Переглянути джерело

利润波动图标显示问题解决

cz 1 рік тому
батько
коміт
1917e60718

+ 3 - 3
src/components/process/EHSD/Sample.vue

@@ -1661,9 +1661,9 @@ const clickCopy = () => {
 const selectSample = (businessId) => {
   if (businessId) {
     proxy.post("/sample/detail", { id: businessId }).then((res) => {
-      if (res && res.dataJson) {
-        res = { ...res, ...JSON.parse(res.dataJson) };
-      }
+      // if (res && res.dataJson) {
+      //   res = { ...res, ...JSON.parse(res.dataJson) };
+      // }
       if (res && res.buyCorporationName) {
         proxy
           .post("/customer/selPage", { keyword: res.buyCorporationName })

+ 6 - 6
src/components/process/EHSD/SampleChange.vue

@@ -1421,9 +1421,9 @@ onMounted(() => {
   if (route.query && route.query.processType) {
     let businessId = route.query.businessId;
     proxy.post("/sample/detail", { id: businessId }).then((res) => {
-      if (res && res.dataJson) {
-        res = { ...res, ...JSON.parse(res.dataJson) };
-      }
+      // if (res && res.dataJson) {
+      //   res = { ...res, ...JSON.parse(res.dataJson) };
+      // }
       res.sampleShipmentList = res.sampleShipmentLists;
       res.countryId = res.buyCountryId;
       res.provinceId = res.buyProvinceId;
@@ -1494,9 +1494,9 @@ onMounted(() => {
   } else if (route.query && !route.query.processType) {
     let businessId = route.query.businessId;
     proxy.post("/sample/detail", { id: businessId }).then((res) => {
-      if (res && res.dataJson) {
-        res = { ...res, ...JSON.parse(res.dataJson) };
-      }
+      // if (res && res.dataJson) {
+      //   res = { ...res, ...JSON.parse(res.dataJson) };
+      // }
       res.sampleShipmentList = res.sampleShipmentLists;
       res.countryId = res.buyCountryId;
       res.provinceId = res.buyProvinceId;

+ 12 - 5
src/views/process/processApproval/index.vue

@@ -398,7 +398,7 @@ const handleSubmit = async (_type) => {
               );
             }
           } else if (flowForm.flowKey == "contract_flow") {
-            data.dataJson = JSON.stringify(proxy.deepClone(data));
+            // data.dataJson = JSON.stringify(proxy.deepClone(data));
             if (data.fileList && data.fileList.length > 0) {
               data.fileList = data.fileList.map((item) => {
                 return {
@@ -435,7 +435,7 @@ const handleSubmit = async (_type) => {
               };
             });
           } else if (flowForm.flowKey == "contract_update_flow") {
-            data.dataJson = JSON.stringify(proxy.deepClone(data));
+            // data.dataJson = JSON.stringify(proxy.deepClone(data));
             if (data.fileList && data.fileList.length > 0) {
               data.fileList = data.fileList.map((item) => {
                 return {
@@ -472,7 +472,7 @@ const handleSubmit = async (_type) => {
               };
             });
           } else if (flowForm.flowKey == "sample_flow") {
-            data.dataJson = JSON.stringify(proxy.deepClone(data));
+            // data.dataJson = JSON.stringify(proxy.deepClone(data));
             if (data.fileList && data.fileList.length > 0) {
               data.fileList = data.fileList.map((item) => {
                 return {
@@ -509,7 +509,7 @@ const handleSubmit = async (_type) => {
               };
             });
           } else if (flowForm.flowKey == "sample_update_flow") {
-            data.dataJson = JSON.stringify(proxy.deepClone(data));
+            // data.dataJson = JSON.stringify(proxy.deepClone(data));
             if (data.fileList && data.fileList.length > 0) {
               data.fileList = data.fileList.map((item) => {
                 return {
@@ -794,7 +794,14 @@ onMounted(async () => {
       userInfo.roles.includes("financeOfficer") ||
       userInfo.roles.includes("approve_ accountant")) &&
     (route.query.processType == 10 || route.query.processType == 30) &&
-    route.query.flowKey != "after_sales_flow"
+    [
+      "contract_flow",
+      "contract_update_flow",
+      "sample_flow",
+      "sample_update_flow",
+      "ehsd_purchase_flow",
+      "ehsd_purchase_update_flow",
+    ].includes(route.query.flowKey)
   ) {
     showChart.value = true;
   }