Browse Source

贸易方式字典统一

lxf 1 year ago
parent
commit
ab2ad7e612

+ 2 - 2
src/components/process/EHSD/Contract.vue

@@ -642,7 +642,7 @@ const getDict = () => {
       "outside_packaging_method_ehsd",
       "account_currency",
       "funds_payment_method",
-      "trade_methods",
+      "trade_mode",
       "shipping_method",
     ])
     .then((res) => {
@@ -662,7 +662,7 @@ const getDict = () => {
         label: x.dictValue,
         value: x.dictKey,
       }));
-      tradeMethods.value = res["trade_methods"].map((x) => ({
+      tradeMethods.value = res["trade_mode"].map((x) => ({
         label: x.dictValue,
         value: x.dictKey,
       }));

+ 2 - 2
src/components/process/EHSD/PriceSheet.vue

@@ -500,7 +500,7 @@ const getDict = () => {
       "outside_packaging_method_ehsd",
       "account_currency",
       "funds_payment_method",
-      "trade_methods",
+      "trade_mode",
       "shipping_method",
     ])
     .then((res) => {
@@ -520,7 +520,7 @@ const getDict = () => {
         label: x.dictValue,
         value: x.dictKey,
       }));
-      tradeMethods.value = res["trade_methods"].map((x) => ({
+      tradeMethods.value = res["trade_mode"].map((x) => ({
         label: x.dictValue,
         value: x.dictKey,
       }));

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

@@ -647,7 +647,7 @@ const getDict = () => {
       "outside_packaging_method_ehsd",
       "account_currency",
       "funds_payment_method",
-      "trade_methods",
+      "trade_mode",
       "shipping_method",
       "submit_type",
     ])
@@ -668,7 +668,7 @@ const getDict = () => {
         label: x.dictValue,
         value: x.dictKey,
       }));
-      tradeMethods.value = res["trade_methods"].map((x) => ({
+      tradeMethods.value = res["trade_mode"].map((x) => ({
         label: x.dictValue,
         value: x.dictKey,
       }));

+ 2 - 2
src/components/process/PriceSheet.vue

@@ -465,7 +465,7 @@ const rules = ref({
   remark: [{ required: true, message: "请输入付款条件", trigger: "blur" }],
 });
 const getDict = () => {
-  proxy.getDictOne(["account_currency", "funds_payment_method", "trade_methods", "shipping_method", "unit"]).then((res) => {
+  proxy.getDictOne(["account_currency", "funds_payment_method", "trade_mode", "shipping_method", "unit"]).then((res) => {
     accountCurrency.value = res["account_currency"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
@@ -474,7 +474,7 @@ const getDict = () => {
       label: x.dictValue,
       value: x.dictKey,
     }));
-    tradeMethods.value = res["trade_methods"].map((x) => ({
+    tradeMethods.value = res["trade_mode"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));

+ 2 - 2
src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -479,12 +479,12 @@ const config = computed(() => {
   ];
 });
 const getDict = () => {
-  proxy.getDictOne(["customer_tag", "trade_methods", "account_currency", "shipping_method"]).then((res) => {
+  proxy.getDictOne(["customer_tag", "trade_mode", "account_currency", "shipping_method"]).then((res) => {
     customerTag.value = res["customer_tag"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));
-    tradeMethods.value = res["trade_methods"].map((x) => ({
+    tradeMethods.value = res["trade_mode"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));

+ 2 - 2
src/views/EHSD/saleContract/priceSheetEHSD/index.vue

@@ -412,8 +412,8 @@ const getDict = () => {
       };
     });
   });
-  proxy.getDictOne(["trade_methods", "account_currency", "shipping_method"]).then((res) => {
-    tradeMethods.value = res["trade_methods"].map((x) => ({
+  proxy.getDictOne(["trade_mode", "account_currency", "shipping_method"]).then((res) => {
+    tradeMethods.value = res["trade_mode"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));

+ 2 - 2
src/views/EHSD/saleContract/sampleEHSD/index.vue

@@ -283,12 +283,12 @@ const config = computed(() => {
   ];
 });
 const getDict = () => {
-  proxy.getDictOne(["customer_tag", "trade_methods", "account_currency", "shipping_method"]).then((res) => {
+  proxy.getDictOne(["customer_tag", "trade_mode", "account_currency", "shipping_method"]).then((res) => {
     customerTag.value = res["customer_tag"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));
-    tradeMethods.value = res["trade_methods"].map((x) => ({
+    tradeMethods.value = res["trade_mode"].map((x) => ({
       label: x.dictValue,
       value: x.dictKey,
     }));

+ 1 - 1
src/views/salesMange/saleContract/priceSheet/index.vue

@@ -452,7 +452,7 @@ const getDict = () => {
     .post("/dictTenantData/page", {
       pageNum: 1,
       pageSize: 999,
-      dictCode: "trade_methods",
+      dictCode: "trade_mode",
       tenantId: useUserStore().user.tenantId,
     })
     .then((res) => {

File diff suppressed because it is too large
+ 110 - 582
src/views/salesMange/shipmentMange/document/index.vue


Some files were not shown because too many files changed in this diff