feat: 撤销单-编辑

史婷婷
1 parent 100ac083
Showing 2 changed files with 23 additions and 33 deletions
components/file-upload/index.vue
pages/revoke_list/modify.vue
--- a/components/file-upload/index.vue
View file @a454aed
+++ b/components/file-upload/index.vue
View file @a454aed
@@ -108,5 +108,6 @@ export default {
 }
 .file-name { 
   font-size: 28rpx; color: rgba(0,0,0,0.9); 
+  line-height: 40rpx;
   }
 </style>
--- a/pages/revoke_list/modify.vue
View file @a454aed
+++ b/pages/revoke_list/modify.vue
View file @a454aed
@@ -58,27 +58,27 @@
       <view class="view-total">
         <view class="head">合计</view>
         <view class="row">
-          <text class="label">总数量</text><text class="value">{{ form.afterTotalQuantity }}</text>
+          <text class="label">原数量</text><text class="value">{{ form.totalQuantity || '-'  }}</text>
+        </view>
+        <view class="row">
+          <text class="label">撤销数量</text><text class="value">{{ form.totalRevokeQuantity || '-' }}</text>
         </view>
       </view>
       <button class="btn submit" type="primary" @click="onSubmit">提交</button>
     </view>
-    <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
-      @confirm="onSheetConfirm" />
   </view>
 </template>
 <script>
 import { getDetailApi, updateApi } from '@/api/revoke_list.js'
 import Product from './product.vue'
-import SingleSelectSheet from '@/components/single-select/index.vue'
 import FileUpload from '@/components/file-upload/index.vue'
 import { getDicName } from '@/utils/dic.js'
 import { getDicByCodes } from '@/utils/dic'
 export default {
   name: 'RevokeListModify',
-  components: { Product, SingleSelectSheet, FileUpload },
+  components: { Product, FileUpload },
   data() {
     return {
       id: '',
@@ -101,7 +101,6 @@ export default {
       },
       initPurchaseOrderLineList: [],
       dicOptions: { SUPPLIER: [], APPLICABLE_STANDARD: [] },
-      sheet: { visible: false, title: '请选择', options: [], value: '', field: '' },
       confirmationVoucherFile: { id: '', name: '' },
     }
   },
@@ -127,12 +126,14 @@ export default {
         next.id = m.id || m.code || id;
         next.purchaseOrderId = m.orderId || '';
         next.purchaseOrderLineList = Array.isArray(m.afterChangeSpecList) ? m.afterChangeSpecList.map(x => ({ ...x })) : []
+        delete next.status
         this.form = next;
         this.initPurchaseOrderLineList = next.purchaseOrderRevokeLineList || [];
         this.confirmationVoucherFile = {
           id: m.confirmationVoucherFileId || '',
           name: m.confirmationVoucherFileName || '',
         }
+        
         this.refreshStandardName()
       } catch (e) {
         uni.showToast({ title: '加载失败', icon: 'none' })
@@ -142,22 +143,6 @@ export default {
       const est = (this.dicOptions.APPLICABLE_STANDARD || []).find(o => String(o.code) === String(this.form.executionStandard))
       this.form.executionStandardName = est ? (est.name || '') : (this.form.executionStandardName || '')
     },
-    openSheet(field) {
-      if (field === 'executionStandard') {
-        const options = (this.dicOptions.APPLICABLE_STANDARD || []).map(it => ({ label: it.name || '', value: it.code || '' }))
-        const current = this.form.executionStandard
-        const match = options.find(o => String(o.value) === String(current))
-        this.sheet = { ...this.sheet, visible: true, title: '执行标准', options, field, value: match ? match.value : '' }
-      }
-    },
-    onSheetConfirm({ value, label }) {
-      const field = this.sheet.field
-      if (field === 'executionStandard') {
-        this.form.executionStandard = value || ''
-        this.form.executionStandardName = label || ''
-      }
-      this.sheet.visible = false
-    },
     getDicName: getDicName,
     validateLineListRequired() {
       const list = Array.isArray(this.form.purchaseOrderLineList) ? this.form.purchaseOrderLineList : []
@@ -166,12 +151,7 @@ export default {
         return false
       }
       const fields = [
-        { key: 'industry', label: '行业' },
-        { key: 'quality', label: '品质' },
-        { key: 'brand', label: '牌号' },
-        { key: 'quantity', label: '数量' },
-        { key: 'salesPrice', label: '销售价格' },
-        { key: 'deliveryDate', label: '发货日期' },
+        { key: 'revokeQuantity', label: '撤销数量kg' },
       ]
       for (let i = 0; i < list.length; i++) {
         const it = list[i] || {}
@@ -182,19 +162,28 @@ export default {
             return false
           }
         }
+        // 撤销数量kg不能大于原数量
+        const originalQuantity = Number(it && it.quantity)
+        const revokeQuantity = Number(it && it.revokeQuantity)
+        if (revokeQuantity > originalQuantity) {
+          uni.showToast({ title: `产品第${i + 1}条：撤销数量kg不能大于原数量！`, icon: 'none' })
+          return false
+        }
       }
       return true
     },
     async onSubmit() {
       if (!this.validateLineListRequired()) return
       const payload = { ...this.form }
-      payload.orderSpecList = payload.purchaseOrderLineList || [];
+      payload.purchaseOrderRevokeLineList = payload.purchaseOrderLineList || [];
       delete payload.purchaseOrderLineList
+      payload.confirmationVoucherFileName = this.confirmationVoucherFile.name || '';
+      payload.confirmationVoucherFileId = this.confirmationVoucherFile.id || '';
       console.log('onSubmit__payload', payload)
       try {
         await updateApi(payload)
         uni.showToast({ title: '保存成功', icon: 'success' })
-        setTimeout(() => { uni.redirectTo({ url: '/pages/change_list/index' }) }, 300)
+        setTimeout(() => { uni.redirectTo({ url: '/pages/revoke_list/index' }) }, 300)
       } catch (e) {
         uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
       }
@@ -203,10 +192,10 @@ export default {
       const list = Array.isArray(data) ? data : []
       this.form.purchaseOrderLineList = list
       const sum = list.reduce((acc, it) => {
-        const v = Number(it && it.quantity)
+        const v = Number(it && it.revokeQuantity)
         return acc + (isNaN(v) ? 0 : v)
       }, 0)
-      this.form.afterTotalQuantity = sum
+      this.form.totalRevokeQuantity = sum
     },
   }
 }
@@ -221,7 +210,7 @@ export default {
 .scroll {
   flex: 1;
-  padding: 6rpx 0 310rpx;
+  padding: 6rpx 0 350rpx;
 }