Merge branch 'feature/order_edit' into pre-release

# Conflicts:
#	src/views/ecw/order/index.vue

src/api/ecw/order.js

@@ -1061,6 +1061,14 @@ export function getRegionList(type,regionId){
   return request({
     url:'/ecw/warehouse/getRegionList?type='+type+'&regionId='+regionId,
     method: 'get',
-    
+
+  })
+}
+
+// 复制订单
+export function copyOrder(orderId){
+  return request({
+    url: '/ecw/order/copy/' + orderId,
+    method: 'post'
   })
-}
\ No newline at end of file
+}

src/views/ecw/order/index.vue

@@ -498,7 +498,8 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      <el-table-column :label="$t('发货人编号')" align="center" prop="consignorCustomerNumber" />
+      <el-table-column :label="$t('收货人编号')" align="center" prop="consigneeCustomerNumber" />
       <el-table-column
         :label="$t('总箱数/入仓箱数')"
         align="center"
@@ -537,12 +538,10 @@
             <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div> -->
             <div>{{ row.sumVolume }}m³ /{{ row.sumWeight }}Kg</div>
           </component>
-          <!-- <el-tooltip v-if="scope.row.orderExceptionType=='order_heavy_cargo_exception'" class="item" effect="dark" :content="(scope.row.wvolume||0)+'m³'" placement="bottom">
-            <span style="color:#ff4949" v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
-            <span style="color:#ff4949" v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
-          </el-tooltip> -->
         </template>
       </el-table-column>
+
+
       <el-table-column
         :label="$t('始发仓')"
         align="center"
@@ -556,7 +555,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('运输方式/目的地')"
+        :label="$t('运输方式-渠道/目的地')"
         align="center"
         prop="transportId"
       >
@@ -565,6 +564,9 @@
             :type="DICT_TYPE.ECW_TRANSPORT_TYPE"
             :value="row.transportId"
           />
+          <template v-if="row.channelName">
+            - {{row.channelName}}
+          </template>
           / {{ row.dstWarehouseName }}
         </template>
       </el-table-column>
@@ -576,18 +578,34 @@
           />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('订单状态')" align="center" prop="status">
+
+      <el-table-column :label="$t('增值服务')" align="center" prop="status">
+        <template slot-scope="{row}">
+          {{ getTypeText(row.type)}}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('状态')" align="center" prop="status">
         <template slot-scope="scope">
           <!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
-          {{ scope.row.statusMsg }}
+          {{ scope.row.statusText }}
         </template>
       </el-table-column>
-
+      <el-table-column :label="$t('唛头')" align="center" prop="marks" />
+      <el-table-column v-if="dept" :label="$t('客户经理')" align="center" prop="salesmanName" />
+      <el-table-column :label="$t('发货人客服')" align="center" prop="consignorFollowCustomerService" />
+      <el-table-column :label="$t('收货人客服')" align="center" prop="consigneeFollowCustomerService" />
+      <el-table-column :label="$t('到仓箱数/方数重量')" align="center" prop="status">
+        <template slot-scope="scope">
+          暂无数据
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('提货率')" align="center" prop="pickRatio" />
+      <el-table-column :label="$t('动态')" align="center" prop="statusMsg" />
       <el-table-column
         :label="$t('操作')"
         align="center"
         class-name="small-padding fixed-width actions"
-        width="150px"
+        width="180px"
       >
         <template slot-scope="scope">
           <!-- 已删除的订单只需要删除和查看 https://zentao.jdshangmen.com/bug-view-684.html -->
@@ -868,6 +886,21 @@
                   v-hasPermi="['ecw:order:turnException']"
                 >{{ $t("转异") }}</el-dropdown-item
                 >
+
+
+                <template
+                  v-if="scope.row.abnormalState != 0"
+                >
+                  <el-dropdown-item
+                    @click.native="openException(scope.row)"
+                  >{{ $t("查看异常") }}</el-dropdown-item
+                  >
+                  <el-dropdown-item
+                    v-if="canHandleException(scope.row)"
+                    @click.native="openException(scope.row)"
+                  >{{ $t("处理异常") }}</el-dropdown-item
+                  >
+                </template>
               </el-dropdown-menu>
             </el-dropdown>
 
@@ -1136,6 +1169,8 @@
                 >
               </el-dropdown-menu>
             </el-dropdown>
+
+            <el-button type="text" @click="handleCopyOrder(scope.row.orderId)">{{$t('复制')}}</el-button>
           </template>
         </template>
       </el-table-column>
@@ -1261,8 +1296,8 @@ import {
   setCanShipment,
   setCanNotShipment,
   getParentOrder,
-  getRegionList,
-} from "@/api/ecw/order";
+  getRegionList, copyOrder
+} from '@/api/ecw/order'
 /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
 import PrintTag from "./components/PrintTag";
 import PrintWarehouseReceipt from "./components/PrintWarehouseReceipt";
@@ -1655,6 +1690,26 @@ export default {
         return arr.indexOf(state) == -1;
       };
     },
+    // 根据异常类型和用户权限校验是否可以处理异常
+    canHandleException(){
+      return (order) => {
+        // TODO 需要等接口返回异常类型
+        return true
+      }
+    },
+    // 增值服务文本
+    getTypeText(){
+      return type => {
+        const arr = []
+        if(type.indexOf('1') > -1){
+          arr.push(this.$t('集运'))
+        }
+        if(type.indexOf('4') > -1){
+          arr.push(this.$t('海外仓'))
+        }
+        return arr.join("、")
+      }
+    }
   },
   activated() {
     this.getList();
@@ -2089,6 +2144,18 @@ export default {
     handleExceptionClose() {
       this.tureExceptionOrder =  null;
     },
+    // 复制订单
+    handleCopyOrder(orderId){
+      copyOrder(orderId).then(res => {
+        this.$router.push({ path: '/order/edit', query: { id: res.data } });
+      });
+    },
+    // 查看异常
+    openException(order){
+      this.$router.push({
+        path: "./pending?id=" + order.orderId,
+      });
+    }
   },
 };
 </script>