2026-08-21

1、ipqc检验，筛选条件”检验类型“改成多选；
2、上传订单判断机器号赋值工序；

src/views/modules/qc/IPQCResultEntry.vue

@@ -59,7 +59,12 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label="检验类型">
-                <el-select v-model="searchData.inspectionTypeNo" clearable placeholder="请选择检验类型">
+                <el-select
+                  v-model="searchData.inspectionTypeNos"
+                  multiple
+                  collapse-tags
+                  clearable
+                  placeholder="请选择检验类型">
                   <el-option label="IPQC首检" value="首件检"></el-option>
                   <el-option label="IPQC自检" value="自检"></el-option>
                   <el-option label="IPQC巡检" value="巡检"></el-option>
@@ -1668,6 +1673,7 @@
           startDate2: '',
           endDate2: '',
           inspectionTypeNo: '',
+          inspectionTypeNos: [],
           partNo: '',
           partDesc: '',
           cinvSourceCode: '',
@@ -3196,6 +3202,7 @@
           userName: this.$store.state.user.name,
           inspectionNo: '',
           inspectionTypeNo: '',
+          inspectionTypeNos: [],
           isQualified: '',
           buNo: '',
           startDate: '',
@@ -4124,7 +4131,8 @@
         this.searchLoading = true
         this.searchData.limit = this.pageSize
         this.searchData.page = this.pageIndex
-        qcIPQCInspectionSearch(this.searchData).then(({data}) => {
+        const queryData = this.buildSearchQueryData()
+        qcIPQCInspectionSearch(queryData).then(({data}) => {
           if (data.code === 0) {
             this.dataList = data.page.list
             this.pageIndex = data.page.currPage
@@ -4156,10 +4164,23 @@
       async createExportData () {
         this.searchData.limit = -1
         this.searchData.page = 1
-        const { data } = await qcIPQCInspectionSearch(this.searchData)
+        const queryData = this.buildSearchQueryData()
+        const { data } = await qcIPQCInspectionSearch(queryData)
         return data.page.list || []
       },
 
+      buildSearchQueryData () {
+        const queryData = {
+          ...this.searchData
+        }
+        const inspectionTypeNos = Array.isArray(queryData.inspectionTypeNos)
+          ? queryData.inspectionTypeNos.filter(item => item !== null && item !== undefined && String(item).trim() !== '')
+          : []
+        queryData.inspectionTypeNos = inspectionTypeNos
+        queryData.inspectionTypeNo = inspectionTypeNos.length === 1 ? inspectionTypeNos[0] : ''
+        return queryData
+      },
+
       startDownload () {
         this._exportLoading = this.$loading({
           lock: true,

src/views/modules/yieldReport/com_tid_upload_order.vue

@@ -270,8 +270,8 @@ export default {
         scheduledDate: scheduleData.scheduledDate || ''
       }
 
-      this.uploadForm.process = ''
       this.uploadForm.machineNo = scheduleData.resourceId || scheduleData.resourceDesc || ''
+      this.uploadForm.process = this.getDefaultProcessByMachineNo(this.uploadForm.machineNo)
       this.uploadForm.shift = scheduleData.shiftNo || ''
       this.uploadForm.operatorNo = ''
       this.uploadForm.date = this.getTodayDateString()
@@ -366,6 +366,21 @@ export default {
       return this.formatDateValue(new Date())
     },
 
+    getDefaultProcessByMachineNo (machineNo) {
+      const normalizedMachineNo = machineNo ? String(machineNo).trim().toUpperCase() : ''
+      if (!normalizedMachineNo) {
+        return ''
+      }
+      const firstLetter = normalizedMachineNo.charAt(0)
+      if (firstLetter === 'A') {
+        return 'testing'
+      }
+      if (firstLetter === 'M') {
+        return 'bonding'
+      }
+      return ''
+    },
+
     formatDateValue (dateObj) {
       var year = dateObj.getFullYear()
       var month = dateObj.getMonth() + 1