Merge remote-tracking branch 'origin/cjerp-1.0_20260116' into publish_cjerp

史婷婷
2 parents 07d91938 ad7f3472
Showing 9 changed files with 244 additions and 19 deletions
pages/change_list/add.vue
pages/change_list/modify.vue
pages/change_list/product.vue
pages/invoice/detail.vue
pages/invoice/fill.vue
pages/invoice/index.vue
pages/order_list/approve.vue
pages/order_list/modify.vue
pages/order_list/product.vue
--- a/pages/change_list/add.vue
View file @dda9b7c
+++ b/pages/change_list/add.vue
View file @dda9b7c
@@ -216,7 +216,10 @@ export default {
         const m = res.data || {}
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id
-        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ ...x })) : []
+        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 
+          ...x,
+          assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
+        })) : []
         this.form = next;
         this.initPurchaseOrderLineList = next.purchaseOrderLineList || [];
         this.refreshStandardName()
--- a/pages/change_list/modify.vue
View file @dda9b7c
+++ b/pages/change_list/modify.vue
View file @dda9b7c
@@ -212,7 +212,10 @@ export default {
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id;
         next.purchaseOrderId = m.orderId || '';
-        next.purchaseOrderLineList = Array.isArray(m.afterChangeSpecList) ? m.afterChangeSpecList.map(x => ({ ...x })) : []
+        next.purchaseOrderLineList = Array.isArray(m.afterChangeSpecList) ? m.afterChangeSpecList.map(x => ({ 
+          ...x,
+          assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
+        })) : []
         this.form = next;
         this.initPurchaseOrderLineList = next.purchaseOrderLineList || [];
         this.refreshStandardName()
--- a/pages/change_list/product.vue
View file @dda9b7c
+++ b/pages/change_list/product.vue
View file @dda9b7c
@@ -148,8 +148,9 @@
                         </uni-list-item>
                         <uni-list-item title="考核超协">
                             <template v-slot:footer>
-                                <uni-easyinput v-model="item.assessmentExceedsAgreement" placeholder="请输入考核超协"
-                                    :inputBorder="false" />
+                                <uni-easyinput type="digit" v-model="item.assessmentExceedsAgreement"
+                                    placeholder="请输入考核超协" :inputBorder="false"
+                                    @input="onAssessmentInput($event, idx)" @blur="onAssessmentBlur($event, idx)" />
                             </template>
                         </uni-list-item>
                     </view>
@@ -330,6 +331,49 @@ export default {
                 }
             })
         },
+        onAssessmentInput(val, idx) {
+            const it = this.items[idx]
+            if (!it) return
+            // 允许负号、数字、小数点
+            let v = String(val).replace(/[^0-9.-]/g, '')
+            // 处理多个小数点
+            const parts = v.split('.')
+            if (parts.length > 2) {
+                v = parts[0] + '.' + parts.slice(1).join('')
+            }
+            // 处理多个负号（仅允许出现在开头）
+            if (v.indexOf('-') > 0) {
+                v = v.replace(/-/g, '')
+            }
+            if (v.startsWith('-') && (v.match(/-/g) || []).length > 1) {
+                v = '-' + v.replace(/-/g, '')
+            }
+            // 限制两位小数
+            if (v.includes('.')) {
+                const [int, dec] = v.split('.')
+                v = int + '.' + dec.slice(0, 2)
+            }
+            this.$set(this.items[idx], 'assessmentExceedsAgreement', v)
+            this.emitChange()
+        },
+        onAssessmentBlur(val, idx) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = it.assessmentExceedsAgreement
+            if (!v || v === '-') {
+                v = ''
+            } else {
+                // 尝试转数字并保留两位小数
+                const n = parseFloat(v)
+                if (!isNaN(n)) {
+                    v = n.toFixed(2)
+                } else {
+                    v = ''
+                }
+            }
+            this.$set(this.items[idx], 'assessmentExceedsAgreement', v)
+            this.emitChange()
+        },
         toggleItem(idx) {
             const it = this.items[idx]
             if (!it) return
--- a/pages/invoice/detail.vue
View file @dda9b7c
+++ b/pages/invoice/detail.vue
View file @dda9b7c
@@ -5,12 +5,14 @@
         <view class="section">
           <text class="row company">{{ form.customerName }}</text>
           <view :class="['status', `status_${form.status}`]" />
-          <view class="row"><text class="label">发货日期</text><text class="value">{{ form.shipmentsDate }}</text></view>
+          <view class="row"><text class="label">原发货日期</text><text class="value">{{ form.shipmentsDate }}</text></view>
+          <view class="row"><text class="label">实际发货日期</text><text class="value">{{ form.newShipmentDate }}</text></view>
           <view class="row"><text class="label">生产厂</text><text class="value">{{ form.workshopName }}</text></view>
           <view class="row"><text class="label">办事处</text><text class="value">{{ form.deptName }}</text></view>
           <view class="row"><text class="label">区域</text><text class="value">{{ form.regionName }}</text></view>
           <view class="row"><text class="label">交货方式</text><text class="value">{{ form.deliveryType }}</text></view>
           <view class="row"><text class="label">目的地</text><text class="value">{{ form.destination }}</text></view>
+          <view class="row"><text class="label">是否当日发货</text><text class="value">{{ form.onTimeShipment === true ? '是' : (form.onTimeShipment === false ? '否' : '') }}</text></view>
         </view>
         <!-- 产品 -->
@@ -41,6 +43,36 @@
         </view>
       </view>
     </uni-popup>
+    <!-- 填写日期 -->
+    <uni-popup ref="fillDatePopup" type="bottom" :mask-click="false">
+      <view class="dialog">
+        <view class="dialog_header">
+          <text>填写日期</text>
+          <view class="dialog_close" @click="closeFillDateInfo"></view>
+        </view>
+        <view class="dialog_body fill-data_body">
+          <uni-list>
+            <uni-list-item title="原发货日期">
+              <template v-slot:footer>
+                <view class="value">{{ fillDateForm.shipmentsDate }}</view>
+              </template>
+            </uni-list-item>
+            <uni-list-item>
+              <template v-slot:body>
+								<view class="item-title"><text class="required">*</text><text>实际发货日期</text></view>
+							</template>
+              <template v-slot:footer>
+                <uni-datetime-picker type="date" :start="todayDate"
+                  v-model="fillDateForm.newShipmentDate" />
+              </template>
+            </uni-list-item>
+          </uni-list>
+        </view>
+        <view class="dialog_footer">
+          <button class="btn confirm" type="primary" @click="onFillDateSave">保存</button>
+        </view>
+      </view>
+    </uni-popup>
     <!-- 申请延期 -->
     <uni-popup ref="applyDelayPopup" type="bottom" :mask-click="false">
       <view class="dialog">
@@ -136,7 +168,7 @@
 </template>
 <script>
-import { getDetailApi, saveSignInTicket, checkApi, splitDataApi } from '@/api/invoice.js'
+import { getDetailApi, saveSignInTicket, checkApi, splitDataApi, updateApi } from '@/api/invoice.js'
 import Product from './product.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
@@ -154,12 +186,18 @@ export default {
         // { text: '编辑', visible: true, variant: 'outline', event: 'edit' },
         { text: '填写实发数', visible: true, variant: 'outline', event: 'fill' },
         { text: '上传签收单据', visible: true, variant: 'primary', event: 'upload' },
+        { text: '填写日期', visible: true, variant: 'primary', event: 'fillDate' },
       ],
       uploadFile: { id: '', name: '' },
       applyDelayForm: {},
       splitForm: {
         initItem: {},
       },
+      fillDateForm: {
+        id: '',
+        shipmentsDate: '',
+        newShipmentDate: '',
+      },
     }
   },
   computed: {
@@ -168,8 +206,10 @@ export default {
       const e = String(m.status || '')
       return {
         canEdit: e === 'UN_SHIPMENTS',
-        canFill: e === 'UN_SHIPMENTS',
+        // onTimeShipment 有值（true || false）， 填写实发数按钮不显示
+        canFill: e === 'UN_SHIPMENTS' && (m.onTimeShipment !== false && m.onTimeShipment !== true),
         canUpload: e === 'SHIPMENTS',
+        canFillDate: e === 'UN_SHIPMENTS' && m.onTimeShipment === false && !m.newShipmentDate,
       }
     },
     displayButtons() {
@@ -178,7 +218,15 @@ export default {
         // { ...this.buttons[0], visible: f.canEdit && this.$auth.hasPermi('shipping-plan-manage:invoice:modify') },
         { ...this.buttons[0], visible: f.canFill && this.$auth.hasPermi('shipping-plan-manage:invoice:fill') },
         { ...this.buttons[1], visible: f.canUpload && this.$auth.hasPermi('shipping-plan-manage:invoice:upload') },
+        { ...this.buttons[2], visible: f.canFillDate && this.$auth.hasPermi('shipping-plan-manage:invoice:fill-date') },
       ]
+    },
+    todayDate() {
+      const now = new Date()
+      const y = now.getFullYear()
+      const m = String(now.getMonth() + 1).padStart(2, '0')
+      const d = String(now.getDate()).padStart(2, '0')
+      return `${y}-${m}-${d}`
     }
   },
   onLoad(query) {
@@ -200,6 +248,7 @@ export default {
         // edit: () => this.onEdit(),
         fill: () => this.onFill(),
         upload: () => this.onUpload(),
+        fillDate: () => this.onFillDate(),
       }
       const fn = map[btn.event]
       if (typeof fn === 'function') fn()
@@ -221,6 +270,11 @@ export default {
     onUpload() {
       this.$refs.uploadPopup && this.$refs.uploadPopup.open()
     },
+    onFillDate() {
+      this.fillDateForm.id = this.form.id;
+      this.fillDateForm.shipmentsDate = this.form.shipmentsDate;
+      this.$refs.fillDatePopup && this.$refs.fillDatePopup.open()
+    },
     downloadFile,
     closeUploadInfo() {
       this.uploadFile = { id: '', name: '' };
@@ -248,6 +302,31 @@ export default {
         uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
       }
     },
+    closeFillDateInfo() {
+      this.uploadFile = { id: '', name: '' };
+      this.$refs.fillDatePopup && this.$refs.fillDatePopup.close()
+    },
+    async onFillDateSave() {
+      console.log('onFillDateSave__this.fillDateForm', this.fillDateForm)
+      if (!this.fillDateForm.newShipmentDate) {
+        uni.showToast({
+          title: '请选择实际发货日期',
+          icon: 'none'
+        })
+        return
+      }
+      const params = {
+        id: this.fillDateForm.id,
+        newShipmentDate: this.fillDateForm.newShipmentDate,
+      }
+      try {
+        await updateApi(params)
+        uni.showToast({ title: '保存成功', icon: 'success' })
+        setTimeout(() => { uni.redirectTo({ url: '/pages/invoice/index' }) }, 300)
+      } catch (e) {
+        uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
+      }
+    },
     // 申请延期
     applyDelayFun(id) {
       getShipmentPlanDetailApi(id).then(res => {
@@ -501,6 +580,7 @@ export default {
     padding: 12rpx 4rpx 24rpx;
     max-height: 70vh;
     overflow-y: auto;
+
   }
   .split_body {
@@ -740,4 +820,11 @@ export default {
     }
   }
 }
+.fill-data_body {
+  ::v-deep .uni-list-item {
+    &__container {
+      align-items: center;
+    }
+  }
+}
 </style>
--- a/pages/invoice/fill.vue
View file @dda9b7c
+++ b/pages/invoice/fill.vue
View file @dda9b7c
@@ -2,6 +2,14 @@
   <view class="page">
     <scroll-view class="scroll" scroll-y>
       <uni-list>
+        <view class="section">
+          <uni-list-item class="select-item" :class="form.onTimeShipment != null ? 'is-filled' : 'is-empty'" clickable
+            @click="openShipmentSheet" :rightText="onTimeShipmentText" showArrow>
+            <template v-slot:body>
+              <view class="item-title"><text>是否当日发货</text></view>
+            </template>
+          </uni-list-item>
+        </view>
         <!-- 产品 -->
         <view class="section2">
           <!-- mode="add" 允许编辑 -->
@@ -24,24 +32,36 @@
         </view>
       </view>
     </uni-popup>
+    <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
+      @confirm="onSheetConfirm" />
   </view>
 </template>
 <script>
 import { listByShipmentOrderId, dataReplenishInput } from '@/api/invoice.js'
 import Product from './product.vue'
+import SingleSelectSheet from '@/components/single-select/index.vue'
 export default {
   name: 'InvoiceFill',
-  components: { Product },
+  components: { Product, SingleSelectSheet },
   data() {
     return {
       form: {
         id: '',
-        detailList: []
+        detailList: [],
+        onTimeShipment: true
       },
       initDetailList: [],
-      customerName: ''
+      customerName: '',
+      sheet: { visible: false, title: '请选择', options: [], value: '' }
+    }
+  },
+  computed: {
+    onTimeShipmentText() {
+      if (this.form.onTimeShipment === true) return '是'
+      if (this.form.onTimeShipment === false) return '否'
+      return '请选择'
     }
   },
   onLoad(query) {
@@ -109,6 +129,17 @@ export default {
       this.$refs.confirmPopup && this.$refs.confirmPopup.close();
       this.submitData(type);
     },
+    openShipmentSheet() {
+      this.sheet = {
+        visible: true,
+        title: '是否当日发货',
+        options: [{ label: '是', value: true }, { label: '否', value: false }],
+        value: this.form.onTimeShipment
+      }
+    },
+    onSheetConfirm({ value }) {
+      this.form.onTimeShipment = value
+    },
     async submitData(type) {
       this.loading = true;
       const params = {};
@@ -126,6 +157,7 @@ export default {
       params.id = this.form.id || '';
       params.detailList = detailList;
       params.type = type || '';
+      params.onTimeShipment = this.form.onTimeShipment;
       console.log(params);
       try {
--- a/pages/invoice/index.vue
View file @dda9b7c
+++ b/pages/invoice/index.vue
View file @dda9b7c
@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="dev-list-fixed">
 			<view class="search-row">
-				<uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入购货单位" clearButton="auto"
+				<uni-search-bar v-model="searchKeyword" radius="6" placeholder="请输入购货单位或者发货单编号" clearButton="auto"
 					cancelButton="none" bgColor="#F3F3F3" textColor="rgba(0,0,0,0.4)" @confirm="search"
 					@input="onSearchInput" />
 				<view class="tool-icons">
@@ -26,6 +26,9 @@
 							</view>
 						</view>
 						<view class="info-row">
+							<text>发货单编号</text><text>{{ item.code || '-' }}</text>
+						</view>
+						<view class="info-row">
 							<text>生产厂</text><text>{{ item.workshopName || '-' }}</text>
 						</view>
 						<view class="info-row">
@@ -35,7 +38,10 @@
 							<text>交货方式</text><text>{{ item.deliveryType || '-' }}</text>
 						</view>
 						<view class="info-row">
-							<text>发货日期</text><text>{{ item.shipmentsDate || '-' }}</text>
+							<text>是否当日发货</text><text>{{ item.onTimeShipment === true ? '是' : (item.onTimeShipment === false ? '否' : '-') || '-' }}</text>
+						</view>
+						<view class="info-row">
+							<text>原发货日期</text><text>{{ item.shipmentsDate || '-' }}</text>
 						</view>
 					</view>
 				</template>
@@ -68,7 +74,7 @@
 					</view>
 					<view class="form-item">
-						<view class="label">订货日期</view>
+						<view class="label">原发货日期</view>
 						<uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" @change="onDateChange($event, model)"/>
 					</view>
 				</view>
@@ -132,7 +138,7 @@ export default {
 	computed: {
 		extraCombined() {
 			return {
-				customerName: this.searchKeywordDebounced || undefined
+				searchKey: this.searchKeywordDebounced || undefined
 			}
 		}
 	},
@@ -253,7 +259,7 @@ export default {
 				delete params.dateRange
 			}
 			if (this.searchKeywordDebounced) {
-				params.customerName = this.searchKeywordDebounced
+				params.searchKey = this.searchKeywordDebounced
 			}
 			return queryApi(params)
 				.then(res => {
--- a/pages/order_list/approve.vue
View file @dda9b7c
+++ b/pages/order_list/approve.vue
View file @dda9b7c
@@ -316,7 +316,10 @@ export default {
         const m = res.data || {}
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id
-        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ ...x })) : []
+        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 
+          ...x,
+          assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
+        })) : []
         this.form = next;
         this.initPurchaseOrderLineList = next.purchaseOrderLineList || [];
         this.refreshStandardName()
--- a/pages/order_list/modify.vue
View file @dda9b7c
+++ b/pages/order_list/modify.vue
View file @dda9b7c
@@ -225,7 +225,10 @@ export default {
         const m = res.data || {}
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id
-        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ ...x })) : []
+        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 
+          ...x,
+          assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
+         })) : []
         this.form = next;
         this.initPurchaseOrderLineList = next.purchaseOrderLineList || [];
         this.refreshStandardName()
--- a/pages/order_list/product.vue
View file @dda9b7c
+++ b/pages/order_list/product.vue
View file @dda9b7c
@@ -75,9 +75,10 @@
                         </uni-list-item>
                         <uni-list-item title="考核超协">
                             <template v-slot:footer>
-                                <uni-easyinput :disabled="pageType === 'modify'"
+                                <uni-easyinput type="digit" :disabled="pageType === 'modify'"
                                     v-model="item.assessmentExceedsAgreement"
-                                    :placeholder="pageType === 'modify' ? '' : '请输入考核超协'" :inputBorder="false" />
+                                    :placeholder="pageType === 'modify' ? '' : '请输入考核超协'" :inputBorder="false"
+                                    @input="onAssessmentInput($event, idx)" @blur="onAssessmentBlur($event, idx)" />
                             </template>
                         </uni-list-item>
                     </uni-list>
@@ -223,6 +224,49 @@ export default {
         toggleViewCollapse() {
             this.collapsedView = !this.collapsedView
         },
+        onAssessmentInput(val, idx) {
+            const it = this.items[idx]
+            if (!it) return
+            // 允许负号、数字、小数点
+            let v = String(val).replace(/[^0-9.-]/g, '')
+            // 处理多个小数点
+            const parts = v.split('.')
+            if (parts.length > 2) {
+                v = parts[0] + '.' + parts.slice(1).join('')
+            }
+            // 处理多个负号（仅允许出现在开头）
+            if (v.indexOf('-') > 0) {
+                v = v.replace(/-/g, '')
+            }
+            if (v.startsWith('-') && (v.match(/-/g) || []).length > 1) {
+                v = '-' + v.replace(/-/g, '')
+            }
+            // 限制两位小数
+            if (v.includes('.')) {
+                const [int, dec] = v.split('.')
+                v = int + '.' + dec.slice(0, 2)
+            }
+            this.$set(this.items[idx], 'assessmentExceedsAgreement', v)
+            this.emitChange()
+        },
+        onAssessmentBlur(val, idx) {
+            const it = this.items[idx]
+            if (!it) return
+            let v = it.assessmentExceedsAgreement
+            if (!v || v === '-') {
+                v = ''
+            } else {
+                // 尝试转数字并保留两位小数
+                const n = parseFloat(v)
+                if (!isNaN(n)) {
+                    v = n.toFixed(2)
+                } else {
+                    v = ''
+                }
+            }
+            this.$set(this.items[idx], 'assessmentExceedsAgreement', v)
+            this.emitChange()
+        },
         onDeliveryChange(e, item, idx) {
             const getStr = (x) => {
                 if (x && x.detail && x.detail.value !== undefined) return x.detail.value