yusheng vor 11 Monaten
Ursprung
Commit
2b1f49a83d

+ 3 - 3
src/api/purchasingManage/purchasePlanManage.js

@@ -91,10 +91,10 @@ export async function isHasGeneratedContractPI(id) {
  */
 export async function savePurchasePlanCutAPI(data) {
   const res = await request.post(`/eom/purchaseplan/savePurchasePlanCutDetails`,data);
-  if (res.data.code == 0) {
-    return res.data.data;
+  if (res.data) {
+    return res.data.code
   }
-  return Promise.resolve(0);
+  return Promise.resolve(false);
 }
 /**
  * 判断是否计划负责任

+ 1 - 1
src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -968,7 +968,7 @@
             item.increaseTotalWeight || item.receiveTotalWeight || 0
           );
         }
-        this.$set(this.form.datasource[index], 'pricingWay', 2);
+        this.$set(this.form.datasource[index], 'pricingWay', item.pricingWay);
       },
 
       remove(i) {

+ 8 - 1
src/views/purchasingManage/purchasePlanManage/components/splitDialog.vue

@@ -762,7 +762,14 @@
         // return
         if (isArrivalBatch)
           return this.$message.warning('因数量变化请重新设置分批到货时间');
-        await savePurchasePlanCutAPI([deepClone(this.form), ...copyList]);
+        const code = await savePurchasePlanCutAPI([
+          deepClone(this.form),
+          ...copyList
+        ]);
+
+        if (code == '-1') {
+          return;
+        }
         this.$message.success('操作成功');
         this.$emit('done');
         this.cancel();

+ 1 - 1
src/views/purchasingManage/purchasePlanManage/index.vue

@@ -216,7 +216,7 @@
                   [2].includes(row.status) &&
                   (!row.parentId || row.parentId == 0) &&
                   [0].includes(row.progress) &&
-                  !orderSourceType.includes(row.sourceType)
+                  !orderSourceType.includes(row.sourceType)&&row.acceptUnpack==1
                 "
                 @click="handleSplit(row)"
               >

+ 10 - 10
src/views/targetManage/salesTarget/index.vue

@@ -206,16 +206,16 @@
             align: 'center',
             showOverflowTooltip: true
           },
-          {
-            minWidth: 80,
-            prop: 'status',
-            label: '状态',
-            align: 'center',
-            showOverflowTooltip: true,
-            formatter: (row, column) => {
-              return row.status == 1 ? '已发布' : '待发布';
-            }
-          },
+          // {
+          //   minWidth: 80,
+          //   prop: 'status',
+          //   label: '状态',
+          //   align: 'center',
+          //   showOverflowTooltip: true,
+          //   formatter: (row, column) => {
+          //     return row.status == 1 ? '已发布' : '待发布';
+          //   }
+          // },
           {
             minWidth: 80,
             prop: 'reviewStatus',