shish 2 years ago
parent
commit
d6c3666650

+ 5 - 3
ghsApp/src/admin/book/custom.vue

@@ -2,7 +2,9 @@
 	<view class="app-content">
 		<view class="ex-page">
 			<view class="top-bar">
-				<view>aaaa</view>
+                <view style="font-size:30upx;padding:10upx 0 10upx 0;">
+					<text style="margin-left:80upx;">请选客户</text>
+				</view>
 			</view>
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
@@ -70,8 +72,8 @@ export default {
 
 	},
 	methods: {
-		goDetail(){
-
+		goDetail(item){
+			this.$util.pageTo({ url: "/admin/book/itemCustom?customId="+item.customId+'&customName='+item.customName})
 		},
 		async init() {
 			this.getStatList();

+ 20 - 3
ghsApp/src/admin/book/itemCustom.vue

@@ -2,7 +2,10 @@
 	<view class="app-content">
 		<view class="ex-page">
             <view class="top-bar">
-                <view>aaaaa</view>
+                <view style="font-size:30upx;padding:10upx 0 10upx 0;">
+					<text style="margin-left:60upx;">请选花材</text>
+					<text style="margin-left:80upx;">请选客户</text>
+				</view>
             </view>
             <scroll-view scroll-y scroll-with-animation class="main-view">
                 <view class="space-view ex-table">
@@ -63,7 +66,11 @@ export default {
 	data() {
 		return {
 			dataList: [],
-			bookData:[]
+			bookData:[],
+			itemId:0,
+			itemName:'',
+			customName:'',
+			customId:0
 		};
 	},
 	onPullDownRefresh() {
@@ -72,6 +79,7 @@ export default {
 		});
 	},
 	onLoad() {
+
 	},
 	methods: {
 		...mapActions(['setUserShopAll']),
@@ -79,12 +87,21 @@ export default {
 
         },
 		async init() {
+			if(this.option.itemId){
+				this.itemId = this.option.itemId
+				this.itemName = this.option.itemName
+			}
+			if(this.option.customId){
+				this.customId = this.option.customId
+				this.customName = this.option.custonName
+			}
 			this.getStatList();
 		},
 		getStatList() {
 			let that = this
 			uni.showLoading()
-			getBookItemCustomList().then(res => {
+
+			getBookItemCustomList({itemId:this.itemId,customId:this.customId}).then(res => {
 				uni.hideLoading()
 				if (!this.$util.isEmpty(res.data.list)) {
 					that.bookData = res.data.list

+ 1 - 1
ghsApp/src/admin/order/statBook.vue

@@ -126,7 +126,7 @@ export default {
 			this.searchContent = e;
 		},
 		goDetail(item){
-			this.$util.pageTo({ url: "/admin/book/itemCustom"})
+			this.$util.pageTo({ url: "/admin/book/itemCustom?itemId="+item.itemId+'&itemName='+item.name})
 		},
 		selectShopFn(val){
 			this.params.shopId = val.id;

+ 2 - 2
ghsApp/src/pagesPurchase/info.vue

@@ -93,12 +93,12 @@
 			<view class="module-com content-box">
 				<view class="commodity-view">
 					<view class="commodity-list">
-						<view v-for="(s, idx) in detailInfo.itemInfo" :key="idx" @click="pageTo({ url: '/admin/item/detail?id='+s.productId })" >
+						<view v-for="(s, idx) in detailInfo.itemInfo" :key="idx">
 							<view class="commodity-item">
 								<image class="item-icon" :src="s.cover" alt="" />
 								<view class="item-info">
 									<view class="info-line">
-										<text class="item-name">
+										<text class="item-name" @click="pageTo({ url: '/admin/item/detail?id='+s.productId })">
 											<text style="font-size:22upx;border:1upx solid #3385ff;color:white;background-color:#3385ff;margin-right:5upx;padding-left:5upx;padding-right:5upx;" v-if="s.presell == 1">预售</text>
 											{{ s.name }}
 										</text>