Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/views/bpm/handleTask/components/bomApproverJSYY/detailDialog.vue

@@ -13,11 +13,12 @@
             : 'EBOM'
         }}
       </div>
-      <div> 编码：{{ this.form.code }} </div>
+      <div> BOM编码：{{ this.form.code }} </div>
       <div> 名称：{{ this.form.name }} </div>
-      <div> 版本：V{{ this.form.versions }} </div>
+      <div> 编码：{{ this.form.categoryCode }} </div>
+      <div> 版本：V{{ this.form.versions }}.0 </div>
     </div>
-    <BOMSearch @search="reload" :statusOpt="statusOpt" />
+    <!-- <BOMSearch @search="reload" :statusOpt="statusOpt" /> -->
 
     <ele-pro-table
       ref="table"
@@ -250,7 +251,7 @@
         ],
         statusOpt: {
           '': '全部',
-          0: '已停用',
+          0: '草稿',
           1: '已发布'
         }
       };
@@ -266,7 +267,8 @@
           ...where,
           pageNum: page,
           size: -1,
-          id: this.businessId
+          id: this.businessId,
+          isResourceBom: 1
         });
       },
 
@@ -278,9 +280,15 @@
       handBomDetails(id) {
         if (id) {
           getBomGetById(id).then((res) => {
-            this.form = res;
-            this.baseCount = res.baseCount;
-            this.unit = res.category.measuringUnit;
+            console.log(res, '返回的数据12');
+            if (Object.keys(res).length != 0) {
+              this.form = res;
+              this.baseCount = res.baseCount;
+              this.unit = res.category.measuringUnit;
+            }
+            // this.form = res;
+            // this.baseCount = res.baseCount;
+            // this.unit = res.category.measuringUnit;
           });
         }
       },

src/views/bpm/handleTask/components/bomApproverJSdevice/detailDialog.vue

@@ -13,12 +13,13 @@
             : 'EBOM'
         }}
       </div>
-      <div> 编码：{{ this.form.code }} </div>
+      <div> BOM编码：{{ this.form.code }} </div>
       <div> 名称：{{ this.form.name }} </div>
+      <div> 编码：{{ this.form.categoryCode }} </div>
       <div> 版本：V{{ this.form.versions }}.0 </div>
     </div>
 
-    <BOMSearch @search="reload" :statusOpt="statusOpt" />
+    <!-- <BOMSearch @search="reload" :statusOpt="statusOpt" /> -->
 
     <ele-pro-table
       ref="table"
@@ -265,7 +266,8 @@
           ...where,
           pageNum: page,
           size: -1,
-          id: this.businessId
+          id: this.businessId,
+          isResourceBom: 1
         });
       },
 
@@ -289,9 +291,12 @@
       handBomDetails(id) {
         if (id) {
           getBomGetById(id).then((res) => {
-            this.form = res;
-            this.baseCount = res.baseCount;
-            this.unit = res.category.measuringUnit;
+            console.log(res, '返回的数据335');
+            if (Object.keys(res).length != 0) {
+              this.form = res;
+              this.baseCount = res.baseCount;
+              this.unit = res.category.measuringUnit;
+            }
           });
         }
       },

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

@@ -145,7 +145,7 @@
       return {
         visible: false,
         form: {
-          reason: ''
+          reason: '同意'
         },
         formData: {
           finishTime: ''

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

@@ -3,7 +3,6 @@
     <el-form label-width="100px" ref="formRef" :model="form">
       <el-form-item
         label="审批建议"
-
         style="margin-bottom: 20px"
         :rules="{
           required: true,
@@ -68,7 +67,7 @@
       return {
         form: {
           technicianId: '',
-          reason: ''
+          reason: '同意'
         }
       };
     },
@@ -81,7 +80,6 @@
       },
 
       async _approveTaskThorVariables(status) {
-
         if (status == 1) {
           outsourceAssign({
             businessId: this.businessId,