feat: 发货单-填写实发数

@@ -43,6 +43,7 @@ export function updateApi(params) {
 
 
 
 
 // 检查发货计划是否可以填写实发数
 // 检查发货计划是否可以填写实发数
+// [id1, id2, ...]
 export function checkApi(ids) {
 export function checkApi(ids) {
   return request({
   return request({
     url: baseUrl + '/check',
     url: baseUrl + '/check',

@@ -666,6 +666,14 @@
 			}
 			}
 		},
 		},
 		{
 		{
+			"path": "pages/invoice/fill",
+			"style": {
+				"navigationBarTitleText": "发货单填写实发数",
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTextStyle": "black"
+			}
+		},
+		{
 			"path": "pages/delay_invoice/index",
 			"path": "pages/delay_invoice/index",
 			"style": {
 			"style": {
 				"navigationBarTitleText": "延期发货单",
 				"navigationBarTitleText": "延期发货单",

@@ -44,7 +44,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { getDetailApi, saveSignInTicket } from '@/api/invoice.js'
+import { getDetailApi, saveSignInTicket, checkApi } from '@/api/invoice.js'
 import Product from './product.vue'
 import Product from './product.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
@@ -110,9 +110,15 @@ export default {
       // const id = this.form.id || this.form.code
       // const id = this.form.id || this.form.code
       // if (id) uni.navigateTo({ url: `/pages/invoice/modify?id=${id}` })
       // if (id) uni.navigateTo({ url: `/pages/invoice/modify?id=${id}` })
     // },
     // },
-    onFill() {
-      const id = this.form.id || this.form.code
-      if (id) uni.navigateTo({ url: `/pages/invoice/fill?id=${id}` })
+    async onFill() {
+      const id = this.form.id || this.form.code;
+      try {
+        await checkApi([id])
+      } catch (e) {
+        uni.showToast({ title: (e && e.msg) || '检查失败', icon: 'none' })
+        return
+      }
+      if (id) uni.navigateTo({ url: `/pages/invoice/fill?id=${id}&customerName=${this.form.customerName}` })
     },
     },
     onUpload() {
     onUpload() {
 			this.$refs.uploadPopup && this.$refs.uploadPopup.open()
 			this.$refs.uploadPopup && this.$refs.uploadPopup.open()

+<template>
+  <view class="page">
+    <scroll-view class="scroll" scroll-y>
+      <uni-list>
+        <!-- 产品 -->
+        <view class="section2">
+          <!-- mode="add" 允许编辑 -->
+          <Product mode="fill" :list="initDetailList" @change="detailListChange" />
+        </view>
+        <view class="footer">
+          <button class="btn submit" type="primary" @click="onSubmit">保存</button>
+        </view>
+      </uni-list>
+    </scroll-view>
+    <uni-popup ref="confirmPopup" type="center" :mask-click="false">
+      <view class="action-modal">
+        <view class="action-modal_header">提示</view>
+        <view class="action-modal_body">
+          <text class="tip">请确认：{{ customerName }} 的货物已发出？</text>
+        </view>
+        <view class="action-modal_footer">
+          <button class="btn cancel" @click="() => handleShipConfirm('ALL')">全部发货</button>
+          <button class="btn confirm" type="primary" @click="() => handleShipConfirm('PART')">部分发货</button>
+        </view>
+      </view>
+    </uni-popup>
+  </view>
+</template>
+
+<script>
+import { listByShipmentOrderId, dataReplenishInput } from '@/api/invoice.js'
+import Product from './product.vue'
+
+export default {
+  name: 'InvoiceFill',
+  components: { Product },
+  data() {
+    return {
+      form: {
+        id: '',
+        detailList: []
+      },
+      initDetailList: [],
+      customerName: ''
+    }
+  },
+  onLoad(query) {
+    const id = (query && (query.id || query.code)) || '';
+    const customerName = query && query.customerName || '';
+    this.form.id = id;
+    this.customerName = customerName;
+    if (id) {
+      this.loadDetail(id)
+    }
+  },
+  methods: {
+    async loadDetail(id) {
+      try {
+        const res = await listByShipmentOrderId(id)
+        const m = res.data || {}
+        // 映射列表
+        // 注意：详情返回的是 replenishmentOrderLineList，需要赋值给 initDelayedShipmentDetailList 以便 Product 组件初始化
+        // 且需要处理字段兼容性，确保 Product 组件能正确显示和编辑
+        const lines = Array.isArray(m) ? m.map(x => ({
+          ...x,
+          // 确保 Product 组件需要的字段存在
+          // 注意：add.vue中 onRelateConfirm 做了映射，这里是回显，通常直接使用即可
+        })) : []
+
+        this.initDetailList = lines;
+      } catch (e) {
+        uni.showToast({ title: '加载失败', icon: 'none' })
+      }
+    },
+    validateLineListRequired() {
+      const list = Array.isArray(this.form.detailList) ? this.form.detailList : []
+      if (list.length === 0) {
+        uni.showToast({ title: '请先添加发货单明细', icon: 'none' })
+        return false
+      }
+      const fields = [
+        { key: 'actualShipmentQuantity', label: '实发数量' },
+        { key: 'num', label: '件数' },
+        { key: 'yieldBatchNo', label: '生产批号' },
+      ]
+      for (let i = 0; i < list.length; i++) {
+        const it = list[i] || {}
+        for (const f of fields) {
+          const v = it && it[f.key]
+          if (v === undefined || v === null || String(v).trim() === '') {
+            uni.showToast({ title: `发货单明细第${i + 1}条：${f.label}不能为空！`, icon: 'none' })
+            return false
+          }
+        }
+      }
+      return true
+    },
+    async onSubmit() {
+      if (!this.validateLineListRequired()) return
+      const payload = { ...this.form }
+
+      console.log('onSubmit__payload', payload)
+      this.$refs.confirmPopup && this.$refs.confirmPopup.open();
+    },
+    detailListChange(data) {
+      const list = Array.isArray(data) ? data : []
+      this.form.detailList = list;
+    },
+    handleShipConfirm(type) {
+      this.$refs.confirmPopup && this.$refs.confirmPopup.close();
+      this.submitData(type);
+    },
+    async submitData(type) {
+      this.loading = true;
+      const params = {};
+      const rows = this.form.detailList || [];
+      const detailList = rows.map((r) => {
+        return {
+          id: r.id || '',
+          actualShipmentQuantity: Number(r.actualShipmentQuantity) || '',
+          num: r.num || '',
+          orderId: r.orderId || '',
+          quantity: Number(r.quantity) || '',
+          yieldBatchNo: r.yieldBatchNo || '',
+        };
+      });
+      params.id = this.form.id || '';
+      params.detailList = detailList;
+      params.type = type || '';
+      console.log(params);
+
+      try {
+        await dataReplenishInput(params)
+        uni.showToast({ title: '提交成功！', icon: 'success' })
+        setTimeout(() => { uni.redirectTo({ url: '/pages/invoice/index' }) }, 300)
+      } catch (e) {
+        uni.showToast({ title: (e && e.msg) || '提交失败！', icon: 'none' })
+      }
+
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.scroll {
+  flex: 1;
+  padding: 6rpx 0 144rpx;
+}
+
+
+
+.title-header {
+  background-color: #fff;
+  display: flex;
+  align-items: center;
+  padding: 32rpx 32rpx 22rpx;
+
+  .title-header_icon {
+    width: 32rpx;
+    height: 28rpx;
+    margin-right: 16rpx;
+  }
+
+  span {
+    color: rgba(0, 0, 0, 0.9);
+    font-size: 32rpx;
+    line-height: 44rpx;
+    font-weight: 600;
+  }
+}
+
+
+.section {
+  background: #fff;
+  margin-bottom: 20rpx;
+}
+
+.section2 {
+  background: #f1f1f1;
+}
+
+::v-deep .uni-list {
+  background: transparent;
+
+  &-item {
+    &__extra-text {
+      font-size: 32rpx;
+    }
+
+    &__content-title {
+      font-size: 32rpx;
+      color: rgba(0, 0, 0, 0.9);
+    }
+
+    &__container {
+      padding: 32rpx;
+      // align-items: center;
+
+      .uni-easyinput {
+
+        .is-disabled {
+          background-color: transparent !important;
+        }
+
+        &__placeholder-class {
+          font-size: 32rpx;
+          color: rgba(0, 0, 0, 0.4);
+        }
+
+        &__content {
+          border: none;
+
+          &-input {
+            padding-left: 0 !important;
+            height: 48rpx;
+            line-height: 48rpx;
+            font-size: 32rpx;
+          }
+
+          .content-clear-icon {
+            font-size: 44rpx !important;
+          }
+        }
+      }
+
+      .amount-row {
+        flex: 1;
+        display: flex;
+        align-items: center;
+
+        .uni-easyinput {
+          flex: 1;
+        }
+
+        .unit {
+          margin-left: 16rpx;
+          color: rgba(0, 0, 0, 0.9);
+        }
+      }
+
+      .item-title,
+      .uni-list-item__content {
+        flex: none;
+        min-height: 48rpx;
+        line-height: 48rpx;
+        font-size: 32rpx;
+        position: relative;
+        width: 210rpx;
+        margin-right: 32rpx;
+        color: rgba(0, 0, 0, 0.9);
+        padding-right: 0;
+
+
+        .required {
+          color: red;
+          position: absolute;
+          top: 50%;
+          transform: translateY(-50%);
+          left: -16rpx;
+        }
+      }
+
+    }
+
+    &.select-item {
+      &.is-empty {
+        .uni-list-item__extra-text {
+          color: rgba(0, 0, 0, 0.4) !important;
+        }
+      }
+
+      &.is-filled {
+        .uni-list-item__extra-text {
+          color: rgba(0, 0, 0, 0.9) !important;
+        }
+      }
+
+      .serial-number-row {
+        display: flex;
+        align-items: center;
+      }
+
+    }
+
+    &.mgb10 {
+      margin-bottom: 20rpx;
+    }
+
+  }
+
+  .title-header {
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    padding: 32rpx 32rpx 22rpx;
+
+    &_icon {
+      width: 32rpx;
+      height: 28rpx;
+      margin-right: 16rpx;
+    }
+
+    span {
+      color: rgba(0, 0, 0, 0.9);
+      font-size: 32rpx;
+      line-height: 44rpx;
+      font-weight: 600;
+    }
+  }
+}
+
+/* 只读 easyinput 根据内容自适应高度 */
+::v-deep .uni-list-item__container {
+  align-items: flex-start;
+}
+
+/* 只读文本样式 */
+.readonly-text {
+  color: rgba(0, 0, 0, 0.9);
+  font-size: 32rpx;
+  line-height: 48rpx;
+  text-align: right;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+
+
+.footer {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 0 32rpx 32rpx;
+  padding-bottom: calc(32rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  box-shadow: 0 -8rpx 24rpx rgba(0, 0, 0, 0.06);
+  z-index: 10;
+
+  .btn {
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 12rpx;
+    font-size: 32rpx;
+  }
+
+  .submit {
+    background: $theme-primary;
+    color: #fff;
+  }
+
+  .view-total {
+    padding: 20rpx 0;
+
+    .head {
+      font-size: 32rpx;
+      font-weight: 600;
+      line-height: 50rpx;
+      color: rgba(0, 0, 0, 0.9);
+      padding-bottom: 16rpx;
+      margin-bottom: 24rpx;
+      border-bottom: 1px dashed #E7E7E7;
+    }
+
+    .row {
+      display: flex;
+      margin-bottom: 24rpx;
+      line-height: 32rpx;
+
+      .row2 {
+        width: 50%;
+      }
+
+      .label {
+        width: 180rpx;
+        margin-right: 14rpx;
+        color: rgba(0, 0, 0, 0.6);
+        font-size: 28rpx;
+      }
+
+      .value {
+        flex: 1;
+        color: rgba(0, 0, 0, 0.9);
+        font-size: 28rpx;
+        white-space: pre-wrap;
+        word-break: break-all;
+      }
+    }
+  }
+}
+
+.action-modal {
+	width: 560rpx;
+	padding: 32rpx 28rpx 20rpx;
+	background: #fff;
+	border-radius: 20rpx;
+
+	&_header {
+		text-align: center;
+		font-size: 34rpx;
+		font-weight: 600;
+		margin-bottom: 12rpx;
+		color: rgba(0, 0, 0, 0.9);
+	}
+
+	&_body {
+		padding: 12rpx 4rpx 24rpx;
+
+		.tip {
+			display: block;
+			text-align: center;
+			font-size: 32rpx;
+			color: rgba(0, 0, 0, 0.6);
+			margin-bottom: 32rpx;
+		}
+
+		::v-deep .uni-easyinput {
+			width: 100%;
+		}
+	}
+
+	&_footer {
+		display: flex;
+		justify-content: space-between;
+		gap: 16rpx;
+
+		.btn {
+			flex: 1;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-radius: 12rpx;
+			font-size: 30rpx;
+			font-size: 32rpx;
+
+			&::after {
+				border: none;
+			}
+		}
+
+		.cancel {
+			background: $theme-primary !important;
+			color: #fff !important;
+		}
+
+		.confirm {
+			background: #fff !important;
+			color: rgba(0, 0, 0, 0.9) !important;
+		}
+	}
+}
+
+</style>

@@ -4,7 +4,7 @@
         <!-- 新增&详情-产品 -->
         <!-- 新增&详情-产品 -->
         <view class="header bp">
         <view class="header bp">
             <image class="opCollapse" src="/static/images/title.png" />
             <image class="opCollapse" src="/static/images/title.png" />
-            <text class="title">{{ title || '产品' }}</text>
+            <text class="title">{{ title || '发货单明细' }}</text>
             <view class="ops">
             <view class="ops">
                 <!-- <image v-if="mode === 'add'" class="opAdd" @click="onAdd" src="/static/images/plus.png" /> -->
                 <!-- <image v-if="mode === 'add'" class="opAdd" @click="onAdd" src="/static/images/plus.png" /> -->
                 <view v-if="mode === 'view'" class="op1" @click="toggleViewCollapse">
                 <view v-if="mode === 'view'" class="op1" @click="toggleViewCollapse">
@@ -15,6 +15,8 @@
             </view>
             </view>
         </view>
         </view>
 
 
+        <view v-if="status === 'UN_SHIPMENTS' && $auth.hasPermi('shipping-plan-manage:invoice:modify') && items.length > 8" class="tip" >提醒：当前待处理明细超过 8 条，请尽快进行延期操作！</view>
+
         <view v-if="mode === 'add'" class="section">
         <view v-if="mode === 'add'" class="section">
             <view v-for="(item, idx) in items" :key="'a-' + idx" class="block">
             <view v-for="(item, idx) in items" :key="'a-' + idx" class="block">
                 <uni-list class="edit-list">
                 <uni-list class="edit-list">
@@ -82,6 +84,7 @@
             </view>
             </view>
         </view>
         </view>
 
 
+
         <view v-else-if="mode === 'view'" class="view-list" v-show="!collapsedView">
         <view v-else-if="mode === 'view'" class="view-list" v-show="!collapsedView">
             <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
             <view v-for="(item, idx) in items" :key="'v-' + idx" class="card">
                 <view class="row"><text class="label">订单编号</text><text class="value">{{ item.orderNo }}</text></view>
                 <view class="row"><text class="label">订单编号</text><text class="value">{{ item.orderNo }}</text></view>
@@ -133,7 +136,7 @@
                 <view class="row"><text class="label">回程费</text><text class="value">{{ item.contractType === 'PROCESS_STD_AGMT' ? item.shippingCost : '' }}</text></view>
                 <view class="row"><text class="label">回程费</text><text class="value">{{ item.contractType === 'PROCESS_STD_AGMT' ? item.shippingCost : '' }}</text></view>
                 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
                 <view class="row"><text class="label">牌号</text><text class="value">{{ item.brand }}</text></view>
                 <view class="row"><text class="label">高新</text><text class="value">-</text></view>
                 <view class="row"><text class="label">高新</text><text class="value">-</text></view>
-                <view v-if="status === 'UN_SHIPMENTS' && $auth.hasPermi('shipping-plan-manage:invoice:modify') " class="row row-opt">
+                <view v-if="status === 'UN_SHIPMENTS' && $auth.hasPermi('shipping-plan-manage:invoice:modify')" class="row row-opt">
                     <text class="row-opt_btn">申请延期</text>
                     <text class="row-opt_btn">申请延期</text>
                     <text class="line"></text>
                     <text class="line"></text>
                     <text class="row-opt_btn">拆分</text>
                     <text class="row-opt_btn">拆分</text>
@@ -141,6 +144,122 @@
             </view>
             </view>
         </view>
         </view>
 
 
+        <view v-else-if="mode === 'fill'" class="section" v-show="!collapsedView">
+            <view v-for="(item, idx) in items" :key="'v-' + idx" class="block">
+                 <uni-list class="edit-list">
+                    <uni-list-item title="订单编号">
+                        <template v-slot:footer>
+                            <view class="value">{{ item.orderNo }}</view>
+                        </template>
+                    </uni-list-item>
+                    <uni-list-item title="品名牌号">
+                        <template v-slot:footer>
+                            <view class="value">{{ item.brand }}</view>
+                        </template>
+                    </uni-list-item>
+                    <uni-list-item title="规格(mm)">
+                        <template v-slot:footer>
+                            <view class="value value-spec">
+                                <view v-if="item.thickness" class="value-spec_val">{{ item.thickness }}</view>
+                                <view v-if="item.thickness" class="value-spec_box">
+                                    <view v-if="item.thicknessTolPos" class="value-spec_box_1">{{ item.thicknessTolPos > 0 ? '+' + item.thicknessTolPos : item.thicknessTolPos }}
+                                    </view>
+                                    <view v-if="item.thicknessTolNeg" class="value-spec_box_2">{{ item.thicknessTolNeg > 0 ? '+' + item.thicknessTolNeg : item.thicknessTolNeg }}
+                                    </view>
+                                </view>
+                                <view v-if="item.width" class="value-spec_val p12">*</view>
+                                <view v-if="item.width" class="value-spec_val">{{ item.width }}</view>
+                                <view v-if="item.width" class="value-spec_box">
+                                    <view v-if="item.widthTolPos" class="value-spec_box_1">{{ item.widthTolPos > 0 ? '+' + item.widthTolPos : item.widthTolPos }}
+                                    </view>
+                                    <view v-if="item.widthTolNeg" class="value-spec_box_2">{{ item.widthTolNeg > 0 ? '+' + item.widthTolNeg : item.widthTolNeg }}
+                                    </view>
+                                </view>
+                                <view v-if="item.length" class="value-spec_val p12">*</view>
+                                <view v-if="item.length" class="value-spec_val">{{ item.length }}</view>
+                                <view v-if="item.length" class="value-spec_box">
+                                    <view v-if="item.lengthTolPos" class="value-spec_box_1">{{ item.lengthTolPos > 0 ? '+' + item.lengthTolPos : item.lengthTolPos  }}</view>
+                                    <view v-if="item.lengthTolNeg" class="value-spec_box_2">{{ item.lengthTolNeg > 0 ? '+' + item.lengthTolNeg : item.lengthTolNeg  }}</view>
+                                </view>
+                            </view>
+                        </template>
+                    </uni-list-item>
+
+                    <view v-show="!item.collapsed">
+                        <uni-list-item title="需发数量(kg)">
+                            <template v-slot:footer>
+                                <view class="value">{{ item.quantity }}</view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="实发数量(kg)">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.actualShipmentQuantity"
+                                    placeholder="请输入实发数量kg" :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'actualShipmentQuantity')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'actualShipmentQuantity')" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="件数">
+                            <template v-slot:footer>
+                                <uni-easyinput type="digit" v-model="item.num"
+                                    placeholder="请输入件数" :inputBorder="false"
+                                    @input="onNonNegativeNumberInput($event, item, idx, 'num')"
+                                    @blur="onNonNegativeNumberBlur(item, idx, 'num')" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="单价(元/kg)">
+                            <template v-slot:footer>
+                                <view class="value">{{ item.salesPrice }}</view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="包装费(元/kg)">
+                            <template v-slot:footer>
+                                <view class="value">{{ item.packagingFee }}</view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="生产批号">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="item.yieldBatchNo" placeholder="请输入生产批号" :inputBorder="false" />
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="加工经销">
+                            <template v-slot:footer>
+                                <view class="value">{{ item.orderType }}</view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="运费">
+                            <template v-slot:footer>
+                                <view class="value">{{ item.contractType !== 'PROCESS_STD_AGMT' ? item.shippingCost : '' }}</view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="回程费">
+                            <template v-slot:footer>
+                                <view class="value">{{ item.contractType === 'PROCESS_STD_AGMT' ? item.shippingCost : '' }}</view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="牌号">
+                            <template v-slot:footer>
+                                <view class="value">{{ item.brand }}</view>
+                            </template>
+                        </uni-list-item>
+                        <uni-list-item title="高新">
+                            <template v-slot:footer>
+                                <view class="value">-</view>
+                            </template>
+                        </uni-list-item>
+                    </view>
+                </uni-list>
+                <view class="block-ops">
+                    <div class="toggle" @click="toggleItem(idx)">
+                        <image :src="item.collapsed ? '/static/images/up.png' : '/static/images/down.png'"
+                            class="icon" />
+                        {{ item.collapsed ? '展开' : '收起' }}
+                    </div>
+                </view>
+            
+            </view>
+        </view>
+
     </view>
     </view>
 </template>
 </template>
 <script>
 <script>
@@ -427,7 +546,7 @@ export default {
                 line-height: 48rpx;
                 line-height: 48rpx;
                 font-size: 32rpx;
                 font-size: 32rpx;
                 position: relative;
                 position: relative;
-                width: 210rpx;
+                width: 200rpx;
                 margin-right: 32rpx;
                 margin-right: 32rpx;
                 color: rgba(0, 0, 0, 0.9);
                 color: rgba(0, 0, 0, 0.9);
                 padding-right: 0;
                 padding-right: 0;
@@ -563,7 +682,7 @@ export default {
     }
     }
 
 
     .label {
     .label {
-        width: 210rpx;
+        width: 200rpx;
         margin-right: 32rpx;
         margin-right: 32rpx;
         color: rgba(0, 0, 0, 0.9);
         color: rgba(0, 0, 0, 0.9);
         font-size: 32rpx;
         font-size: 32rpx;
@@ -793,4 +912,12 @@ export default {
         }
         }
     }
     }
 }
 }
+
+.tip {
+    font-size: 24rpx;
+    line-height: 60rpx;
+    background: #fffbe6;
+    color: #ad6800;
+    text-align: center;
+}
 </style>
 </style>