From 6118bbeccf1b014496cc7e27142c8bd223393333 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Wed, 15 May 2024 14:56:58 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pagesApp/components/payContent.vue   | 7 +++++--
 src/pagesReceive/form/pricingForm.vue    | 1 +
 src/pagesReceive/review/index.vue        | 3 ++-
 src/pagesShipment/review/index.vue       | 2 +-
 src/pagesShipment/shipmentSettlement.vue | 3 ++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/pagesApp/components/payContent.vue b/src/pagesApp/components/payContent.vue
index a62ae01..8bb382b 100644
--- a/src/pagesApp/components/payContent.vue
+++ b/src/pagesApp/components/payContent.vue
@@ -29,7 +29,7 @@
       >{{ obj.paymentType === 0 ? "收货" : "出货" }}单号：
       <text>{{ obj.orderNumber }}</text></view
     >
-    <up-image :show-loading="true" v-for="(item, index) in obj.fileLists" :key="index" :src="item.url" width="80px" height="80px"></up-image>
+    <up-image :show-loading="true" v-for="(item, index) in state.fileLists" :key="index" :src="item.url" width="80px" height="80px"></up-image>
   </view>
 </template>
 <script setup lang="ts">
@@ -37,6 +37,9 @@ import { FinanceApi, PictureApi } from "@/services";
 import { ImagesType, OrderType } from "@/utils/enum";
 import { onLoad } from "@dcloudio/uni-app";
 const obj = ref<any>({});
+const state = reactive<any>({
+  fileLists: []
+})
 const getPayment = (item: any) => {
   return ["供应商付款", "客户付款", "客户(手动)", "供应商(手动)"][
     item.paymentType
@@ -58,7 +61,7 @@ onLoad((option: any) => {
       imagesType: ImagesType.NORMARL,
     }).then((res) => {
       if (res.code === 200) {
-        obj.value.fileLists = res.data;
+        state.fileLists = res.data;
       }
     });
 });
diff --git a/src/pagesReceive/form/pricingForm.vue b/src/pagesReceive/form/pricingForm.vue
index a314039..2ab04ea 100644
--- a/src/pagesReceive/form/pricingForm.vue
+++ b/src/pagesReceive/form/pricingForm.vue
@@ -222,6 +222,7 @@ const model1 = reactive<{ order: Order }>({
     fileLists: [],
     scaleStatus: 1,
     netWeight: 0,
+    balanceTotalPrice: 0
   },
 });
 
diff --git a/src/pagesReceive/review/index.vue b/src/pagesReceive/review/index.vue
index 1c50b4c..02388a0 100644
--- a/src/pagesReceive/review/index.vue
+++ b/src/pagesReceive/review/index.vue
@@ -97,7 +97,8 @@
         <view @click="handleReviewNoPay"> 审核暂不支付 </view>
         <view class="active" @click="handleReviewPay"> 审核立即支付 </view>
       </view>
-      <view v-if="state.order.scaleStatus === 2">
+      <!-- 零皮重不需要重新过皮 -->
+      <view v-if="state.order.scaleStatus === 2 && state.order.weighingMethod === 0">
         <u-button
           text="重新过皮"
           plain
diff --git a/src/pagesShipment/review/index.vue b/src/pagesShipment/review/index.vue
index 48d5191..90a349d 100644
--- a/src/pagesShipment/review/index.vue
+++ b/src/pagesShipment/review/index.vue
@@ -474,7 +474,7 @@ const handleSettlement = () => {
 };
 const handleScenePhoto = (id: string) => {
   uni.navigateTo({
-    url: "/pagesScenePhoto/index?orderType=1&imagesType=2&id=" + id, // 要跳转到的页面路径
+    url: "/pagesScenePhoto/index?orderType=2&imagesType=1&id=" + id, // 要跳转到的页面路径
   });
 };
 // 出货未结算 // 先填写结算信息后更新状态为3
diff --git a/src/pagesShipment/shipmentSettlement.vue b/src/pagesShipment/shipmentSettlement.vue
index fde7423..4bc7d98 100644
--- a/src/pagesShipment/shipmentSettlement.vue
+++ b/src/pagesShipment/shipmentSettlement.vue
@@ -123,6 +123,7 @@
 import { ShipmentApi } from "@/services/index";
 import { ScaleStatus, ScaleStatusBtnType } from "@/utils/enum";
 import { onLoad } from "@dcloudio/uni-app";
+import { onShow } from "@dcloudio/uni-app";
 import PageView from "@/components/PageView/index.vue";
 // scaleStatus
 const pageList: PageResult<Shipment> = reactive({
@@ -251,7 +252,7 @@ const getList = (v?: boolean) => {
     }
   });
 };
-onMounted(() => {
+onShow(() => {
   getList();
 });
 onLoad((option) => {