工艺逻辑提交

src/views/processManagement/components/addTestDialog.vue

@@ -21,7 +21,7 @@
         <el-col :span="12">
           <el-form-item label="工艺版本号:" prop="version">
             <el-select v-model="ruleForm.version" placeholder="请输入" clearable filterable>
-              <el-option v-for="(item,index) in versionOptions" :key="index" :label="item.partVersions" :value="item.partVersions" />
+              <el-option v-for="(item,index) in versionOptions" :key="index" :label="item.partVersion" :value="item.partVersion" />
             </el-select>
           </el-form-item>
         </el-col>

src/views/processManagement/components/processMainte/processPlanning.vue

@@ -276,7 +276,11 @@
                   clearable
                   filterable
                 >
-                  <el-option v-for="(item, index) in projectOptions" :label="item.name" :value="item.id"></el-option>
+                  <el-option
+                    v-for="(item, index) in projectOptions"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
                 </el-select>
               </el-form-item>
             </template>
@@ -296,7 +300,11 @@
                   clearable
                   filterable
                 >
-                  <el-option v-for="(item, index) in standardList" :label="item.name" :value="item.id"></el-option>
+                  <el-option
+                    v-for="(item, index) in standardList"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
                 </el-select>
                 <!-- <el-input
                   v-model="scope.row.projectStandard"
@@ -501,7 +509,7 @@ import {
   getCraftAbilityList,
   getPartDetail,
   getProject,
-  getStandardList
+  getStandardList,
 } from '@/api/processManagement/taskProcessing';
 import { getPqList } from '@/api/qualityManagement/remindRedeem/remindRedeem';
 export default {
@@ -604,29 +612,28 @@ export default {
       treeNodes: {}, //选中组织树节点信息
       partInfoData: {}, //零件信息
       tempId: 0,
-      projectOptions: [],//检验项目列表
-      standardList: [],//检验标准列表
-
+      projectOptions: [], //检验项目列表
+      standardList: [], //检验标准列表
     };
   },
   mounted() {
     this.getModelList();
     this.getDetails();
-    
+
     this.getProcessSetList();
     this.getCraftAbilityList();
     this.getPqList();
-    this.getProject()
-    this.getStandardList()
+    this.getProject();
+    this.getStandardList();
   },
   methods: {
-    getStandardList(){
+    getStandardList() {
       getStandardList().then(res => {
         this.standardList = res.data.data;
       });
     },
-    getProject(){
-      getProject({size: 999999, current: 1}).then(res => {
+    getProject() {
+      getProject({ size: 999999, current: 1 }).then(res => {
         this.projectOptions = res.data.data.records;
       });
     },
@@ -647,10 +654,9 @@ export default {
       });
     },
     // 工艺模板列表
-   async getModelList  () {
-     await getModelList().then(res => {
+    async getModelList() {
+      await getModelList().then(res => {
         this.modelOption = res.data.data;
-       
       });
     },
     // 工序列表查询
@@ -695,15 +701,15 @@ export default {
       });
     },
     // 获取零件信息详情数据
-   async getDetails() {
-     await getProcessAuthorized({
+    async getDetails() {
+      await getProcessAuthorized({
         partId: this.partId,
         taskId: this.updateRow.id,
         rank: this.rank,
       }).then(res => {
         this.data = this.transformCraftTree(res.data.data);
         this.partInfoData = res.data.data.partInfo;
-       if (this.partInfoData.partName == '石墨模') {
+        if (this.partInfoData.partName == '石墨模') {
           let graphite = this.modelOption.find(item => item.name == '石墨模');
           this.modelLevel = graphite.id;
           this.modelLevelChange();
@@ -774,6 +780,11 @@ export default {
       this.form2.tableData2 = [];
       this.form3.tableData3 = [];
       this.form4.tableData4 = [];
+      this.form1.deleteIds = [];
+      this.form2.deleteIds = [];
+      this.form3.deleteIds = [];
+      this.form4.deleteIds = [];
+      
       // 根据节点层级切换标签页
       if (this.treeLeave === 2) {
         this.activeName = '1';
@@ -798,11 +809,19 @@ export default {
     // 右侧tab切换
     handleClick(value) {
       console.log(999999, value);
+      this.form1.deleteIds = [];
+      this.form2.deleteIds = [];
+      this.form3.deleteIds = [];
+      this.form4.deleteIds = [];
     },
     // 切换等级
     leavelChange() {
       // this.$message.success('保存成功');
       this.getDetails();
+      this.form1.deleteIds = [];
+      this.form2.deleteIds = [];
+      this.form3.deleteIds = [];
+      this.form4.deleteIds = [];
     },
     // 获取工序号
     getProcessNo(table) {
@@ -854,21 +873,18 @@ export default {
     },
     handleSelectionChange1(val) {
       this.form1.selectIds = val.map(row => row.id || row._tempId);
-      this.form1.deleteIds = val
-        .filter(row => row.id != null && row.id !== '') // 排除新增行（id 为 null 或空）
-        .map(row => row.id);
     },
     handleSelectionChange2(val) {
       this.form2.selectIds = val.map(row => row.id || row._tempId);
-      this.form2.deleteIds = val.filter(row => row.id != null).map(row => row.id);
+      // this.form2.deleteIds = val.filter(row => row.id != null).map(row => row.id);
     },
     handleSelectionChange3(val) {
       this.form3.selectIds = val.map(row => row.id || row._tempId);
-      this.form3.deleteIds = val.filter(row => row.id != null).map(row => row.id);
+      // this.form3.deleteIds = val.filter(row => row.id != null).map(row => row.id);
     },
     handleSelectionChange4(val) {
       this.form4.selectIds = val.map(row => row.id || row._tempId);
-      this.form4.deleteIds = val.filter(row => row.id != null).map(row => row.id);
+      // this.form4.deleteIds = val.filter(row => row.id != null).map(row => row.id);
     },
     // 删除选择行
     delTable() {
@@ -880,16 +896,26 @@ export default {
           this.$message.warning(message);
           return;
         }
+        this.form1.deleteIds = this.form1.tableData1
+          .filter(row => this.form1.selectIds.includes(row.id || row._tempId))
+          .filter(row => row.id != null && row.id !== '') // 只保留有真实 id 的行
+          .map(row => row.id);
         this.form1.tableData1 = this.form1.tableData1.filter(row => {
           const key = row.id || row._tempId;
           return !this.form1.selectIds.includes(key);
         });
+
         this.form1.selectIds = []; // 清空选中
       } else if (active === '2') {
         if (this.form2.selectIds.length === 0) {
           this.$message.warning(message);
           return;
         }
+        this.form2.deleteIds = this.form2.tableData2
+          .filter(row => this.form2.selectIds.includes(row.id || row._tempId))
+          .filter(row => row.id != null && row.id !== '')
+          .map(row => row.id);
+
         this.form2.tableData2 = this.form2.tableData2.filter(row => {
           const key = row.id || row._tempId;
           return !this.form2.selectIds.includes(key);
@@ -900,6 +926,10 @@ export default {
           this.$message.warning(message);
           return;
         }
+        this.form3.deleteIds = this.form3.tableData3
+          .filter(row => this.form3.selectIds.includes(row.id || row._tempId))
+          .filter(row => row.id != null && row.id !== '')
+          .map(row => row.id);
         this.form3.tableData3 = this.form3.tableData3.filter(row => {
           const key = row.id || row._tempId;
           return !this.form3.selectIds.includes(key);
@@ -910,6 +940,11 @@ export default {
           this.$message.warning(message);
           return;
         }
+        this.form4.deleteIds = this.form4.tableData4
+          .filter(row => this.form4.selectIds.includes(row.id || row._tempId))
+          .filter(row => row.id != null && row.id !== '')
+          .map(row => row.id);
+
         this.form4.tableData4 = this.form4.tableData4.filter(row => {
           const key = row.id || row._tempId;
           return !this.form4.selectIds.includes(key);
@@ -1140,6 +1175,7 @@ export default {
 
             authorizedAccomplish2(query_).then(res => {
               this.$message.success('保存成功');
+              this.getDetails();
             });
           }
         });
@@ -1155,6 +1191,7 @@ export default {
 
             saveProcessProjectSave(query_).then(res => {
               this.$message.success('保存成功');
+              this.getDetails();
             });
           }
         });
@@ -1169,6 +1206,7 @@ export default {
             };
             saveProcessMeasuringTool(query_).then(res => {
               this.$message.success('保存成功');
+              this.getDetails();
             });
           }
         });
@@ -1183,6 +1221,7 @@ export default {
             };
             saveProcessMoldTool(query_).then(res => {
               this.$message.success('保存成功');
+              this.getDetails();
             });
           }
         });

src/views/processManagement/components/processMainte/reworkProcessPlanning.vue

@@ -275,11 +275,14 @@
                 :prop="`tableData2[${scope.$index}].projectStandard`"
                 :rules="formRules2.projectStandard"
               >
-                <el-input
+                <el-select
                   v-model="scope.row.projectStandard"
-                  placeholder="请输入"
-                  style="width: 100%"
-                ></el-input>
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                >
+                  <el-option v-for="(item, index) in standardList" :label="item.name" :value="item.id"></el-option>
+                </el-select>
               </el-form-item>
             </template>
           </el-table-column>
@@ -449,7 +452,8 @@ import {
   getProcessSetList,
   getCraftAbilityList,
   getProject,
-  getTeamSetList
+  getTeamSetList,
+  getStandardList
 } from '@/api/processManagement/taskProcessing';
 
 export default {
@@ -564,6 +568,7 @@ export default {
       reworkNoNum: null, //返工序号
       projectOptions:[],//检验项目维护
       teamOptions:[],//班组
+      standardList:[],//标准
 
     };
   },
@@ -574,8 +579,14 @@ export default {
     this.getCraftAbilityList();
     this.getProject()
     this.getTeamSetList()
+    this.getStandardList()
   },
   methods: {
+    getStandardList(){
+      getStandardList().then(res => {
+        this.standardList = res.data.data;
+      });
+    },
     getTeamSetList(){
       getTeamSetList().then(res => {
         this.teamOptions = res.data.data;

src/views/processManagement/sinTer/index.vue

@@ -141,7 +141,7 @@ export default {
           },
           {
             label: '子件号',
-            prop: 'bpartName',
+            prop: 'zpartCode',
             sortable: true,
             filter: true,
             span: 24,
@@ -157,7 +157,7 @@ export default {
             span: 24,
             search: false,
             headerAlign: 'center',
-            align: 'left',
+            align: 'center',
           },
         ],
       },

src/views/qualityManagement/similarParts/index.vue

@@ -136,6 +136,7 @@ export default {
             sortable: true,
             span: 24,
             type: 'select',
+            filterable: true,
             dicUrl: '/blade-desk/dsPart/getPartList',
             props: {
               label: 'partCode',
@@ -148,6 +149,9 @@ export default {
                 trigger: 'blur',
               },
             ],
+            change: val => {
+              this.onChangeData(val.item, 'partOne');
+            },
           },
           {
             label: '相似零件',
@@ -155,12 +159,13 @@ export default {
             search: true,
             sortable: true,
             span: 24,
-            // type: 'select',
-            // dicUrl: '/blade-desk/dsPart/getPartList',
-            // props: {
-            //   label: 'partCode',
-            //   value: 'id',
-            // },
+            filterable: true,
+            type: 'select',
+            dicUrl: '/blade-desk/dsPart/getPartList',
+            props: {
+              label: 'partCode',
+              value: 'id',
+            },
             rules: [
               {
                 required: true,
@@ -168,6 +173,9 @@ export default {
                 trigger: 'blur',
               },
             ],
+            change: val => {
+              this.onChangeData(val.item, 'partTwo');
+            },
           },
         ],
       },
@@ -178,6 +186,14 @@ export default {
     };
   },
   methods: {
+    onChangeData(val, type) {
+      if (val&&type == 'partOne') {
+        this.form.partOneCode = val.partName;
+      }
+      if (val&&type == 'partTwo') {
+        this.form.partTwoCode = val.partName;
+      }
+    },
     // 点击导入按钮
     handleImport() {
       this.isShowImport = true;