2025/5/30

src/views/modules/part/routingManagement.vue

@@ -850,7 +850,8 @@
     </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>
@@ -934,10 +935,13 @@
     </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>
@@ -946,7 +950,8 @@
           <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>
@@ -959,7 +964,8 @@
             <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>
@@ -1008,7 +1014,8 @@
           :label="item.columnLabel">
           <template slot-scope="scope">
             <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
           </template>
         </el-table-column>
       </el-table>
@@ -1032,12 +1039,13 @@
     <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
 
     <!--         加工中心模态框 -->
-    <el-dialog title="加工中心" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workCenterModelFlag" width="940px">
+    <el-dialog title="加工中心" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workCenterModelFlag"
+               width="940px">
       <el-form :inline="true" label-position="top" :model="searchData">
         <el-form-item :label="'编码'">
           <el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input>
         </el-form-item>
-        <el-form-item :label="'物料名称'">
+        <el-form-item :label="'加工中心名称'">
           <el-input v-model="searchData.workCenterDesc" clearable style="width: 120px"></el-input>
         </el-form-item>
         <el-form-item :label="' '">
@@ -1062,7 +1070,8 @@
           :label="item.columnLabel">
           <template slot-scope="scope">
             <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
           </template>
         </el-table-column>
       </el-table>
@@ -1083,7 +1092,8 @@
     </el-dialog>
 
     <!--         人员等级模态框 -->
-    <el-dialog title="人员等级" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workerLevelModelFlag1" width="940px">
+    <el-dialog title="人员等级" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workerLevelModelFlag1"
+               width="940px">
       <el-form :inline="true" label-position="top" :model="searchData">
         <el-form-item :label="'编码'">
           <el-input v-model="searchData.levelId" clearable style="width: 120px"></el-input>
@@ -1113,7 +1123,8 @@
           :label="item.columnLabel">
           <template slot-scope="scope">
             <span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
-            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+            <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                               style="width: 100px; height: 80px"/></span>
           </template>
         </el-table-column>
       </el-table>
@@ -1133,7 +1144,8 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="人员等级" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workerLevelModelFlag2" width="940px">
+    <el-dialog title="人员等级" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workerLevelModelFlag2"
+               width="940px">
       <el-form :inline="true" label-position="top" :model="searchData">
         <el-form-item :label="'编码'">
           <el-input v-model="searchData.levelId" clearable style="width: 120px"></el-input>
@@ -1273,9 +1285,10 @@ export default {
     componentData: {
       deep: true,
       handler: function (newV, oldV) {
-        this.componentData.workCenterNo = this.componentData.workCenterNo.toUpperCase()
-        this.componentData.laborClassDesc = this.componentData.laborClassDesc.toUpperCase()
-        this.componentData.setupLaborClassDesc = this.componentData.setupLaborClassDesc.toUpperCase()
+        // 不用转大写
+        // this.componentData.workCenterNo = this.componentData.workCenterNo.toUpperCase()
+        // this.componentData.laborClassDesc = this.componentData.laborClassDesc.toUpperCase()
+        // this.componentData.setupLaborClassDesc = this.componentData.setupLaborClassDesc.toUpperCase()
       }
     },
     routingToolData: {
@@ -5004,6 +5017,7 @@ export default {
 
     // 加工中心输入校验
     workCenterBlur(tagNo) {
+      console.log('@change触发')
       if (this.componentData.workCenterNo != null && this.componentData.workCenterNo !== '') {
         let tempData = {
           tagno: tagNo,
@@ -5172,6 +5186,18 @@ export default {
       this.componentData.workCenterNo = row.workCenterNo
       this.componentData.workCenterDesc = row.workCenterDesc
       this.componentData.workCenterType = row.workCenterType
+      this.searchData.levelId = row.workCenterNo
+      this.searchData.lavelDesc = row.workCenterDesc
+      queryWorkerLevelList(this.searchData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.componentData.setupLaborClassNo = data.page.list[0].levelId
+          this.componentData.setupLaborClassDesc = data.page.list[0].levelDesc
+          this.componentData.laborClassNo = data.page.list[0].levelId
+          this.componentData.laborClassDesc = data.page.list[0].levelDesc
+        } else {
+          this.workCenterList = []
+        }
+      })
       this.workCenterModelFlag = false
     },
 
@@ -5189,7 +5215,6 @@ export default {
     },
 
 
-
   }
 }
 </script>

src/views/modules/test/testSoRouting/testRoutingTable.vue

@@ -895,7 +895,7 @@ export default {
 <!--    </el-dialog>-->
 
     <!--         加工中心模态框 -->
-    <el-dialog title="加工中心" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workCenterDialogFlag" width="940px">
+    <el-dialog title="加工中心" top="17vh" :close-on-click-modal="false" v-drag :visible.sync="workCenterDialogFlag" append-to-body width="940px">
       <el-form :inline="true" label-position="top" :model="searchData">
         <el-form-item :label="'加工中心'">
           <el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input>