From b0e31d9d9e8faf89cc6e9b1a2f4b4bd0c3cd3bdd Mon Sep 17 00:00:00 2001
From: admin <>
Date: Mon, 20 May 2024 13:56:40 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PagesStatistics/receivePanel.vue        |  2 +-
 src/pagesApp/components/FilterDialog.vue    |  6 +-
 src/pagesApp/components/addShipmentType.vue |  2 +-
 src/pagesApp/components/addSupplier.vue     | 86 ++++++++++++++-------
 src/pagesApp/components/addUser.vue         | 14 ++++
 src/pagesApp/shipmentCl.vue                 |  6 +-
 src/pagesApp/shipmentDetail.vue             |  8 +-
 src/pagesApp/shipmentSpl.vue                |  8 ++
 src/pagesApp/stockCard.vue                  |  2 +-
 src/pagesApp/supplierMgt.vue                |  3 +-
 src/pagesReceive/form/pricingForm.vue       | 50 ++++++++----
 src/pagesShipment/review/index.vue          |  2 +-
 src/types/order.d.ts                        |  5 +-
 13 files changed, 134 insertions(+), 60 deletions(-)

diff --git a/src/PagesStatistics/receivePanel.vue b/src/PagesStatistics/receivePanel.vue
index e301cb8..bd5c0d4 100644
--- a/src/PagesStatistics/receivePanel.vue
+++ b/src/PagesStatistics/receivePanel.vue
@@ -71,7 +71,7 @@
             <view class="num">{{
               formatMoney(state.summary.totalPaidPrice)
             }}</view>
-            <view>实收金额</view>
+            <view>已付金额</view>
           </view>
         </up-col>
         <up-col span="4">
diff --git a/src/pagesApp/components/FilterDialog.vue b/src/pagesApp/components/FilterDialog.vue
index 09ea043..3a50357 100644
--- a/src/pagesApp/components/FilterDialog.vue
+++ b/src/pagesApp/components/FilterDialog.vue
@@ -247,8 +247,8 @@ const state = reactive({
 const currentSpl = ref<any>(null);
 const splBtnList = [
   { key: null, name: "全部" },
-  { key: false, name: "补单" },
-  { key: true, name: "未补单" },
+  { key: false, name: "手工补单" },
+  { key: true, name: "系统单" },
 ];
 const deliveryMethod = ref<any>(null);
 const deliveryMethodBtnList = [
@@ -441,7 +441,7 @@ const getFilter = () => {
 </script>
 <style lang="scss" scoped>
 .box {
-  padding: 60rpx 30rpx;
+  padding: 60rpx 30rpx 150rpx;
   ::v-deep .u-cell__value {
     font-size: 26rpx;
   }
diff --git a/src/pagesApp/components/addShipmentType.vue b/src/pagesApp/components/addShipmentType.vue
index 5c43439..02cb097 100644
--- a/src/pagesApp/components/addShipmentType.vue
+++ b/src/pagesApp/components/addShipmentType.vue
@@ -159,7 +159,7 @@ const startSave = () => {
   if (model1.formData.id) {
     GoodsApi.editShipmentCategory({
       id: model1.formData.id,
-      shmCategoryName: model1.formData.name,
+      shmCategoryName: model1.formData.shmCategoryName,
       parentId: model1.formData.parentId,
     }).then((res) => {
       if (res.code === 200) {
diff --git a/src/pagesApp/components/addSupplier.vue b/src/pagesApp/components/addSupplier.vue
index 9b44515..3150e66 100644
--- a/src/pagesApp/components/addSupplier.vue
+++ b/src/pagesApp/components/addSupplier.vue
@@ -3,7 +3,7 @@
     <u-form
       labelPosition="left"
       :model="model1"
-      :rules="rules"
+      :rules="model1.formData.id ? rules1 : rules2"
       ref="form"
       :labelWidth="100"
       :labelStyle="{ padding: '0rpx 10rpx' }"
@@ -33,7 +33,11 @@
           border="none"
           @change="(e:any) => {handleInput(e, item)}"
           :disabled="item.type === 'select'"
-          :disabledColor="['卡号', '供应商分类'].indexOf(item.name) > -1?'#ffffff':'#f5f7fa'"
+          :disabledColor="
+            ['卡号', '供应商分类'].indexOf(item.name) > -1
+              ? '#ffffff'
+              : '#f5f7fa'
+          "
           @clear="handleClear(item)"
         >
           <template #suffix>
@@ -70,11 +74,11 @@ import { DeviceType, ImagesType, OrderType, StockCardType } from "@/utils/enum";
 import valid from "@/utils/validate";
 import { onLoad } from "@dcloudio/uni-app";
 import _ from "underscore";
-const handleClear = (item:any) => {
-  (model1.formData as any)[item.key] = '';
-}
+const handleClear = (item: any) => {
+  (model1.formData as any)[item.key] = "";
+};
 const handleInput = (e: any, item: any) => {
-  if (item.key === "phone" || item.key === 'bankNumber') {
+  if (item.key === "phone" || item.key === "bankNumber") {
     const temp = e?.replace(valid.valid_number, "");
     setTimeout(() => {
       model1.formData[item.key] = temp;
@@ -84,7 +88,21 @@ const handleInput = (e: any, item: any) => {
 const model1 = reactive<any>({
   formData: {},
 });
-const rules = ref({
+const rules1 = ref({
+  "formData.name": {
+    type: "string",
+    required: true,
+    message: "请输入供应商",
+    trigger: ["blur", "change"],
+  },
+  "formData.supplierTypeName": {
+    type: "string",
+    required: true,
+    message: "请选择供应商分类",
+    trigger: ["blur", "change"],
+  },
+});
+const rules2 = ref({
   "formData.stockCardName": {
     type: "string",
     required: true,
@@ -127,11 +145,11 @@ const formAttrList = reactive<any>([
     key: "stockCardName",
     type: "select",
     childKey: "stockCard",
-    required: true,
+    // required: true,
     fn: () => {
       if (contrlModalParams.stockCard.list.length === 0) {
-        uni.showToast({icon: 'none', title: '当前无可用卡号,请添加入库卡'})
-        return
+        uni.showToast({ icon: "none", title: "当前无可用卡号,请添加入库卡" });
+        return;
       }
       contrlModalParams.stockCard.isShow = true;
       contrlModalParams.stockCard.title = "卡号";
@@ -261,14 +279,14 @@ const save = () => {
 const startSave = () => {
   if (model1.formData.id) {
     SupplierApi.updateSupplierUser(model1.formData).then((res) => {
-    if (res.code === 200) {
-     uni.navigateBack()
-    }
-  });
+      if (res.code === 200) {
+        uni.navigateBack();
+      }
+    });
   } else {
     SupplierApi.addSupplierUser(model1.formData).then((res) => {
       if (res.code === 200) {
-        uni.navigateBack()
+        uni.navigateBack();
       }
     });
   }
@@ -283,15 +301,17 @@ const getSupplierTypeList = () => {
 };
 
 const getStockCardList = () => {
-  StockCardApi.getStockCardListInfo({ vincolante: StockCardType.Receive }).then((res) => {
-    if (res.code === 200) {
-      contrlModalParams.stockCard.list = (res.data as any).map(
-        (item: any) => {
-          return { ...item, name: item.cardCode };
-        }
-      );
+  StockCardApi.getStockCardListInfo({ vincolante: StockCardType.Receive }).then(
+    (res) => {
+      if (res.code === 200) {
+        contrlModalParams.stockCard.list = (res.data as any).map(
+          (item: any) => {
+            return { ...item, name: item.cardCode };
+          }
+        );
+      }
     }
-  });
+  );
 };
 
 onMounted(() => {
@@ -299,10 +319,24 @@ onMounted(() => {
   getStockCardList();
 });
 
-onLoad((option) => {
+onLoad((option:any) => {
   // 接收传递的标题参数
-  const title = (option as any).title;
-  model1.formData = JSON.parse((option as any).item);
+  const title = option.title;
+  SupplierApi.getSupplierUserList({ id: option.item }).then(
+    (res: any) => {
+      if (res.code === 200) {
+        if (res.data.length > 0) {
+          model1.formData = res.data[0]
+        } else {
+          uni.showToast({ title: "未查询到供应商" });
+        }
+      }
+    }
+  );
+  // 新增供应商卡号必填 编辑供应商卡号非必填
+  if (!option.item) {
+    formAttrList[1].required = true
+  }
   if (model1.formData.cardCode) {
     model1.formData.stockCardName = model1.formData.cardCode;
   }
diff --git a/src/pagesApp/components/addUser.vue b/src/pagesApp/components/addUser.vue
index b430586..0bfb50b 100644
--- a/src/pagesApp/components/addUser.vue
+++ b/src/pagesApp/components/addUser.vue
@@ -95,6 +95,12 @@ const model1 = reactive<any>({
   formData: {},
 });
 const rules1 = ref({
+  "formData.roleName": {
+    type: "string",
+    required: true,
+    message: "请选择用户角色",
+    trigger: ["blur", "change"],
+  },
   "formData.userName": {
     type: "string",
     required: true,
@@ -109,6 +115,12 @@ const rules1 = ref({
   },
 });
 const rules2 = ref({
+  "formData.roleName": {
+    type: "string",
+    required: true,
+    message: "请选择用户角色",
+    trigger: ["blur", "change"],
+  },
   "formData.userName": {
     type: "string",
     required: true,
@@ -159,6 +171,7 @@ const formAttrList1 = reactive<any>([
     key: "roleName",
     type: "select",
     childKey: "role",
+    required: true,
     fn: () => {
       contrlModalParams.role.isShow = true;
       contrlModalParams.role.title = "选择角色";
@@ -204,6 +217,7 @@ const formAttrList2 = reactive<any>([
     key: "roleName",
     type: "select",
     childKey: "role",
+    required: true,
     fn: () => {
       contrlModalParams.role.isShow = true;
       contrlModalParams.role.title = "选择角色";
diff --git a/src/pagesApp/shipmentCl.vue b/src/pagesApp/shipmentCl.vue
index 5e4ab2b..3c2b622 100644
--- a/src/pagesApp/shipmentCl.vue
+++ b/src/pagesApp/shipmentCl.vue
@@ -56,7 +56,7 @@
             <text v-if="cItem.name">{{ cItem.name }}：</text
             ><text
               >{{ cItem.isBefore ? cItem.unit : "" }}
-              {{ cItem.num }}
+              {{ cItem.name === '送货方式' ?  item[`${cItem.enName}`] === DeliveryMethod.Deliver ? '送货' : '自提' : item[`${cItem.enName}`] }}
               {{ cItem.isBefore ? "" : cItem.unit }}
             </text>
           </view>
@@ -68,7 +68,7 @@
 <script setup lang="ts">
 import { ReceiveApi, ShipmentApi } from "@/services";
 import PageView from "@/components/PageView/index.vue";
-import { ScaleStatus } from "@/utils/enum";
+import { DeliveryMethod, ScaleStatus } from "@/utils/enum";
 
 const keyword = ref("");
 const gridList1 = reactive([
@@ -156,7 +156,7 @@ const gridList1 = reactive([
   },
   {
     name: "作废人",
-    enName: "updateUserName",
+    enName: "updateName",
     unit: "",
     isBefore: false,
     isCustomStyle: true,
diff --git a/src/pagesApp/shipmentDetail.vue b/src/pagesApp/shipmentDetail.vue
index 87f59ba..fff327d 100644
--- a/src/pagesApp/shipmentDetail.vue
+++ b/src/pagesApp/shipmentDetail.vue
@@ -200,11 +200,11 @@ const state = reactive({
       key: 2,
     },
     {
-      name: "已审未付",
+      name: "待结算",
       key: 3,
     },
     {
-      name: "已审已付",
+      name: "已结算",
       key: 4,
     },
   ],
@@ -334,9 +334,9 @@ const getScaleStatus = (type: number) => {
   } else if (type === ScaleStatus.ToBeShipmentReview) {
     return "待审核";
   } else if (type === ScaleStatus.ToBeShipmentPay) {
-    return "待支付";
+    return "待结算";
   } else if (type === ScaleStatus.ShipmentPaid) {
-    return "已支付";
+    return "已结算";
   }
 };
 
diff --git a/src/pagesApp/shipmentSpl.vue b/src/pagesApp/shipmentSpl.vue
index b1302c6..b3cb7ab 100644
--- a/src/pagesApp/shipmentSpl.vue
+++ b/src/pagesApp/shipmentSpl.vue
@@ -541,6 +541,14 @@ const save = () => {
       return;
     }
   }
+
+  if (parseFloat(model1.order.tare) > parseFloat(model1.order.grossWeight)) {
+    uni.showToast({
+      title: `毛重需大于皮重`,
+      icon: "none",
+    });
+    return;
+  }
   check().then((res) => {
     if (res) {
       startSave();
diff --git a/src/pagesApp/stockCard.vue b/src/pagesApp/stockCard.vue
index 1e35660..d954471 100644
--- a/src/pagesApp/stockCard.vue
+++ b/src/pagesApp/stockCard.vue
@@ -30,7 +30,7 @@
             <view
               >{{
                 item.type === StockCardType.Shipment ? "客户" : "供应商"
-              }}：{{ item.name }}</view
+              }}：{{ item.customUserName }}</view
             >
             <view>卡号：{{ item.cardCode }}</view>
             <view
diff --git a/src/pagesApp/supplierMgt.vue b/src/pagesApp/supplierMgt.vue
index 059c64e..1eb9463 100644
--- a/src/pagesApp/supplierMgt.vue
+++ b/src/pagesApp/supplierMgt.vue
@@ -118,10 +118,11 @@ const update = (item: any) => {
 };
 
 const edit = (item: any) => {
+  console.log(JSON.stringify(item))
   uni.navigateTo({
     url:
       "/pagesApp/components/addSupplier?title=编辑供应商&item=" +
-      JSON.stringify(item), // 要跳转到的页面路径
+      item.id, // 要跳转到的页面路径
   });
 };
 const getList = (v?: boolean) => {
diff --git a/src/pagesReceive/form/pricingForm.vue b/src/pagesReceive/form/pricingForm.vue
index 2ab04ea..536c4c4 100644
--- a/src/pagesReceive/form/pricingForm.vue
+++ b/src/pagesReceive/form/pricingForm.vue
@@ -65,7 +65,9 @@
           v-if="item.type === 'radio'"
           v-model="(model1.order as any)[item.key]"
           placement="row"
-          :disabled="model1.order.scaleStatus === 1 && item.key === 'weighingMethod'"
+          :disabled="
+            model1.order.scaleStatus === 1 && item.key === 'weighingMethod'
+          "
         >
           <u-radio
             v-for="(c, index) in item.child"
@@ -128,15 +130,15 @@ import {
   SupplierApi,
 } from "@/services/index";
 import _ from "underscore";
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad, onShow } from "@dcloudio/uni-app";
 import { ImagesType, OrderType } from "@/utils/enum";
 import SupplierDialog from "../components/SupplierDialog.vue";
 import ProductDialog from "../components/ProductDialog.vue";
 import valid from "@/utils/validate";
 import { countDots } from "@/utils";
-const handleClear = (item:any) => {
-  (model1.order as any)[item.key] = '';
-}
+const handleClear = (item: any) => {
+  (model1.order as any)[item.key] = "";
+};
 // 供应商选择
 const showDialog = <
   {
@@ -222,7 +224,7 @@ const model1 = reactive<{ order: Order }>({
     fileLists: [],
     scaleStatus: 1,
     netWeight: 0,
-    balanceTotalPrice: 0
+    balanceTotalPrice: 0,
   },
 });
 
@@ -290,7 +292,12 @@ const formAttrList = reactive<ComType>([
     childKey: "userSelect",
     required: true,
     fn: () => {
-      // handleDialog("showSupplier", true);
+      uni.navigateTo({
+        url:
+          "/pagesApp/components/addSupplier?title=编辑供应商&item=" +
+          model1.order.userId, // 要跳转到的页面路径
+      });
+
       uni.hideKeyboard();
     },
   },
@@ -524,9 +531,14 @@ watch(
       实际收入：实际结算金额-运费-杂费
      */
     if (model1.order.scaleStatus === 0) {
-      return
+      return;
     }
-    model1.order.netWeight = parseFloat(((parseFloat(grossWeightNew as any) || 0) - (parseFloat(tareNew as any) || 0)).toFixed(2));
+    model1.order.netWeight = parseFloat(
+      (
+        (parseFloat(grossWeightNew as any) || 0) -
+        (parseFloat(tareNew as any) || 0)
+      ).toFixed(2)
+    );
     if (model1.order.buttonType === 0) {
       if (model1.order.subtractNum) {
         model1.order.netWeight =
@@ -540,16 +552,16 @@ watch(
     }
     model1.order.totalPrice =
       (model1.order.price || 0) * (model1.order.netWeight || 0);
-      // 货款金额默认=预估总价，当系统自动算出预估总价时，值需同步
+    // 货款金额默认=预估总价，当系统自动算出预估总价时，值需同步
     model1.order.balanceTotalPrice = model1.order.totalPrice;
   }
 );
 
-SupplierApi.getSupplierUserList({}).then((res) => {
-  if (res.code === 200) {
-    contrlModalParams.userSelect.list = res.data;
-  }
-});
+// SupplierApi.getSupplierUserList({}).then((res) => {
+//   if (res.code === 200) {
+//     contrlModalParams.userSelect.list = res.data;
+//   }
+// });
 ReceiveProductApi.getAllReProducts().then((res) => {
   if (res.code === 200) {
     contrlModalParams.productSelect.list = _.map(
@@ -649,7 +661,8 @@ const save = () => {
   }
   if (
     model1.order.price &&
-    model1.order.price.toString()[model1.order.price.toString().length - 1] === "."
+    model1.order.price.toString()[model1.order.price.toString().length - 1] ===
+      "."
   ) {
     uni.showToast({
       title: "请输入正确的单价",
@@ -762,6 +775,9 @@ onLoad((option) => {
       title: "编辑信息",
     });
   }
+});
+
+onShow(() => {
   if (model1.order.id) {
     ReceiveApi.getDetailById({ id: model1.order.id }).then((res) => {
       if (res.code === 200) {
@@ -796,7 +812,7 @@ onLoad((option) => {
       }
     });
   }
-});
+})
 </script>
 <style lang="scss" scoped>
 .c-card {
diff --git a/src/pagesShipment/review/index.vue b/src/pagesShipment/review/index.vue
index b16d228..6e7543c 100644
--- a/src/pagesShipment/review/index.vue
+++ b/src/pagesShipment/review/index.vue
@@ -20,7 +20,7 @@
           ></view>
           <view
             ><u-tag
-              text="收货单作废"
+              text="出货单作废"
               plain
               shape="circle"
               :borderColor="'rgba(255, 147, 68, 1) !important'"
diff --git a/src/types/order.d.ts b/src/types/order.d.ts
index 0c22883..2e93878 100644
--- a/src/types/order.d.ts
+++ b/src/types/order.d.ts
@@ -29,7 +29,7 @@ interface Order {
   points?: number; //扣点
   buckleMiscellaneous?: number; //扣杂
   price?: number; //单价
-  balanceTotalPrice: number; //结算总价 货款金额 
+  balanceTotalPrice?: number; //结算总价 货款金额 
   totalPrice?: number; //实际总价 预估价格
   weighingMethod?: number; //称重方式：0：有皮重 1：零皮重
   multiCategory?: number; //多品类：0：单品类 1：多品类
@@ -211,5 +211,6 @@ interface StockCard {
   cardCode?: string,
   type?: number, // 库存卡类型1=出库2=入库
   cardCode?: string,
-  name?: string
+  name?: string,
+  customUserName?:string
 }