소스 검색

修复应付结算记录查看详情编号为空的bug单

zhangdan 4 년 전
부모
커밋
82aff8f8e2

+ 4 - 5
src/views/FinancialManagement/PaySettlementRecords.vue

@@ -49,7 +49,7 @@
     <!-- 应收结算记录详情弹窗 -->
     <pay-settlement-records-details-modal :itemId="itemId" :openModalDetails="openModalDetails" @close="openModalDetails=false"></pay-settlement-records-details-modal>
     <!-- 核销详情弹窗 -->
-    <WriteOffDetailsModal :settleId="settleId" :openWriteOffModal="openWriteOffModal" @close="openWriteOffModal=false"></WriteOffDetailsModal>
+    <WriteOffDetailsModal :itemId="itemId" :openWriteOffModal="openWriteOffModal" @close="openWriteOffModal=false"></WriteOffDetailsModal>
   </a-card>
 </template>
 
@@ -103,7 +103,7 @@ export default {
       orderTotal: 0, // 订单数量
       amountTotal: 0, // 实收总金额
       itemId: '', // 每条数据id
-      settleId: '',
+      // settleId: '',
       openModalDetails: false, // 默认关闭详情弹窗
       openWriteOffModal: false,
       columns: [{
@@ -158,15 +158,14 @@ export default {
     },
     // 查看详情
     handleDetail (record) {
-      this.itemId = record.settleNo
-      this.settleId = record.settleNo
-      console.log(this.itemId, record.settleType)
+		 this.itemId = record.settleNo
       if (record.settleType === 'BUNDLE_SALE') {
         this.openModalDetails = true
         console.log(this.openModalDetails)
       } else {
         this.openWriteOffModal = true
       }
+	  console.log(this.itemId, record.settleType)
     },
     // 查询
     refresh () {

+ 113 - 100
src/views/FinancialManagement/PaySettlementRecordsDetailsModal.vue

@@ -1,107 +1,120 @@
 <template>
-	<div>
-		<a-modal class="modalBox" title="详情" v-model="isshow" @cancle="cancel" :footer="null" width="60%" :centered="true">
-			<s-table ref="table" size="default" :rowKey="(record) => record.id" bordered :columns="columns" :data="loadData">
-			</s-table>
-		</a-modal>
-	</div>
+  <div>
+    <a-modal
+      class="modalBox"
+      title="详情"
+      v-model="isshow"
+      @cancle="cancel"
+      :footer="null"
+      width="60%"
+      :centered="true">
+      <s-table
+        ref="table"
+        size="default"
+        :rowKey="(record) => record.id"
+        bordered
+        :columns="columns"
+        :data="loadData">
+      </s-table>
+    </a-modal>
+  </div>
 </template>
 
 <script>
-	import { STable } from '@/components'
-	import { SettlementRecordsDetailsList } from '@/api/FinancialManagement'
-	export default {
-		name: 'SettlementRecordsDetailsModal',
-		components: {
-			STable
-		},
-		props: {
-			openModalDetails: {
-				type: Boolean,
-				default: false
-			},
-			itemId: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				loadData: parameter => {
-					return SettlementRecordsDetailsList({
-						settleNo: this.itemId,
-						pageNo: 1,
-						pageSize: 10
-					}).then(res => {
-						const no = (res.data.pageNo - 1) * res.data.pageSize
-						for (let i = 0; i < res.data.list.length; i++) {
-							const _item = res.data.list[i]
-							_item.no = no + i + 1
-						}
-						return res.data
-					})
-				},
-				isshow: this.openModalDetails,
-				settleId: '', // 套餐名称
-				openWriteOffModal: false, // 核销弹窗默认关闭
-				columns: [
-					{
-						title: '序号',
-						dataIndex: 'no',
-						width: '60px',
-						align: 'center'
-					},
-					{
-						title: '订单号',
-						dataIndex: 'orderBundleNo',
-						width: '150px',
-						align: 'center'
-					},
-					{
-						title: '下单时间',
-						dataIndex: 'orderDate',
-						width: '150px',
-						align: 'center'
-					},
-					{
-						title: '套餐名称',
-						dataIndex: 'bundleName',
-						width: '150px',
-						align: 'center'
-					},
-					{
-						title: '结算金额',
-						dataIndex: 'settleAmount',
-						align: 'center',
-						width: '150px'
-					}
-				]
-			}
-		},
-		methods: {
-			// 关闭弹窗
-			cancel(e) {
-				this.$emit('close')
-			}
-		},
-		watch: {
-			openModalDetails(newValue, oldValue) {
-				this.isshow = newValue
-				console.log(this.isshow)
-			},
-			isshow(val) {
-				if (!val) {
-					this.$emit('close')
-				}
-			},
-			itemId(newValue, oldValue) {
-				console.log(newValue)
-				if (newValue && this.isshow) {
-					this.$refs.table.refresh(newValue)
-				}
-			}
-		}
-	}
+import { STable } from '@/components'
+import { SettlementRecordsDetailsList } from '@/api/FinancialManagement'
+export default {
+  name: 'SettlementRecordsDetailsModal',
+  components: {
+    STable
+  },
+  props: {
+    openModalDetails: {
+      type: Boolean,
+      default: false
+    },
+    itemId: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      loadData: parameter => {
+        return SettlementRecordsDetailsList({
+          settleNo: this.itemId,
+          pageNo: 1,
+          pageSize: 10
+        }).then(res => {
+          const no = (res.data.pageNo - 1) * res.data.pageSize
+          for (let i = 0; i < res.data.list.length; i++) {
+            const _item = res.data.list[i]
+            _item.no = no + i + 1
+          }
+          return res.data
+        })
+      },
+      isshow: this.openModalDetails,
+      settleId: '', // 套餐名称
+      openWriteOffModal: false, // 核销弹窗默认关闭
+      columns: [
+        {
+          title: '序号',
+          dataIndex: 'no',
+          width: '60px',
+          align: 'center'
+        },
+        {
+          title: '订单号',
+          dataIndex: 'orderBundleNo',
+          width: '150px',
+          align: 'center'
+        },
+        {
+          title: '下单时间',
+          dataIndex: 'orderDate',
+          width: '150px',
+          align: 'center'
+        },
+        {
+          title: '套餐名称',
+          dataIndex: 'bundleName',
+          width: '150px',
+          align: 'center'
+        },
+        {
+          title: '结算金额',
+          dataIndex: 'settleAmount',
+          align: 'center',
+          width: '150px'
+        }
+      ]
+    }
+  },
+  methods: {
+    // 关闭弹窗
+    cancel (e) {
+      this.$emit('close')
+    }
+  },
+  watch: {
+    openModalDetails (newValue, oldValue) {
+      this.isshow = newValue
+      console.log(this.isshow)
+    },
+    isshow (val) {
+      if (!val) {
+        this.$emit('close')
+      }
+    },
+    itemId (newValue, oldValue) {
+      console.log(newValue)
+      if (newValue && this.isshow) {
+        this.$refs.table.refresh(true)
+      }
+    }
+  }
+}
 </script>
 
 <style>

+ 2 - 2
src/views/FinancialManagement/WriteOffDetailsModal.vue

@@ -34,7 +34,7 @@ export default {
       type: Boolean,
       default: false
     },
-    settleId: {
+    itemId: {
       type: String,
       default: ''
     }
@@ -120,7 +120,7 @@ export default {
 	      this.$emit('close')
 	    }
 	  },
-	  settleId (newValue, oldValue) {
+	  itemId (newValue, oldValue) {
 	    if (newValue && this.isshow) {
 	       this.$refs.table.refresh(newValue)
 	    }