tabs-form校验 | 成型标签改名

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

@@ -19,9 +19,9 @@
           <SelectPop ref="pdtGradeIds" v-model="edgeData.pdtGradeIds" label-key="gradeName" value-key="gradeId" :multiple="true" :options="productGradeList" />
         </DkFormItem>
         <!--    成型标签    -->
-        <DkFormItem prop="moldingSysTags" :data-type="$config.dataType.array">
-          <SelectPop ref="moldingSysTags" v-model="edgeData.moldingSysTags" label-key="kindName" value-key="kindCode" :multiple="true"
-                     :options="dataKindList.filter(it=>it.kindType==='成线标签')" />
+        <DkFormItem prop="moldlineTags" :data-type="$config.dataType.array">
+          <SelectPop ref="moldlineTags" v-model="edgeData.moldlineTags" label-key="dataValue" value-key="dataId" :multiple="true"
+                     :options="dictionaryDataList.filter(it => it.dictCode === $config.dictType.moldlineTag)" />
         </DkFormItem>
         <!--    备注    -->
         <DkFormItem prop="remarks" :span="24">
@@ -51,7 +51,7 @@ import Process from '@/view/process/process-flow/config/ProcessConfig'
 export default {
   name: 'EdgeModal',
   props: {
-    dataKindList:{
+    dictionaryDataList:{
       type:Array,
       default: ()=>[]
     },
@@ -126,7 +126,7 @@ export default {
       cell.setData(this.edgeData,{overwrite:true})
       //设置样式
       if(Object.keys(cell.data).length!=0&&
-        ((cell?.data?.pdtGradeIds&&cell?.data?.pdtGradeIds.length>0)||(cell?.data?.moldingSysTags&&cell?.data?.moldingSysTags.length>0)||this.edgeData.pdtList.length>0)){
+        ((cell?.data?.pdtGradeIds&&cell?.data?.pdtGradeIds.length>0)||(cell?.data?.moldlineTags&&cell?.data?.moldlineTags.length>0)||this.edgeData.pdtList.length>0)){
         cell.setAttrs({ line: { stroke: '#4169E1', }, }, );
       }else{
         cell.setAttrs({ line: { stroke: '#A2B1C3', }, },);

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

@@ -13,7 +13,7 @@
       @modalOk="modalOk"
       @modalCancel="modalCancel"
       @on-cancel="modalCancel">
-        <DkTabs :options="tabsOptions" v-model="currentTab" @on-click="changeTabs" style="margin: 10px 0;"/>
+        <DkTabs ref='tabs' v-if="tabsShow" :options="tabsOptions" v-model="currentTab" @on-click="changeTabs" style="margin: 10px 0;"/>
 
         <!--          &lt;!&ndash;    返回工序    &ndash;&gt;-->
         <!--          <DkFormItem prop="backNodeId" v-if="nodeControl?.backNodeId?.visible">-->
@@ -27,7 +27,7 @@
         <!--                       :multiple="false" :options="packKindList"/>-->
         <!--          </DkFormItem>-->
 
-        {{ nodeData }}<br/>
+<!--        {{ nodeData }}<br/>-->
 
         <!--   tab1 - 基本信息    -->
         <DkForm ref="formInline" v-if="currentTab =='tab1'" v-model="nodeData" :label-max-words="6" :colCount="2">
@@ -47,9 +47,7 @@
                        :options="flowKindList.filter(it=>!(nodeControl?.flowKind?.invalidCode||[]).includes(it.kindCode))"/>
           </DkFormItem>
           <!--    可判分级  -->
-          <DkFormItem prop="judgeGradeIds"
-                      :required="[$config.nodeKind.halfCheck,$config.nodeKind.finishCheck].includes(nodeData.nodeKind)"
-                      v-if="nodeControl?.judgeGradeIds?.visible" :data-type="$config.dataType.array">
+          <DkFormItem prop="judgeGradeIds" :required="true" v-if="nodeControl?.judgeGradeIds?.visible" :data-type="$config.dataType.array">
             <MultiSelect v-model="nodeData.judgeGradeIds"
                          main-field="defGradeId"
                          main-field-text="【默认】"
@@ -184,9 +182,9 @@
         <!--   tab4 - 流程控制    -->
         <DkForm ref="formInline" v-if="currentTab =='tab4'" v-model="nodeData" :label-max-words="6" :colCount="2">
           <!--    成型标签    -->
-          <DkFormItem prop="moldingSysTags" v-if="nodeControl?.moldingSysTags?.visible" :span="12">
-            <SelectPop ref="moldingSysTags" v-model="nodeData.moldingSysTags" label-key="kindName" value-key="kindCode"
-                       :multiple="true" :options="moldingSysTagsList"/>
+          <DkFormItem prop="moldlineTags" v-if="nodeControl?.moldlineTags?.visible" :span="12">
+            <SelectPop ref="moldlineTags" v-model="nodeData.moldlineTags" label-key="dataValue" value-key="dataId"
+                       :multiple="true" :options="moldlineTagsList"/>
           </DkFormItem>
         </DkForm>
         <Divider></Divider>
@@ -270,7 +268,7 @@
         </div>
         <!--            {{ nodeControl }}<br/>-->
         <!--            {{ allNodes }}<br/>-->
-        <!--      {{nodeData.routerList}}<br/>--> 
+        <!--      {{nodeData.routerList}}<br/>-->
 <!--   todo 校验问题，并跳转到对应tab   -->
 
     </DkModal>
@@ -475,11 +473,11 @@ export default {
           width: 'auto'
         },
         {
-          field: 'moldingSysTags',
+          field: 'moldlineTags',
           type: 'select',
-          options: () => self.moldingSysTagsList,
-          labelKey: 'kindName',
-          valueKey: 'kindCode',
+          options: () => self.moldlineTagsList,
+          labelKey: 'dataValue',
+          valueKey: 'dataId',
           multiple: true,
           width: 'auto'
         },
@@ -515,11 +513,11 @@ export default {
           width: 'auto'
         },
         {
-          field: 'moldingSysTags',
+          field: 'moldlineTags',
           type: 'select',
-          options: () => self.moldingSysTagsList,
-          labelKey: 'kindName',
-          valueKey: 'kindCode',
+          options: () => self.moldlineTagsList,
+          labelKey: 'dataValue',
+          valueKey: 'dataId',
           multiple: true,
           width: 'auto'
         },
@@ -558,11 +556,11 @@ export default {
           width: 'auto'
         },
         {
-          field: 'moldingSysTags',
+          field: 'moldlineTags',
           type: 'select',
-          options: () => self.moldingSysTagsList,
-          labelKey: 'kindName',
-          valueKey: 'kindCode',
+          options: () => self.moldlineTagsList,
+          labelKey: 'dataValue',
+          valueKey: 'dataId',
           multiple: true,
           width: 'auto'
         },
@@ -574,7 +572,7 @@ export default {
       pieceKindList: [],// 计件模式
       opnKindList: [],// 操作模式
       nodeSysTagsList: [],// 工序标签
-      moldingSysTagsList: [],// 成线标签
+      moldlineTagsList: [],// 成线标签
       recycledKindList: [],// 回收后到达
       recycledKindListSocial: [],// 回收后到达（记录原始数据）
       packKindList: [], // 组装方式
@@ -640,6 +638,8 @@ export default {
      * @date   : 2023/5/29 14:50
      */
     changeTabs(e) {
+      //清除校验
+      this.$refs['formInline'].clearValidate()
 
       // region重新渲染各table
       this.productUserTableFlag = !this.productUserTableFlag
@@ -975,7 +975,7 @@ export default {
             node2Id: this.process.currentNodeId,
             backNodeId: it.backNodeId,
             productGrade: it.productGrade,
-            moldingSysTags: it.moldingSysTags,
+            moldlineTags: it.moldlineTags,
             remarks: it.remarks,
             ftyId: this.$store.state.user.ftyId
           }
@@ -999,7 +999,7 @@ export default {
               node2Id: it.node2Id,
               node2IdName: it.node2IdName,
               productGrade: it.productGrade,
-              moldingSysTags: it.moldingSysTags,
+              moldlineTags: it.moldlineTags,
               remarks: it.remarks,
               ftyId: this.$store.state.user.ftyId
             }
@@ -1016,26 +1016,20 @@ export default {
      * @date   : 2023/2/27 11:12
      */
     validData() {
-      // 工号类型可见才进行判断
-      if (this.nodeControl && this.nodeControl.userKind
-        && this.nodeControl.userKind.visible) {
-        // 判断用户类型是否填写
-        let userList = this.$refs.userTable?.getTableData()
-        if (userList && userList.length > 0) {
-          for (let i in userList) {
-            if (userList[i].userId && !userList[i].userKind) {
-              let rowsNo = 1 + parseInt(i)
-              this.$Message.warning(this.$t('W_089', {
-                'param1': rowsNo + this.$t('rowNo'),
-                'param2': this.$t('userKind')
-              }))
-              this.setErrToRow(userList[i], this.$t('W_093', {
-                'param': this.$t('userKind')
-              }))// 给行增加错误提示信息
-              return false
-            }
-          }
-        }
+      if(!this.nodeData.nodeName||!this.nodeData.flowKind||!this.nodeData.userKind||!this.nodeData.opnKind||!this.nodeData.pieceKind
+      ||(this.nodeControl?.recycledKind?.visible&&!this.nodeData.recycledKind)||(this.nodeControl?.judgeGradeIds?.visible&&!this.nodeData.judgeGradeIds)) {
+        this.currentTab='tab1'
+        this.$nextTick(() => {
+          this.$refs['formInline'].validate()
+        })
+        return
+      }
+      if(this.nodeControl?.pdtLabelKinds?.visible&&this.nodeData.flgCheckLabel&&!this.nodeData.pdtLabelKinds){
+        this.currentTab='tab3'
+        this.$nextTick(() => {
+          this.$refs['formInline'].validate()
+        })
+        return
       }
       // 销毁提示弹窗
       this.$Message.destroy()
@@ -1098,8 +1092,6 @@ export default {
       this.opnKindList = this.dataKindList.filter(it => it.kindType === this.$config.dataKind.opnKind)
       // 工序标签
       this.nodeSysTagsList = this.dataKindList.filter(it => it.kindType === this.$config.dataKind.nodeSysTags)
-      // 成线标签
-      this.moldingSysTagsList = this.dataKindList.filter(it => it.kindType === this.$config.dataKind.moldlineTags)
       // 回收处理方式
       this.recycledKindList = this.dataKindList.filter(it => it.kindType === this.$config.dataKind.recover)
       this.recycledKindListSocial = this.recycledKindList?.copy()
@@ -1111,6 +1103,8 @@ export default {
       this.nodeTypeList = this.dictionaryDataList.filter(it => it.dictCode === this.$config.dictType.nodeType)
       // 工艺类别
       this.techTypeList = this.dictionaryDataList.filter(it => it.dictCode === this.$config.dictType.techType)
+      // 成线标签
+      this.moldlineTagsList = this.dictionaryDataList.filter(it => it.dictCode === this.$config.dictType.moldlineTag)
     },
     /**
      * @desc   : 设置table初始值

src/locale/lang/zh-CN.js

@@ -612,7 +612,6 @@ export const columns = {
   nodeSysTags: '工序标签',
   kilnIds: '可用窑炉',
   defGradeId: '默认分级',
-  moldingSysTags: '成型标签',
   judgeGradeIds: '可判分级',
   flgAloneJudge: '独立检验',
   backGradeIds: '返回分级',

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

@@ -63,7 +63,7 @@
         <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>
+        <DkTableColumn field="moldlineTagsName" :title="$t('moldlineTags')"></DkTableColumn>
         <DkTableColumn field="judgeGradeIdsName" :title="$t('judgeGradeIds')"></DkTableColumn>
         <DkTableColumn field="flgAloneJudge" type="switch"></DkTableColumn>
         <DkTableColumn field="backGradeIdsName" :title="$t('backGradeIds')"></DkTableColumn>

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

@@ -128,7 +128,7 @@
                  :dictionaryDataList="dictionaryDataList"/>
       <!--  连线弹窗  -->
       <EdgeModal key="edge" v-if="process.edgeModal.display"
-                 :dataKindList="dataKindList"
+                 :dictionaryDataList="dictionaryDataList"
                  :productGradeList="productGradeList.filter(it=>![$config.gradeKindType.decrease,$config.gradeKindType.inferior].includes(it.gradeKind))"/>
     </transition-group>
   </div>