修改bug

src/views/productionPlan/components/newFactoryProductionScheduling.columns.js

@@ -14,6 +14,12 @@ export function createSchedulingColumns() {
       align: 'center',
       showOverflowTooltip: true
     },
+    {
+      prop: 'batchNo',
+      label: '批次号',
+      align: 'center',
+      minWidth: 140
+    },
     {
       prop: 'code',
       label: '计划编号',
@@ -52,12 +58,6 @@ export function createSchedulingColumns() {
       align: 'center',
       minWidth: 150
     },
-    {
-      prop: 'batchNo',
-      label: '批次号',
-      align: 'center',
-      minWidth: 140
-    },
     {
       prop: 'productCode',
       label: '编码',
@@ -227,6 +227,13 @@ export function createWorkOrderSchedulingColumns() {
       align: 'center',
       showOverflowTooltip: true
     },
+    {
+      prop: 'batchNo',
+      label: '批次号',
+      align: 'center',
+      minWidth: 120,
+      showOverflowTooltip: true
+    },
     {
       prop: 'code',
       label: '生产订单号',
@@ -269,13 +276,6 @@ export function createWorkOrderSchedulingColumns() {
       minWidth: 150,
       showOverflowTooltip: true
     },
-    {
-      prop: 'batchNo',
-      label: '批次号',
-      align: 'center',
-      minWidth: 120,
-      showOverflowTooltip: true
-    },
     {
       prop: 'formingNum',
       label: '订单数量',

src/views/productionPlan/components/newFactoryProductionScheduling.vue

@@ -2852,9 +2852,9 @@
               matchedPlanInfo,
               period
             );
-            const childDisplayOrderCode = this.isOrderScheduling
-              ? this.getOrderSchedulingDisplayOrderCode(matchedPlanInfo, period)
-              : matchedPlanInfo.planCode;
+            const childBatchNo =
+              matchedPlanInfo.batchNo || period.batchNo || '';
+            const childDisplayOrderCode = childBatchNo;
             rows.push({
               id: this.buildGanttPeriodTaskId(
                 parentId,
@@ -2882,7 +2882,7 @@
                 matchedPlanInfo.routingName ||
                 matchedPlanInfo.produceRoutingName ||
                 '',
-              batchNo: matchedPlanInfo.batchNo || period.batchNo || '',
+              batchNo: childBatchNo,
               specification: matchedPlanInfo.specification || '',
               modeType: matchedPlanInfo.modeType || '',
               workstationName:
@@ -2927,8 +2927,7 @@
               text: [
                 taskLabel,
                 childDisplayOrderCode,
-                matchedPlanInfo.productName,
-                matchedPlanInfo.batchNo || period.batchNo
+                matchedPlanInfo.productName
               ]
                 .filter(Boolean)
                 .join(' / '),

src/views/saleOrder/index.vue

@@ -97,7 +97,11 @@
         <template v-slot:action="{ row }">
           <template>
             <el-link
-              v-if="row.orderSource != 1 && activeName == 'first'"
+              v-if="
+                row.orderSource != 1 &&
+                activeName == 'first' &&
+                clientEnvironmentId != 9
+              "
               type="primary"
               :underline="false"
               icon="el-icon-edit"
@@ -205,9 +209,9 @@
 
     computed: {
       // 表格列配置
-      // clientEnvironmentId() {
-      //   return
-      // },
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      }
     },
     created() {
       this.setColumns();