预订

ghsApp/src/admin/book/custom.vue

@@ -73,10 +73,10 @@ export default {
 	},
 	methods: {
 		goChange(item){
-			this.$util.pageTo({ url: "/admin/book/customBookChange?customId="+item.customId+'&customName='+item.customName})
+			this.$util.pageTo({ url: "/admin/book/customBookChange?customId="+item.customId+'&customName='+item.name+'&id='+item.id})
 		},
 		goDetail(item){
-			this.$util.pageTo({ url: "/admin/book/itemCustom?customId="+item.customId+'&customName='+item.customName})
+			this.$util.pageTo({ url: "/admin/book/itemCustom?customId="+item.customId+'&customName='+item.name})
 		},
 		async init() {
 			this.getStatList();

ghsApp/src/admin/book/customBookChange.vue

@@ -5,7 +5,7 @@
 				<t-table :headerBackgroundColor="'#F0F2F6'">
 					<t-tr header>
                         <t-th>时间</t-th>
-						<t-th>花材</t-th>
+						<t-th>事项</t-th>
 						<t-th>变动</t-th>
 						<t-th>最终</t-th>
 						<t-th>操作人</t-th>
@@ -45,10 +45,10 @@ export default {
 	methods: {
 		async init(){
             let id = this.option.id?this.option.id:0
-			let itemId = this.option.itemId?this.option.itemId:0
-			let itemName = this.option.itemName?this.option.itemName:0
-			uni.setNavigationBarTitle({ title: itemName })
-			const res = await getCustomBookChangeList({ page:this.list.page,relateSecondId:id,itemId:itemId })
+			let customId = this.option.customId?this.option.customId:0
+			let customName = this.option.customName?this.option.customName:0
+			uni.setNavigationBarTitle({ title: customName })
+			const res = await getCustomBookChangeList({ page:this.list.page,relateSecondId:id,customId:customId })
 			if (this.$util.isEmpty(res.data.list)){
 				this.completes(res)
 				return

ghsApp/src/admin/book/globalBookChange.vue

@@ -5,7 +5,7 @@
 				<t-table :headerBackgroundColor="'#F0F2F6'">
 					<t-tr header>
                         <t-th>时间</t-th>
-						<t-th>花材</t-th>
+						<t-th>事项</t-th>
 						<t-th>变动</t-th>
 						<t-th>最终</t-th>
 						<t-th>操作人</t-th>

ghsApp/src/admin/book/itemCustom.vue

@@ -22,7 +22,7 @@
                             <view v-for="(item, index) in bookData" :key="index" @click="goDetail(item)">
                                 <t-tr>
                                     <t-td><view style="color:#333333;font-size:25upx;width:170upx;text-align:left;height:60upx;display: flex;align-items: center;">{{item.name}}</view></t-td>
-                                    <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
+                                    <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;" @click="goChange(item)">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
                                     <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
                                     <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
                                     <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
@@ -83,6 +83,9 @@ export default {
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),
+		goChange(item){
+			this.$util.pageTo({ url: "/admin/book/itemCustomBookChange?id="+item.id+'&customId='+item.customId+'&itemId='+item.itemId+'&customName='+item.customName+'&itemName='+item.name})
+		},
 		goDetail(item){
 			this.$util.pageTo({ url: "/admin/book/itemCustomDetail?parentId="+item.id})
 		},

ghsApp/src/admin/book/itemBookChange.vue → ghsApp/src/admin/book/itemCustomBookChange.vue

@@ -5,7 +5,7 @@
 				<t-table :headerBackgroundColor="'#F0F2F6'">
 					<t-tr header>
                         <t-th>时间</t-th>
-						<t-th>花材</t-th>
+						<t-th>事项</t-th>
 						<t-th>变动</t-th>
 						<t-th>最终</t-th>
 						<t-th>操作人</t-th>
@@ -45,10 +45,12 @@ export default {
 	methods: {
 		async init(){
             let id = this.option.id?this.option.id:0
+			let customId = this.option.customId?this.option.customId:0
 			let itemId = this.option.itemId?this.option.itemId:0
-			let itemName = this.option.itemName?this.option.itemName:0
-			uni.setNavigationBarTitle({ title: itemName })
-			const res = await getBookChangeList({ page:this.list.page,relateSecondId:id,itemId:itemId })
+			let itemName = this.option.itemName?this.option.itemName:''
+			let customName = this.option.customName?this.option.customName:''
+			uni.setNavigationBarTitle({title: customName+' 的 '+itemName})
+			const res = await getBookChangeList({ page:this.list.page,relateSecondId:id,customId:customId,itemId:itemId})
 			if (this.$util.isEmpty(res.data.list)){
 				this.completes(res)
 				return

ghsApp/src/admin/book/itemCustomDetail.vue

@@ -14,7 +14,7 @@
                             <view v-for="(item, index) in ghsData" :key="index">
                                 <t-tr>
                                     <t-td><view style="width:170upx;">{{item.name}}</view></t-td>
-									<t-td><view>{{item.ghsName}}</view></t-td>
+									<t-td><view @click="goChange(item)">{{item.ghsName}}</view></t-td>
 									<t-td><view>{{item.num}}</view></t-td>
 									<t-td><view>{{item.status==0?'在路上':item.status==1?'已送达':'已取消'}}</view></t-td>
                                 </t-tr>
@@ -68,6 +68,9 @@ export default {
 			}
 			this.getStatList();
 		},
+		goChange(item){
+			this.$util.pageTo({ url: "/admin/book/itemCustomBookChange"})
+		},
 		getStatList() {
 			let that = this
 			uni.showLoading()

ghsApp/src/pages.json

@@ -487,7 +487,7 @@
 				{"path": "custom","style": {"navigationBarTitleText": "预订客户"}},
 				{"path": "globalBookChange","style": {"navigationBarTitleText": "预订变动"}},
 				{"path": "customBookChange","style": {"navigationBarTitleText": "预订变动"}},
-				{"path": "itemBookChange","style": {"navigationBarTitleText": "预订变动"}}
+				{"path": "itemCustomBookChange","style": {"navigationBarTitleText": "预订变动"}}
 			]
 		},
 		{