物料添加工序查询

cclqms-vue/src/views/modules/qc/QcDataAcquisitionDialog.vue

@@ -2,7 +2,7 @@
   <el-dialog
     :title="$t('qc.iqcPage.dataCollectEquipmentTitle')"
     :visible.sync="innerVisible"
-    width="780px"
+    width="680px"
     append-to-body
     :close-on-click-modal="false"
     custom-class="qc-data-acquisition-dialog">
@@ -17,7 +17,7 @@
         :label="$t('qc.iqcPage.equipmentType')"
         header-align="center"
         align="left"
-        min-width="180"
+        min-width="120"
         show-overflow-tooltip>
         <template slot-scope="scope">
           <span class="equipment-type-text">{{ scope.row.equipmentDesc || scope.row.equipmentNo }}</span>

cclqms-vue/src/views/modules/qc/qcPartAttribute.vue

@@ -688,6 +688,13 @@
               <el-option :label="$t('qc.table.finalInspection')" value="末件检"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item :label="$t('qc.table.process')">
+            <el-select v-model="qcSpecFilterOperation" :placeholder="$t('qc.common.selectPlaceholder')"
+              @change="onQcSpecOperationFilterChange" clearable filterable style="width: 140px">
+              <el-option :label="$t('qc.common.all')" value=""></el-option>
+              <el-option v-for="item in qcSpecOperationFilterOptions" :key="item" :label="item" :value="item"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label=" ">
           <el-button type="primary" @click="addQcSpecModal()" icon="el-icon-plus">{{ $t('qc.common.add') }}</el-button>
           <el-button v-if="!authItemImport" type="primary" @click="qcSpecUploadModal()"
@@ -2508,6 +2515,7 @@ export default {
       qcSpecDragSaving: false,
       qcSpecFilterType: '',
       qcSpecFilterIpqcMethod: '',
+      qcSpecFilterOperation: '',
       qcSpecCurrentRow: null,
       editQcSpecBatchVisible: false,
       batchQcSpecLoading: false,
@@ -3558,6 +3566,9 @@ export default {
     qcSpecFilterIpqcMethod() {
       this.syncQcSpecTableList()
     },
+    qcSpecFilterOperation() {
+      this.syncQcSpecTableList()
+    },
     activeTable(val) {
       if (val === 'qcSpec') {
         this.$nextTick(() => this.initQcSpecSortable())
@@ -3626,6 +3637,16 @@ export default {
     qcSpecAddApplyCanCustomer() {
       return this.qcSpecAddApplyCanOperation
     },
+    qcSpecOperationFilterOptions() {
+      const operationSet = new Set()
+      ;(this.qcSpecList || []).forEach((item) => {
+        const operation = (item.operation || '').trim()
+        if (operation) {
+          operationSet.add(operation)
+        }
+      })
+      return [...operationSet].sort((a, b) => a.localeCompare(b, 'zh-CN'))
+    },
   },
 
   methods: {
@@ -4273,6 +4294,9 @@ export default {
     onQcSpecIpqcMethodFilterChange() {
       this.resetQcSpecTableSelection()
     },
+    onQcSpecOperationFilterChange() {
+      this.resetQcSpecTableSelection()
+    },
     resetQcSpecTableSelection() {
       this.qcSpecCurrentRow = null
       this.$nextTick(() => {
@@ -4315,6 +4339,11 @@ export default {
           (item) => item.ipqcInspectionMethod === this.qcSpecFilterIpqcMethod
         )
       }
+      if (this.qcSpecFilterOperation) {
+        list = list.filter(
+          (item) => (item.operation || '') === this.qcSpecFilterOperation
+        )
+      }
       this.qcSpecTableList = this.sortQcSpecByRowNo(list)
       this.$nextTick(() => {
         if (this.activeTable === 'qcSpec') {