From 20836c633fba2a9dec4878af0790b42fffc8f741 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Jun 2025 17:27:25 +0800
Subject: [PATCH] =?UTF-8?q?2025-06-10=20=E5=B7=A5=E8=89=BA=E6=8C=87?=
 =?UTF-8?q?=E5=AF=BC=E5=90=8D=E7=A7=B0=E9=9C=80=E8=A6=81=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=20=E6=94=BE=E5=9C=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E4=B8=AD=E7=BB=B4=E6=8A=A4=20=E9=9C=80?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/part/routingManagement.vue  | 23 ++++++++-----------
 .../technicalSpecificationList.vue            |  6 ++++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/part/routingManagement.vue b/src/views/modules/part/routingManagement.vue
index df943fe..9f94323 100644
--- a/src/views/modules/part/routingManagement.vue
+++ b/src/views/modules/part/routingManagement.vue
@@ -837,8 +837,7 @@
     </el-dialog>
 
     <!-- workGuideline -->
-    <el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="queryWorkGuidelineModal"
-               width="1000px">
+    <el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="queryWorkGuidelineModal" width="1000px">
       <el-form :inline="true" label-position="top" :model="workGuidelineData" style="margin-left: 5px">
         <el-form-item :label="'物料编码'">
           <el-input v-model="workGuidelineData.partNo" readonly style="width: 120px"></el-input>
@@ -922,23 +921,20 @@
     </el-dialog>
 
     <!-- workGuideline 新增模态框 -->
-    <el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal"
-               width="664px">
-      <el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules"
-               style="margin-left: 5px">
+    <el-dialog title="工艺指导" :close-on-click-modal="false" v-drag :visible.sync="saveWorkGuidelineModal" width="664px">
+      <el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" style="margin-left: 5px">
         <el-form-item :label="'序号'" prop="guidelineSeq" :rules="guidelineRules.guidelineSeq">
-          <el-input-number :controls="false" :step="0" v-model="saveWorkGuidelineData.guidelineSeq"
-                           style="width: 60px"></el-input-number>
+          <el-input-number :controls="false" :step="0" v-model="saveWorkGuidelineData.guidelineSeq" style="width: 60px"></el-input-number>
         </el-form-item>
         <el-form-item :label="'工艺指导名称'" prop="guidelineDesc" :rules="guidelineRules.guidelineDesc">
-          <el-input v-model="saveWorkGuidelineData.guidelineDesc" style="width: 126px"></el-input>
+<!--          <el-input v-model="saveWorkGuidelineData.guidelineDesc" style="width: 126px"></el-input>-->
+          <dict-data-select :site="saveWorkGuidelineData.site" v-if="saveWorkGuidelineData.site" v-model="saveWorkGuidelineData.guidelineDesc" style="width: 126px" dict-type="routing_work_guide_line"></dict-data-select>
         </el-form-item>
         <el-form-item :label="'工艺指导描述'" prop="guidelineText" :rules="guidelineRules.guidelineText">
           <el-input v-model="saveWorkGuidelineData.guidelineText" style="width: 413px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules"
-               style="margin-left: 5px">
+      <el-form :inline="true" label-position="top" :model="saveWorkGuidelineData" :rules="guidelineRules" style="margin-left: 5px">
         <el-form-item :label="'工艺指导类型'" prop="guidelineType" :rules="guidelineRules.guidelineType">
           <el-select v-model="saveWorkGuidelineData.guidelineType" style="width: 200px">
             <el-option label="Subtask" value="Subtask"></el-option>
@@ -951,8 +947,7 @@
             <el-option label="Not Required" value="Not Required"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'检验签字'" prop="inspectionSignOffRequired"
-                      :rules="guidelineRules.inspectionSignOffRequired">
+        <el-form-item :label="'检验签字'" prop="inspectionSignOffRequired" :rules="guidelineRules.inspectionSignOffRequired">
           <el-select v-model="saveWorkGuidelineData.inspectionSignOffRequired" style="width: 200px">
             <el-option label="Required to Shop Order" value="Required to Shop Order"></el-option>
             <el-option label="Required to Close Operation" value="Required to Close Operation"></el-option>
@@ -1231,10 +1226,12 @@ import {getChooselistData, verifyData} from "@/api/chooselist/chooselist.js"
 import ChooseList from '@/views/modules/common/Chooselist'
 import {queryWorkCenterList} from "../../../api/part/workCenter";
 import {queryWorkerLevelList} from "../../../api/base/laborClass";
+import DictDataSelect from "../sys/dict-data-select-highlight.vue";
 
 export default {
   // 组件
   components: {
+    DictDataSelect,
     ChooseList
   },
   // 监听
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index 63ffc44..63c9014 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -1163,15 +1163,20 @@
             codeNo: row.codeNo,
             menuId: this.$route.meta.menuId
           }
+          this.dataListLoading = true
           issueChange(tempData).then(({data}) => {
             if (data && data.code === 0) {
               this.search()
               this.$message({message: '操作成功', type: 'success'})
+              this.dataListLoading = false
             } else {
+              this.dataListLoading = false
               this.$alert(data.msg, '错误', {
                 confirmButtonText: '确定'
               })
             }
+          }).catch(() => {
+            this.dataListLoading = false
           })
         })
       },
@@ -1333,7 +1338,6 @@
               this.$message.error(data.msg)
             }
           })
-        }).catch(() => {
         })
       },
       addRevModel(row){