From 0fa4a675ece2e88ccc159ecd24ef8acb43bbde6b Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Tue, 11 Nov 2025 15:24:59 +0800
Subject: [PATCH] fix: 宁夏邮政定制

---
 pages.json                      |   5 +++++
 pages/goodSource/add.vue        |  37 ++++++++++++++++++++++---------------
 pages/goodSource/detail.vue     |  12 ++++++++++++
 pages/goodSource/goods-info.vue | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 pages/me/index.vue              |  10 +++++-----
 pages/order/add.vue             |  49 ++++++++++++++++++++++++++++++++-----------------
 6 files changed, 188 insertions(+), 37 deletions(-)
 create mode 100644 pages/goodSource/goods-info.vue

diff --git a/pages.json b/pages.json
index 437a05f..36e77ed 100644
--- a/pages.json
+++ b/pages.json
@@ -28,6 +28,11 @@
 				"navigationBarTitleText": "创建货源"
 			}
 		},{
+			"path": "pages/goodSource/goods-info",
+			"style": {
+				"navigationBarTitleText": "货物信息"
+			}
+		},{
 			"path": "pages/goodSource/select-remark",
 			"style": {
 				"navigationBarTitleText": "填写备注"
diff --git a/pages/goodSource/add.vue b/pages/goodSource/add.vue
index 8c73c8a..7b77b73 100644
--- a/pages/goodSource/add.vue
+++ b/pages/goodSource/add.vue
@@ -24,7 +24,7 @@
           </u-form-item>
         </view>
         <view class="card">
-          <u-form-item label="货物类型" required @click="choseGoodsName">
+          <u-form-item label="货物信息" required @click="selectGoodsInfo">
             <u-input :value="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
           <u-form-item label="需求车型" required @click="specificationVisible = true">
@@ -161,6 +161,9 @@ export default {
         specification: '',
         vanType: '',
         goodsName: '',
+        dispatchUnit: '',
+        customerContractNo: '',
+        transportShiftNo: '',
         priceType: 'VEHICLE', // VEHICLE, TON
         priceTypeName: '',
         goodsWeight: '',
@@ -178,7 +181,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['dictList', 'dictValue', 'userInfo']),
+    ...mapGetters(['dictList', 'dictValue', 'userInfo', 'freightInfo']),
     // 箱型
     vanTypeList() {
       return [...this.dictList('VEHICLE_COMPARTMENT_TYPE'), { valueCode: 'ALL', valueName: '不限' }];
@@ -212,6 +215,9 @@ export default {
     priceTypeColumns() {
       return [this.dictList('FREIGHT_GOODS_SOURCE_PRICE_TYPE')];
     },
+    ningXiaYouZhengFlag() {
+      return this.freightInfo.enterpriseName === '中国邮政速递物流股份有限公司宁夏物流运营分公司' && this.form.projectName === 'JYYJ';
+    },
   },
   onLoad(option) {
     if (option.code) {
@@ -310,20 +316,21 @@ export default {
     chosePriceType() {
       this.priceTypeVisible = true;
     },
-    choseGoodsName() {
-      uni.$off('select-common');
-      uni.$once('select-common', option => {
-        this.form.goodsName = option.name;
-      });
+    selectGoodsInfo() {
       uni.navigateTo({
-        url: `/pages/global/search-common${urlParam({
-          mode: 'select',
-          url: 'goodsName',
-          title: '货物名称',
-          label: 'name',
-          value: '',
-          params: `{"projectCode":"${this.form.projectCode}"}`,
-        })}`,
+        url: `/pages/goodSource/goods-info`,
+        events: {
+          submitData: option => {
+            this.form = {
+              ...this.form,
+              ...option,
+            };
+            uni.navigateBack();
+          },
+        },
+        success: res => {
+          res.eventChannel.emit('data', { form: this.form, ningXiaYouZhengFlag: this.ningXiaYouZhengFlag });
+        },
       });
     },
     selectAddress(index) {
diff --git a/pages/goodSource/detail.vue b/pages/goodSource/detail.vue
index 1ed44ab..16c7aad 100644
--- a/pages/goodSource/detail.vue
+++ b/pages/goodSource/detail.vue
@@ -7,6 +7,18 @@
           <view class="card__item_field">货物类型</view>
           <view class="card__item_content">{{ form.goodsName || '' }}</view>
         </view>
+        <view class="card__item">
+          <view class="card__item_field">发货单位</view>
+          <view class="card__item_content">{{ form.dispatchUnit || '' }}</view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">合同号</view>
+          <view class="card__item_content">{{ form.customerContractNo || '' }}</view>
+        </view>
+        <view class="card__item">
+          <view class="card__item_field">运输班次号</view>
+          <view class="card__item_content">{{ form.transportShiftNo || '' }}</view>
+        </view>
         <template v-if="form.priceType === 'TON'">
           <view class="card__item">
             <view class="card__item_field">货物总量</view>
diff --git a/pages/goodSource/goods-info.vue b/pages/goodSource/goods-info.vue
new file mode 100644
index 0000000..1858bf5
--- /dev/null
+++ b/pages/goodSource/goods-info.vue
@@ -0,0 +1,112 @@
+<template>
+  <Page name="goods-info" flank>
+    <template #content>
+      <u-form :model="form" ref="uForm" labelWidth="100">
+        <view class="card">
+          <u-form-item label="货物名称" required @click="choseGoodsName">
+            <u-input v-model="form.goodsName" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
+          </u-form-item>
+          <u-form-item label="发货单位" :required="ningXiaYouZhengFlag">
+            <u-input v-model="form.dispatchUnit" border="none" placeholder="请输入" />
+          </u-form-item>
+          <u-form-item label="合同号" :required="ningXiaYouZhengFlag">
+            <u-input v-model="form.customerContractNo" border="none" placeholder="请输入" />
+          </u-form-item>
+          <u-form-item label="运输班次号" :required="ningXiaYouZhengFlag">
+            <u-input v-model="form.transportShiftNo" border="none" placeholder="请输入" />
+          </u-form-item>
+        </view>
+      </u-form>
+    </template>
+    <template #footer>
+      <u-button type="primary" @click="onSubmit">确定</u-button>
+    </template>
+  </Page>
+</template>
+<script>
+import { urlParam } from '@/utils/param';
+
+export default {
+  name: 'goods-info',
+  data() {
+    return {
+      ningXiaYouZhengFlag: false,
+      projectCode: '',
+      form: {
+        goodsName: '',
+        dispatchUnit: '',
+        customerContractNo: '',
+        transportShiftNo: '',
+      },
+    };
+  },
+  onLoad(option) {
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.on('data', data => {
+      this.ningXiaYouZhengFlag = data.ningXiaYouZhengFlag || false;
+      this.setHisData(data.form);
+      this.projectCode = data.form.projectCode || '';
+    });
+  },
+
+  methods: {
+    setHisData(v) {
+      Object.keys(this.form).forEach(k => {
+        this.form[k] = v[k] || '';
+      });
+    },
+    choseGoodsName() {
+      uni.$off('select-common');
+      uni.$once('select-common', option => {
+        this.form.goodsName = option.name;
+      });
+      uni.navigateTo({
+        url: `/pages/global/search-common${urlParam({
+          mode: 'select',
+          url: 'goodsName',
+          title: '货物名称',
+          label: 'name',
+          value: '',
+          params: `{"projectCode":"${this.projectCode}"}`,
+        })}`,
+      });
+    },
+    onSubmit() {
+      if (this.ningXiaYouZhengFlag) {
+        if (!this.form.dispatchUnit) {
+          return uni.showToast({ title: '发货单位不能为空', icon: 'none' });
+        }
+        if (!this.form.customerContractNo) {
+          return uni.showToast({ title: '合同号不能为空', icon: 'none' });
+        }
+        if (!this.form.transportShiftNo) {
+          return uni.showToast({ title: '运输班次号不能为空', icon: 'none' });
+        }
+      }
+      this.getOpenerEventChannel().emit('submitData', this.form);
+      // setTimeout(() => uni.navigateBack(), 500);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.page-goods-info {
+  &__footer {
+    background: $color-white;
+  }
+  .card {
+    color: #999999;
+    background-color: $color-white;
+    border-radius: $radius-md;
+    box-shadow: $shadow-normal;
+    .u-form-item {
+      padding-left: $padding-md !important;
+      padding-right: $padding-sm !important;
+    }
+    .u-form-item + .u-form-item {
+      border-top: 1px solid #f6f6f6;
+    }
+  }
+}
+</style>
diff --git a/pages/me/index.vue b/pages/me/index.vue
index 5bb8986..77c87d9 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -79,9 +79,7 @@
 </template>
 
 <script>
-import cache from '@/utils/cache';
 import { mapState, mapGetters } from 'vuex';
-import { version } from '@/config';
 import page from '@/mixins/page';
 
 export default {
@@ -89,15 +87,17 @@ export default {
   data() {
     return {
       loading: false,
+      version: '',
       versionInfo: uni.getSystemInfoSync(),
     };
   },
+  onLoad() {
+    const accountInfo = wx.getAccountInfoSync();
+    this.version = accountInfo.miniProgram?.version;
+  },
   computed: {
     ...mapState(['authed']),
     ...mapGetters(['userInfo', 'freightInfo']),
-    version() {
-      return version;
-    },
   },
   methods: {
     mobileFilter(value = '') {
diff --git a/pages/order/add.vue b/pages/order/add.vue
index 77789db..42901a7 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -25,7 +25,7 @@
             <u-input v-model="form.waypoints[1].address" border="none" suffix-icon="arrow-right" placeholder="请选择" disabledColor="#ffffff" disabled />
           </u-form-item>
           <u-form-item label="货物信息" required @click="selectGoodsInfo">
-            <u-input v-model="form.goodsInfo" border="none" suffix-icon="arrow-right" placeholder="请输入" disabledColor="#ffffff" disabled />
+            <u-input :value="goodsInfo" border="none" suffix-icon="arrow-right" placeholder="请输入" disabledColor="#ffffff" disabled />
           </u-form-item>
         </view>
         <!--        <view class="card">-->
@@ -241,7 +241,6 @@ export default {
         loadTime: '',
         projectName: '',
         customerOrderCode: '',
-        goodsInfo: '',
         goodsName: '',
         goodsValue: '',
         goodsPiece: '',
@@ -269,6 +268,9 @@ export default {
         receiveInsuranceAmount: '',
         insuranceProgramCode: '',
         coverageLimit: '',
+        dispatchUnit: '',
+        customerContractNo: '',
+        transportShiftNo: '',
       },
       payeeModel: {},
       driverObj: {}, //司机信息
@@ -289,6 +291,22 @@ export default {
       // 自动计算货到
       return 'OUT_INVITE_ARRIVAL' === this.currentFreight?.autoComputeFeeType;
     },
+    goodsInfo() {
+      let infoList = [];
+      if (this.form.goodsName) {
+        infoList.push(this.form.goodsName);
+      }
+      if (this.form.goodsPiece) {
+        infoList.push(this.form.goodsPiece + '件');
+      }
+      if (this.form.goodsWeight) {
+        infoList.push(this.form.goodsWeight + '吨');
+      }
+      if (this.form.goodsVolume) {
+        infoList.push(this.form.goodsVolume + '方');
+      }
+      return infoList.join('，');
+    },
     // 获取价值
     showGoodsValue() {
       return this.currentFreight ? this.currentFreight.driverSecurityServiceFlag || this.currentFreight.securityServiceFlag : false;
@@ -355,7 +373,17 @@ export default {
           },
         ],
       };
-      this.setFormValue(detail, ['priceType', 'weightUnitPrice', 'goodsSourceCode', 'goodsSourceBiddingCode', 'loadTime', 'paidAmount']);
+      this.setFormValue(detail, [
+        'priceType',
+        'weightUnitPrice',
+        'goodsSourceCode',
+        'goodsSourceBiddingCode',
+        'loadTime',
+        'paidAmount',
+        'dispatchUnit',
+        'customerContractNo',
+        'transportShiftNo',
+      ]);
       this.getAllowDriverSeeFreightAmount();
       this.clipboard(`手机号：${detail.driverMobile || ''}车牌：${detail.vehicleLicenseNum || ''}车挂：${detail.trailerLicenseNum || ''}`);
       this.computedService();
@@ -488,20 +516,7 @@ export default {
             };
             this.computedPaid();
             this.computedService();
-            let goodsInfo = [];
-            if (this.form.goodsName) {
-              goodsInfo.push(this.form.goodsName);
-            }
-            if (this.form.goodsPiece) {
-              goodsInfo.push(this.form.goodsPiece + '件');
-            }
-            if (this.form.goodsWeight) {
-              goodsInfo.push(this.form.goodsWeight + '吨');
-            }
-            if (this.form.goodsVolume) {
-              goodsInfo.push(this.form.goodsVolume + '方');
-            }
-            this.form.goodsInfo = goodsInfo.join('，');
+
             uni.navigateBack();
           },
         },
--
libgit2 0.21.0