工艺节点增加工序描述、工序类别、工艺类别、生产车间

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

@@ -140,7 +140,25 @@
           <DkSwitch ref="flgNoJobDefect" v-model="nodeData.flgNoJobDefect"
                     @on-change="(e)=>{if(e)nodeData.jobDefectList=undefined;}"></DkSwitch>
         </DkFormItem>
-
+        <!--    工序描述    -->
+        <DkFormItem prop="nodeDesc">
+          <InputPop v-model="nodeData.nodeDesc" ref="nodeDesc"/>
+        </DkFormItem>
+        <!--    工序类别    -->
+        <DkFormItem prop="nodeTypes" :data-type="$config.dataType.array">
+          <SelectPop ref="nodeTypes" v-model="nodeData.nodeTypes" label-key="dataValue" value-key="dataId"
+                     :multiple="true" :options="nodeTypeList"/>
+        </DkFormItem>
+        <!--    工艺类别    -->
+        <DkFormItem prop="techType" :data-type="$config.dataType.number">
+          <SelectPop ref="techType" v-model="nodeData.techType" label-key="dataValue" value-key="dataId"
+                     :multiple="false" :options="techTypeList"/>
+        </DkFormItem>
+        <!--    生产车间    -->
+        <DkFormItem prop="workShop" :data-type="$config.dataType.number">
+          <SelectPop ref="workShop" v-model="nodeData.workShop" label-key="spaceName" value-key="spaceId"
+                     :multiple="false" :options="shopList"/>
+        </DkFormItem>
         <!--    显示顺序    -->
         <DkFormItem prop="displayNo" :required="true" :data-type="this.$config.dataType.number">
           <InputNumberPop v-model="nodeData.displayNo" ref="displayNo" :min="1" :digits="0"/>
@@ -150,7 +168,7 @@
           <InputPop ref="remarks" v-model="nodeData.remarks"/>
         </DkFormItem>
       </DkForm>
-            {{ nodeData }}<br/>
+<!--            {{ nodeData }}<br/>-->
       <!--      {{ allNodes }}<br/>-->
       <Divider></Divider>
       <!--   表格     -->
@@ -222,11 +240,18 @@
 <script>
 import {mapState, mapMutations} from 'vuex'
 import Process from '@/view/process/process-flow/config/ProcessConfig'
-import config from '@/config'
 
 export default {
   name: 'NodeModal',
   props: {
+    shopList: {
+      type: Array,
+      default: () => []
+    },
+    dictionaryDataList: {
+      type: Array,
+      default: () => []
+    },
     jobList: {
       type: Array,
       default: () => []
@@ -401,6 +426,8 @@ export default {
       recycledKindListSocial: [],// 回收后处理方式（记录原始数据）
       packKindList: [], // 组装方式
       pdtLabelKindsList: [],//验证标签
+      nodeTypeList:[],//工序类别
+      techTypeList:[],//工艺类别
     }
   },
   methods: {
@@ -714,6 +741,10 @@ export default {
       this.packKindList = this.dataKindList.filter(it => it.kindType === this.$config.dataKind.recycledKind)
       // 验证标签
       this.pdtLabelKindsList = this.dataKindList.filter(it => it.kindType === this.$config.dataKind.checkLabel)
+      // 工序类别
+      this.nodeTypeList = this.dictionaryDataList.filter(it => it.dictCode === this.$config.dictType.nodeType)
+      // 工艺类别
+      this.techTypeList = this.dictionaryDataList.filter(it => it.dictCode === this.$config.dictType.techType)
     },
     /**
      * @desc   : 计算高度

src/config/index.js

@@ -616,7 +616,9 @@ export default {
    */
   dictType: {
     materialType: '模具-模具原料',
-    unmoldedReason: '生产-未成型原因'
+    unmoldedReason: '生产-未成型原因',
+    nodeType: '生产-工序类别',
+    techType: '生产-工艺类别',
   },
 
   /**
@@ -1701,6 +1703,16 @@ export default {
     middle: '节点流程-中间',
     end: '节点流程-结束'
   },
+  /**
+   * @desc   : 工厂区域
+   * @author : 张潇木
+   * @date   : 2023/3/30 14:32
+   */
+  factorySpace:{
+    shop: "工厂区域-车间",
+    floor: "工厂区域-楼层",
+    area: "工厂区域-区域",
+  },
 }
 
 

src/locale/lang/zh-CN.js

@@ -569,6 +569,10 @@ export const columns = {
   carModelCode: '载具型号',
   carModelName: '载具名称',
   flgNoJobDefect :'无工种缺陷',
+  nodeDesc :'工序描述',
+  nodeTypes :'工序类别',
+  techType :'工艺类别',
+  workShop :'生产车间',
 
 
   fty: '工厂',

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

@@ -32,9 +32,16 @@
     </Layout>
     <transition-group name="fade">
       <!--  节点弹窗  -->
-      <NodeModal key="node" v-if="process.nodeModal.display" :dataKindList="dataKindList" :productGradeList="productGradeList" :jobList="jobList"/>
+      <NodeModal key="node" v-if="process.nodeModal.display"
+                 :dataKindList="dataKindList"
+                 :productGradeList="productGradeList"
+                 :jobList="jobList"
+                 :shopList="shopList"
+                 :dictionaryDataList="dictionaryDataList"/>
       <!--  连线弹窗  -->
-      <EdgeModal key="edge" v-if="process.edgeModal.display" :dataKindList="dataKindList" :productGradeList="productGradeList"/>
+      <EdgeModal key="edge" v-if="process.edgeModal.display"
+                 :dataKindList="dataKindList"
+                 :productGradeList="productGradeList"/>
     </transition-group>
   </div>
 </template>
@@ -65,7 +72,9 @@ export default {
       importValue: undefined,
       dataKindList: [],//基础数据
       productGradeList: [],//产品等级
-      jobList: []//工种
+      jobList: [],//工种
+      dictionaryDataList:[],//数据字典
+      shopList:[],//车间
     }
   },
   created() {
@@ -77,6 +86,7 @@ export default {
   mounted() {
     //创建流程图对象
     this.graph = Process.init(this.$refs.container)
+    //监听删除节点
     this.bindDeleteNodes()
     // this.graph.zoomToFit({ maxScale: 1 });// 将画布中元素缩小或者放大一定级别，让画布正好容纳所有元素，可以通过 maxScale 配置最大缩放级别
     // this.graph.centerContent(); // 将画布中元素居中展示
@@ -117,6 +127,23 @@ export default {
           this.jobList = res.data.list
         }
       })
+      //数据字典
+      this.excute(this.$service.commonService, this.$service.commonService.getDictionaryData, {
+        ftyId: this.$store.state.user.ftyId,
+      }).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.dictionaryDataList = res.data
+        }
+      })
+      //数据字典
+      this.excute(this.$service.commonService, this.$service.commonService.getFactorySpace, {
+        ftyId: this.$store.state.user.ftyId,
+        spaceKind: this.$config.factorySpace.shop
+      }).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.shopList = res.data
+        }
+      })
     },
     /**
      * @desc   : 提交保存