lilei vor 1 Jahr
Ursprung
Commit
38c11a5ed4

+ 2 - 17
pages.json

@@ -170,23 +170,8 @@
 		    "path" : "pages/shuntBackManage/detail",
 		    "style" :                                                                                    
 		    {
-		        "navigationBarTitleText": "调回详情",
-		        "enablePullDownRefresh": false,
-				"navigationStyle":"custom",
-				"app-plus":{
-					"titleNView": {
-						"titleAlign": "left",
-						"buttons": [ //原生标题栏按钮配置,
-							{
-								"text": "\ue859 生成销售退货单" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
-								"fontSrc": "/static/iconfont/iconfont.ttf",
-								"fontSize": "14",
-								"color": "#ffffff",
-								"width":"140px"
-							}
-						]
-					}
-				}
+		        "navigationStyle": "custom" ,// 隐藏系统导航栏
+		        "navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 		    }
 		},
 		{

+ 2 - 1
pages/replenishmentManage/detail.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="replenishment-detail-wrap">
 		<u-navbar back-text="补货单详情" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder" v-if="pageType=='success'&&totalNums">
+			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder" 
+			v-if="pageType=='success'&&totalNums&&basicInfoData&&basicInfoData.shelfInfo.state!='WRITE_OFF'&&basicInfoData.shelfInfo.state!='SUSPEND'">
 				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
 				<text style="margin-left: 6rpx;">生成销售单</text>
 			</view>

+ 1 - 0
pages/replenishmentManage/replenishmentList.vue

@@ -16,6 +16,7 @@
 							<view>
 							{{item.shelfInfo&&item.shelfInfo.shelfName}}
 							<u-tag size='mini' type="info" shape="circle" v-if="item.shelfInfo&&item.shelfInfo.state=='WRITE_OFF'" text="已注销"></u-tag>
+							<u-tag size='mini' type="info" shape="circle" v-if="item.shelfInfo&&item.shelfInfo.state=='SUSPEND'" text="已暂停"></u-tag>
 							<u-tag size='mini' type="info" shape="circle" v-if="item.shelfInfo&&item.shelfInfo.state=='DISABLED'" text="已停用"></u-tag>
 							</view>
 							<view>

+ 9 - 4
pages/shuntBackManage/detail.vue

@@ -1,5 +1,13 @@
 <template>
-	<view class="shuntBack-detail-wrap" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
+	<view class="shuntBack-detail-wrap">
+		<u-navbar back-text="调回详情" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
+			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="refundModal = true" 
+			v-if="basicInfoData&&basicInfoData.shelfInfo.state!='WRITE_OFF'&&basicInfoData.shelfInfo.state!='SUSPEND'">
+				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+				<text style="margin-left: 6rpx;">生成销售退货单</text>
+			</view>
+		</u-navbar>
+		
 		<view class="shuntBack-detail-body">
 			<view class="head-info" v-if="basicInfoData">
 				<view class="states">
@@ -86,9 +94,6 @@
 			this.getDetail()
 			this.getPartList()
 		},
-		onNavigationBarButtonTap(){
-			this.refundModal = true;
-		},
 		methods: {
 			// 查询详情
 			getDetail(){

+ 5 - 1
pages/shuntBackManage/shelfList.vue

@@ -20,7 +20,11 @@
 					<view class="item-info">
 						<view class="item-name clearFix">
 							<text class="barBox"></text>
-							<text class="itemName">{{ item.shelfName }}</text>
+							<text class="itemName">
+								<text style="margin-right: 0.5rem;">{{item.shelfName}}</text>
+								<u-tag size='mini' type="info" shape="circle" v-if="item.state=='SUSPEND'" text="已暂停"></u-tag>
+								<u-tag size='mini' type="info" shape="circle" v-if="item.state=='DISABLED'" text="已停用"></u-tag>
+							</text>
 						</view>
 						<view class="item-detail">
 							<view>

+ 6 - 1
pages/shuntBackManage/shuntBackList.vue

@@ -13,7 +13,12 @@
 						:key="item.id+'-'+sindex"
 						@click="viewRow(item)" >
 							<view class="check-row">
-								<view>{{item.shelfInfo&&item.shelfInfo.shelfName}}</view>
+								<view>
+								<text style="margin-right: 0.5rem;">{{item.shelfInfo&&item.shelfInfo.shelfName}}</text>
+								<u-tag size='mini' type="info" shape="circle" v-if="item.shelfInfo&&item.shelfInfo.state=='WRITE_OFF'" text="已注销"></u-tag>
+								<u-tag size='mini' type="info" shape="circle" v-if="item.shelfInfo&&item.shelfInfo.state=='SUSPEND'" text="已暂停"></u-tag>
+								<u-tag size='mini' type="info" shape="circle" v-if="item.shelfInfo&&item.shelfInfo.state=='DISABLED'" text="已停用"></u-tag>
+								</view>
 								<view>
 									<text :style="{color: item.billState=='FINISH'?$config('successColor'):item.billState=='CANCEL'?$config('infoColor'):$config('errorColor')}">{{item.billStateDictValue}}</text>
 								</view>

+ 3 - 2
pages/soldOut/shelfList.vue

@@ -45,8 +45,9 @@
 				<view class="nav-right-item" v-for="(item, index) in shelfList" :key="item.id" @click="viewDetail(item)">
 					<view class="item-info">
 						<view class="item-name">
-							<text style="margin-right: 0.6rem;">{{item.shelfName}}</text>
-							<u-tag size='mini' type="info" shape="circle" v-if="item.state!='ENABLE'" text="已暂停"></u-tag>
+							<text style="margin-right: 0.5rem;">{{item.shelfName}}</text>
+							<u-tag size='mini' type="info" shape="circle" v-if="item.state=='SUSPEND'" text="已暂停"></u-tag>
+							<u-tag size='mini' type="info" shape="circle" v-if="item.state=='DISABLED'" text="已停用"></u-tag>
 						</view>
 						<view class="item-detail">
 							<view>