Browse Source

交接单bug

cz 1 year ago
parent
commit
b94aa8f676

+ 12 - 3
src/components/process/SendPurchase.vue

@@ -420,21 +420,25 @@ const getDetails = () => {
   if (props.queryData.type && props.queryData.type === "handoverSlip") {
     proxy.post("/contractProduct/getListDetail", ids.value).then((res) => {
       formData.data.purchaseDetailList = res.map((x) => {
-        delete x.id;
-        return {
+        let obj = {
           ...x,
+          dataResource: "1", //来源写死外销合同采购
+          dataResourceId: x.id,
           bussinessId: x.productId,
-          subscribeCount: x.sumPackQuantity,
+          subscribeCount: x.quantity || x.sumPackQuantity || 0,
           purchaseCount: x.sumPurchaseCount || 0,
           count: x.expendQuantity || 0,
           price: null,
           amount: null,
         };
+        delete obj.id;
+        return obj;
       });
     });
   } else {
     proxy.post("/subscribeDetail/detail", { ids: ids.value }).then((res) => {
       formData.data.purchaseDetailList = res.map((x) => ({
+        subscribeDetailId: x.id,
         bussinessId: x.bussinessId,
         goodType: x.productDefinition,
         productCode: x.productCode,
@@ -777,6 +781,11 @@ onMounted(() => {
     ids.value = props.queryData.ids.split(",") || [];
     getDetails();
   }
+  // if (props.queryData.type === "handoverSlip") {
+  //   formData.data.dataResource = "1"; //外销合同采购
+  //   formData.data.dataResourceId = "";
+  // }
+
   if (props.queryData.type === "handoverSlip" && props.queryData.arr) {
     contractData.value = JSON.parse(props.queryData.arr);
     auxiliaryData.value.unshift({

+ 3 - 3
src/views/purchaseManage/purchaseManage/handoverSlip/index.vue

@@ -517,7 +517,7 @@ const transferToProduction = (row) => {
     formData.data = {
       list: [
         {
-          sourceId: "1",
+          sourceId: row.id,
           source: "1",
           productId: row.productId,
           productCode: row.productCode,
@@ -532,7 +532,7 @@ const transferToProduction = (row) => {
     formData.data = {
       list: selectData.value.map((item) => {
         return {
-          sourceId: "1",
+          sourceId: item.id,
           source: "1",
           productId: item.productId,
           productCode: item.productCode,
@@ -554,7 +554,7 @@ watch(selectData, (newVal) => {
   } else if (newVal.length == 1) {
     const current = newVal[0];
     sourceList.value.data.forEach((x) => {
-      if (x.contractId !== current.contractId) {
+      if (x.corporationId !== current.corporationId) {
         x.isCheck = false;
       }
     });