Merge branch 'master' into dev0.3

正式合并到开发

.env.development

@@ -7,4 +7,6 @@ VITE_APP_ENV = 'development'
 # 若依管理系统/开发环境
 VITE_APP_BASE_API = '/dev-api'
 
+VITE_APP_WS_API = '/test-api'
+
 VITE_APP_IP = '36.134.91.96'

.env.production

@@ -7,6 +7,8 @@ VITE_APP_ENV = 'production'
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/prod-api'
 
+VITE_APP_WS_API = '/prod-api'
+
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
 

.env.staging

@@ -7,6 +7,8 @@ VITE_APP_ENV = 'staging'
 # 若依管理系统/生产环境
 VITE_APP_BASE_API = '/test-api'
 
+VITE_APP_WS_API = '/test-api'
+
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip
 

src/components/contractCom/contractDetails.vue

@@ -92,6 +92,10 @@ const transactionType = ref([
     label: "采购付款",
     value: "20",
   },
+  {
+    label: "到账认领",
+    value: "30",
+  },
 ]);
 const config = computed(() => {
   return [

src/components/notice/index.vue

@@ -135,7 +135,7 @@ const confirm = () => {
 
 const socketInit = () => {
 	window.ws = new WebSocket(
-		'ws://'+ import.meta.env.VITE_APP_IP +':9898/test-api/webStock/' +
+		'ws://'+ import.meta.env.VITE_APP_IP +':9898'+ import.meta.env.VITE_APP_WS_API +'/webStock/' +
 			getToken()
 		// 'ws://192.168.1.97:8300/webStock/' + window.localStorage.getItem('token')
 	)

src/components/process/Contract.vue

@@ -671,15 +671,6 @@ const getDict = () => {
       };
     });
   });
-  proxy.post("/customer/privateSeaPage", { pageNum: 1, pageSize: 999 }).then((res) => {
-    customerList.value = res.rows.map((item) => {
-      return {
-        ...item,
-        label: item.name,
-        value: item.id,
-      };
-    });
-  });
   proxy.post("/accountManagement/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     accountList.value = res.rows.map((item) => {
       return {
@@ -1269,6 +1260,7 @@ watch(
       }
       getDecisionAids();
     }
+    console.log('111');
   },
   {
     deep: true,
@@ -1287,6 +1279,27 @@ const acquireSelectList = () => {
   return data;
 };
 onMounted(() => {
+  if(!route.query.processType || route.query.processType == 30) {
+    proxy.post("/customer/privateSeaPage", { pageNum: 1, pageSize: 999 }).then((res) => {
+      customerList.value = res.rows.map((item) => {
+        return {
+          ...item,
+          label: item.name,
+          value: item.id,
+        };
+      });
+    });
+  } else {
+    proxy.post("/customer/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+      customerList.value = res.rows.map((item) => {
+        return {
+          ...item,
+          label: item.name,
+          value: item.id,
+        };
+      });
+    });
+  }
   if (props.queryData.priceSheetId) {
     proxy.post("/saleQuotation/detail", { id: props.queryData.priceSheetId }).then((res) => {
       res.countryId = res.buyCountryId;

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,
     }));
@@ -508,15 +508,6 @@ const getDict = () => {
       };
     });
   });
-  proxy.post("/customer/privateSeaPage", { pageNum: 1, pageSize: 999 }).then((res) => {
-    customerList.value = res.rows.map((item) => {
-      return {
-        ...item,
-        label: item.name,
-        value: item.id,
-      };
-    });
-  });
 };
 getDict();
 const changeTemplate = (val) => {
@@ -829,6 +820,27 @@ watch(
   }
 );
 onMounted(() => {
+  if(!route.query.processType || route.query.processType == 30) {
+    proxy.post("/customer/privateSeaPage", { pageNum: 1, pageSize: 999 }).then((res) => {
+      customerList.value = res.rows.map((item) => {
+        return {
+          ...item,
+          label: item.name,
+          value: item.id,
+        };
+      });
+    });
+  } else {
+    proxy.post("/customer/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+      customerList.value = res.rows.map((item) => {
+        return {
+          ...item,
+          label: item.name,
+          value: item.id,
+        };
+      });
+    });
+  }
   if (props.queryData.priceSheetId) {
     proxy.post("/saleQuotation/detail", { id: props.queryData.priceSheetId }).then((res) => {
       res.countryId = res.buyCountryId;

src/components/process/SendFunds.vue

@@ -1178,6 +1178,7 @@ const getDictData = () => {
       accountData.value = res.rows;
     });
   // 关联合同
+ 
   proxy
     .post("/contract/page", { pageNum: 1, pageSize: 9999, status: 30 })
     .then((res) => {

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/customer/privatesea/index.vue

@@ -772,7 +772,7 @@ const follow = ref(null);
 const getList = async (req) => {
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
-  proxy.post("customer/privateSeaPage", sourceList.value.pagination).then((res) => {
+  proxy.post("/customer/privateSeaPage", sourceList.value.pagination).then((res) => {
     res.rows.forEach((x) => {
       x.addTagShow = false;
       if (x.tag) {

src/views/finance/fundManage/comeAndGo/index.vue

@@ -14,7 +14,7 @@
           type: ' ',
         },
         {
-          text: '发起请款',
+          text: '添加往来',
           action: () => addModal(),
         },
       ]"
@@ -325,7 +325,7 @@ const addModal = () => {
     type: "",
     currency: "",
     amount: undefined,
-    isFlowingWater: "",
+    isFlowingWater: "0",
     accountId: "",
     remark: "",
   };

src/views/finance/fundManage/funds/index.vue

@@ -966,7 +966,7 @@ const config = computed(() => {
       },
       renderHTML(row) {
         return [
-          row.type == 1 && row.writeOffStatus == 0
+          row.type == 1 && row.writeOffStatus == 0 && row.status == '30'
             ? {
                 attrs: {
                   label: "核销",

src/views/purchaseManage/purchaseManage/purchase/index.vue

@@ -356,6 +356,9 @@ const formConfig = computed(() => {
   ];
 });
 const getList = async (req) => {
+  if (req && !req.status) {
+    req.status = "15,30";
+  }
   sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
   loading.value = true;
   proxy

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

@@ -548,11 +548,11 @@ const computeScale = (item) => {
   if (
     item.sumClaimMoney &&
     Number(item.sumClaimMoney) > 0 &&
-    item.amount &&
-    Number(item.amount) > 0
+    item.amountCNY &&
+    Number(item.amountCNY) > 0
   ) {
     text = parseFloat(
-      (Number(item.sumClaimMoney) / Number(item.amount)) * 100
+      (Number(item.sumClaimMoney) / Number(item.amountCNY)) * 100
     ).toFixed(2);
   }
   return text + "%";

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/packing/index.vue

@@ -774,7 +774,7 @@ const openModalOne = () => {
   for (let i = 0; i < list.length; i++) {
     const e = list[i];
     ids = [...ids, ...e.contractIds.split(",")];
-    idsOne.push(e.id);
+    idsOne = [...idsOne, ...e.ids.split(",")];
   }
   formData.dataOne.ids = idsOne;
   proxy.post(`/contract/getByIds`, ids).then((res) => {

src/views/system/user2/index.vue

@@ -121,15 +121,6 @@ const config = computed(() => {
       render(userType) {
         return userType == 1 ? "是" : "否";
       },
-    },
-    {
-      attrs: {
-        label: "系统用户",
-        prop: "userType",
-      },
-      render(userType) {
-        return userType == 1 ? "是" : "否";
-      },
     },{
       attrs: {
         label: "角色",