lilei 1 year ago
parent
commit
4c4d4e3dc4

+ 4 - 1
pages/replenishmentManage/replenishmentList.vue

@@ -13,7 +13,10 @@
 					:key="item.id+'-'+sindex"
 					@click="viewRow(item)" >
 						<view class="check-row">
-							<view>{{item.shelfInfo&&item.shelfInfo.shelfName}}</view>
+							<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>
+							</view>
 							<view>
 								<text :style="{color: item.billState=='FINISH'?$config('successColor'):item.billState=='CANCEL'?$config('infoColor'):$config('errorColor')}">{{item.billStateDictValue}}</text>
 							</view>

+ 5 - 2
pages/shelfOrder/shelfList.vue

@@ -23,7 +23,10 @@
 						v-for="(item, index) in shelfList" 
 						:key="item.shelfSn"
 						:name="item.shelfSn"
-					>{{item.shelfName}}</u-checkbox>
+					>
+					<text style="margin-right: 0.5rem;">{{item.shelfName}}</text>
+					<text style="font-size: 0.6rem;background-color: #f8f8f8;">{{item.state=='WRITE_OFF'?'已注销':''}}</text>
+					</u-checkbox>
 				</u-checkbox-group>
 				<view v-if="shelfList&&shelfList.length==0">
 					<u-empty v-if="status!='loading'" :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="50"></u-empty>
@@ -130,7 +133,7 @@
 				    pageNo: this.pageNo,
 				    pageSize: this.pageSize,
 					shelfName: this.shelfName,
-					stateSet: [ 'ENABLE', 'SUSPEND', 'DISABLED' ]
+					// stateSet: [ 'ENABLE', 'SUSPEND', 'DISABLED' ]
 				}
 				_this.status = 'loading'
 				getShelfList(params).then(res => {

+ 2 - 2
pages/soldOut/shelfList.vue

@@ -45,8 +45,8 @@
 				<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>{{item.shelfName}}</text>
-							<text style="color: #ff5500;" v-if="item.state!='ENABLE'">(状态为"已暂停")</text>
+							<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>
 						</view>
 						<view class="item-detail">
 							<view>