shish 2 سال پیش
والد
کامیت
ea3d79b6ad
3فایلهای تغییر یافته به همراه27 افزوده شده و 12 حذف شده
  1. 1 10
      ghs/src/views/custom/pastAccountChange.vue
  2. 13 1
      ghs/src/views/custom/yj.vue
  3. 13 1
      ghs/src/views/order/list.vue

+ 1 - 10
ghs/src/views/custom/pastAccountChange.vue

@@ -29,16 +29,7 @@ export default {
 			if (this.$route.query.endTime) {
 				this.endTime = this.$route.query.endTime
 			}
-			ctx.service({
-				page: () => {
-					return this.$service.customDebtChange.getList({endTime:this.endTime,customId:this.customId}).then((res) => {
-						this.totalAmount = res.totalAmount ? res.totalAmount : 0
-						return {
-							list: res.list
-						};
-					});
-				}
-			})
+			ctx.service(this.$service.customDebtChange)
 			.set('table', {
 				columns: [
 					{

+ 13 - 1
ghs/src/views/custom/yj.vue

@@ -28,6 +28,10 @@
 				<el-button type="primary" size="mini" style="margin-left:60px;" @click="exportDue()">导出数据</el-button>
 			</template>
 
+			<template #slot-column-option="{scope}">
+				<el-button size="small" type="primary" @click="goChange(scope.row)">查看明细</el-button>
+			</template>
+
 		</x-crud>
 	</div>
 </template>
@@ -82,6 +86,14 @@ export default {
 		...mapGetters(['shopInfo']),
 	},
 	methods: {
+		goChange(data){
+			let query = {};
+			query.customName = data.name
+			query.startTime = this.startTime
+			query.endTime = this.endTime
+			query.searchTime = this.searchTime
+			this.$router.push({ path: '/order/list', query });
+		},
 		exportDue(){
 			this.$service.order.getYj({searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,debt:this.debt,export:1}).then(res => {
 				if(res.file){
@@ -168,7 +180,7 @@ export default {
 							fixed: 'right',
 							label: '操作'
 						},
-						layout: []
+						layout: ['slot-column-option']
 					}
 				})
 				.set('layout', [

+ 13 - 1
ghs/src/views/order/list.vue

@@ -443,6 +443,18 @@ export default {
       if(this.$route.query.status){
         this.tabIndex = this.$route.query.status
       }
+      if(this.$route.query.customName){
+        this.name = this.$route.query.customName
+      }
+      if(this.$route.query.searchTime){
+        this.searchTime = this.$route.query.searchTime
+      }
+      if(this.$route.query.startTime){
+        this.startTime = this.$route.query.startTime
+      }
+      if(this.$route.query.endTime){
+        this.endTime = this.$route.query.endTime
+      }
       ctx.service(this.$service.order)
           .set('table', {
             columns: [
@@ -604,7 +616,7 @@ export default {
             this.tabsData[4].val = asset.shop.finishOrder||0;
           })
           .done();
-          app.refresh({ status: this.tabIndex,book:this.book,clearSign:this.clearSign })
+          app.refresh({ status: this.tabIndex,book:this.book,clearSign:this.clearSign,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime,name:this.name })
     },
     onSongSuccess() {