zhangdan před 4 roky
rodič
revize
14183ce2d0

+ 15 - 3
src/views/FinancialManagement/PaySettlementRecords.vue

@@ -49,6 +49,8 @@
     </div>
     <!-- 应收结算记录详情弹窗 -->
     <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>
   </a-card>
 </template>
 
@@ -63,12 +65,14 @@ import {
   settlementRecordsListTotal
 } from '@/api/FinancialManagement'
 import PaySettlementRecordsDetailsModal from './PaySettlementRecordsDetailsModal.vue'
+import WriteOffDetailsModal from './WriteOffDetailsModal.vue'
 export default {
   name: 'SettlementRecordsList',
   components: {
     VSelect,
     STable,
-    PaySettlementRecordsDetailsModal
+    PaySettlementRecordsDetailsModal,
+    WriteOffDetailsModal
   },
   data () {
     return {
@@ -100,7 +104,9 @@ export default {
       orderTotal: 0, // 订单数量
       amountTotal: 0, // 实收总金额
       itemId: '', // 每条数据id
+      settleId: '',
       openModalDetails: false, // 默认关闭详情弹窗
+      openWriteOffModal: false,
       columns: [{
         title: '序号',
         dataIndex: 'no',
@@ -154,8 +160,14 @@ export default {
     // 查看详情
     handleDetail (record) {
       this.itemId = record.settleNo
-      console.log(this.itemId)
-      this.openModalDetails = true
+      this.settleId = record.settleNo
+      console.log(this.itemId, record.settleType)
+      if (record.settleType === 'BUNDLE_SALE') {
+        this.openModalDetails = true
+        console.log(this.openModalDetails)
+      } else {
+        this.openWriteOffModal = true
+      }
     },
     // 查询
     refresh () {

+ 22 - 49
src/views/FinancialManagement/PaySettlementRecordsDetailsModal.vue

@@ -8,21 +8,15 @@
       :footer="null"
       width="60%"
       :centered="true">
-      <a-table
+      <s-table
         ref="table"
         size="default"
         :rowKey="(record) => record.id"
         bordered
         :columns="columns"
         :data-source="loadData">
-        <template slot="action" slot-scope="text, record">
-          <!-- <a-icon type="eye" title="查看" :style="{ fontSize: '20px', color: '#e29e14', padding: '0 10px' }" @click="handleDetail(record)" /> -->
-          <a-button type="primary" @click="handleDetail(record)" id="PaySettlementRecordsDetailsModal-handleDetail">详情</a-button>
-        </template>
-      </a-table>
+      </s-table>
     </a-modal>
-    <!-- 核销详情弹窗 -->
-    <WriteOffDetailsModal :settleId="settleId" :openWriteOffModal="openWriteOffModal" @close="openWriteOffModal=false"></WriteOffDetailsModal>
   </div>
 </template>
 
@@ -52,26 +46,20 @@ export default {
   },
   data () {
     return {
-      // loadData: parameter => {
-      //   // const searchData = Object.assign(parameter, this.queryParam)
-      //   // console.log(this.queryOrderDate, 'this.queryOrderDate')
-      //   // if (this.queryOrderDate && this.queryOrderDate.length) {
-      //   //   searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-      //   //   searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-      //   // } else {
-      //   //   searchData.beginDate = ''
-      //   //   searchData.endDate = ''
-      //   // }
-      //   // return listCustomerBundle(searchData).then(res => {
-      //   //   const no = (res.pageNo - 1) * res.pageSize
-      //   //   for (let i = 0; i < res.list.length; i++) {
-      //   //     const _item = res.list[i]
-      //   //     _item.no = no + i + 1
-      //   //   }
-      //   //   return res
-      //   // })
-      // },
-	 loadData: [],
+      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, // 核销弹窗默认关闭
@@ -104,15 +92,6 @@ export default {
         dataIndex: 'settleAmount',
         align: 'center',
         width: '150px'
-      },
-      {
-        title: '操作',
-        dataIndex: 'action',
-        width: '100px',
-        align: 'center',
-        scopedSlots: {
-          customRender: 'action'
-        }
       }
       ]
     }
@@ -137,12 +116,6 @@ export default {
    	  console.log(this.loadData, '----列表')
         }
       })
-    },
-    // 查看核销详情
-    handleDetail (record) {
-      this.settleId = record.settleNo
-      this.openWriteOffModal = true
-      console.log('查看详情', this.settleId, this.openWriteOffModal)
     }
   },
   watch: {
@@ -154,13 +127,13 @@ export default {
       if (!val) {
         this.$emit('close')
       }
-    },
-    itemId (newValue, oldValue) {
-      console.log(newValue)
-      if (newValue && this.isshow) {
-        this.getListData(newValue)
-      }
     }
+    // itemId (newValue, oldValue) {
+    //   console.log(newValue)
+    //   if (newValue && this.isshow) {
+    //     this.getListData(newValue)
+    //   }
+    // }
   }
 }
 </script>

+ 20 - 27
src/views/FinancialManagement/WriteOffDetailsModal.vue

@@ -41,27 +41,20 @@ export default {
   },
   data () {
     return {
-    //   loadData: parameter => {
-		  // // const searchData = Object.assign(parameter, this.queryParam)
-		  // // console.log(this.queryOrderDate, 'this.queryOrderDate')
-		  // // if (this.queryOrderDate && this.queryOrderDate.length) {
-		  // //   searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-		  // //   searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-		  // // } else {
-		  // //   searchData.beginDate = ''
-		  // //   searchData.endDate = ''
-		  // // }
-		  // // return listCustomerBundle(searchData).then(res => {
-		  // //   const no = (res.pageNo - 1) * res.pageSize
-		  // //   for (let i = 0; i < res.list.length; i++) {
-		  // //     const _item = res.list[i]
-		  // //     _item.no = no + i + 1
-		  // //   }
-		  // //   return res
-		  // // })
-    //   },
-      // title: this.PackageName + '--' + '核销详情',
-      loadData: [],
+      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.openWriteOffModal,
 	  columns: [{
 	    title: '序号',
@@ -141,13 +134,13 @@ export default {
 	    if (!val) {
 	      this.$emit('close')
 	    }
-	  },
-	  settleId (newValue, oldValue) {
-	    console.log(newValue)
-	    if (newValue && this.isshow) {
-	      this.getListData(newValue)
-	    }
 	  }
+	  // settleId (newValue, oldValue) {
+	  //   console.log(newValue)
+	  //   if (newValue && this.isshow) {
+	  //     this.getListData(newValue)
+	  //   }
+	  // }
   }
 }
 </script>