工艺逻辑提交

src/api/processManagement/taskProcessing.js

@@ -255,3 +255,12 @@ export const getTeamSetList = (params) => {
     params: params,
   });
 }
+
+// 检验标注   
+export const getStandardList = (params) => {
+  return request({
+    url: '/blade-desk/QA/Standard/listForSelect',
+    method: 'get',
+    params: params,
+  });
+}

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

@@ -290,11 +290,19 @@
                 :prop="`tableData2[${scope.$index}].projectStandard`"
                 :rules="formRules2.projectStandard"
               >
-                <el-input
+                <el-select
+                  v-model="scope.row.projectStandard"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                >
+                  <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"
                   placeholder="请输入"
                   style="width: 100%"
-                ></el-input>
+                ></el-input> -->
               </el-form-item>
             </template>
           </el-table-column>
@@ -492,7 +500,8 @@ import {
   getProcessSetList,
   getCraftAbilityList,
   getPartDetail,
-  getProject
+  getProject,
+  getStandardList
 } from '@/api/processManagement/taskProcessing';
 import { getPqList } from '@/api/qualityManagement/remindRedeem/remindRedeem';
 export default {
@@ -596,6 +605,7 @@ export default {
       partInfoData: {}, //零件信息
       tempId: 0,
       projectOptions: [],//检验项目列表
+      standardList: [],//检验标准列表
 
     };
   },
@@ -607,8 +617,14 @@ export default {
     this.getCraftAbilityList();
     this.getPqList();
     this.getProject()
+    this.getStandardList()
   },
   methods: {
+    getStandardList(){
+      getStandardList().then(res => {
+        this.standardList = res.data.data;
+      });
+    },
     getProject(){
       getProject({size: 999999, current: 1}).then(res => {
         this.projectOptions = res.data.data.records;

src/views/processManagement/taskProcessing.vue

@@ -43,7 +43,7 @@
           type="primary"
           link
           @click="completedFn(scope.row)"
-          v-if="scope.row.taskStatus == 2"
+          v-if="scope.row.taskStatus == 2&& (!scope.row.children || scope.row.children.length === 0)"
           >完成</el-button
         >
         <el-button