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

src/components/contractCom/contractDetails.vue

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

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/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/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: "角色",