工序增加可用窑炉

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

@@ -85,7 +85,6 @@
           <DkFormItem prop="recycledKind" v-if="nodeControl?.recycledKind?.visible" :required="true">
             <SelectPop ref="recycledKind" v-model="nodeData.recycledKind" label-key="kindName" value-key="kindCode"
                        :options="recycledKindList" :multiple="false" @on-select="changeRecycledKind"/>
-            ;
           </DkFormItem>
           <!--    可回收分级    -->
           <DkFormItem prop="recycledGradeIds" v-if="nodeControl?.recycledGradeIds?.visible">
@@ -99,6 +98,11 @@
                        :multiple="true"
                        :options="nodeSysTagsList.filter(it=>!(nodeControl?.nodeSysTags?.invalidCode||[]).includes(it.kindCode))"/>
           </DkFormItem>
+          <!--    可用窑炉    -->
+          <DkFormItem prop="kilnIds" v-if="nodeControl?.kilnIds?.visible">
+            <SelectPop ref="kilnIds" v-model="nodeData.kilnIds" label-key="kilnName" value-key="uniqueId"
+                       :multiple="true" :options="kilnList"/>
+          </DkFormItem>
           <!--    生产车间    -->
           <DkFormItem prop="workShop" :data-type="$config.dataType.number">
             <SelectPop ref="workShop" v-model="nodeData.workShop" label-key="spaceName" value-key="spaceId"
@@ -266,8 +270,7 @@
         </div>
         <!--            {{ nodeControl }}<br/>-->
         <!--            {{ allNodes }}<br/>-->
-        <!--      {{nodeData.routerList}}<br/>-->
-<!--   todo 可用窑炉【非必须，多选】   -->
+        <!--      {{nodeData.routerList}}<br/>--> 
 <!--   todo 校验问题，并跳转到对应tab   -->
 
     </DkModal>
@@ -293,6 +296,10 @@ export default {
       type: Array,
       default: () => []
     },
+    kilnList: {
+      type: Array,
+      default: () => []
+    },
     dataKindList: {
       type: Array,
       default: () => []

src/locale/lang/zh-CN.js

@@ -610,6 +610,7 @@ export const columns = {
   pieceKind: '计件模式',
   opnKind: '操作模式',
   nodeSysTags: '工序标签',
+  kilnIds: '可用窑炉',
   defGradeId: '默认分级',
   moldingSysTags: '成型标签',
   judgeGradeIds: '可判分级',

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

@@ -60,6 +60,7 @@
         <DkTableColumn field="pieceKindName" :title="$t('pieceKind')"></DkTableColumn>
         <DkTableColumn field="opnKindName" :title="$t('opnKind')"></DkTableColumn>
         <DkTableColumn field="nodeSysTagsName" :title="$t('nodeSysTags')"></DkTableColumn>
+        <DkTableColumn field="kilnIdsName" :title="$t('kilnIds')"></DkTableColumn>
         <DkTableColumn field="flgUndo" type="switch"></DkTableColumn>
         <DkTableColumn field="defGradeIdName" :title="$t('defGradeId')"></DkTableColumn>
         <DkTableColumn field="moldingSysTagsName" :title="$t('moldingSysTags')"></DkTableColumn>
@@ -122,6 +123,7 @@
                  :productGradeList="productGradeList"
                  :jobList="jobList"
                  :shopList="shopList"
+                 :kilnList="kilnList"
                  :dictionaryDataList="dictionaryDataList"
                  :flowFormData="flowFormData"
                  :isFromIndex="true"
@@ -156,6 +158,7 @@ export default {
       jobList: [],//工种
       dictionaryDataList:[],//数据字典
       shopList:[],//车间
+      kilnList:[],//窑炉
       editAddModal: false,
       modalTitle: '',//新建编辑弹窗名称
       submitType: '',//新建编辑提交类型、
@@ -227,7 +230,7 @@ export default {
           this.dictionaryDataList = res.data
         }
       })
-      //数据字典
+      //车间
       this.excute(this.$service.commonService, this.$service.commonService.getFactorySpace, {
         ftyId: this.$store.state.user.ftyId,
         spaceKind: this.$config.factorySpace.shop
@@ -236,6 +239,15 @@ export default {
           this.shopList = res.data
         }
       })
+      //窑炉
+      this.excute(this.$service.equipKilnService, this.$service.equipKilnService.selectByCond, {
+        ftyId: this.$store.state.user.ftyId,
+        flgValid: true,
+      }).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.kilnList = res.data.list
+        }
+      })
     },
     /**
      * @desc   : 获取数据

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

@@ -124,6 +124,7 @@
                  :productGradeList="productGradeList"
                  :jobList="jobList"
                  :shopList="shopList"
+                 :kilnList="kilnList"
                  :dictionaryDataList="dictionaryDataList"/>
       <!--  连线弹窗  -->
       <EdgeModal key="edge" v-if="process.edgeModal.display"
@@ -163,6 +164,7 @@ export default {
       jobList: [],//工种
       dictionaryDataList:[],//数据字典
       shopList:[],//车间
+      kilnList:[],//窑炉
     }
   },
   created() {
@@ -269,7 +271,7 @@ export default {
           this.dictionaryDataList = res.data
         }
       })
-      //数据字典
+      //车间
       this.excute(this.$service.commonService, this.$service.commonService.getFactorySpace, {
         ftyId: this.$store.state.user.ftyId,
         spaceKind: this.$config.factorySpace.shop
@@ -278,6 +280,15 @@ export default {
           this.shopList = res.data
         }
       })
+      //窑炉
+      this.excute(this.$service.equipKilnService, this.$service.equipKilnService.selectByCond, {
+        ftyId: this.$store.state.user.ftyId,
+        flgValid: true,
+      }).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.kilnList = res.data.list
+        }
+      })
     },
     /**
      * @desc   : 提交保存