Merge remote-tracking branch 'origin/master'

src/locale/lang/zh-CN.js

@@ -1461,6 +1461,7 @@ export const columns = {
   nodeCode: '节点编号',
   nodeName2: '节点名称',
   nodeType: '节点类别',
+  nodeColor: '节点颜色',
 }
 
 /**

src/router/routers.js

@@ -95,6 +95,14 @@ let menu = [
         },
         component: () => import('@/view/bpm/waiting-for-approval/detail.vue')
       },
+      {
+        path: '/node_type',
+        name: 'node-type',
+        meta: {
+          title: 'erp节点'
+        },
+        component: () => import('@/view/mst/erp-node/index')
+      },
     ]
   },
   {

src/view/mst/erp-node/index.vue

@@ -42,6 +42,7 @@
         <DkTableColumn field="nodeCode"></DkTableColumn>
         <DkTableColumn field="nodeName" :title="$t('nodeName2')"></DkTableColumn>
         <DkTableColumn field="nodeTypeName" :title="$t('nodeType')"></DkTableColumn>
+        <DkTableColumn field="nodeColor"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onNodeSwitchChange"
                        :switch-disabled=false min-width="50px"></DkTableColumn>
         <DkTableColumn field="displayNo" :data-type="$config.dataType.number" ></DkTableColumn>
@@ -66,11 +67,13 @@
         <DkFormItem prop="nodeName" required :label="$t('nodeName2')">
           <InputPop v-model="formData.nodeName"/>
         </DkFormItem>
-        <!--损坯原因-->
         <DkFormItem prop="nodeType" required>
           <SelectPop v-model="formData.nodeType" :multiple="false" ref="nodeType"
                      pop-type="nodeType"/>
         </DkFormItem>
+        <DkFormItem prop="nodeColor">
+          <InputPop v-model="formData.nodeColor"/>
+        </DkFormItem>
         <!--    显示顺序    -->
         <DkFormItem prop="displayNo" :required="true"
                     :data-type="$config.dataType.number">
@@ -89,7 +92,7 @@
 import {indexMixin} from '@/mixins'
 
 export default {
-  name: 'erp-name',
+  name: 'erp-node',
   mixins: [indexMixin],
   data() {
     let self = this
@@ -108,10 +111,8 @@ export default {
       formData: {
         nodeCode: null,
         nodeName: null,
-        flgAutoDispatch: true,
-        flgChangePdtModel: true,
-        flgSupply: true,
-        flgMaterial: false,
+        nodeType: null,
+        nodeColor: null,
       },
     }
   },
@@ -174,10 +175,10 @@ export default {
     },
     clear () {
       this.formData = {
-        flgAutoDispatch: true,
-          flgChangePdtModel: true,
-          flgSupply: true,
-          flgMaterial: false,
+        nodeCode: null,
+        nodeName: null,
+        nodeType: null,
+        nodeColor: null,
       }
       // 加载最大序号
       this.getMaxDisplayNo(this.$config.displayNoTable.erpNode)