Browse Source

bug 修复

lilei 2 years ago
parent
commit
d510d4eac7

+ 2 - 2
pages.json

@@ -244,7 +244,7 @@
             "path" : "pages/digitalShelf/tempOrderList/tempOrderList",
             "path" : "pages/digitalShelf/tempOrderList/tempOrderList",
             "style" :                                                                                    
             "style" :                                                                                    
             {
             {
-                "navigationBarTitleText": "临配订单",
+                "navigationBarTitleText": "急送订单",
                 "enablePullDownRefresh": false
                 "enablePullDownRefresh": false
             }
             }
             
             
@@ -253,7 +253,7 @@
             "path" : "pages/digitalShelf/tempOrderList/orderDetail",
             "path" : "pages/digitalShelf/tempOrderList/orderDetail",
             "style" :                                                                                    
             "style" :                                                                                    
             {
             {
-                "navigationBarTitleText": "临配订单详情",
+                "navigationBarTitleText": "急送订单详情",
                 "enablePullDownRefresh": false
                 "enablePullDownRefresh": false
             }
             }
             
             

+ 3 - 3
pages/digitalShelf/choosePart.vue

@@ -74,7 +74,7 @@
 												<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
 												<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
 											</view>
 											</view>
 											<view class="item-detail-text" v-if="item.affiliation=='SUPER_CATALOGUE'||!item.currentInven">
 											<view class="item-detail-text" v-if="item.affiliation=='SUPER_CATALOGUE'||!item.currentInven">
-												<text v-if="!item.checked" @click="addPart(item)" class="phtxt">我要临配</text>
+												<text v-if="!item.checked" @click="addPart(item)" class="phtxt">我要急送</text>
 												<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
 												<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
 											</view>
 											</view>
 										</view>
 										</view>
@@ -127,7 +127,7 @@
 											<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
 											<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
 										</view>
 										</view>
 										<view class="item-detail-text" v-else>
 										<view class="item-detail-text" v-else>
-											<text @click="addPart(item)" v-if="!item.checked" class="phtxt">我要临配</text>
+											<text @click="addPart(item)" v-if="!item.checked" class="phtxt">我要急送</text>
 											<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
 											<u-number-box v-else @change="updateNums" @blur="updateNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
 										</view>
 										</view>
 									</view>
 									</view>
@@ -177,7 +177,7 @@
 						</view>
 						</view>
 						<view class="item-info uni-col-10">
 						<view class="item-info uni-col-10">
 							<view class="item-name">
 							<view class="item-name">
-								<text class="item-tempPart" v-if="!item.currentInven">临配</text>
+								<text class="item-tempPart" v-if="!item.currentInven">急送</text>
 								<text>{{item.name}}</text>
 								<text>{{item.name}}</text>
 							</view>
 							</view>
 							<view class="item-detail">
 							<view class="item-detail">

+ 2 - 2
pages/digitalShelf/choosePartResult.vue

@@ -19,7 +19,7 @@
 		</view>
 		</view>
 		<view class="order-body">
 		<view class="order-body">
 			<view class="info partList" v-if="state == 1">
 			<view class="info partList" v-if="state == 1">
-				<u-tabs :list="[{name:'货架订单',value:0},{name:'临配订单',value:1}]" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
+				<u-tabs :list="[{name:'货架订单',value:0},{name:'急送订单',value:1}]" :is-scroll="false" :current="current" @change="changeTab"></u-tabs>
 				<view v-if="current==0">
 				<view v-if="current==0">
 					<view class="infoList" v-if="partList.length">
 					<view class="infoList" v-if="partList.length">
 						<view class="title">请在货架上按照指定位置拿取配件</view>
 						<view class="title">请在货架上按照指定位置拿取配件</view>
@@ -56,7 +56,7 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view v-else>
 					<view v-else>
-						<u-empty :src="`/static/nodata.png`" icon-size="180" text="暂无临配订单" mode="list" :margin-top="30"></u-empty>
+						<u-empty :src="`/static/nodata.png`" icon-size="180" text="暂无急送订单" mode="list" :margin-top="30"></u-empty>
 					</view>
 					</view>
 					<view v-for="item in tempPartList" :key="item.id" class="flex align-center item-list">
 					<view v-for="item in tempPartList" :key="item.id" class="flex align-center item-list">
 						<view>
 						<view>

+ 1 - 1
pages/morePage/morePage.vue

@@ -22,7 +22,7 @@
 				<u-cell-item title="货架订单" v-if="$hasPermissions('M_shelfOrder_mini')" @click="toPage('/pages/digitalShelf/orderList')" :title-style="{fontSize:'1em'}">
 				<u-cell-item title="货架订单" v-if="$hasPermissions('M_shelfOrder_mini')" @click="toPage('/pages/digitalShelf/orderList')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 					<text slot="icon"></text>
 				</u-cell-item>
 				</u-cell-item>
-				<u-cell-item title="临配订单" v-if="$hasPermissions('M_tempShelfOrder_mini')" @click="toPage('/pages/digitalShelf/tempOrderList/tempOrderList')" :title-style="{fontSize:'1em'}">
+				<u-cell-item title="急送订单" v-if="$hasPermissions('M_tempShelfOrder_mini')" @click="toPage('/pages/digitalShelf/tempOrderList/tempOrderList')" :title-style="{fontSize:'1em'}">
 					<text slot="icon"></text>
 					<text slot="icon"></text>
 				</u-cell-item>
 				</u-cell-item>
 			</u-cell-group>
 			</u-cell-group>