Browse Source

bug 修复

lilei 2 years ago
parent
commit
98f119480d

+ 2 - 2
pages.json

@@ -235,7 +235,7 @@
 		    "path" : "pages/digitalShelf/scanBarcode/scanBarcode",
 		    "style" :                                                                                    
 		    {
-		        "navigationBarTitleText": "扫码货",
+		        "navigationBarTitleText": "扫码货",
 		        "enablePullDownRefresh": false
 		    }
 		    
@@ -289,7 +289,7 @@
             "path" : "pages/queryByCode/confirmQh",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "确认货",
+                "navigationBarTitleText": "确认货",
                 "enablePullDownRefresh": false
             }
             

+ 7 - 3
pages/digitalShelf/choosePart.vue

@@ -64,7 +64,9 @@
 											<view class="item-detail-text flex_1" v-if="item.affiliation=='SUPER_CATALOGUE'">
 												<view v-if="showPrice[0]">
 													<text class="item-price" v-if="showPrice[1]!='PURCHASES_PRICE'">¥{{item.price||0}}</text>
-													<text class="item-price" v-else></text>
+													<text class="item-price" v-else>
+														{{showPrice[2]?(item.cost||''):(isAdmin?(item.cost||''):'')}}
+													</text>
 												</view>
 											</view>
 											<view class="item-detail-text" v-if="item.currentInven">
@@ -156,7 +158,7 @@
 					<u-image width="44" height="44" :src="`/static/icon_shopping@3x.png`"></u-image>
 				</div>
 			</div>
-			<view v-if="showPrice[1]=='CAR_OWNER_PRICE'&&totalAmount">
+			<view v-if="showPrice[0]&&showPrice[1]=='CAR_OWNER_PRICE'&&totalAmount">
 				合计:<text>¥{{totalAmount}}</text>
 			</view>
 			<div>
@@ -190,7 +192,9 @@
 										<view class="item-detail-text flex_1" v-if="item.affiliation=='SUPER_CATALOGUE'">
 											<view v-if="showPrice[0]">
 												<text class="item-price" v-if="showPrice[1]=='CAR_OWNER_PRICE'">¥{{item.price||0}}</text>
-												<text class="item-price" v-else></text>
+												<text class="item-price" v-else>
+													{{showPrice[2]?(item.cost||''):(isAdmin?(item.cost||''):'')}}
+												</text>
 											</view>
 										</view>
 										<view class="item-detail-text flex_1" v-else>

+ 5 - 5
pages/digitalShelf/choosePartResult.vue

@@ -10,8 +10,8 @@
 					</view>
 					<view class="messageText" v-html="info&&info.shelfOrder&&info.shelfOrder.remindMessage||''"></view>
 					<!-- <view class="button-group"> -->
-						<!-- <button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码货</button> -->
-						<!-- <button :hover-stop-propagation="true" :loading="loading" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键货</button> -->
+						<!-- <button :hover-stop-propagation="true" @click="toScan" v-if="state == 1&&partList.length" class="back" size="mini">扫码货</button> -->
+						<!-- <button :hover-stop-propagation="true" :loading="loading" @click="onceQh" v-if="state == 1&&partList.length" class="action" size="mini">一键货</button> -->
 						<!-- <button :hover-stop-propagation="true" @click="toSettle" v-if="state == 0" class="actionFail" size="mini">去结算</button> -->
 					<!-- </view> -->
 				</view>
@@ -192,18 +192,18 @@
 		 changeTab(index){
 			 this.current = index
 		 },
-		 // 扫码
+		 // 扫码
 		 toScan(){
 			 uni.redirectTo({
 			 	url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn
 			 })
 		 },
-		 // 一键
+		 // 一键
 		 onceQh(item,index){
 		 	const _this = this
 		 	uni.showModal({
 		 		title: '提示',
-		 		content: '确认一键货吗?',
+		 		content: '确认一键货吗?',
 		 		success: (ret) => {
 		 		  if(ret.confirm){
 		 			  _this.loading = true

+ 3 - 3
pages/digitalShelf/orderList.vue

@@ -54,7 +54,7 @@
 									 <view style="text-align: right;">
 										 <button :hover-stop-propagation="true" @click.stop="deleteRow(item,index)" v-if="item.billState != 'CLOSE'&&item.settleState=='WAIT'" class="action del" size="mini">取消订单</button>
 										 <!-- <button :hover-stop-propagation="true" @click.stop="sanCodeRow(item)" v-if="item.billState == 'WAIT'" class="action finish" size="mini">扫码取货</button> -->
-										 <!-- <button :hover-stop-propagation="true" @click.stop="onceQh(item,index)" :loading="loading" v-if="item.billState == 'WAIT'" class="action finish" size="mini">一键取货</button> -->
+										 <button :hover-stop-propagation="true" @click.stop="onceQh(item,index)" :loading="loading" v-if="item.billState == 'WAIT'" class="action finish" size="mini">一键取货</button>
 									 </view>
 								 </view>
 							 </view>
@@ -98,8 +98,8 @@
 						count: 0
 					  },
 				  ],
-				current: 0,
-				swiperCurrent: 0,
+				current: 1,
+				swiperCurrent: 1,
 				// 查询条件
 				pageNo: 1,
 				pageSize: 10,

+ 6 - 6
pages/digitalShelf/scanBarcode/scanBarcode.vue

@@ -48,7 +48,7 @@
 				点击扫码
 			</u-button>
 			<u-button v-else :throttle-time="100" @click="outShelfOrder" :custom-style="{ background: '#066cff', color: '#fff',width:'400rpx' }" shape="circle" type="info">
-				确认
+				确认
 			</u-button>
 		</view>
 	</view>
@@ -101,11 +101,11 @@ export default {
 			  if(res.status == 200){
 				  this.info = res.data
 				  this.partList = res.data.shelfOrderDetailList
-				  // 此单已全部扫码,是否确认
+				  // 此单已全部扫码,是否确认
 				  if(this.hasScanFinish){
 					  uni.showModal({
 					  	title: '扫码成功',
-					  	content: '此单已全部扫码,是否确认货?',
+					  	content: '此单已全部扫码,是否确认货?',
 					  	success: (ret) => {
 					  	  if(ret.confirm){
 					  		  this.outShelfOrder()
@@ -120,18 +120,18 @@ export default {
 			  }
 		  })
 		},
-		// 确认
+		// 确认
 		outShelfOrder(){
 			if(this.hasScanFinish){
 				outShelfOrder({sn:this.shelfOrderSn}).then(res => {
-					console.log(res,'确认货')
+					console.log(res,'确认货')
 					if(res.status == 200){
 						uni.$emit("refreshOrder")
 						uni.navigateBack()
 					}
 				})
 			}else{
-				this.message("请先扫码货")
+				this.message("请先扫码货")
 			}
 		},
 		confimInfo(msg,type){

+ 1 - 1
pages/digitalShelf/settlementManage/settlementSxDetail.vue

@@ -24,7 +24,7 @@
 		<view class="ds-box">
 			<scroll-view style="height: calc(100vh - 370upx);position: relative;" scroll-y @scrolltolower="loadMore">
 				 <view class="notes-msg" v-if="tabIndex==1">
-				 	已冻结金额是指状态为“待货”的订单结算金额合计,暂时无需支付,但是会占用授信额度,请尽快处理
+				 	已冻结金额是指状态为“待货”的订单结算金额合计,暂时无需支付,但是会占用授信额度,请尽快处理
 				 </view>
 				 <!-- 列表 -->
 				 <view class="ds-list" v-for="item in list" :key="item.id">

+ 1 - 1
pages/digitalShelf/tempOrderList/orderDetail.vue

@@ -136,7 +136,7 @@
 		 		title: title
 		 	})
 		 }, 
-		 // 打开扫描
+		 // 打开扫描
 		 sanCodeRow () {
 			 uni.navigateTo({
 				url:"/pages/digitalShelf/scanBarcode/scanBarcode?shelfOrderSn="+this.shelfOrderSn

+ 1 - 1
pages/digitalShelf/tempOrderList/tempOrderList.vue

@@ -208,7 +208,7 @@
 					url: "/pages/digitalShelf/tempOrderList/orderDetail?orderSn="+item.tempSn+"&state="+(item.billState == 'FINISH'?1:0)
 				})
 			},
-			// 获取待货数量
+			// 获取待货数量
 			async getWaitTotal(){
 				 const ret = await shelfTempTotalWaitQty({billStateList:['WAIT_AUDIT','AUDIT_REJECT','WAIT_OUT_WAREHOUSE']}).then(res => res.data)
 				 this.tabList[1].count = ret || 0

+ 3 - 3
pages/queryByCode/confirmQh.vue

@@ -27,7 +27,7 @@
 		 </view>
 		 <view class="buttons">
 			 <u-button :throttle-time="100" :loading="loading" @click="onSubmit" :custom-style="{ background: '#066cff', color: '#fff',width:'400rpx' }" shape="circle" type="info">
-			 	确认
+			 	确认
 			 </u-button>
 		 </view>
 	</view>
@@ -62,7 +62,7 @@
 				const _this = this
 				uni.showModal({
 					title: '提示',
-					content: '取货后扣减库存,确认取货吗?',
+					content: '拿货后扣减库存,确认拿货吗?',
 					confirmText: '确定',
 					success(res) {
 						if(res.confirm){
@@ -77,7 +77,7 @@
 					url: "/pages/digitalShelf/orderDetail?shelfOrderSn="+data.shelfOrderSn
 				})
 			},
-			// 确认
+			// 确认
 			 outShelfOrder(){
 				 const _this = this
 				 this.loading = true

+ 2 - 2
pages/queryByCode/queryByCode.vue

@@ -93,7 +93,7 @@
 			uni.$off("updateQueryByCodeList")
 		},
 		methods: {
-			//
+			//
 			toEdit(item){
 				if(item.currentInven){
 					const params = {
@@ -107,7 +107,7 @@
 				}else{
 					uni.showToast({
 						icon:'none',
-						title: '库存不足,不能货!',
+						title: '库存不足,不能货!',
 						duration: 4000
 					})
 				}