优化

pages/pda/common.js

@@ -102,14 +102,8 @@ export const tableHeader = selectEquiType => {
 			
 	    case 11:
 			return [
-				{
-					label: '位置',
-					prop: 'region'
-				},
-				{
-					label: '状态',
-					prop: 'region'
-				},
+			
+			
 			]
 				
 		case 14:

pages/pda/jobBooking/components/aridRegion.vue

@@ -23,11 +23,11 @@
 						<view class="lable rx-cc">编号</view>
 						<view class="content rx-bc">
 							<view>{{item.code}}</view>
-							<view class="stateColor">空闲</view>
+							<view :style="{ color:  item.status == 0 ? '#157A2C' :'#FFA929' }"  >{{ item.status == 0 ? '空闲' : item.status == 1 ? '占用' : ''}}</view>
 						</view>
 					</view>
 
-
+                    
 
 					<view class="item">
 						<view class="lable rx-cc">名称</view>
@@ -36,7 +36,7 @@
 
 					<view class="item">
 						<view class="lable rx-cc">位置</view>
-						<view class="content">{{ item.region }} {{}} </view>
+						<view class="content">{{ item.region }}  </view>
 					</view>
 
 
@@ -241,9 +241,6 @@
 						color: #404446;
 					}
 
-					.stateColor {
-						color: $theme-color;
-					}
 
 				}
 

pages/pda/workOrder/search/index.vue

@@ -29,9 +29,8 @@
 				<checkbox-group v-for="(item, index) in list" :key="index" @change="e => selectVal(e, item, index)">
 					<label class="listBox rx-bs">
 
-						<view class="listBox-sel">
-
-							<checkbox :value="item.code" color="#fff" :disabled="item.disabled"
+						<view class="listBox-sel" >
+							<checkbox  v-if='item.rootCategoryLevelId != 11 || (item.rootCategoryLevelId == 11 && item.status != 1)':value="item.code" color="#fff" :disabled="item.disabled"
 								:checked="item.checked" />
 						</view>
 
@@ -50,6 +49,27 @@
 								<view class="items" v-if='item.rootCategoryLevelId != 11'>
 									可用库存：{{ item.availableCountBase }} {{item.unit}}
 								</view>
+								
+								<view class="items" v-if='item.rootCategoryLevelId == 11'>
+								  	<text    :style="{ color:  item.status == 0 ? '#157A2C' :'#FFA929' }"   >状态：{{ item.status == 0 ? '空闲' : item.status == 1 ? '占用' : ''}}</text>
+								</view>
+								
+								
+								<view class="items" v-if='item.rootCategoryLevelId == 11'>
+									<view class="time rx-sc">
+										剩余时间：<u-count-down v-if='item.occupationTime && item.occupationTime > 0' :time="item.occupationTime" format="HH:mm:ss"></u-count-down>
+									</view>
+								</view>
+								
+	
+						
+								<view class="items" v-if='item.rootCategoryLevelId == 11'>
+									位置：{{ item.region }}
+								</view>
+								
+							
+								
+									
 
 							</view>
 
@@ -285,8 +305,8 @@
 					if (this.rootCategoryLevelId == '11') {
 
 						res.list.forEach(e => {
-							if (e.extInfo?.positionList && e.extInfo?.positionList.length != 0) {
-								e.extInfo.positionList.map(i => {
+							if (e.aridRegionList && e.aridRegionList.length != 0) {
+								e.aridRegionList.map(i => {
 									const checked =
 										this.memoList.findIndex(itm => itm.id === i.id) > -1
 
@@ -306,7 +326,7 @@
 						})
 
 
-						console.log(this.list)
+					
 
 					} else {
 						this.list.push(
@@ -335,6 +355,10 @@
 
 			//勾选
 			selectVal(e, val, index) {
+				console.log(val)
+				if(val.rootCategoryLevelId == 11 && val.status == 1) {
+					return false
+				}
 				this.list[index].checked = !this.list[index].checked
 				this.seletedAll = !this.list.some(item => !item.checked)
 				const idx = this.memoList.findIndex(
@@ -447,6 +471,12 @@
 				width: 50%;
 				margin-top: 8rpx;
 			}
+			.time{
+				color: #FFA929;
+				/deep/ .u-count-down__text{
+					color: #FFA929;
+				}
+			}
 		}
 	}
 </style>