Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

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

@@ -1101,7 +1101,7 @@ export default {
      */
     validData() {
       if(!this.nodeData.nodeName||!this.nodeData.flowKind||!this.nodeData.userKind||!this.nodeData.opnKind||!this.nodeData.pieceKind
-        ||!([this.$config.processType.dressKilnCar,this.$config.processType.exchangeKilnCar].includes(this.nodeData.opnKind)&&!this.nodeData.carKind)
+        ||([this.$config.processType.dressKilnCar,this.$config.processType.exchangeKilnCar].includes(this.nodeData.opnKind)&&!this.nodeData.carKind)
       ||(this.nodeControl?.recycledKind?.visible&&!this.nodeData.recycledKind)||(this.nodeControl?.judgeGradeIds?.visible&&!this.nodeData.judgeGradeIds)) {
         this.currentTab='tab1'
         this.$nextTick(() => {
@@ -1110,6 +1110,7 @@ export default {
         return
       }
       if(this.nodeControl?.pdtLabelKinds?.visible&&this.nodeData.flgCheckLabel&&(!this.nodeData.pdtLabelKinds||this.nodeData.pdtLabelKinds.isEmptyArray())){
+        console.log(2)
         this.currentTab='tab3'
         this.$nextTick(() => {
           this.$refs['formInline'].validate()

src/view/process/process-flow/config/ProcessConfig.js

@@ -1267,7 +1267,7 @@ export default class Process {
   static getNodeTagsDiv(cell, iconsNodeTags) {
     let nodeTags=cell.getData().nodeSysTags
     console.log('nodeTags',nodeTags)
-    nodeTags.forEach(it=>{
+    nodeTags?.forEach(it=>{
       let icon=document.createElement('img')
       icon.src = this.getNodeTagsIcon(it)
       icon.width = 8