工艺逻辑提交

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

@@ -278,7 +278,7 @@
           </avue-crud>
         </el-card>
       </div>
-      <div v-show="activeNameTab === '2'" class="box-card">
+      <div v-show="activeNameTab === '2'" class="box-card box-card-two">
         <div class="process-left">
           <div class="process-select">
             <!-- 工艺级别：-->
@@ -361,8 +361,43 @@
           </el-table>
           <el-table :data="form2.tableData2" style="width: 100%" v-if="activeName == '2'">
             <el-table-column prop="processNo" label="工序号"></el-table-column>
-            <el-table-column prop="projectName" label="检验项目"> </el-table-column>
+            <el-table-column prop="projectName" label="检验项目">
-            <el-table-column prop="projectStandard" label="检验标准"> </el-table-column>
+              <template #default="scope">
+                <el-select
+                  v-model="scope.row.projectName"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  disabled
+                >
+                  <el-option
+                    v-for="(item, index) in projectOptions"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column prop="projectStandard" label="检验标准">
+              <template #default="scope">
+              
+                <el-select
+                  v-model="scope.row.projectStandard"
+                  placeholder="请选择"
+                  clearable
+                  filterable
+                  disabled
+                >
+                  <el-option
+                    v-for="(item, index) in standardList"
+                    :label="item.name"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+                
+            
+            </template>
+             </el-table-column>
             <el-table-column prop="proHours" label="定额工时(分钟)"> </el-table-column>
             <el-table-column prop="prepareHours" label="准备工时(分钟)"></el-table-column>
           </el-table>
@@ -407,6 +442,7 @@ import {
   getProcessAuthorized,
   getVersion,
   getPlatingList,
+  getProject,
 } from '@/api/processManagement/taskProcessing';
 
 export default {
@@ -602,6 +638,8 @@ export default {
       version: '', //版本号
       versionOptions: [], //
       plateList: [], //镀种信息
+      projectOptions: [],
+      standardList:[],//检验标准
     };
   },
   mounted() {
@@ -610,8 +648,19 @@ export default {
     this.getCcraftInfo();
     this.getPartInfo();
     this.getPlatingList();
+    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;
+      });
+    },
     getPlatingList() {
       getPlatingList().then(res => {
         this.plateList = res.data.data;
@@ -723,7 +772,7 @@ export default {
         getPartDetail(this.rowData.id).then(res => {
           this.formData = res.data.data.dsPartEntity;
           this.dataTable = res.data.data.dsPartEntities;
-          this.partChange( this.formData.id)
+          this.partChange(this.formData.id);
           if (this.dataTable.length > 0) {
             this.dataTable.forEach(item => {
               item.totalArea = (item.quota * item.area).toFixed(5); // 保留5位小数（字符串）
@@ -816,10 +865,13 @@ export default {
   top: -5px;
   /* 或者使用 flex: 0 0 200px; 根据需要调整宽度 */
 }
+.box-card-two{
+ height: calc(100vh - 200px);
+}
 .box-card {
   display: flex;
   flex-direction: row;
-  // height: calc(100vh - 200px);
+ 
 
   .process-left {
     // padding: 20px;

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

@@ -88,7 +88,7 @@
         <div class="table-btn-left">
           <el-button type="primary" plain @click="addTable()">插入一行</el-button>
           <el-button type="danger" plain @click="delTable()">删除选择行</el-button>
-          <el-button type="primary" @click="saveInfo()">保存</el-button>
+          <el-button type="primary" @click="saveInfo()" :loading="craftLoading">保存</el-button>
         </div>
         <div class="table-btn-right" v-if="activeName == '1'">
           <el-select
@@ -535,6 +535,7 @@ export default {
   },
   data() {
     return {
+      craftLoading:false,
       rank: '2',
       processLevel: '2',
       data: [],
@@ -970,6 +971,7 @@ export default {
       }
     },
     saveInfo() {
+
       if (this.activeName == '1') {
         // 调用单个 Form 的校验方法
         this.$refs.tableForm1.validate(async (isValid, invalidFields) => {
@@ -1158,6 +1160,7 @@ export default {
             //     });
             //   }
             // }
+            this.craftLoading = true
 
             // 处理传参
             if (this.treeNodes.rawData.qualityGradeCode) {
@@ -1175,6 +1178,7 @@ export default {
 
             authorizedAccomplish2(query_).then(res => {
               this.$message.success('保存成功');
+              this.craftLoading = false
               this.getDetails();
             });
           }
@@ -1183,6 +1187,7 @@ export default {
       if (this.activeName == '2') {
         this.$refs.tableForm2.validate((isValid, invalidFields) => {
           if (isValid) {
+            this.craftLoading = true
             let query_ = {
               processEntity: this.treeNodes.rawData.processInfo, //工序
               processProjectEntityList: this.form2.tableData2, //项目
@@ -1191,6 +1196,7 @@ export default {
 
             saveProcessProjectSave(query_).then(res => {
               this.$message.success('保存成功');
+              this.craftLoading = false
               this.getDetails();
             });
           }
@@ -1199,6 +1205,7 @@ export default {
       if (this.activeName == '3') {
         this.$refs.tableForm3.validate((isValid, invalidFields) => {
           if (isValid) {
+            this.craftLoading = true
             let query_ = {
               processEntity: this.treeNodes.rawData.processInfo, //工序
               processMeasuringToolEntities: this.form3.tableData3, //尺寸量具
@@ -1206,6 +1213,7 @@ export default {
             };
             saveProcessMeasuringTool(query_).then(res => {
               this.$message.success('保存成功');
+              this.craftLoading = false
               this.getDetails();
             });
           }

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

@@ -455,7 +455,7 @@ import {
   getTeamSetList,
   getStandardList
 } from '@/api/processManagement/taskProcessing';
-import {getPartList} from '@/api/orderManagement/getPartList';
+// import {getPartList} from '@/api/orderManagement/getPartList';
 
 export default {
   name: 'CraftIndex',