From caf73c174b365b06bc522e1314631600a0b2ef47 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 14 Apr 2025 10:34:21 +0800
Subject: [PATCH] 20250414

---
 .../modules/Abnormal/AbnormalFeedBack.vue     | 17 +++++-
 src/views/modules/production/bagPrint.vue     |  2 +-
 .../modules/production/liuhuaProductView.vue  |  2 +-
 .../modules/production/scheduleForSOTask.vue  | 52 +++++++++++--------
 4 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue
index b3d9624..0e91c29 100644
--- a/src/views/modules/Abnormal/AbnormalFeedBack.vue
+++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue
@@ -24,9 +24,21 @@
           placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
+<!--      <el-form-item label="异常情况原因：" >-->
+<!--        <el-select v-model="searchData.abnormalCode" style="width: 120px">-->
+<!--          <el-option label="全部" value="" ></el-option>-->
+<!--          <el-option-->
+<!--            v-for="(item,index) in abnormalList"-->
+<!--            :key="index"-->
+<!--            :label="item.abnormalDesc"-->
+<!--            :value="item.abnormalCode"-->
+<!--          >-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="异常情况原因：" >
-        <el-select v-model="searchData.abnormalCode" style="width: 120px">
-          <el-option label="全部" value="" ></el-option>
+        <el-select v-model="searchData.abnormalCodeList" multiple collapse-tags style="width: 240px" clearable>
+<!--          <el-option label="全部" value="" ></el-option>-->
           <el-option
             v-for="(item,index) in abnormalList"
             :key="index"
@@ -524,6 +536,7 @@
           startDate:'',
           endDate:'',
           abnormalCode:'',
+          abnormalCodeList:[],
           abnormalDesc:'',
           site:'',
           status:'',
diff --git a/src/views/modules/production/bagPrint.vue b/src/views/modules/production/bagPrint.vue
index 15f8a7e..0d2518c 100644
--- a/src/views/modules/production/bagPrint.vue
+++ b/src/views/modules/production/bagPrint.vue
@@ -151,7 +151,7 @@ export default {
   created() {
   },
   mounted() {
-    this.queryBag();
+    // this.queryBag();
   }
 }
 </script>
diff --git a/src/views/modules/production/liuhuaProductView.vue b/src/views/modules/production/liuhuaProductView.vue
index 5509f3e..4db2544 100644
--- a/src/views/modules/production/liuhuaProductView.vue
+++ b/src/views/modules/production/liuhuaProductView.vue
@@ -176,7 +176,7 @@
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
-            columnWidth: 100,
+            columnWidth: 140,
             format: null,
             functionId: this.$route.meta.menuId,
             sortLv: 0,
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 7e2d858..037a2d0 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -297,7 +297,7 @@
         header-align="center"
         align="right"
         width="80"
-        label="参考重量">
+        label="材料需求">
       </el-table-column>
       <el-table-column
         prop="qtyfinished"
@@ -550,7 +550,7 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="组合件清单" :close-on-click-modal="false" v-drag :visible.sync="vpModalFlag" width="600px">
+    <el-dialog title="组合件清单" :close-on-click-modal="false" v-drag :visible.sync="vpModalFlag" width="680px">
       <div class="rq ">
         <el-table
           height="200"
@@ -571,6 +571,13 @@
             min-width="150"
             label="规格型号">
           </el-table-column>
+          <el-table-column
+            prop="inventoryQty"
+            header-align="center"
+            align="left"
+            min-width="100"
+            label="库存数量">
+          </el-table-column>
           <el-table-column
             prop="qtyRequire"
             header-align="center"
@@ -799,7 +806,6 @@
         this.scheduledModalFlag = true
       },
       addPlans () {
-
         // if (this.schedulingModalData.resourceId == '') {
         //   this.$alert('请选择机台！', '错误', {
         //     confirmButtonText: '确定'
@@ -812,26 +818,25 @@
         //   })
         //   return false
         // }
-          let data={
-            scheduleQty: '',
-            weight:'',
-            resourceId: this.schedulingModalData.resourceId,
-            shiftNo: this.schedulingModalData.shiftNo,
-            scheduleDate: null,
-            operatorId:this.schedulingModalData.operatorId,
-            createBy:this.$store.state.user.name,
-            jobType:'',
-          }
+        let data={
+          scheduleQty: '',
+          weight:'',
+          resourceId: this.schedulingModalData.resourceId,
+          shiftNo: this.schedulingModalData.shiftNo,
+          scheduleDate: null,
+          operatorId:this.schedulingModalData.operatorId,
+          createBy:this.$store.state.user.name,
+          jobType:'',
+        }
         if(this.schedulingModalData.partPlanQty!=null&&this.schedulingModalData.partPlanQty!=''&&this.schedulingModalData.partPlanQty!=0){
           data.scheduleQty=this.schedulingModalData.partPlanQty;
           if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='0'){
           }else {
             data.weight=Math.round( data.scheduleQty*this.schedulingModalData.weightFactor)
           }
-
         }
         this.schedulingModalTableData.push(data)
-        this.changeSum ();
+        this.changeSum();
       },
       changeSum () {
         let sum = 0
@@ -959,19 +964,22 @@
         }
         scheduleForSOTask(indata).then(({data}) => {
           if (data && data.code === 0) {
+            if (data.msgList.length > 0){
+              let str = data.msgList.join('\n');
+              this.$alert(`${str}`,'提示', {
+                confirmButtonText: '确定',
+                type: 'warning'
+              }).then(() => {
+              })
+            }else {
+              this.$message.success('操作成功')
+            }
             this.scheduledModalFlag = false
             for (let i = 0; i <this.tableData.length ; i++) {
               if(this.tableData[i].orderNo==indata.orderNo &&this.tableData[i].itemNo==indata.itemNo){
                 this.tableData[i].scheduledQty=data.qty;
               }
             }
-            this.$message({
-              message: '操作成功',
-              type: 'success',
-              duration: 1500,
-              onClose: () => {
-              }
-            })
           } else {
             this.$alert(data.msg, '错误', {
               confirmButtonText: '确定'