Browse Source

bug 修复

lilei 3 years ago
parent
commit
e349cb40b2

+ 9 - 0
src/api/settleReceipt.js

@@ -29,4 +29,13 @@ export const settleReceiptBookBatch = (params) => {
     data: params,
     method: 'post'
   })
+}
+
+// 凭证
+export const settleReceiptFindBySn = (params) => {
+  const url = `/settleReceipt/findBySn/${params.sn}`
+  return axios({
+    url: url,
+    method: 'get'
+  })
 }

+ 1 - 0
src/views/salesManagement/salesCollection/list.vue

@@ -387,6 +387,7 @@ export default {
     // 凭证
     handleVoucher (row) {
       this.showVoucher = true
+      this.$refs.voucherModal.getData(row)
     },
     // 点击收款
     handleColle (row) {

+ 26 - 27
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -10,54 +10,54 @@
     @cancle="isShow=false"
     width="80%">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div class="common-main">
+      <div class="common-main" v-if="detail">
         <div class="toolsBar">
           <a-descriptions>
             <a-descriptions-item label="销售单号">
-              XS220506000005
+              {{ detail.bizNo || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="备货单号">
-              FH220605000004-1
+              {{ detail.dispatchBillNo || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="发货编号">
-              3
+              {{ detail.sendNo || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="客户名称">
-              箭冠汽配西安未央店
+              {{ detail.settleClientName || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="收货客户名称">
-              箭冠汽配西安未央店
+              {{ detail.receiverName || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="收款方式">
-              未指定
+              {{ detail.settleStyleDictValue || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="产品款数">
-              15
+              {{ detail.totalCategory }}
             </a-descriptions-item>
             <a-descriptions-item label="产品数量">
-              6
+              {{ detail.qty }}
             </a-descriptions-item>
             <a-descriptions-item label="总售价">
-              115
+              {{ detail.totalAmount }}
             </a-descriptions-item>
             <a-descriptions-item label="业务状态">
-              出库中
+              {{ detail.billStatusDictValue || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="财务状态">
-              已完结
+              {{ detail.settleStateDictValue || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="单据状态">
-              有效
+              {{ detail.voidFlagDictValue || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="收款类型">
-              关联收款单
+              {{ detail.keepTypeDictValue || '--' }}
             </a-descriptions-item>
             <a-descriptions-item label="收款时间">
-              2022-05-31 16:17:22
+              {{ detail.settleTime || '--' }}
             </a-descriptions-item>
           </a-descriptions>
         </div>
-        <div>
+        <div v-if="detail.keepType == 'RELATION_BOOK'">
           <a-table :columns="columns" :pagination="false" :data-source="tableData" bordered>
             <!-- 收款单号 -->
             <template slot="salesBillNo" slot-scope="text, record">
@@ -75,6 +75,7 @@
 
 <script>
 import { STable, VSelect } from '@/components'
+import { settleReceiptFindBySn } from '@/api/settleReceipt.js'
 export default {
   name: 'VoucherModal',
   components: { STable, VSelect },
@@ -101,7 +102,7 @@ export default {
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       spinning: false,
-      detail: [],
+      detail: null,
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
@@ -118,8 +119,13 @@ export default {
     }
   },
   methods: {
-    setData (data) {
-      this.detail = data
+    getData (data) {
+      this.spinning = true
+      settleReceiptFindBySn({ sn: data.accountReceiptSn }).then(res => {
+        this.detail = res.data || null
+        this.$message.info(res.message)
+        this.spinning = false
+      })
     },
     // 删除
     handleDel (row) {
@@ -128,18 +134,11 @@ export default {
     // 选择
     handleChoose (row) {
 
-    },
-    // 确定
-    handleCommonOk () {
-      this.$emit('ok')
     },
     // 取消
     handleCommonCancel () {
       this.$emit('cancel')
-    },
-    // 重置
-    resetSearchForm () {
-
+      this.detail = null
     }
   },
   watch: {