工艺节点、工艺路线关联业务数据查看功能

src/components/business/process/node-modal/node-modal.vue

@@ -12,7 +12,7 @@
       sticky
       @modalOk="modalOk"
       @modalCancel="modalCancel">
-      {{ nodeData }}<br/>
+<!--      {{ nodeData }}<br/>-->
 <!--      {{ allNodes }}<br/>-->
       <DkForm ref="formInline" :col-count="4" :label-max-words="6">
         <!--    节点名称    -->
@@ -206,7 +206,8 @@
                    :height="200"
                    :showSeqBtnFlag="false"
                    :enabledRepeat="false"
-                   :show-setting-flag="false"/>
+                   :show-setting-flag="false"
+                  @chooseData="chooseData"/>
         <!--    无线路由    -->
         <EditTable ref="routerTable" :data="nodeData.routerList"
                    :columns="routerColumns"
@@ -228,6 +229,10 @@ import Process from '@/view/process/process-flow/config/ProcessConfig'
 export default {
   name: 'NodeModal',
   props: {
+    jobList: {
+      type: Array,
+      default: () => []
+    },
     dataKindList: {
       type: Array,
       default: () => []
@@ -269,7 +274,6 @@ export default {
           return { id: it.id, name: it.data.nodeName }
         })
       }
-
     }
   },
   data() {
@@ -375,7 +379,16 @@ export default {
           width: 'auto',
         },
         { field: 'defectName', type: 'disabled', width: 'auto' },
-        { field: 'jobId', type: 'disabled', width: 'auto' },
+        { field: 'jobName',
+          // type: 'disabled', width: 'auto' },
+          type: 'select',
+          options: () => self.jobList,
+          labelKey: 'jobName',
+          valueKey: 'jobId',
+          fieldUpdate: [
+            {updateField: 'jobId', valueFiled: 'jobName'},
+          ],
+          searchDetailFlag: false, width: 'auto' },
         { field: 'remarks', type: 'text', width: 'auto' },
       ],
       routerColumns: [
@@ -395,6 +408,11 @@ export default {
   },
   methods: {
     ...mapMutations(['setProcessNodeModalDisplay', 'setProcessEdgeModalDisplay']),
+    chooseData(row, rowIndex){
+      console.log('row',row,rowIndex)
+      this.$set(this.nodeData.jobDefectList[rowIndex],'jobId',row.jobId)
+      this.$set(this.nodeData.jobDefectList[rowIndex],'jobName',row.jobName)
+    },
     /**
      * @desc   : 确定
      * @author : 张潇木
@@ -481,6 +499,7 @@ export default {
           ftyId:this.$store.state.user.ftyId
         }
       })
+      console.log('jobDefectTable',this.$refs.jobDefectTable.getTableDataFilter())
       //工种缺陷
       this.nodeData.jobDefectList=this.$refs.jobDefectTable.getTableDataFilter().map((it) => {
         return {

src/libs/update-columns/index.js

@@ -199,6 +199,7 @@ export default {
     {updateField: 'defectName', valueFiled: 'defectName'},
     {updateField: 'defectTypesName', valueFiled: 'defectTypesName'},
     {updateField: 'jobId', valueFiled: 'defJobId'},
+    {updateField: 'jobName', valueFiled: 'defJobName'},
   ],
 
   /**

src/view/process/process-flow/process-setting.vue

@@ -28,7 +28,7 @@
       </Layout>
     </Layout>
     <!--  节点弹窗  -->
-    <NodeModal :dataKindList="dataKindList" :productGradeList="productGradeList"/>
+    <NodeModal :dataKindList="dataKindList" :productGradeList="productGradeList" :jobList="jobList"/>
     <!--  连线弹窗  -->
     <EdgeModal :dataKindList="dataKindList" :productGradeList="productGradeList"/>
   </div>
@@ -59,6 +59,7 @@ export default {
       importValue:undefined,
       dataKindList:[],//基础数据
       productGradeList:[],//产品等级
+      jobList:[]//工种
     }
   },
   created() {
@@ -89,6 +90,11 @@ export default {
           this.productGradeList = res.data.list;
         }
       })
+      this.excute(this.$service.jobService, this.$service.jobService.selectByCond, {flgValid: true,ftyId:this.$store.state.user.ftyId}).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.jobList = res.data.list;
+        }
+      })
     },
     /**
      * @desc   : 提交保存