Merge remote-tracking branch 'origin/master'

src/views/bpm/handleTask/components/equipmentDisposal/edit.vue

@@ -10,6 +10,16 @@
       class="create-form"
     >
       <el-row :gutter="15">
+        <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }">
+          <el-form-item label="处置方式:" prop="disposalType">
+            <DictSelection
+              dictName="设备处置方式"
+              v-model="form.disposalType"
+              :disabled="type == 'detail'"
+              @change='disposalTypeChange'
+            ></DictSelection>
+          </el-form-item>
+        </el-col>
         <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }">
           <el-form-item label="编码:" prop="code">
             <el-input v-model="form.code" disabled />
@@ -20,15 +30,7 @@
             <el-input v-model="form.name" :disabled="type == 'detail'" />
           </el-form-item>
         </el-col>
-        <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }">
-          <el-form-item label="处置方式:" prop="disposalType">
-            <DictSelection
-              dictName="设备处置方式"
-              v-model="form.disposalType"
-              :disabled="type == 'detail'"
-            ></DictSelection>
-          </el-form-item>
-        </el-col>
+     
         <el-col v-bind="styleResponsive ? { lg: 8, md: 12 } : { span: 8 }">
           <el-form-item label="管理类别:" prop="managementCategory">
             <DictSelection
@@ -212,11 +214,11 @@ export default {
   },
   created() {
     this.open();
-    this.columnsInit();
+   
     this.type = this.taskDefinitionKey == 'fqr' ? 'edit' : 'detail';
   },
   methods: {
-    async columnsInit(list = []) {
+    async columnsInit(val) {
       this.columns = [
         {
           columnKey: 'index',
@@ -260,7 +262,13 @@ export default {
           label: '规格',
           align: 'center'
         },
-        ...list,
+        {
+          prop: 'sealingTime',
+          showOverflowTooltip: true,
+          label: '封存时间',
+          show: val == 6,
+          align: 'center'
+        },
         {
           showOverflowTooltip: true,
           prop: 'postName',
@@ -345,11 +353,15 @@ export default {
     async open() {
       const data = await getById(this.businessId);
       this.form = data;
+      this.columnsInit(this.form.disposalType);
       this.form.disposalType = this.form.disposalType + '';
       this.form.managementCategory = this.form.managementCategory + '';
       this.deviceList = this.form.deviceList;
       this.disposalTypeList = this.form.disposalTypeList;
     },
+    disposalTypeChange(val) {
+      this.columnsInit(val);
+    },
     del(id) {
       this.deviceList = this.deviceList.filter((item) => item.id != id);
     },

src/views/bpm/handleTask/components/equipmentDisposal/submit.vue

@@ -54,12 +54,6 @@
 import { approveTaskWithVariables } from '@/api/bpm/task';
 import dictMixins from '@/mixins/dictMixins';
 import { save } from '@/api/bpm/components/equipmentDisposal';
-
-// import {
-//   assign,
-//   cancel
-// } from '@/api/bpm/components/purchasingManage/purchasePlanManage';
-
 // 流程实例的详情页，可用于审批
 export default {
   mixins: [dictMixins],