bug-5345

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

@@ -14,17 +14,6 @@
       @on-cancel="modalCancel">
         <DkTabs ref='tabs' :options="tabsOptions" v-model="currentTab" @on-click="changeTabs" style="margin: 10px 0;"/>
 
-        <!--          &lt;!&ndash;    返回工序    &ndash;&gt;-->
-        <!--          <DkFormItem prop="backNodeId" v-if="nodeControl?.backNodeId?.visible">-->
-        <!--            <SelectPop ref="backNodeId" v-model="nodeData.backNodeId" label-key="name" value-key="id" :multiple="false"-->
-        <!--                       :options="allNodes"/>-->
-        <!--          </DkFormItem>-->
-
-        <!--          &lt;!&ndash;    组装方式    &ndash;&gt;-->
-        <!--          <DkFormItem prop="packKind" v-if="nodeControl?.packKind?.visible">-->
-        <!--            <SelectPop ref="packKind" v-model="nodeData.packKind" label-key="kindName" value-key="kindCode"-->
-        <!--                       :multiple="false" :options="packKindList"/>-->
-        <!--          </DkFormItem>-->
 
 <!--        {{ nodeData }}<br/>-->
 
@@ -251,7 +240,7 @@
                               ||($config.nodeKind.recover==nodeData.nodeKind&&nodeData.recycledKind==$config.recycledKind.before)?checkRecoverColumns:checkRecoverColumns_noBack"
                        :controlId="'node1Id'"
                        :height="200"
-                       :enabledRepeatId="['node1Id','backNodeId']"
+                       :enabledRepeatId="['node1Id','backNodeIds']"
                        :enabledRepeat="false"
                        :show-setting-flag="false"/>
           </div>
@@ -497,12 +486,13 @@ export default {
           width: 'auto'
         },
         {
-          field: 'backNodeId',
+          field: 'backNodeIds',
           type: 'select',
           options: () => self.allNodes.filter(it => !it.flgAloneJudge && it.id != self.process.currentNodeId),
           labelKey: 'name',
           valueKey: 'id',
           width: 'auto',
+          multiple: true,
           info:'未设置时，默认为下一道工序'
         },
         { field: 'remarks', type: 'text', width: 'auto' },
@@ -1027,7 +1017,7 @@ export default {
             nodeId: this.process.currentNodeId,
             node1Id: it.node1Id,
             node2Id: this.process.currentNodeId,
-            backNodeId: it.backNodeId,
+            backNodeIds: it.backNodeIds,
             productGrade: it.productGrade,
             moldlineTags: it.moldlineTags,
             remarks: it.remarks,

src/locale/lang/zh-CN.js

@@ -633,6 +633,7 @@ export const columns = {
   flgAloneJudge: '独立检验',
   backGradeIds: '返回分级',
   backNodeId: '返回工序',
+  backNodeIds: '返回工序',
   recycledGradeIds: '可回收分级',
   recycledKind: '回收后到达',
   packKind: '组装方式',