feat: 添加保卡日期选择功能到订单详情页面

pages/orderDetailRefactored/components/PageFour.vue

@@ -137,6 +137,17 @@
                 @blur="saveWarehouseInfoOnBlur" />
             </u-form-item>
           </u-col>
+          <u-col span="5.8">
+            <view @tap="openCardDatePicker">
+              <u-form-item label="保卡日期" prop="cardDate">
+                <view class="click-wrapper info-input">
+                  {{ warehouseInfo.cardDate || '点击选择保卡日期' }}
+                </view>
+              </u-form-item>
+            </view>
+            <u-datetime-picker :show="showCardDatePicker" :value="cardDatePickerValue" mode="date"
+              @confirm="confirmCardDate" @close="showCardDatePicker = false" @cancel="showCardDatePicker = false" />
+          </u-col>
         </u-row>
         <!-- 成本合计、业绩、毛业绩 -->
         <u-row class="info-row" justify="space-between">
@@ -318,6 +329,7 @@ export default {
         performance: '',
         splitRatio: '',
         remarks: '',
+        cardDate: '',
         customerServiceNameLabel: '',
         customerServiceName: '',
         categoryLabel: '',
@@ -325,6 +337,7 @@ export default {
         needCheckCodeLabel: '',
         needCheckCode: ''
       },
+      showCardDatePicker: false,
       profitSharingList: [],
       showOrgPicker: false,
       showPersonPicker: false,
@@ -383,6 +396,12 @@ export default {
       const performance = this.computedPerformance || 0
       const splitRatio = Number(this.warehouseInfo.splitRatio) / 100 || 0
       return (performance * splitRatio).toFixed(2)
+    },
+    // 保卡日期选择器用：转为时间戳
+    cardDatePickerValue() {
+      if (!this.warehouseInfo.cardDate) return Date.now()
+      const t = dayjs(this.warehouseInfo.cardDate, 'YYYY-MM-DD').valueOf()
+      return Number.isNaN(t) ? Date.now() : t
     }
   },
   watch: {
@@ -441,6 +460,7 @@ export default {
         splitRatio: data.splitRatio || '',
         remarks: remarkParts[0] || '',
         model: data.model || '',
+        cardDate: data.cardDate || '',
         customerServiceName: defaultCustomerServiceName,
         customerServiceNameLabel: this.getLabelByValue(
           this.customerServiceColumns[0],
@@ -467,6 +487,17 @@ export default {
       return item ? item.label : ''
     },
 
+    openCardDatePicker() {
+      this.showCardDatePicker = true
+    },
+    confirmCardDate(e) {
+      this.$nextTick(() => {
+        this.warehouseInfo.cardDate = e.value ? dayjs(e.value).format('YYYY-MM-DD') : ''
+        this.showCardDatePicker = false
+        this.saveWarehouseInfoOnBlur()
+      })
+    },
+
     /**
      * 入库信息失焦 / 物流图片变更后保存
      */
@@ -491,7 +522,8 @@ export default {
           category: this.warehouseInfo.category || '',
           needCheckCode: this.warehouseInfo.needCheckCode || '',
           totalCost: this.computedTotalCost || '',
-          model: this.warehouseInfo.model || ''
+          model: this.warehouseInfo.model || '',
+          cardDate: this.warehouseInfo.cardDate || ''
         })
       } catch (e) {
         console.error('保存入库信息失败:', e)
@@ -826,6 +858,7 @@ export default {
                   needCheckCode: this.warehouseInfo.needCheckCode || '',
                   totalCost: this.computedTotalCost || '',
                   model: this.warehouseInfo.model || '',
+                  cardDate: this.warehouseInfo.cardDate || '',
                 })
 
                 // 上传分成数据
@@ -934,10 +967,39 @@ export default {
       }
 
       // 校验表单
-      this.$refs.form.validate().then(() => {
+      this.$refs.form.validate().then(async () => {
+        // 先解析收单人、鉴定人，用于弹窗展示及入库提交（与 PC warehouseDialog 一致）
+        const orderSource = this._latestOrderForWarehouse || this.orderDetail
+        const receiptNickName = orderSource?.receiptNickName ?? ''
+        const authUserId = orderSource?.authenticateUserId ?? null
+        let identifyingPerson = orderSource?.authenticateNickName ?? ''
+        const identifyingPersonId = authUserId != null ? String(authUserId) : ''
+        if (authUserId != null && authUserId !== '') {
+          try {
+            const userRes = await uni.$u.api.getUserByUserIds({ userIds: String(authUserId) })
+            const list = userRes?.data ?? userRes
+            const user = Array.isArray(list) ? list[0] : list
+            if (user && (user.nickName != null || user.nickname != null)) {
+              identifyingPerson = user.nickName ?? user.nickname ?? ''
+            }
+          } catch (e) {
+            console.warn('根据鉴定人 id 获取昵称失败，使用发单返回的昵称', e)
+          }
+        }
+        const receiptLabel = receiptNickName || '-'
+        const identifyingLabel = identifyingPerson || '-'
+        // 与 PC warehouseDialog 一致：品牌、来源、实价、型号、编码、保卡日期、备注
+        const brandLabel = this.currentReceipt.brand || '-'
+        const websiteLabel = this.orderDetail.website || '-'
+        const sellingPriceLabel = this.currentReceipt.sellingPrice != null && this.currentReceipt.sellingPrice !== '' ? this.currentReceipt.sellingPrice : '-'
+        const modelLabel = this.warehouseInfo.model || '-'
+        const codeLabel = this.warehouseInfo.codeStorage || '-'
+        const cardDateLabel = this.warehouseInfo.cardDate || '-'
+        const receiptRemarkLabel = `${this.warehouseInfo.remarks || ''}${this.warehouseInfo.uploadedImage ? ';' + this.warehouseInfo.uploadedImage : ''}`.trim() || '-'
+
         uni.showModal({
           title: '确认入库',
-          content: `是否确认入库该订单：${this.orderDetail.item}-${this.currentReceipt.brand}？`,
+          content: `是否确认入库该订单：${this.orderDetail.item}-${this.currentReceipt.brand}？\n收单人：${receiptLabel}\n鉴定人：${identifyingLabel}\n品牌：${brandLabel}\n来源：${websiteLabel}\n实价：${sellingPriceLabel}\n型号：${modelLabel}\n编码：${codeLabel}\n保卡日期：${cardDateLabel}\n备注：${receiptRemarkLabel}`,
           success: async (res) => {
             if (res.confirm) {
               //点击了确认入库，执行入库方法
@@ -985,6 +1047,7 @@ export default {
                   indentifyCode: this.warehouseInfo.codeStorage || '',//独立编码
                   costPrice: this.computedTotalCost || '',//总成本价
                   recycleTime: dayjs().format('YYYY-MM-DD'),//回收时间 必填
+                  cardDate: this.warehouseInfo.cardDate || '',//保卡日期
                   stockStatus: 0,//库存状态，0待入库，1已入库，因为是我们是预入库，所以是0
                   origin: this.orderDetail.website,//来源
                   actualPrice: this.currentReceipt.sellingPrice || '',//实价，也就是顶部的第三个价格sellingPrice
@@ -992,6 +1055,8 @@ export default {
                   model: this.warehouseInfo.model || '',//型号
                   recyclePerson: (this._latestOrderForWarehouse && this._latestOrderForWarehouse.receiptNickName != null) ? this._latestOrderForWarehouse.receiptNickName : (this.warehouseInfo.recyclePerson || ''),//回收人员：使用接口返回的收单人员姓名
                   recyclePersonId: (this._latestOrderForWarehouse && this._latestOrderForWarehouse.receiptUserId != null) ? this._latestOrderForWarehouse.receiptUserId : (this.warehouseInfo.recyclePersonId || ''),//回收人员id：使用接口返回的收单人员id
+                  identifyingPerson: identifyingPerson || '',   // 鉴定人：发单鉴定人，昵称由系统接口按 id 查询
+                  identifyingPersonId: identifyingPersonId || ''  // 鉴定人 id：来自发单 authenticateUserId
                 }
                 if (!this.currentReceipt.warehouseId) {
                   //当没有仓库id的时候调用新增仓库接口

store/modules/user.js

@@ -31,8 +31,8 @@ export default {
 		netConfig: {
 			// http://59.42.9.166:9520/proxy
 			// http://10.0.7.100:9500
-			ip: "https://crm.nanjingshiyu.com/prod-api/", // ip
-			// ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
+			// ip: "https://crm.nanjingshiyu.com/prod-api/", // ip
+			ip: "https://crmtest.nanjingshiyu.com/prod-api", // 测试环境ip
 			// ip : "/api", // 测试环境ip
 			// ip : "http://47.113.184.101", // 测试环境ip
 			// ip: "http://172.16.7.200", // ip