1

src/views/modules/inspection/inspectionPendingList.vue

@@ -19,8 +19,15 @@
         </el-form-item>
         <el-form-item label="状态" class="search-item">
           <el-select v-model="searchData.status" clearable placeholder="请选择" style="width: 60%">
-            <el-option label="全部" value="" />
+            <el-option label="全部(除草稿)" value="NON_DRAFT" />
+            <el-option label="待审核" value="Confirmed" />
+            <el-option label="已下达" value="Audited" />
             <el-option label="已排程" value="Scheduled" />
+            <el-option label="验货中" value="Inspecting" />
+            <el-option label="验货完成" value="InspectionCompleted" />
+
+            <el-option label="已完成" value="Completed" />
+            <el-option label="已取消" value="Cancelled" />
           </el-select>
         </el-form-item>
       </div>
@@ -154,10 +161,11 @@ export default {
       searchType: '',
       activeTab: 'base',
       searchData: {
+        site: this.$store.state.user.site,
         requestNo: '',
         supplierNo: '',
         supplierName: '',
-        status: 'Scheduled',  // 默认状态为已排程
+        status: 'NON_DRAFT',  // 默认查询全部（除草稿）
         qcOperator: '',  // QC人员不设置默认值
         createBy: '',
         requestDateStart: '',
@@ -494,14 +502,14 @@ export default {
       }
     },
 
-    // 查询数据 - 🔑 核心方法：默认状态为已排程，但允许用户选择全部
+    // 查询数据 - 默认查询全部（除草稿），用户也可切换到具体状态
     getMainData () {
       this.searchData.limit = this.pageSize
       this.searchData.page = this.pageIndex
 
-      // 🔑 如果状态为 undefined 或 null(未初始化)，则默认使用已排程；如果用户主动选择"全部"(空字符串)，则保持为空
+      // 若状态未初始化，默认按全部（除草稿）查询
       if (this.searchData.status === undefined || this.searchData.status === null) {
-        this.searchData.status = 'Scheduled'
+        this.searchData.status = 'NON_DRAFT'
       }
 
       // QC人员由用户手动输入，不自动设置默认值

src/views/modules/inspection/inspectionRequestList.vue

@@ -24,7 +24,10 @@
             <el-option label="待审核" value="Confirmed" />
             <el-option label="已下达" value="Audited" />
             <el-option label="已排程" value="Scheduled" />
-            <el-option label="已验货" value="Inspected" />
+            <el-option label="验货中" value="Inspecting" />
+            <el-option label="验货完成" value="InspectionCompleted" />
+
+            <el-option label="已完成" value="Completed" />
             <el-option label="已取消" value="Cancelled" />
           </el-select>
         </el-form-item>

src/views/modules/inspection/myInspectionList.vue

@@ -71,6 +71,7 @@ export default {
       pageSize: 50,
       totalPage: 0,
       searchData: {
+        site: this.$store.state.user.site,
         page: 1,
         limit: 50,
         statusDb: 'Scheduled,Inspecting'
@@ -141,7 +142,7 @@ export default {
         'Scheduled': '已排程',
         'Audited': '已审核',
         'Inspecting': '验货中',
-        'Inspected': '已验货',
+
         'Completed': '已完成',
         'Cancelled': '已取消'
       }
@@ -194,11 +195,11 @@ export default {
               page: 1,
               limit: 1
             }
-            
+
             qcIQCInspectionSearch(searchParams).then(({ data }) => {
               if (data.code === 0 && data.page.list && data.page.list.length > 0) {
                 const iqcRecord = data.page.list[0]
-                
+
                 // 调用开始检验接口，更新状态为"待检验"
                 const actionIQCData = {
                   site: iqcRecord.site,
@@ -208,14 +209,14 @@ export default {
                   state: '待检验',
                   equipmentList: []
                 }
-                
+
                 actionIQCInspection(actionIQCData).then(({ data }) => {
                   if (data.code === 0) {
                     this.$message.success('开始检验成功')
                   } else {
                     this.$message.warning((data && data.msg) || '开始检验失败，但不影响后续操作')
                   }
-                  
+
                   // 第三步：执行原有的 startInspection 逻辑
                   const startInspectionData = {
                     requestNo: row.requestNo,

src/views/modules/qc/IQCResultEntry.vue

@@ -246,7 +246,7 @@
         </el-form-item>
         <el-form-item :label="'不合格项目数量'">
           <el-input-number :controls="false" :step="0" v-if="detailData.submitFlag === 'Y'" v-model="detailData.unqualifiedQty" disabled style="width: 81px" @change="noBatchQualifiedQtyChange"></el-input-number>
-          <el-input-number :controls="false" :step="0" v-else v-model="detailData.unqualifiedQty" style="width: 81px" @change="noUnqualifiedQtyChange"></el-input-number>
+          <el-input-number :controls="false" :step="0" v-else v-model="detailData.unqualifiedQty" disabled style="width: 81px" @change="noUnqualifiedQtyChange"></el-input-number>
         </el-form-item>
 
         <el-form-item :label="'批次不合格数'">
@@ -413,7 +413,7 @@
                 <el-option label="合格" value="Y" style="color: green"></el-option>
                 <el-option label="不合格" value="N" style="color: red"></el-option>
               </el-select>
-              <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-else v-model="scope.row.itemResult" style="height: 11px;padding: 0px" placeholder="合格">
+              <el-select :class="{redElSelect:scope.row.itemResult === 'N', greenElSelect:scope.row.itemResult === 'Y'}" v-else v-model="scope.row.itemResult" style="height: 11px;padding: 0px" placeholder="合格" @change="handleItemResultChange($event, scope.row)">
                 <el-option label="合格" value="Y" style="color: green"></el-option>
                 <el-option label="不合格" value="N" style="color: red"></el-option>
               </el-select>
@@ -827,13 +827,7 @@
       detailList: {
         deep: true,
         handler: function (newV, oldV) {
-          let num2 = 0
-          for (let i = 0; i < this.detailList.length; i++) {
-            if (this.detailList[i].itemResult === 'N') {
-              num2++
-            }
-          }
-          this.detailData.unqualifiedQty = num2
+          this.refreshUnqualifiedQty()
         }
       },
     },
@@ -2838,9 +2832,15 @@
       getInspectionFormData () {
         iqcDetailSearch(this.detailData).then(({data}) => {
           if (data && data.code === 0) {
-            this.detailList = data.rows
+            const rows = Array.isArray(data.rows) ? data.rows : []
+            this.detailList = rows.map(item => ({
+              ...item,
+              itemResult: item.itemResult == null ? '' : item.itemResult
+            }))
+            this.refreshUnqualifiedQty()
           } else {
             this.detailList = []
+            this.refreshUnqualifiedQty()
           }
         })
       },
@@ -3284,32 +3284,48 @@
         })
       },
       updateItemResult(row){
-        if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
-          return;
+        if (row.maxValue == null && row.minValue == null && row.defaultValue == null) {
+          return
         }
+        let nextItemResult = row.itemResult
         if (row.maxValue == null && row.minValue == null) {
-          if (row.numberValue!=row.defaultValue){
-            row.itemResult = 'N'
+          if (row.numberValue != row.defaultValue) {
+            nextItemResult = 'N'
           }
-        }else if (row.maxValue != null && row.minValue != null){
-          if (row.numberValue>row.maxValue ||row.numberValue<row.minValue){
-            row.itemResult = 'N'
-          }else {
-            row.itemResult = 'Y'
+        } else if (row.maxValue != null && row.minValue != null) {
+          if (row.numberValue > row.maxValue || row.numberValue < row.minValue) {
+            nextItemResult = 'N'
+          } else {
+            nextItemResult = 'Y'
           }
-        }else if(row.maxValue != null){
-          if ( row.numberValue>row.maxValue) {
-            row.itemResult = 'N'
-          }else {
-            row.itemResult = 'Y'
+        } else if (row.maxValue != null) {
+          if (row.numberValue > row.maxValue) {
+            nextItemResult = 'N'
+          } else {
+            nextItemResult = 'Y'
           }
-        }else if(row.minValue != null){
-          if ( row.numberValue<row.minValue) {
-            row.itemResult = 'N'
-          }else {
-            row.itemResult = 'Y'
+        } else if (row.minValue != null) {
+          if (row.numberValue < row.minValue) {
+            nextItemResult = 'N'
+          } else {
+            nextItemResult = 'Y'
+          }
+        }
+        this.$set(row, 'itemResult', nextItemResult)
+        this.refreshUnqualifiedQty()
+      },
+      handleItemResultChange (value, row) {
+        this.$set(row, 'itemResult', value)
+        this.refreshUnqualifiedQty()
+      },
+      refreshUnqualifiedQty () {
+        let num2 = 0
+        for (let i = 0; i < this.detailList.length; i++) {
+          if (this.detailList[i] && this.detailList[i].itemResult === 'N') {
+            num2++
           }
         }
+        this.$set(this.detailData, 'unqualifiedQty', num2)
       },
 
       //删除
@@ -3370,16 +3386,17 @@
         saveIQCSubDetailed(this.subDetailData).then(({data}) => {
           if (data && data.code === 0) {
             if (data.count > 0) {
-              this.subDetailData.itemResult = 'N'
-              this.subDetailData.unqualifiedQuantity = data.count
+              this.$set(this.subDetailData, 'itemResult', 'N')
+              this.$set(this.subDetailData, 'unqualifiedQuantity', data.count)
             }
             if (this.subDetailData.subDetailValues.length > 0) {
-              this.subDetailData.subDetailRecordNum = 1
+              this.$set(this.subDetailData, 'subDetailRecordNum', 1)
             } else {
-              this.subDetailData.subDetailRecordNum = -1
-              this.subDetailData.unqualifiedQuantity = 0
-              this.subDetailData.itemResult = 'Y'
+              this.$set(this.subDetailData, 'subDetailRecordNum', -1)
+              this.$set(this.subDetailData, 'unqualifiedQuantity', 0)
+              this.$set(this.subDetailData, 'itemResult', 'Y')
             }
+            this.refreshUnqualifiedQty()
             this.subDetailFlag = false
             this.tableData = []
             this.$message({
@@ -3540,15 +3557,16 @@
       changeMyString (val) {
         for (let i = 0; i < this.detailList.length; i++) {
           if (val[this.detailList[i].itemNo] !== undefined) {
-            this.detailList[i].unqualifiedQuantity = val[this.detailList[i].itemNo]
+            this.$set(this.detailList[i], 'unqualifiedQuantity', val[this.detailList[i].itemNo])
             if (val[this.detailList[i].itemNo] != null) {
-              this.detailList[i].subDetailRecordNum = 1
+              this.$set(this.detailList[i], 'subDetailRecordNum', 1)
             }
             if (val[this.detailList[i].itemNo] > 0) {
-              this.detailList[i].itemResult = 'N'
+              this.$set(this.detailList[i], 'itemResult', 'N')
             }
           }
         }
+        this.refreshUnqualifiedQty()
       },
 
       //获取按钮的权限数据

src/views/modules/srmSupplier/supplierList.vue

@@ -20,7 +20,7 @@
           <el-form-item :label="' '" >
             <el-button class="customer-bun-min" type="primary" @click="getMainData" style="">查询</el-button>
             <el-button @click="addSupplier()" type="primary" style="margin-left: 2px">新增</el-button>
-            <el-button @click="handleTestCurrentLoginSite" type="primary" style="margin-left: 2px">测试</el-button>
+<!--            <el-button @click="handleTestCurrentLoginSite" type="primary" style="margin-left: 2px">测试</el-button>-->
 <!--            <el-button @click="exportExcel()" type="primary" style="margin-left: 2px">{{'导出'}}</el-button>-->
           </el-form-item>
         </el-col>