优化

ghsApp/src/admin/book/custom.vue

@@ -13,15 +13,21 @@
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
 					<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-tr>
+						<t-tr header>
+							<t-th><view style="color:black;">客户</view></t-th>
+							<t-th><view style="color:black;">预订</view></t-th>
+							<t-th><view style="color:black;">上架</view></t-th>
+							<t-th><view style="color:black;">路上</view></t-th>
+							<t-th><view style="color:black;">待采</view></t-th>
+						</t-tr>
 						<template v-if="!$util.isEmpty(bookCustomData)">
 							<view v-for="(item, index) in bookCustomData" :key="index">
 								<t-tr>
-									<t-td><view style="color:#333333;font-size:26upx;" @click="goDetail(item)">{{item.name}}</view></t-td>
-									<t-td><view style="color:#333333;font-size:26upx;" @click="goChange(item)">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
-									<t-td><view style="color:#333333;font-size:26upx;" @click="goOnChange(item)">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
-									<t-td><view style="color:#333333;font-size:26upx;" @click="goRoadChange(item)">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
-									<t-td><view style="color:#333333;font-size:26upx;" @click="goCgChange(item)">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:26upx;color:black;" @click="goDetail(item)">{{item.name}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:26upx;color:black;" @click="goChange(item)">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:26upx;color:black;" @click="goOnChange(item)">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:26upx;color:black;" @click="goRoadChange(item)">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
+									<t-td><view style="color:#333333;font-size:26upx;color:black;" @click="goCgChange(item)">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
 								</t-tr>
 							</view>
 						</template>

ghsApp/src/admin/book/itemCustom.vue

@@ -8,26 +8,26 @@
                 <view class="space-view ex-table">
                     <t-table :headerBackgroundColor="'#F0F2F6'">
                         <t-tr header>
-                            <t-th><view style="width:170upx;">花材</view></t-th>
-                            <t-th>预订</t-th>
-                            <t-th>上架</t-th>
-                            <t-th>路上</t-th>
-                            <t-th>待采</t-th>
-                            <t-th><view style="width:90upx;">客户</view></t-th>
+                            <t-th><view style="width:170upx;color:black;">花材</view></t-th>
+                            <t-th><view style="color:black;">预订</view></t-th>
+                            <t-th><view style="color:black;">上架</view></t-th>
+                            <t-th><view style="color:black;">路上</view></t-th>
+                            <t-th><view style="color:black;">待采</view></t-th>
+                            <t-th><view style="width:90upx;color:black;">客户</view></t-th>
                         </t-tr>
                         <template v-if="!$util.isEmpty(bookData)">
-                            <view v-for="(item, index) in bookData" :key="index">
+                            <view v-for="(item, index) in bookData" :key="index" @click="goAction(item)">
                                 <t-tr>
-                                    <t-td><view style="color:#333333;font-size:25upx;width:170upx;text-align:left;height:60upx;display: flex;align-items: center;" @click="goDetail(item)">{{item.name}}</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;" @click="goOnChange(item)">{{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;" @click="goRoadChange(item)">{{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;" @click="goCgChange(item)">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
+                                    <t-td><view style="color:#333333;font-size:25upx;width:170upx;text-align:left;height:60upx;display: flex;align-items: center;color:black;">{{item.name}}</view></t-td>
+                                    <t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;color:black;">{{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;color:black;">{{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;color:black;">{{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;color:black;">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
                                     <t-td>
-										<view style="font-size:20upx;color:#333333;overflow: hidden;width:90upx;">
+										<view style="font-size:24upx;color:#333333;overflow: hidden;width:90upx;color:black;">
 											<view>{{ item.customName }}</view>
 											<view v-if="item.seatSn != 0">
-												{{item.seatSn }}号 <i class="iconfont iconbianji" style="margin-left:10upx;"></i>
+												{{item.seatSn }}号
 											</view>
 										</view>
 									</t-td>
@@ -38,6 +38,47 @@
                 </view>
             </scroll-view>
 		</view>
+
+
+		<uni-popup ref="actRef" background-color="#fff" type="center" :animation="false" class="class-popup-style" :is-mask-click="false">
+			<view style="max-height:90vh;overflow: scroll;padding:15upx;">
+				<view style="text-align:center;font-size:32upx;font-weight:bold;">{{ currentItem.name ? currentItem.name:'未命名' }}</view>
+				<view style="margin-top:10upx;">
+					<input v-model="currentNum" type="number" @focus="currentNum=''" style="height:100upx;border:1upx solid #CCCCCC;text-align:center;font-size:38upx;width:420upx;" placeholder="数量" />
+				</view>
+				<view style="margin-top:6upx;">
+					<button class="admin-button-com big blue" style="margin-right:20upx;width:200upx;" @click="onNum()">上架</button>
+					<button class="admin-button-com big blue" style="width:200upx;" @click="outNum()">下架</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="margin-right:15upx;width:200upx;" @click="toSj()">上齐</button>
+					<button class="admin-button-com big blue" style="margin-right:15upx;width:200upx;" @click="toBox()">装箱</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goDetail()">供货明细</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goChange()">预订记录</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goOnChange()">上架记录</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goRoadChange()">路上记录</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goCgChange()">待采记录</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big default" style="width:420upx;" @click="cancelBox()">取消装箱</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big default" style="width:420upx;" @click="cancelAct()">取消</button>
+				</view>
+			</view>
+		</uni-popup>
+
+
 	</view>
 </template>
 <script>
@@ -67,7 +108,8 @@ export default {
 			itemId:0,
 			itemName:'',
 			customName:'',
-			customId:0
+			customId:0,
+			currentItem:null
 		};
 	},
 	onPullDownRefresh() {
@@ -80,20 +122,47 @@ 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})
+		goChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/itemCustomBookChange?id="+this.currentItem.id+'&customId='+this.currentItem.customId+'&itemId='+this.currentItem.itemId+'&customName='+this.currentItem.customName+'&itemName='+this.currentItem.name})
+		},
+		goOnChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/itemCustomBookOnChange?id="+this.currentItem.id+'&customId='+this.currentItem.customId+'&itemId='+this.currentItem.itemId+'&customName='+this.currentItem.customName+'&itemName='+this.currentItem.name})
+		},
+		goRoadChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/itemCustomBookRoadChange?id="+this.currentItem.id+'&customId='+this.currentItem.customId+'&itemId='+this.currentItem.itemId+'&customName='+this.currentItem.customName+'&itemName='+this.currentItem.name})
+		},
+		goCgChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/itemCustomBookCgChange?id="+this.currentItem.id+'&customId='+this.currentItem.customId+'&itemId='+this.currentItem.itemId+'&customName='+this.currentItem.customName+'&itemName='+this.currentItem.name})
+		},
+		goDetail(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/itemCustomDetail?parentId="+this.currentItem.id})
 		},
-		goOnChange(item){
-			this.$util.pageTo({ url: "/admin/book/itemCustomBookOnChange?id="+item.id+'&customId='+item.customId+'&itemId='+item.itemId+'&customName='+item.customName+'&itemName='+item.name})
+		goAction(item){
+			this.currentItem = item
+			this.$refs.actRef.open('center')
 		},
-		goRoadChange(item){
-			this.$util.pageTo({ url: "/admin/book/itemCustomBookRoadChange?id="+item.id+'&customId='+item.customId+'&itemId='+item.itemId+'&customName='+item.customName+'&itemName='+item.name})
+		onNum(){
+
+		},
+		outNum(){
+
+		},
+		toSj(){
+
+		},
+		toBox(){
+
 		},
-		goCgChange(item){
-			this.$util.pageTo({ url: "/admin/book/itemCustomBookCgChange?id="+item.id+'&customId='+item.customId+'&itemId='+item.itemId+'&customName='+item.customName+'&itemName='+item.name})
+		cancelBox(){
+
 		},
-		goDetail(item){
-			this.$util.pageTo({ url: "/admin/book/itemCustomDetail?parentId="+item.id})
+		cancelAct(){
+			this.$refs.actRef.close()
 		},
 		async init() {
 			if(this.option.itemId){

ghsApp/src/admin/order/statBook.vue

@@ -3,35 +3,37 @@
 		<view class="ex-page">
 		<view class="input-wrap_box">
 			<view>
-				<AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
+				<AppSearchModule placeholder="搜索花材" @input="searchFn"/>
 			</view>
 		</view>
 		<view class="top-bar">
-			<text @click="changeStaff()" style="margin-left:90upx;font-size:30upx;">{{selectStaff.id == 0 ?'选采购人':selectStaff.name}}</text>
-			<button class="admin-button-com mini-btn blue" style="margin-left:50upx;" @click="modifyBook(0)" v-if="Number(bookSn)>0">结束预订</button>
-			<button class="admin-button-com mini-btn blue" style="margin-left:50upx;" @click="modifyBook(1)" v-else>开启预订</button>
-			<button class="admin-button-com mini-btn blue" style="margin-left:50upx;" @click="goCg()">去采购</button>
+			<button class="admin-button-com middle blue" style="margin-left:80upx;" @click="changeStaff()" v-if="Number(bookSn)>0">
+				{{selectStaff.id == 0 ?'选采购人':selectStaff.name}}
+			</button>
+			<button class="admin-button-com middle blue" style="margin-left:60upx;" @click="modifyBook(0)" v-if="Number(bookSn)>0">结束预订</button>
+			<button class="admin-button-com middle blue" style="margin-left:60upx;" @click="modifyBook(1)" v-else>开启预订</button>
+			<button class="admin-button-com middle blue" style="margin-left:60upx;" @click="goCg()">去采购</button>
 		</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<t-table :headerBackgroundColor="'#F0F2F6'">
 					<t-tr header>
-						<t-th><view style="width:160upx;">花材</view></t-th>
-						<t-th>预订</t-th>
-						<t-th>上架</t-th>
-						<t-th>剩余</t-th>
-						<t-th>路上</t-th>
-						<t-th>待采</t-th>
+						<t-th><view style="width:160upx;color:black;font-weight:bold;">花材</view></t-th>
+						<t-th><view style="color:black;font-weight:bold;">预订</view></t-th>
+						<t-th><view style="color:black;font-weight:bold;">上架</view></t-th>
+						<t-th><view style="color:black;font-weight:bold;">剩余</view></t-th>
+						<t-th><view style="color:black;font-weight:bold;">路上</view></t-th>
+						<t-th><view style="color:black;font-weight:bold;">待采</view></t-th>
 					</t-tr>
 					<template v-if="!$util.isEmpty(profile)">
-						<view v-for="(item, index) in profile" :key="index">
+						<view v-for="(item, index) in profile" :key="index" @click="goAction(item)">
 							<t-tr>
-								<t-td><view style="color:#333333;font-size:25upx;width:160upx;text-align:left;height:60upx;display: flex;align-items: center;" @click="goAction(item)">{{item.name}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;" @click="goBookChange(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;" @click="goBookOnChange(item)">{{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.remainStockNum?parseFloat(item.remainStockNum):0}}</view></t-td>
-								<t-td><view style="color:#333333;font-size:25upx;height:60upx;display: flex;align-items: center;" @click="goBookRoadChange(item)">{{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;" @click="goBookCgChange(item)">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:26upx;width:160upx;text-align:left;height:60upx;display: flex;align-items: center;color:black;">{{item.name}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.bookNum?parseFloat(item.bookNum):0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.onNum?parseFloat(item.onNum):0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.remainStockNum?parseFloat(item.remainStockNum):0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.roadNum?parseFloat(item.roadNum):0}}</view></t-td>
+								<t-td><view style="color:#333333;font-size:26upx;height:60upx;display: flex;align-items: center;color:black;">{{item.needCgNum?parseFloat(item.needCgNum):0}}</view></t-td>
 							</t-tr>
 						</view>
 					</template>
@@ -52,19 +54,26 @@
 			</view>
       	</uni-popup>
 
-		<uni-popup ref="actRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
+		<uni-popup ref="actRef" background-color="#fff" type="center" :animation="false" class="class-popup-style" :is-mask-click="false">
 			<view style="max-height:90vh;overflow: scroll;padding:15upx;">
-				<view>
-					<input v-model="currentNum" type="Number" style="height:100upx;border:1upx solid #CCCCCC;text-align:center;font-size:32upx;" placeholder="数量" />
+				<view style="text-align:center;font-size:32upx;font-weight:bold;">{{ currentItem.name ? currentItem.name:'未命名' }}</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goDetail()">预订客户</button>
 				</view>
-				<view style="margin-top:6upx;">
-					<button class="admin-button-com big blue" style="margin-right:15upx;" @click="onNum()">上架</button>
-					<button class="admin-button-com big blue" @click="outNum()">下架</button>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goBookChange()">预订记录</button>
 				</view>
-				<view style="margin-top:20upx;">
-					<button class="admin-button-com big blue" style="margin-right:15upx;" @click="toSj()">上齐</button>
-					<button class="admin-button-com big blue" style="margin-right:15upx;" @click="toBox()">装箱</button>
-					<button class="admin-button-com big blue" @click="goDetal()">明细</button>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goBookOnChange()">上架记录</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goBookRoadChange()">路上记录</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big blue" style="width:420upx;" @click="goBookCgChange()">待采记录</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big default" style="width:420upx;" @click="cancelAct()">取消</button>
 				</view>
 			</view>
 		</uni-popup>
@@ -125,7 +134,7 @@ export default {
 	onPullDownRefresh() {
 		this.resetList();
 		this.getStatList().then(res => {
-			uni.stopPullDownRefresh();
+			uni.stopPullDownRefresh()
 		});
 	},
 	onLoad(e) {
@@ -156,7 +165,7 @@ export default {
 			this.$refs.staffRef.open('center')
 		},
 		goCg(){
-			this.$util.pageTo({ url: "/pagesPurchase/supplier",type:2})
+			this.$util.pageTo({ url: "/pagesPurchase/supplier"})
 		},
 		modifyBook(status){
 			let hint = status == 0 ?'确认结束？':'确认开启？'
@@ -195,22 +204,32 @@ export default {
 		},
 		toBox(){
 
+		},
+		cancelBox(){
+
+		},
+		cancelAct(){
+			this.$refs.actRef.close()
 		},
 		goDetail(){
 			this.$refs.actRef.close()
 			this.$util.pageTo({ url: "/admin/book/itemCustom?itemId="+this.currentItem.itemId+'&itemName='+this.currentItem.name})
 		},
-		goBookChange(item){
-			this.$util.pageTo({ url: "/admin/book/globalBookChange?itemId="+item.itemId+'&itemName='+item.name+'&id='+item.id})
+		goBookChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/globalBookChange?itemId="+this.currentItem.itemId+'&itemName='+this.currentItem.name+'&id='+this.currentItem.id})
 		},
-		goBookOnChange(item){
-			this.$util.pageTo({ url: "/admin/book/globalBookOnChange?itemId="+item.itemId+'&itemName='+item.name+'&id='+item.id})
+		goBookOnChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/globalBookOnChange?itemId="+this.currentItem.itemId+'&itemName='+this.currentItem.name+'&id='+this.currentItem.id})
 		},
-		goBookRoadChange(item){
-			this.$util.pageTo({ url: "/admin/book/globalBookRoadChange?itemId="+item.itemId+'&itemName='+item.name+'&id='+item.id})
+		goBookRoadChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/globalBookRoadChange?itemId="+this.currentItem.itemId+'&itemName='+this.currentItem.name+'&id='+this.currentItem.id})
 		},
-		goBookCgChange(item){
-			this.$util.pageTo({ url: "/admin/book/globalBookCgChange?itemId="+item.itemId+'&itemName='+item.name+'&id='+item.id})
+		goBookCgChange(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/book/globalBookCgChange?itemId="+this.currentItem.itemId+'&itemName='+this.currentItem.name+'&id='+this.currentItem.id})
 		},
 		selectDateFn(val) {
 			this.params = {...this.params,...val}
@@ -259,7 +278,7 @@ export default {
 		}
 	}
 	.main-view {
-		margin-top:100upx;
+		margin-top:110upx;
 		flex: 1;
 		background-color: #f9fbfc;
 		.space-view {

ghsApp/src/pages.json

@@ -483,7 +483,7 @@
 				{"path": "jdIndex","style": {"navigationBarTitleText": "基地和昆明批发教程"}},
 				{"path": "detail","style": {"navigationBarTitleText": ""}},
 				{"path": "itemCustom","style": {"navigationBarTitleText": "明细"}},
-				{"path": "itemCustomDetail","style": {"navigationBarTitleText": "送货信息"}},
+				{"path": "itemCustomDetail","style": {"navigationBarTitleText": "供货信息"}},
 				{"path": "custom","style": {"navigationBarTitleText": "预订客户"}},
 				{"path": "globalBookChange","style": {"navigationBarTitleText": "变动"}},
 				{"path": "globalBookCgChange","style": {"navigationBarTitleText": "变动"}},