Merge branch 'stage' of http://36.137.93.232:3000/hf/byte-sailing-new into stage

src/components/process/EHSD/Contract.vue

@@ -645,7 +645,7 @@ const getDict = () => {
       "outside_packaging_method_ehsd",
       "account_currency",
       "funds_payment_method",
-      "trade_methods",
+      "trade_mode",
       "shipping_method",
     ])
     .then((res) => {
@@ -665,7 +665,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,
       }));

src/components/process/EHSD/PriceSheet.vue

@@ -503,7 +503,7 @@ const getDict = () => {
       "outside_packaging_method_ehsd",
       "account_currency",
       "funds_payment_method",
-      "trade_methods",
+      "trade_mode",
       "shipping_method",
     ])
     .then((res) => {
@@ -523,7 +523,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,
       }));

src/components/process/EHSD/Sample.vue

@@ -650,7 +650,7 @@ const getDict = () => {
       "outside_packaging_method_ehsd",
       "account_currency",
       "funds_payment_method",
-      "trade_methods",
+      "trade_mode",
       "shipping_method",
       "submit_type",
     ])
@@ -671,7 +671,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,
       }));

src/components/process/PriceSheet.vue

@@ -468,7 +468,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,
@@ -477,7 +477,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,
     }));

src/components/selectCity/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="select-city">
-    <el-select clearable filterable allow-create :placeholder="placeholder" @change="getCityData" v-model="showModel" style="width: 100%">
+    <el-select clearable filterable allow-create :placeholder="placeholder" @change="getCityData" @clear="getCityData" v-model="showModel" style="width: 100%">
       <el-option v-for="item in data" :label="item.name" :value="item.id"> </el-option>
     </el-select>
   </div>
@@ -38,23 +38,29 @@ defineProps({
 //监听modelValue的变化
 watch(
   formData.value,
-  (val) => {
-    if (formData.value[proxy.addressId || "provinceId"] === "-1") {
-      formData.value[proxy.addressId || "provinceId"] = "";
-      formData.value[proxy.addressName || "provinceName"] = "";
-    }
-    // console.log(formData.value[proxy.addressId || 'provinceId'],formData.value[proxy.addressName || 'provinceName'])
+  () => {
     if (!formData.value[proxy.addressId || "provinceId"] && !formData.value[proxy.addressName || "provinceName"]) {
-      showModel.value = "";
+      if (formData.value[proxy.addressId || "provinceId"] === "-1") {
+        showModel.value = "";
+        formData.value[proxy.addressId || "provinceId"] = "";
+        formData.value[proxy.addressName || "provinceName"] = "";
+      } else {
+        showModel.value = "";
+      }
     } else {
-      showModel.value = formData.value[proxy.addressId || "provinceId"] || formData.value[proxy.addressName || "provinceName"];
+      if (formData.value[proxy.addressId || "provinceId"] === "-1") {
+        showModel.value = formData.value[proxy.addressId || "provinceId"] || formData.value[proxy.addressName || "provinceName"];
+        formData.value[proxy.addressId || "provinceId"] = "";
+        formData.value[proxy.addressName || "provinceName"] = "";
+      } else {
+        showModel.value = formData.value[proxy.addressId || "provinceId"] || formData.value[proxy.addressName || "provinceName"];
+      }
     }
   },
   {
     immediate: true,
   }
 );
-
 const getCityData = (val) => {
   let isAddCity = true;
   //判断val是否在data里面

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,
     }));

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,
     }));

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,
     }));

src/views/purchaseManage/purchasePayment/invoice/index.vue

@@ -307,7 +307,7 @@ const openModal = (val) => {
 };
 const changeSupply = (val) => {
   if (val) {
-    proxy.get("/purchase/getListBySupplyId", { supplyId: val }).then((res) => {
+    proxy.get("/purchase/getNoInvoiceListBySupplyId", { supplyId: val }).then((res) => {
       if (res.data && res.data.length > 0) {
         formData.data.invoiceDetailsList = res.data.map((item) => {
           return {

src/views/salesMange/saleContract/priceSheet/index.vue

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

src/views/salesMange/shipmentMange/document/index.vue

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