cz 1 年之前
父节点
当前提交
f7236b38fc
共有 2 个文件被更改,包括 24 次插入9 次删除
  1. 4 0
      src/components/process/EHSD/SampleChange.vue
  2. 20 9
      src/views/EHSD/procurement/profitBudgetEHSD/index.vue

+ 4 - 0
src/components/process/EHSD/SampleChange.vue

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

+ 20 - 9
src/views/EHSD/procurement/profitBudgetEHSD/index.vue

@@ -267,6 +267,7 @@
                     v-model="formBudgetData.data.trailerFeeCurrency"
                     v-model="formBudgetData.data.trailerFeeCurrency"
                     placeholder="请选择货币"
                     placeholder="请选择货币"
                     style="width: 115px"
                     style="width: 115px"
+                    disabled
                   >
                   >
                     <el-option
                     <el-option
                       v-for="(item, index) in accountCurrency"
                       v-for="(item, index) in accountCurrency"
@@ -293,6 +294,7 @@
                     v-model="formBudgetData.data.customsFeeCurrency"
                     v-model="formBudgetData.data.customsFeeCurrency"
                     placeholder="请选择货币"
                     placeholder="请选择货币"
                     style="width: 115px"
                     style="width: 115px"
+                    disabled
                   >
                   >
                     <el-option
                     <el-option
                       v-for="(item, index) in accountCurrency"
                       v-for="(item, index) in accountCurrency"
@@ -319,6 +321,7 @@
                     v-model="formBudgetData.data.agencyFeeCurrency"
                     v-model="formBudgetData.data.agencyFeeCurrency"
                     placeholder="请选择货币"
                     placeholder="请选择货币"
                     style="width: 115px"
                     style="width: 115px"
+                    disabled
                   >
                   >
                     <el-option
                     <el-option
                       v-for="(item, index) in accountCurrency"
                       v-for="(item, index) in accountCurrency"
@@ -345,6 +348,7 @@
                     v-model="formBudgetData.data.portMixedFeeCurrency"
                     v-model="formBudgetData.data.portMixedFeeCurrency"
                     placeholder="请选择货币"
                     placeholder="请选择货币"
                     style="width: 115px"
                     style="width: 115px"
+                    disabled
                   >
                   >
                     <el-option
                     <el-option
                       v-for="(item, index) in accountCurrency"
                       v-for="(item, index) in accountCurrency"
@@ -371,6 +375,7 @@
                     v-model="formBudgetData.data.inspectionRedPackCurrency"
                     v-model="formBudgetData.data.inspectionRedPackCurrency"
                     placeholder="请选择货币"
                     placeholder="请选择货币"
                     style="width: 115px"
                     style="width: 115px"
+                    disabled
                   >
                   >
                     <el-option
                     <el-option
                       v-for="(item, index) in accountCurrency"
                       v-for="(item, index) in accountCurrency"
@@ -397,6 +402,7 @@
                     v-model="formBudgetData.data.commissionCurrency"
                     v-model="formBudgetData.data.commissionCurrency"
                     placeholder="请选择货币"
                     placeholder="请选择货币"
                     style="width: 115px"
                     style="width: 115px"
+                    disabled
                   >
                   >
                     <el-option
                     <el-option
                       v-for="(item, index) in accountCurrency"
                       v-for="(item, index) in accountCurrency"
@@ -419,6 +425,7 @@
                     v-model="formBudgetData.data.otherCurrency"
                     v-model="formBudgetData.data.otherCurrency"
                     placeholder="请选择货币"
                     placeholder="请选择货币"
                     style="width: 115px"
                     style="width: 115px"
+                    disabled
                   >
                   >
                     <el-option
                     <el-option
                       v-for="(item, index) in accountCurrency"
                       v-for="(item, index) in accountCurrency"
@@ -792,30 +799,34 @@ const formBudgetConfig = computed(() => {
   ];
   ];
 });
 });
 const changeBudget = (row) => {
 const changeBudget = (row) => {
+  let currency = "CNY";
+  if (accountCurrency.value && accountCurrency.value.length > 0) {
+    currency = accountCurrency.value[0].value;
+  }
   formBudgetData.data = {
   formBudgetData.data = {
-    id: row.id,
+    contractId: row.contractId,
     code: row.code,
     code: row.code,
     customerName: row.customerName,
     customerName: row.customerName,
     userName: row.userName,
     userName: row.userName,
-    trailerFeeCurrency: row.trailerFeeCurrency,
+    trailerFeeCurrency: currency,
     trailerFee: row.trailerFee,
     trailerFee: row.trailerFee,
-    customsFeeCurrency: row.customsFeeCurrency,
+    customsFeeCurrency: currency,
     customsFee: row.customsFee,
     customsFee: row.customsFee,
-    agencyFeeCurrency: row.agencyFeeCurrency,
+    agencyFeeCurrency: currency,
     agencyFee: row.agencyFee,
     agencyFee: row.agencyFee,
-    portMixedFeeCurrency: row.portMixedFeeCurrency,
+    portMixedFeeCurrency: currency,
     portMixedFee: row.portMixedFee,
     portMixedFee: row.portMixedFee,
-    inspectionRedPackCurrency: row.inspectionRedPackCurrency,
+    inspectionRedPackCurrency: currency,
     inspectionRedPack: row.inspectionRedPack,
     inspectionRedPack: row.inspectionRedPack,
-    commissionCurrency: row.commissionCurrency,
+    commissionCurrency: currency,
     commission: row.commission,
     commission: row.commission,
-    otherCurrency: row.otherCurrency,
+    otherCurrency: currency,
     other: row.other,
     other: row.other,
   };
   };
   openBudget.value = true;
   openBudget.value = true;
 };
 };
 const submitBudgetForm = () => {
 const submitBudgetForm = () => {
-  proxy.post("/contract/edit", formBudgetData.data).then(() => {
+  proxy.post("/contractBudget/budget", formBudgetData.data).then(() => {
     ElMessage({
     ElMessage({
       message: "保存成功",
       message: "保存成功",
       type: "success",
       type: "success",