Ver Fonte

bug-5628

sh4wmoo há 2 anos atrás
pai
commit
6070559401

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

@@ -18,7 +18,7 @@
           <SelectPop ref="pdtGradeIds" v-model="edgeData.pdtGradeIds" label-key="gradeName" value-key="gradeId" :multiple="true" :options="productGradeList" />
         </DkFormItem>
         <!--    成型标签    -->
-        <DkFormItem prop="moldlineTags" :data-type="$config.dataType.array">
+        <DkFormItem prop="moldlineTags" :data-type="$config.dataType.array" :info="$config.nodeInfo.moldlineTags">
           <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>

+ 4 - 1
src/components/business/process/node-modal/node-modal.vue

@@ -175,7 +175,7 @@
         <!--   tab4 - 流程控制    -->
         <DkForm ref="formInline" v-if="currentTab =='tab4'" v-model="nodeData" :label-max-words="6" :colCount="2">
           <!--    成型标签    -->
-          <DkFormItem prop="moldlineTags" v-if="nodeControl?.moldlineTags?.visible" :span="12">
+          <DkFormItem prop="moldlineTags" v-if="nodeControl?.moldlineTags?.visible" :span="12" :info="$config.nodeInfo.moldlineTags">
             <SelectPop ref="moldlineTags" v-model="nodeData.moldlineTags" label-key="dataValue" value-key="dataId"
                        :multiple="true" :options="moldlineTagsList"/>
           </DkFormItem>
@@ -478,6 +478,7 @@ export default {
         },
         {
           field: 'moldlineTags',
+          info:self.$config.nodeInfo.moldlineTags,
           type: 'select',
           options: () => self.moldlineTagsList,
           labelKey: 'dataValue',
@@ -520,6 +521,7 @@ export default {
         },
         {
           field: 'moldlineTags',
+          info:self.$config.nodeInfo.moldlineTags,
           type: 'select',
           options: () => self.moldlineTagsList,
           labelKey: 'dataValue',
@@ -564,6 +566,7 @@ export default {
         },
         {
           field: 'moldlineTags',
+          info:self.$config.nodeInfo.moldlineTags,
           type: 'select',
           options: () => self.moldlineTagsList,
           labelKey: 'dataValue',

+ 1 - 0
src/config/index.js

@@ -2087,6 +2087,7 @@ export default {
   nodeInfo: {
     //绑定工序
     flgJobDefect: '未设置代表可产生全部缺陷',
+    moldlineTags:'需满足所设所有标签条件'
   },
   /**
    *   @desc   : 窑车管理info静态变量