Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/boxSea.js

@@ -367,7 +367,7 @@ export function secGoodsList(params) {
 }
 
 /**
- * 获得订单预装分页
+ * 获得预装分页
  *
  * @export
  * @param {*} params
@@ -375,7 +375,7 @@ export function secGoodsList(params) {
  */
 export function preloadPage(params) {
   return request({
-    url: "/ecw/order/preloadPage",
+    url: "/ecw/box-preload-goods/preloadPage",
     method: "get",
     params,
   });

src/api/ecw/orderException.js

@@ -75,3 +75,11 @@ export function handlerExceptionByExceptionId(data){
     data: data
   })
 }
+
+// 根据商品ID获取商品详情
+export function getOrderItemById(id) {
+  return request({
+    url: '/ecw/order-exception/getOrderItemById?id=' + id,
+    method: 'get'
+  })
+}

src/components/WarehouseAreaDialog/index.vue

@@ -106,7 +106,7 @@ export default {
         warehouse.selected = true
 
         // 区域被选，清空该区域下的位置
-        warehouse.positionList.forEach(g => {
+        if(warehouse.positionList) warehouse.positionList.forEach(g => {
           g.children.forEach(k => {
             k.selected = false
           })
@@ -154,7 +154,7 @@ export default {
         e.children.forEach(f => {
           // 区域
           f.selected = false
-          f.positionList.forEach(g => {
+          if(f.positionList) f.positionList.forEach(g => {
             // 位置
             g.children.forEach(k => {
               // 子位置
@@ -177,7 +177,7 @@ export default {
         e.children.forEach(f => {
           // 区域
           if (f.selected) result.push(f.code)
-          f.positionList.forEach(g => {
+          else if(f.positionList) f.positionList.forEach(g => {
             // 位置
             if (g.selected) result.push(k.code)
             g.children.forEach(k => {
@@ -202,7 +202,7 @@ export default {
             wareId: f.pid,
             areaId: f.id
           })
-          else f.positionList.forEach(g => {
+          else if(f.positionList) f.positionList.forEach(g => {
             // 位置
             if (g.selected) result.push({
               orderId: this.orderId,

src/utils/dict.js

@@ -148,6 +148,22 @@ export const DICT_TYPE = {
   ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
   PAYMENT_TYPE:'payment_type',//收款类型
   ORDER_WAREHOUSE_IN_STATUS: 'order_warehouse_in_status', // 入仓状态
+  ORDER_NO_QUOTE_EXCEPTION_RESULT:'order_no_quote_exception_result',//未报价异常处理结果
+  ORDER_SUPERFLUOUS_BOX_EXCEPTION_RESULT:'order_superfluous_box_exception_result',//多箱异常处理结果
+  ORDER_LACI_BOX_EXCEPTION_RESULT:'order_lack_box_exception_result',//少箱异常处理结果
+  ORDER_PAY_EXCEPTION_RESULT:'order_pay_exception_result',//预付异常处理结果
+  ORDER_MISS_EXCEPTION_RESULT:'order_miss_exception_result',//货物丢失异常处理结果
+  ORDER_SUPERFLUOUS_GOODS_EXCEPTION_RESULT:'order_superfluous_goods_exception_result',//货物增多异常处理结果
+  ORDER_DAMAGE_EXCEPTION_RESULT:'order_damage_exception_result',//货物破损异常处理结果
+  ORDER_IN_WATER_EXCEPTION_RESULT:'order_in_water_exception_result',//货物浸水异常处理结果
+  ORDER_HEAVY_CARGO_EXCEPTION_RESULT:'order_heavy_cargo_exception_result',//重货异常处理结果
+  ORDER_DOC_EXCEPTION_RESULT:'order_doc_exception_result',//单证异常处理结果
+  ORDER_CONSIGNOR_EXCEPTION_RESULT:'order_consignor_exception_result',//发货人异常处理结果
+  ORDER_COD_EXCEPTION_RESULT:'order_cod_exception_result',//代收货款异常处理结果
+  ORDER_OTHER_EXCEPTION_RESULT:'order_other_exception_result',//其它异常处理结果
+  ORDER_BULKY_CARGO_EXCEPTION_RESULT:'order_bulky_cargo_exception_result',//泡货异常处理结果
+  PAYMENT_TYPE:'payment_type',//收款类型
+  
 
   ECASH_INIT:'ecash_init', //e-cash
   FEE_TYPE:'receivable_fee_type',
@@ -166,6 +182,7 @@ export const DICT_TYPE = {
   BOX_SHIPPING_PRICE_UNIT: 'shipping_price_unit', // 金额单位
   BOX_SHIPPING_TICKET_EXCEPTION: 'shipping_ticket_exception', // 票异常
   BOX_SHIPPING_PROCESS: 'shipping_process', // 海运出货流程
+  BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
 }
 
 /**

src/views/ecw/box/shippingDetail.vue

@@ -53,7 +53,7 @@
 
       <el-row style="marginTop:15px">
         <el-table :data="loadDetail.sectionOrderList" border>
-          <el-table-column prop="" label="部分" align="center"></el-table-column>
+          <el-table-column prop="sectionName" label="部分" align="center"></el-table-column>
           <el-table-column prop="orderNo" label="订单号" align="center">
             <template v-slot="{row}">
               <el-button type="text" @click="jumpOrderDetail(row)">{{row.orderNo}}</el-button>

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -43,7 +43,7 @@
           <el-row class="right-title">
             <div>货物筛选</div>
             <div>当前装柜：{{partData.title}}</div>
-            <div>可预装方数：无返回m³，重量：无返回Kg</div>
+            <div>可预装方数：{{unloadStatistics.volume}}m³，重量：{{unloadStatistics.weight}}Kg</div>
           </el-row>
 
           <!-- 搜索工作栏 -->
@@ -76,7 +76,7 @@
                 <div>
                   <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
                 </div>
-                <div>入仓时间：{{item.rucangtime}}</div>
+                <div>入仓时间：{{formatDate(item.rucangTime)}}</div>
                 <div>
                   <el-button type="text" @click="handleGoods('all', item)">[全部预装]</el-button>
                   <el-button type="text" @click="foldTable(index, item)">[{{item.fold ? '展开' : '收起'}}]</el-button>
@@ -84,12 +84,12 @@
               </el-row>
               <el-collapse-transition>
                 <div v-show="!item.fold">
-                  <el-table v-loading="loading" :data="item.orderItemList" border>
+                  <el-table v-loading="loading" :data="item.boxOrderItemList" border>
                     <el-table-column label="序号" type="index" align="center" width="50" />
                     <el-table-column label="品名" align="center" prop="prodTitleZh" min-width="500" />
                     <el-table-column label="品牌" align="center" prop="brandType" width="120">
                       <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.brandType" />
+                        <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
                       </template>
                     </el-table-column>
                     <el-table-column label="箱数" align="center" prop="num" width="120" />
@@ -103,7 +103,9 @@
                         <p v-if="scope.row.weight">{{scope.row.weight}}kg</p>
                       </template>
                     </el-table-column>
-                    <el-table-column label="预装柜" align="center" prop="weight" width="120" />
+                    <el-table-column label="预装柜" align="center" prop="" width="120">
+                      无返回
+                    </el-table-column>
                     <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
                       <template slot-scope="scope">
                         <el-button type="text" size="small" @click="handleGoods('singele',scope.row)">预装</el-button>
@@ -125,11 +127,11 @@
       <el-col :span="6" class="totle-info">
         <div>
           <p>总计：</p>
-          <p>111</p>
+          <p>无返回</p>
         </div>
         <div>
           <p>容量：</p>
-          <p>111</p>
+          <p>无返回</p>
         </div>
       </el-col>
     </el-row>
@@ -149,6 +151,7 @@ import {
   createGoods,
   remove,
 } from "@/api/ecw/boxSea";
+import { formatDate } from "../../utils";
 /**
  * 补单
  */
@@ -174,6 +177,7 @@ export default {
       toBePreList: [],
       total: 0,
       loading: false,
+      unloadStatistics: {},
     };
   },
   created() {
@@ -211,8 +215,10 @@ export default {
         ...this.queryParams,
       };
       preloadPage({ ...params, ...this.pageParam }).then((res) => {
-        this.toBePreList = res.data.list;
-        this.total = res.data.total;
+        const { data } = res;
+        this.toBePreList = data.dataList?.list ?? [];
+        this.total = data.dataList?.total ?? 0;
+        this.unloadStatistics = data.unloadStatistics ?? {};
         this.loading = false;
       });
     },
@@ -317,6 +323,7 @@ export default {
         })
         .catch((_) => {});
     },
+    formatDate,
   },
   computed: {
     /** 目的地 */

src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue

 <template>
   <div>
     <el-form ref="cusDeclarationForm" :rules="rules" :model="cusDeclarationObj" label-width="120px">
-      <el-form-item label="单证要求">我司全代 <el-button type="primary" style="margin-left:10px;" @click="downloadVGM">VGM声明</el-button>
+      <el-form-item label="单证要求">无返回 <el-button type="primary" style="margin-left:10px;" @click="downloadVGM">VGM声明</el-button>
       </el-form-item>
       <el-form-item label="柜重" prop="dcBoxWgt">
         <el-input v-model="cusDeclarationObj.dcBoxWgt" placeholder="请输入柜重" clearable />

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -31,7 +31,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="订单号" prop="toBePreOrderNo">
-        <el-input v-model="queryParams.orderNo" placeholder="请输入订单号码" clearable />
+        <el-input v-model="queryParams.toBePreOrderNo" placeholder="请输入订单号码" clearable />
       </el-form-item>
       <el-form-item label="已预装单号" prop="preOrderNo">
         <el-input v-model="queryParams.preOrderNo" placeholder="请输入已预装单号" clearable />
@@ -126,7 +126,7 @@
                     <el-table-column type="selection" align="center" width="55" fixed="left" />
                     <el-table-column label="订单号" align="center" prop="orderNo" width="120" />
                     <el-table-column label="目的地" align="center" prop="destWarehouseName" width="120" />
-                    <el-table-column label="入仓时间" align="center" prop="rucangtime" width="120" />
+                    <el-table-column label="入仓时间" align="center" prop="rucangTime" width="120" />
                     <el-table-column label="品名" align="center" prop="prodTitleZh" width="120" />
                     <el-table-column label="箱数" align="center" prop="num" />
                     <el-table-column label="体积/重量/重货比" align="center" width="140" prop="volumeWeight">
@@ -142,7 +142,7 @@
                     </el-table-column>
                     <el-table-column label="备案" align="center" prop="productRecord" width="100">
                       <template slot-scope="scope">
-                        <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.productRecord" />
+                        <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.productRecord" />
                       </template>
                     </el-table-column>
                     <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
@@ -169,15 +169,15 @@
             <div class="preinstall-title preinstalled">
               <div class="red-label">
                 <p>筛选后待预装数量：</p>
-                <p>无返回</p>
+                <p>{{unloadStatistics.num}}箱</p>
               </div>
               <div class="red-label">
                 <p>方数：</p>
-                <p>无返回</p>
+                <p>{{unloadStatistics.volume}}m³</p>
               </div>
               <div class="red-label">
                 <p>重量：</p>
-                <p>无返回</p>
+                <p>{{unloadStatistics.weight}}kg</p>
               </div>
             </div>
           </el-row>
@@ -199,7 +199,7 @@
                 </div>
                 <div>
                   <p>入仓时间：</p>
-                  <p>{{item.rucangtime}}</p>
+                  <p>{{formatDate(item.rucangTime)}}</p>
                 </div>
                 <div>
                   <p>重货比：</p>
@@ -214,12 +214,12 @@
                   </el-dropdown>
                 </div>
               </el-row>
-              <el-table v-loading="toBePreLoading" :data="item.orderItemList" border show-summary :summary-method="getSummaries">
+              <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
                 <el-table-column type="index" align="center" label="序号" width="50" />
                 <el-table-column label="品名" align="center" prop="prodTitleZh" />
                 <el-table-column label="备案" align="center" prop="brandType">
                   <template slot-scope="scope">
-                    <dict-tag :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :value="scope.row.brandType" />
+                    <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />
                   </template>
                 </el-table-column>
                 <el-table-column label="箱数" align="center" prop="num" />
@@ -229,8 +229,14 @@
                     <p v-if="scope.row.weight">{{scope.row.weight}}kg</p>
                   </template>
                 </el-table-column>
-                <el-table-column label="报关方式" align="center" prop="" />
-                <el-table-column label="包装类型" align="center" prop="" />
+                <el-table-column label="报关方式" align="center" prop="">
+                  <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="item.customsType" />
+                </el-table-column>
+                <el-table-column label="包装类型" align="center" prop="">
+                  <template slot-scope="scope">
+                    <dict-tag :type="DICT_TYPE.ECW_PACKAGE_TYPE" :value="scope.row.unit" />
+                  </template>
+                </el-table-column>
                 <el-table-column label="材质" align="center" prop="material" />
                 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                   <template slot-scope="scope">
@@ -278,6 +284,7 @@ import {
   approvalCreate,
 } from "@/api/ecw/boxSea";
 import userSelect from "./common/userSelect.vue";
+import { formatDate } from "../utils";
 
 /**
  * 预装
@@ -309,6 +316,7 @@ export default {
       toBePreLoading: false,
       toBePreList: [],
       total: 0,
+      unloadStatistics: {},
 
       // 显示搜索条件
       showSearch: true,
@@ -345,6 +353,7 @@ export default {
     this.handleQuery("toBePre");
   },
   methods: {
+    formatDate,
     /* 获取城市 */
     importCityName(id) {
       var arr = this.$attrs.warehouseList.filter((item) => item.id == id);
@@ -358,9 +367,10 @@ export default {
     getSecGoods() {
       this.preLoading = true;
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = this.getParams();
       // 已预装单号
       params.orderNo = params.preOrderNo;
+      delete params.preOrderNo;
       params.shipmentId = this.shipmentObj.id;
       secGoodsList(params).then((res) => {
         this.preList = res.data;
@@ -371,12 +381,15 @@ export default {
     getPreLoad() {
       this.toBePreLoading = true;
       // 处理查询参数
-      let params = { ...this.queryParams };
+      let params = this.getParams();
       // 订单号
       params.orderNo = params.toBePreOrderNo;
+      delete params.toBePreOrderNo;
       preloadPage({ ...params, ...this.pageParam }).then((res) => {
-        this.toBePreList = res.data.list;
-        this.total = res.data.total;
+        const { data } = res;
+        this.toBePreList = data.dataList?.list ?? [];
+        this.total = data.dataList?.total ?? 0;
+        this.unloadStatistics = data.unloadStatistics ?? {};
         this.toBePreLoading = false;
       });
     },
@@ -525,6 +538,15 @@ export default {
       this.pageParam.pageNo = 1;
       this.getPreLoad();
     },
+    getParams() {
+      const { rucangtime = [] } = this.queryParams;
+      delete this.queryParams.rucangtime;
+      return {
+        ...this.queryParams,
+        rucangTimeStart: rucangtime[0],
+        rucangTimeEnd: rucangtime[1],
+      };
+    },
   },
 };
 </script>

src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue

@@ -18,9 +18,9 @@
       <el-select v-model="currPart" placeholder="请选择当前部分">
       </el-select>
       <p>
-        <span>13箱</span>
-        <span>10.83m3</span>
-        <span>210kg</span>
+        <span>无返回 箱</span>
+        <span>无返回 m3</span>
+        <span>无返回 kg</span>
       </p>
     </el-row>
 
@@ -62,15 +62,16 @@
       <div class="label-font">
         <p>
           <span>总计：</span>
-          <span>{{pageData.totalStatistics ? pageData.totalStatistics.num : 0}}箱</span>
+          <span>无返回</span>
+          <!-- <span>{{pageData.totalStatistics ? pageData.totalStatistics.num : 0}}箱</span>
           <span>{{pageData.totalStatistics ? pageData.totalStatistics.volume : 0}}m3</span>
-          <span>{{pageData.totalStatistics ? pageData.totalStatistics.weight : 0}}kg</span>
+          <span>{{pageData.totalStatistics ? pageData.totalStatistics.weight : 0}}kg</span> -->
         </p>
       </div>
       <div class="label-font">
         <p>
           <span>已卸：</span>
-          <span>0</span>
+          <span>无返回</span>
         </p>
       </div>
     </el-row>

src/views/ecw/box/shippingSea/utils.js

@@ -859,6 +859,11 @@ function formatDateStr(obj, keys, format = "YYYY-MM-DD") {
   return obj;
 }
 
+function formatDate(date, format = "YYYY-MM-DD") {
+  if (!date) return date;
+  return dayjs(date).format(format);
+}
+
 function getSeaStatus(val) {
   let currNodeStatus = 11,
     isBreak = false,
@@ -911,4 +916,5 @@ export {
   formatStringNumber,
   formatDateStr,
   formatNumberString,
+  formatDate,
 };

src/views/ecw/channel/edit.vue

 <template>
 	<div class="app-container">
 		<el-form ref="form" :model="form" :rules="rules" label-width="100px">
-            
-            
+
+
             <el-card shadow="never">
                 <div slot="header" class="clearfix">
                     <span>渠道信息</span>
@@ -42,6 +42,14 @@
                             />
                         </el-form-item>
                     </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="简码" prop="code">
+                      <el-input
+                        v-model="form.code"
+                        placeholder="请输入简码"
+                      />
+                    </el-form-item>
+                  </el-col>
                     <el-col :span="12">
                         <el-form-item label="归属仓库" prop="warehouseIds">
                             <!-- <el-select v-model="form.wareHouseIds">
@@ -86,7 +94,7 @@
                         </el-form-item>
                     </el-col> -->
                 </el-row>
-                
+
                 <el-form-item label="备注-中文" prop="remarksZh">
                     <el-input
                         v-model="form.remarksZh"
@@ -105,22 +113,22 @@
                     </el-radio-group>
                 </el-form-item> -->
             </el-card>
-            <el-card shadow="never">
-                <div slot="header" class="clearfix">
-                    <span>渠道收费规则</span>
-                </div>
-                
-                <el-form-item label="清关单价" prop="customsClearUnit">
-                    <el-input v-model="form.customsClearUnit" placeholder="请输入清关单价">
-                        <span slot="append">$</span>
-                    </el-input>
-                </el-form-item>
-                <el-form-item label="每0.5KG单价" prop="weightUnitPrice">
-                    <el-input v-model="form.weightUnitPrice" placeholder="此字段名暂缺" >
-                        <span slot="append">$</span>
-                    </el-input>
-                </el-form-item>
-            </el-card>
+<!--            <el-card shadow="never">-->
+<!--                <div slot="header" class="clearfix">-->
+<!--                    <span>渠道收费规则</span>-->
+<!--                </div>-->
+<!--                -->
+<!--                <el-form-item label="清关单价" prop="customsClearUnit">-->
+<!--                    <el-input v-model="form.customsClearUnit" placeholder="请输入清关单价">-->
+<!--                        <span slot="append">$</span>-->
+<!--                    </el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="每0.5KG单价" prop="weightUnitPrice">-->
+<!--                    <el-input v-model="form.weightUnitPrice" placeholder="此字段名暂缺" >-->
+<!--                        <span slot="append">$</span>-->
+<!--                    </el-input>-->
+<!--                </el-form-item>-->
+<!--            </el-card>-->
 		</el-form>
 		<div>
 			<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -222,4 +230,4 @@ export default {
 .el-card{
     margin-bottom: 20px;
 }
-</style>
+</style>
\ No newline at end of file

src/views/ecw/channel/index.vue

@@ -74,7 +74,7 @@
       <!-- <el-table-column label="名称-英文" align="center" prop="nameEn" /> -->
       <el-table-column label="内部名称" align="center" prop="internalNameZh" />
       <!-- <el-table-column label="内部名称-英文" align="center" prop="internalNameEn" />
-      <el-table-column label="类型编码" align="center" prop="typeNumber" />
+      <el-table-column label="类型编码" align="center" prop="typeNumber" />-->
       <!-- <el-table-column label="仓库id字符串" align="center" prop="warehouseIds" /> -->
       <el-table-column label="仓库名" align="center" prop="warehouseNameList" width="180">
        <template slot-scope="scope">
@@ -88,6 +88,7 @@
        </el-scrollbar>
        </template>
       </el-table-column>
+      <el-table-column label="简码" align="center" prop="code" />
       <el-table-column label="排序" align="center" prop="sort" />
       <el-table-column label="快递公司" align="center" prop="companyName" />
       <el-table-column label="预计时间(天)" align="center" prop="etaTime" />
@@ -202,6 +203,7 @@ export default {
         internalNameZh: undefined,
         internalNameEn: undefined,
         typeNumber: undefined,
+        code: undefined,
         warehouseIds: undefined,
         sort: undefined,
         expressId: undefined,

src/views/ecw/financial/printVoucher.vue

@@ -4,26 +4,26 @@
         <div style="text-align: center;font-weight: bold;font-size: 20px;">收款单</div>
         <div style="margin-top: 20px;">
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
-            <div style="flex:1"><span style="width: 120px;text-align: right;">部门：</span><span>{{form?form.departmentName:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">部门：</div><span>{{form?form.departmentName:'无'}}</span></div>
           </div>
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
-            <div style="flex:1"><span style="width: 120px;text-align: right;">收款单号：</span><span>{{form?form.receiptNo:'无'}}</span></div>
-            <div style="flex:1"><span style="width: 120px;text-align: right;">收款日期：</span><span>{{form?form.payedAt:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">收款单号：</div> <span>{{form?form.receiptNo:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">收款日期：</div><span>{{form?form.payedAt:'无'}}</span></div>
           </div>
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
-            <div style="flex:1"><span style="width: 120px;text-align: right;">客户名称：</span><span>{{form?form.customerName:'无'}}</span></div>
-            <div style="flex:1"><span style="width: 120px;text-align: right;">收款户名：</span><span>{{form?form.platformAccount:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">客户名称：</div><span>{{form?form.customerName:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">收款户名：</div><span>{{form?form.platformAccount:'无'}}</span></div>
           </div>
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
-            <div style="flex:1"><span style="width: 120px;text-align: right;">银行名称：</span><span>{{form?form.accountBank:'无'}}</span></div>
-            <div style="flex:1"><span style="width: 120px;text-align: right;">银行账号：</span><span>{{form?form.accountBank:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">银行名称：</div><span>{{form?form.accountBank:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">银行账号：</div><span>{{form?form.accountBank:'无'}}</span></div>
           </div>
           <div style="display: flex;width: 80%;align-items: center;margin-bottom: 10px;">
-            <div style="flex:1"><span style="width: 120px;text-align: right;">水单号：</span><span>{{form?form.accountBank:'无'}}</span></div>
-            <div style="flex:1"><span style="width: 120px;text-align: right;">手续费：</span><span>{{form?form.accountBank:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">水单号：</div><span>{{form?form.accountBank:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">手续费：</div><span>{{form?form.accountBank:'无'}}</span></div>
           </div>
           <div style="display: flex;width: 80%;align-items: center;">
-            <div style="flex:1"><span style="width: 120px;text-align: right;">备注：</span><span>{{form?form.accountBank:'无'}}</span></div>
+            <div style="flex:1"><div style="width: 120px;text-align: right;">备注：</div><span>{{form?form.accountBank:'无'}}</span></div>
           </div>
       </div>
       <table border="1" style="margin-top: 20px;width: 100%;text-align: center;border-collapse: collapse; ">

src/views/ecw/offer/detail.vue

@@ -83,7 +83,7 @@
                 <el-table-column label="英文名" align="center" prop="prodTitleEn" />
                 <el-table-column label="品牌" width="100px">
                   <template slot-scope="scope">
-                      {{scope.row.brand?'有':'无'}}
+                      <dict-tag :value="scope.row.brand" :type="DICT_TYPE.ECW_IS_BRAND" defaultable />
                   </template>
                 </el-table-column>
                 <el-table-column label="件数" width="90px" prop="num" />
@@ -167,7 +167,7 @@
           </el-descriptions>
           <el-descriptions v-if="item.transportId==2">
               <el-descriptions-item label="船公司">
-                 {{item.airlineCompany}}
+                 {{item.shippingCompany}}
               </el-descriptions-item>
           </el-descriptions>
           <el-descriptions v-if="[2,3,4].indexOf(item.transportId) > -1">

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

@@ -5,17 +5,12 @@
       <el-row>
         <el-form-item >
           <el-select v-model="queryParams.dateType" style="width: 172px;">
-             <el-option label="入仓时间" value="0"/>
-             <el-option label="处理时间" value="1"/>
+             <el-option label="入仓时间" value="1"/>
+             <el-option label="处理时间" value="2"/>
           </el-select>
-          <el-date-picker
-            v-model="queryParams.date"
-            type="datetimerange"
-            style="margin-left: 10px;"
-            range-separator="到"
-            start-placeholder="请选择日期"
-            end-placeholder="请选择日期">
-          </el-date-picker>
+          <el-date-picker clearable v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="请选择开始日期" />
+         <span>到</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="请选择结束日期" />
         </el-form-item>
         <el-form-item label="始发地:">
             <el-select v-model="queryParams.originId" placeholder="请选择始发地">
@@ -47,13 +42,13 @@
       </el-row>
       <el-row>
         <el-form-item label="发货人:">
-            <customer-selector v-model="queryParams.consignorId" @change="consignor = $event" />
+            <customer-selector v-model="queryParams.consignor" @change="consignor = $event" />
         </el-form-item>
         <el-form-item label="唛头:">
           <el-input v-model="queryParams.marks" placeholder="请输入唛头" clearable @keyup.enter.native="handleQuery"/>
         </el-form-item>
-        <el-form-item label="品名:" prop="prodId">
-          <product-selector v-model="queryParams.prodId" @keyup.enter.native="handleQuery" />
+        <el-form-item label="品名:">
+          <product-selector v-model="queryParams.goodsName" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="备案:">
              <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
@@ -61,13 +56,13 @@
       </el-row>
       <el-row>
         <el-form-item label="跟进业务">
-         <el-select v-model="queryParams.followUpSalesmanId" placeholder="请选择跟进业务">
+         <el-select v-model="queryParams.salesmanId" placeholder="请选择跟进业务">
           <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="reset">重置</el-button>
+          <!-- <el-button icon="el-icon-refresh" @click="reset">重置</el-button> -->
         </el-form-item>
       </el-row>
     </el-form>
@@ -85,7 +80,12 @@
             <span>{{scope.$index + 1}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="订单号" align="center" prop="orderNo" />
+      <el-table-column label="订单号" align="center">
+        <template slot-scope="scope">
+             <span>{{scope.row.orderNo}}</span>
+             <span>{{specialNeedTag(scope.row.specialNeed)}}</span>
+         </template>
+       </el-table-column>
       <el-table-column label="唛头" align="center" >
         <template slot-scope="scope">
           <span>{{scope.row.marks||'无'}}</span>
@@ -168,21 +168,7 @@ export default {
       // 查询参数
       queryParams: {
         page: 1,
-        rows: 10,
-        dateType:null,
-        date:null,
-        originId:null,
-        destinationId:null,
-        transportId:null,
-        isCargoControl:null,
-        orderExceptionStatus:null,
-        orderExceptionType:null,
-        orderNo:null,
-        consignorId:null,
-        marks:null,
-        prodId:null,
-        productRecord:null,
-        followUpSalesmanId:null
+        rows: 10
       },
        tradeCityList:[],
     };
@@ -198,7 +184,8 @@ export default {
     },
     importCityList(){
         return this.tradeCityList.filter(item => item.type == 1)
-    }
+    },
+
   },
   methods: {
     /** 查询列表 */
@@ -218,20 +205,6 @@ export default {
       this.queryParams = {
         page: 1,
         rows: 10,
-        dateType:undefined,
-        date:undefined,
-        originId:undefined,
-        destinationId:undefined,
-        transportId:undefined,
-        isCargoControl:undefined,
-        orderExceptionStatus:undefined,
-        orderExceptionType:undefined,
-        orderNo:undefined,
-        consignorId:undefined,
-        marks:undefined,
-        prodId:undefined,
-        productRecord:undefined,
-        followUpSalesmanId:undefined
       };
       this.resetForm("queryForm");
     },
@@ -247,6 +220,31 @@ export default {
       this.$router.push({
         path:"./pending?id="+id,
       })
+    },
+    specialNeedTag(value){
+        var tag = ''
+        if(!value){
+          return 
+        }
+        if(value.indexOf("1")!=-1||value.indexOf("2")!=-1){
+          tag += '(木)'
+        }
+        if(value.indexOf("3")!=-1){
+          tag += '(箱)'
+        }
+        if(value.indexOf("4")!=-1){
+          tag += '(袋)'
+        }
+        if(value.indexOf("5")!=-1){
+          tag += '(纸)'
+        }
+        if(value.indexOf("6")!=-1){
+          tag += '(垫)'
+        }
+        if(value.indexOf("7")!=-1){
+          tag += '(空)'
+        }
+        return tag
     }
   }
 }

src/views/ecw/order/pending.vue

@@ -8,13 +8,13 @@
                 {{orderData.marks?orderData.marks:'无'}}
             </el-descriptions-item>
             <el-descriptions-item label="已到箱数/总箱数">
-                {{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.num:0}}
+                {{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
             </el-descriptions-item>
             <el-descriptions-item label="订单状态">
               <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
             </el-descriptions-item>
             <el-descriptions-item label="送货日期">
-              <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?orderData.orderItemVOList[0].warehouseInInfoVO.inTime:'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span>
+              <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?orderData.orderItemVOList[0].warehouseInInfoVO.firstInTime:'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span>
             </el-descriptions-item>
             <el-descriptions-item label="运输方式">
                 <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
@@ -65,54 +65,61 @@
         </el-table-column>
         <el-table-column label="异常描述" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.orderExceptionRemark}}</span>
+              <span>{{scope.row.orderExceptionDescVO.descZh}}</span>
             </template>
         </el-table-column>
         <el-table-column label="金额" align="center" scope="orderExceptionAmount" />
-       <el-table-column label="异常状态" align="center">
+       <el-table-column label="状态" align="center">
           <template slot-scope="scope">
               <dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />
             </template>
           </el-table-column>
         <el-table-column label="附件" align="center">
           <template slot-scope="scope">
-            <span>{{scope.row.orderExceptionRemark}}</span>
+            <div class="filelist">
+              <span v-for="(item,index) in scope.row.orderExceptionAttr" :key="index" @click="onClickOpenPreview(item,scope.$index)">{{item}}</span>
+            </div>
           </template>
         </el-table-column>
-        <el-table-column label="处理人" align="center" prop="orderExceptionAmount" />
-        <el-table-column label="处理时间" align="center" prop='orderExceptionTime' />
+        <el-table-column label="处理人" align="center" prop="userName" />
+        <el-table-column label="处理时间" align="center" prop='handlerTime' />
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.id,scope.row.orderExceptionType)">处理</el-button>
+            <el-tag v-if="scope.row.orderExceptionStatus>0">已完成</el-tag>
+            <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.id,scope.row.orderExceptionType)">处理</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
+    <div class="preview" v-if="IsPreview">
+      <file-preview :key="timers" :TragetPic="TragetPic" :FilePreAll="FilePreAll" @Close="onClickClosePreview"></file-preview>
+    </div>
   </div>
 </template>
 
 <script>
 import {getExceptionListByOrderId} from "@/api/ecw/orderException"
-import {getTradeCityList} from '@/api/ecw/region'
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOrder} from '@/api/ecw/order'
+import FilePreview from '@/components/FilePreview'
 
 export default {
   name: "Pending",
   components: {
-
+    FilePreview
   },
   data() {
     return {
       // 遮罩层
-      loading: false,
-      // 显示搜索条件
-      showSearch: true,
+      loading: true,
       orderData:{},
       // 订单异常列表
       list: [],
-      tradeCityList:[],
-      orderId:0
+      orderId:0,
+      IsPreview:false, // 控制预览弹窗字段
+      timers:"", //时间戳
+      FilePreAll:[], // 预览数组
+      TragetPic:{},
     };
   },
   created() {
@@ -121,7 +128,6 @@ export default {
       this.getList()
       this.getOrders()
     }
-    getTradeCityList().then(res => this.tradeCityList = res.data)
   },
   methods: {
     /** 查询列表 */
@@ -138,22 +144,72 @@ export default {
         this.orderData = response.data
       });
     },
-    importCityName(id){
-        var arr = this.tradeCityList.filter(item => item.id == id)
-        return arr.length>0?arr[0].titleZh:'无'
-    },
+
     handEdit(id, type){
-      // if(type == 3){
+      if(type == 8||type==15){
+        this.$router.push({
+          path:"/order/weightDeal?id="+id,
+        })
+       }else{
         this.$router.push({
           path:"/order/prepayDeal?id="+id,
         })
-      // }
+       }
 
-    }
+    },
+    getFileName(fileName){
+      var fileArr = fileName.split('/')
+      return fileArr[fileArr.length-1]
+    },
+    getFileFormat(fileName){
+      var fileArr = this.getFileName(fileName).split('.')
+      return fileArr[fileArr.length-1]
+    },
+    	// 打开预览
+    onClickOpenPreview(val,index){
+      this.TragetPic  = { // 当前点击的文件
+        FileName: this.getFileName(val), // 文件名称
+        name: this.getFileName(val), // 文件名称（可以不传）
+        format:this.getFileFormat(val), // 文件格式
+        url: val,  // 预览地址
+        downUrl:"", // 下载地址
+      } // 目标对象
+      if(this.list[index].orderExceptionAttr.indexOf(',')==-1){
+        this.FilePreAll.push(this.TragetPic)
+      }else{
+        var fileArr = this.list[index].orderExceptionAttr.split(',')
+        fileArr.forEach(item =>{ // 需要预览的文件数组（可以传空数组就是单张预览）
+          let obj = {
+            FileName: this.getFileName(item),
+            name: this.getFileName(item),
+            format:this.getFileFormat(item),
+            url: item,
+            downUrl:"",
+          }
+          this.FilePreAll.push(obj)
+        })
+      }
+      this.IsPreview = true // 打开预览弹窗
+      this.timers = new Date().getTime() // 刷新预览地址
+    },
+  // 关闭预览
+    onClickClosePreview(val){
+      this.IsPreview = val  // 由组件内部传入的关闭数据赋值关闭
+    },
   }
 }
 </script>
-<style>
+<style scoped>
+  .filelist{
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+  }
+  .filelist span{
+    width: 48%;
+    margin-right: 2%;
+    color: #1E98D7;
+  }
   .card-title{
       font-size: 18px;
       font-weight: bold;

src/views/ecw/order/weightDeal.vue

+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-card>
+        <div slot="header" class="card-title">查看</div>
+        <el-descriptions :column="4">
+            <el-descriptions-item label="唛头">
+                {{orderData.marks?orderData.marks:'无'}}
+            </el-descriptions-item>
+            <el-descriptions-item label="已到箱数/总箱数">
+                {{orderData.sumNum||0}}/{{orderData.costVO?orderData.costVO.totalNum:0}}
+            </el-descriptions-item>
+            <el-descriptions-item label="订单状态">
+              <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="orderData.status" />
+            </el-descriptions-item>
+            <el-descriptions-item label="送货日期">
+              <span v-if="orderData">{{orderData.status>=5?(orderData.orderItemVOList.length>0?orderData.orderItemVOList[0].warehouseInInfoVO.inTime:'无'):(orderData.consigneeVO?orderData.consigneeVO.deliveryDate:'无')}}</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="运输方式">
+                <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="orderData.transportId" />
+              </el-descriptions-item>
+            <el-descriptions-item label="始发地">
+                  {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.startTitleZh:'无'}}
+              </el-descriptions-item>
+              <el-descriptions-item label="目的地">
+                {{orderData.logisticsInfoDto?orderData.logisticsInfoDto.destTitleZh:'无'}}
+              </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="4">
+            <el-descriptions-item label="发货人">
+                {{orderData.consignorVO?orderData.consignorVO.name||'无':'无'}}
+            </el-descriptions-item>
+            <el-descriptions-item label="发货公司">
+                {{orderData.consignorVO?orderData.consignorVO.company||'无':'无'}}
+            </el-descriptions-item>
+            <el-descriptions-item label="发货电话">
+                {{orderData.consignorVO?orderData.consignorVO.phone||'无':'无'}}
+            </el-descriptions-item>
+          </el-descriptions>
+          <el-descriptions :column="4">
+            <el-descriptions-item label="收货人">
+                {{orderData.consigneeVO?orderData.consigneeVO.name||'无':'无'}}
+            </el-descriptions-item>
+            <el-descriptions-item label="收货公司">
+                {{orderData.consigneeVO?orderData.consigneeVO.company||'无':'无'}}
+            </el-descriptions-item>
+            <el-descriptions-item label="收货电话">
+                {{orderData.consigneeVO?orderData.consigneeVO.phone||'无':'无'}}
+            </el-descriptions-item>
+        </el-descriptions>
+    </el-card>
+    <el-card class="card">
+      <!-- 列表 -->
+      <div slot="header" class="card-title">货物信息</div>
+      <el-table v-loading="loading" border :data="orderData.orderItemVOList" :summary-method="getSummaries" show-summary>
+        <el-table-column label="序号" align="center" prop="id" type="index">
+          <template slot-scope="scope">
+              <span>{{scope.$index + 1}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="品名" align="center" >
+          <template slot-scope="scope">
+            <p>{{scope.row.prodTitleEn||''}}</p>
+            <p>{{scope.row.prodTitleZh||''}}</p>
+          </template>
+          </el-table-column>
+          <el-table-column label="填单货物信息">
+            <template slot-scope="scope">
+              <p>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></p>
+              <p>箱数：{{scope.row.num||0}}</p>
+              <p>体积：{{scope.row.volume||0}}CBM</p>
+              <p>重量：{{scope.row.weight||0}}KG</p>
+            </template>
+            </el-table-column>
+            <el-table-column label="入库货物属性" align="center" >
+              <template slot-scope="scope">
+                 <span>规格：{{scope.row.boxGauge||0}}</span>
+                 <p>
+                  <span>品牌：<dict-tag :value="scope.row.brand" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
+                  <span>箱数：{{scope.row.num||0}}</span>
+                  <span>体积：{{scope.row.volume||0}}CBM</span>
+                  <span>重量：{{scope.row.weight||0}}KG</span>
+                </p>
+              </template>
+         </el-table-column>
+        <el-table-column label="重货方数" align="center" >
+          <template slot-scope="scope">
+            <span>{{scope.row.ss||0}}CBM</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="最后操作时间" scope="handlerTime" />
+
+      </el-table>
+
+    </el-card>
+      <div slot="footer" class="dialog-footer">
+        <div>
+          <el-button  type="primary" @click="submit('general_cargo')">设为普货</el-button>
+          <el-button plain type="primary" @click="submit('process')">设为已处理</el-button>
+        </div>
+      </div>
+  </div>
+</template>
+
+<script>
+import {getExceptionById,handlerExceptionByExceptionId} from "@/api/ecw/orderException"
+import {DICT_TYPE} from  '@/utils/dict'
+import {getOrder} from '@/api/ecw/order'
+
+export default {
+  name: "WeightDeal",
+  components: {
+
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      orderData:{},
+      list: {},
+      orderId:0,
+    };
+  },
+  created() {
+    if(this.$route.query.id){
+      this.id = this.$route.query.id
+      this.getList()
+
+    }
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getExceptionById(this.id).then(response => {
+        this.list = response.data;
+        this.loading = false;
+        this.getOrders()
+      });
+    },
+    getOrders(){
+      getOrder(this.list.orderId).then(response => {
+        this.orderData = response.data
+      });
+    },
+    getSummaries(){
+      const sums = [];
+      if(!this.orderData || !this.orderData.list ||ths.orderData.length==0){
+        return sums
+      }
+      sums[0] = '小计'
+      var orderSum = 0
+      var orderV = 0
+      var orderW = 0
+      var leviteSum = 0
+      var leviteV = 0
+      var leviteW = 0
+      this.orderData.list.forEach((column, index) => {
+          orderSum += column.orderSum
+          orderV += column.volume
+          orderW += column.weight
+          leviteSum += column.orderSum
+          leviteV += column.volume
+          leviteW += column.weight
+      });
+      sums[1] = ''
+      sums[2] = '下单统计：'+ orderSum+' 箱 '+ orderV +' m³ ' + orderW + ' kg'
+      sums[3] = '入仓统计：'+ leviteSum+' 箱 '+ leviteV +' m³ ' + leviteW + ' kg'
+      sums[4] = ''
+      sums[5] = ''
+      return sums;
+    },
+    submit(result){
+      handlerExceptionByExceptionId({orderExceptionId:this.list.id,orderExceptionHandlerResult:result}).then(res=>{
+          this.$modal.msgSuccess("提交成功");
+          this.$router.back()
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+  .filelist{
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+  }
+  .filelist span{
+    width: 48%;
+    margin-right: 2%;
+    color: #1E98D7;
+  }
+  .card-title{
+      font-size: 18px;
+      font-weight: bold;
+      margin-top: 10px;
+  }
+  .card{
+    margin-top: 20px;
+  }
+</style>