guzijian / garbage-removal · Commits

Commit 2837c826aeeb34b593d2ee0d32298d313762fc8d

Authored by lichao
1 parent 1e6e210a
build: skipped

提交

Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
garbage-removal/src/pages/order-info/order-other/detail/index.vue
  View file @2837c82
@@ -168,8 +168,8 @@ @@ -168,8 +168,8 @@
168 buttonSize="46" 168 buttonSize="46"
169 inputWidth="70"> 169 inputWidth="70">
170 </u-number-box> 170 </u-number-box>
171 -<!-- :disabled="!isDriverAssigned"-->  
172 - <u-button type="primary" color="#19a97c" style="margin-left: 20rpx; height: 46rpx; width: 120rpx;" @click="confirmAddVehicle" >确定</u-button> 171 +
  172 + <u-button type="primary" color="#19a97c" style="margin-left: 20rpx; height: 46rpx; width: 120rpx;" @click="confirmAddVehicle" :disabled="!isDriverAssigned">确定</u-button>
173 </view> 173 </view>
174 </view> 174 </view>
175 </view> 175 </view>
@@ -266,6 +266,13 @@ @@ -266,6 +266,13 @@
266 v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.garCancelFlag === 0" 266 v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.garCancelFlag === 0"
267 @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button> 267 @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
268 <u-button 268 <u-button
  269 + @click="handleOrder(orderId)"
  270 + shape="square"
  271 + color="#19a97c"
  272 + text="开始运输"
  273 + :disabled="!isDriverAndDisposalAssigned()">
  274 + </u-button>
  275 + <u-button
269 v-if="dataGram.garOrderScanHandlerFlag === 0 && userType == '用户' && dataGram.garOrderHandlerStatus != 3 && dataGram.garAskStatus != '1'" 276 v-if="dataGram.garOrderScanHandlerFlag === 0 && userType == '用户' && dataGram.garOrderHandlerStatus != 3 && dataGram.garAskStatus != '1'"
270 @click="handlerUpdateOrderClick()" shape="square" color="#19a97c" text="修改车辆数"></u-button> 277 @click="handlerUpdateOrderClick()" shape="square" color="#19a97c" text="修改车辆数"></u-button>
271 </view> 278 </view>
@@ -274,13 +281,6 @@ @@ -274,13 +281,6 @@
274 <view class="button-group-wrap" v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.handleFlag && dataGram.garCancelFlag === 0"> 281 <view class="button-group-wrap" v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.handleFlag && dataGram.garCancelFlag === 0">
275 <u-button @click="handleOrderDispatchClick(orderId)" shape="square" color="#19a97c" text="分配驾驶员"></u-button> 282 <u-button @click="handleOrderDispatchClick(orderId)" shape="square" color="#19a97c" text="分配驾驶员"></u-button>
276 <u-button @click="handleDisposalDispatchClick(orderId)" shape="square" color="#19a97c" text="分配处置场所"></u-button> 283 <u-button @click="handleDisposalDispatchClick(orderId)" shape="square" color="#19a97c" text="分配处置场所"></u-button>
277 - <u-button  
278 - @click="handleOrder(orderId)"  
279 - shape="square"  
280 - color="#19a97c"  
281 - text="开始运输"  
282 - :disabled="!isDriverAndDisposalAssigned()">  
283 - </u-button>  
284 </view> 284 </view>
285 285
286 <view class="button-group-spread" v-else-if="!isAllTripsCompleted()"> 286 <view class="button-group-spread" v-else-if="!isAllTripsCompleted()">