订单异常优化

src/views/ecw/order/exception/index.vue

@@ -12,17 +12,17 @@
          <span style="margin: 0 8px;">{{$t('到')}}</span>
           <el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
         </el-form-item>
-        <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
-          <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发仓')" clearable>
+       <el-form-item :label="$t('始发仓')" prop="destinationId">
+          <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发仓')" clearable>
             <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
-          <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的仓')" clearable>
+        <el-form-item :label="$t('目的仓')" prop="destinationId">
+          <el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的仓')" clearable>
             <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item :label="$t('始发地')+':'">
+<!--       <el-form-item :label="$t('始发地')+':'">
             <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')" clearable>
                 <el-option v-for="item in expoerCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
             </el-select>
@@ -98,7 +98,9 @@
       </el-table-column>
       <el-table-column :label="$t('订单号')" align="center">
         <template slot-scope="scope">
-             <span>{{scope.row.orderNo}}</span>
+         <router-link :to="{path: '/order/detail',query: {orderId: scope.row.orderId}}" class="link-type">
+           <span>{{ scope.row.orderNo }}</span>
+         </router-link>
              <span>{{specialNeedTag(scope.row.specialNeed)}}</span>
          </template>
        </el-table-column>
@@ -198,8 +200,8 @@ export default {
   },
   created() {
     this.getList();
-    
-    // getTradeCityList().then(res => this.tradeCityList = res.data)
+
+    getTradeCityList().then(res => this.tradeCityList = res.data)
     listServiceUser().then(r => {
       this.creatorData = r.data
     })

src/views/ecw/order/pending.vue

@@ -194,7 +194,7 @@ export default {
           var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
           if(productData){
             getProduct(productData.prodId).then(res=>{
-                let url = '../../lineProject/product-price/edit?product_id='+productData.prodId+'&product_type='+res.data.typeId
+                let url = '../../lineProject/product-price/edit?product_id='+productData.prodId+'&product_type='+res.data.typeId+'&transportId='+this.orderData.transportId+'&exportCity='+this.orderData.logisticsInfoDto.startCityId+'&importCity='+this.orderData.logisticsInfoDto.destCityId
                 return this.$router.push(url)
             })
           }
@@ -278,9 +278,9 @@ export default {
     margin-top: 20px;
   }
   .clamp3{
-    overflow: hidden; 
-    display: -webkit-box; 
+    overflow: hidden;
+    display: -webkit-box;
     -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3; 
+    -webkit-line-clamp: 3;
   }
 </style>

src/views/ecw/order/prepayDeal.vue

@@ -286,7 +286,7 @@
               </el-select>
           </el-form-item>
         </el-row>
-        <el-row :span="8" v-if="orderExceptionData.orderExceptionType!='order_lack_box_exception'&&orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'&&orderExceptionData.orderExceptionType!='order_lack_box_exception'">
+        <el-row :span="8" v-if="orderExceptionData.orderExceptionType!='order_lack_box_exception'&&orderExceptionData.orderExceptionType!='order_lack_box_exception'">
           <el-form-item :label="$t('备注')+':'" size="medium">
             <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
           </el-form-item>

src/views/ecw/order/weightDeal.vue

@@ -103,6 +103,12 @@
           <el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
         </div>
       </div>
+      <el-form  v-if="type=='order_heavy_cargo_exception'" :model="handlerParams" ref="queryForms" size="small" label-width="50px" class="card">
+        <el-form-item :label="$t('备注')+':'" size="medium">
+          <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
+        </el-form-item>
+      </el-form>
+
   </div>
 </template>
 
@@ -125,7 +131,10 @@ export default {
       list: {},
       orderId:0,
       type:'',
-      branklist:[]
+      branklist:[],
+      handlerParams:{
+        orderExceptionHandlerRemark:''
+      }
     };
   },
   created() {
@@ -194,7 +203,7 @@ export default {
       return sums;
     },
     submit(result){
-      handlerExceptionByExceptionId({orderExceptionId:this.list.id,orderExceptionHandlerResult:result}).then(res=>{
+      handlerExceptionByExceptionId({orderExceptionId:this.list.id,orderExceptionHandlerResult:result,orderExceptionHandlerRemark:this.handlerParams.orderExceptionHandlerRemark}).then(res=>{
           this.$modal.msgSuccess(this.$t("提交成功"));
           this.$router.back()
       })