shish пре 2 година
родитељ
комит
8ed965103a

+ 1 - 1
ghsApp/src/admin/book/custom.vue

@@ -45,7 +45,7 @@
 			<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;">
-					<button class="admin-button-com big blue" style="width:420upx;" @click="goDetail()">预订花材</button>
+					<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>

+ 23 - 21
ghsApp/src/admin/book/itemCustom.vue

@@ -51,44 +51,48 @@
 		</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="max-height:98vh;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;">
+				<view style="margin-top:6upx;">
 					<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="addOnNum()">上架</button>
 					<button class="admin-button-com big blue" style="width:200upx;" @click="delOnNum()">下架</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<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;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big blue" style="width:420upx;" @click="goDetail()">供货明细</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big blue" style="width:420upx;" @click="goChange()">预订记录</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big blue" style="width:420upx;" @click="goOnChange()">上架记录</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big blue" style="width:420upx;" @click="goRoadChange()">路上记录</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big blue" style="width:420upx;" @click="goCgChange()">待采记录</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big blue" style="width:420upx;" @click="loanStock()">借库存</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
+					<button class="admin-button-com big default" style="margin-right:20upx;width:200upx;" @click="">加库存上架</button>
+					<button class="admin-button-com big default" style="width:200upx;" @click="">下架报损</button>
+				</view>
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big default" style="width:420upx;" @click="getStockDetail()">库存明细</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big default" style="width:420upx;" @click="cancelBox()">取消装箱</button>
 				</view>
-				<view style="margin-top:10upx;">
+				<view style="margin-top:6upx;">
 					<button class="admin-button-com big default" style="width:420upx;" @click="cancelAct()">取消</button>
 				</view>
 			</view>
@@ -227,15 +231,13 @@ export default {
 		toBox(){
 			let that = this
 			this.$refs.actRef.close()
-			this.$util.confirmModal({content:'确认已装箱?'},() => {
-				toBoxFn({id:this.currentItem.id}).then(res=>{
-					if(res.code == 1){
-						that.$msg('操作成功')
-						setTimeout(() => {
-							that.getStatList()
-						}, 1000)
-					}
-				})
+			toBoxFn({id:this.currentItem.id}).then(res=>{
+				if(res.code == 1){
+					that.$msg('操作成功')
+					setTimeout(() => {
+						that.getStatList()
+					}, 1000)
+				}
 			})
 		},
 		cancelBox(){

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

@@ -69,7 +69,7 @@
 			<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;">
-					<button class="admin-button-com big blue" style="width:420upx;" @click="goDetail()">预订客户</button>
+					<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="goBookChange()">预订记录</button>