借库存ok

ghsApp/src/admin/book/custom.vue

@@ -54,9 +54,6 @@
 				<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 blue" style="width:420upx;" @click="getStock()">借库存</button>
-				</view>
 				<view style="margin-top:10upx;">
 					<button class="admin-button-com big default" style="width:420upx;" @click="cancelAct()">取消</button>
 				</view>

ghsApp/src/admin/book/itemCustom.vue

@@ -70,7 +70,10 @@
 					<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 blue" style="width:420upx;" @click="getStock()">借库存</button>
+					<button class="admin-button-com big blue" style="width:420upx;" @click="loanStock()">借库存</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big default" style="width:420upx;" @click="getStockDetail()">库存明细</button>
 				</view>
 				<view style="margin-top:10upx;">
 					<button class="admin-button-com big default" style="width:420upx;" @click="cancelBox()">取消装箱</button>
@@ -141,8 +144,13 @@ export default {
 			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})
 		},
-		getStock(){
-			this.$msg('开发中')
+		loanStock(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/admin/item/loan?itemId="+this.currentItem.itemId})
+		},
+		getStockDetail(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/pagesStorehouse/stockWarn/detailed?id="+this.currentItem.itemId+'&name='+this.currentItem.name})
 		},
 		goDetail(){
 			this.$refs.actRef.close()

ghsApp/src/admin/item/loan.vue

@@ -116,15 +116,21 @@ export default {
 	},
 	methods: {
 		loanItem(item){
+			let that = this
 			if(Number(item.bigCount)<=0){
 				this.$msg('请填写数量')
 				return false
 			}
-			loanFn({inId:this.inId,outId:item.id,num:bigCount}).then(res=>{
-				if(res.code == 1){
-					this.$msg('操作成功')
-					this.goBack()
-				}
+			this.$util.confirmModal({content:'确认借用？'},() => {
+				uni.showLoading()
+				loanFn({inId:this.inId,outId:item.id,num:item.bigCount}).then(res=>{
+					if(res.code == 1){
+						this.$msg('操作成功')
+						setTimeout(function(){
+							that.goBack()
+						},1000)
+					}
+				})
 			})
 		},
 		goBack(){

ghsApp/src/admin/order/statBook.vue

@@ -73,7 +73,10 @@
 					<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 blue" style="width:420upx;" @click="getStock()">借库存</button>
+					<button class="admin-button-com big blue" style="width:420upx;" @click="loanStock()">借库存</button>
+				</view>
+				<view style="margin-top:10upx;">
+					<button class="admin-button-com big default" style="width:420upx;" @click="getStockDetail()">库存明细</button>
 				</view>
 				<view style="margin-top:10upx;">
 					<button class="admin-button-com big default" style="width:420upx;" @click="cancelAct()">取消</button>
@@ -234,10 +237,14 @@ export default {
 			this.$refs.actRef.close()
 			this.$util.pageTo({ url: "/admin/book/globalBookCgChange?itemId="+this.currentItem.itemId+'&itemName='+this.currentItem.name+'&id='+this.currentItem.id})
 		},
-		getStock(){
+		loanStock(){
 			this.$refs.actRef.close()
 			this.$util.pageTo({ url: "/admin/item/loan?itemId="+this.currentItem.itemId})
 		},
+		getStockDetail(){
+			this.$refs.actRef.close()
+			this.$util.pageTo({ url: "/pagesStorehouse/stockWarn/detailed?id="+this.currentItem.itemId+'&name='+this.currentItem.name})
+		},
 		selectDateFn(val) {
 			this.params = {...this.params,...val}
 			this.init()

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -103,6 +103,8 @@ export default {
 			let that = this
 			if(item.recordType == 1){
 				that.pageTo({ url: '/pagesPurchase/info?orderSn='+item.orderSn})
+			}else if(item.recordType == 4){
+				that.pageTo({ url: '/pagesStorehouse/inventory/details?orderSn='+item.orderSn})
 			}else if(item.recordType == 5){
 				uni.showLoading()
 				getInfoByOrderSn({orderSn:item.orderSn}).then(res=>{