Merge remote-tracking branch 'origin/dev' into dev

src/components/RoutersSelector/index.vue

@@ -52,7 +52,7 @@
                             </el-table-column>
                             <el-table-column :label="$t('操作')" prop="">
                                 <template slot="header">
-                                    <el-checkbox @change="toggleGroupChecker(index, $event)"></el-checkbox>
+                                    <el-checkbox @change="toggleGroupChecker(index, $event)" v-model="groupChecker[item.value]"></el-checkbox>
                                 </template>
                                 <template slot-scope="{row}">
                                     <el-checkbox :checked="getSelectedIndex(row) > -1" @change="toggleChecker(row, $event)"></el-checkbox>
@@ -88,6 +88,7 @@ export default {
             selectedRoutes: [], // 勾选的路线渠道
             hideMap: {}, // 折叠状态
             checkAll: null,
+            groupChecker: {}, // 分组全选记录
             
         }
     },

src/views/ecw/box/indexSeaAir.vue

@@ -100,7 +100,7 @@
           size="small"
         >
           <el-option
-            v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SHIPMENT_STATUS)"
+            v-for="dict in this.getDictDatas(DICT_TYPE.BOX_ORDER_SHIPMENT_STATE)"
             :key="dict.value"
             :label="$l(dict, 'label')"
             :value="dict.value"
@@ -226,7 +226,7 @@
               <el-dropdown-item command="error">{{$t('异常登记')}}</el-dropdown-item>
               <el-dropdown-item command="cost">{{$t('费用登记')}}</el-dropdown-item>
               <el-dropdown-item command="delete">{{$t('删除')}}</el-dropdown-item>
-              <el-dropdown-item v-if="scope.row.ldStatus>42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
+              <el-dropdown-item :disabled="scope.row.ldStatus<42" command="editLadingBill">{{$t('编辑提货单')}}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown trigger="click" @command="(command)=>handleCommand(scope.row, command)">

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

@@ -103,7 +103,7 @@
       </el-table>
     </el-card>
 
-    <el-card class="card" v-if="splitData">
+    <el-card class="card" v-if="splitData.id">
       <!-- 列表 -->
       <div slot="header" class="card-title">{{$t('拆单信息')}}</div>
       <div>

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

@@ -233,7 +233,7 @@
               </el-row>
               <el-table v-loading="toBePreLoading" :data="item.boxOrderItemList" border show-summary :summary-method="getSummaries">
                 <el-table-column type="index" align="center" :label="$t('序号')" width="50" />
-                <el-table-column :label="$t('品名')" align="center" :prop="$t('prodTitle')" />
+                <el-table-column :label="$t('品名')" align="center" prop="prodTitleZh" />
                 <el-table-column :label="$t('备案')" align="center" prop="brandType">
                   <template slot-scope="scope">
                     <dict-tag :type="DICT_TYPE.BOX_SHIPPING_BRAND_TYPE" :value="scope.row.brandType" />

src/views/ecw/order/edit.vue

@@ -425,8 +425,8 @@
             </template>
             <template v-else>
                 <el-button type="primary" @click="submitForm(0)" v-if="!form.status">{{$t('保存草稿')}}</el-button> <!--草稿-->
-                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('提交报价')}}</el-button> <!--待入仓-->
-                <el-button type="primary" @click="submitForm(2)" v-else>{{$t('编辑')}}</el-button> <!--修改-->
+                <el-button type="primary" @click="submitForm(2)" v-if="!form.orderId || !form.status">{{$t('新建订单')}}</el-button> <!--待入仓-->
+                <el-button type="primary" @click="submitForm(2)" v-else>{{$t('编辑订单')}}</el-button> <!--修改-->
             </template>
             <el-button @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
         </el-form-item>

src/views/ecw/order/prepayDeal.vue

@@ -32,7 +32,9 @@
        <div v-if="orderExceptionData.orderExceptionType!='order_doc_exception'&&orderExceptionData.orderExceptionType!='order_consignor_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'">
          <el-row>
             <el-form-item :label="$t('填单参数')+':'">
+              <template v-if="orderData && orderData.costVO">
                {{(orderData.costVO.totalNum||0)+$t('箱 ')+(orderData.costVO.totalVolume||0)+'m³ '+(orderData.costVO.totalWeight||0)+'kg '+(orderData.costVO.totalQuantity||0)+$t('个')}}
+              </template>
             </el-form-item>
          </el-row>
          <el-row>
@@ -205,8 +207,9 @@
             <el-row v-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
                 <el-form-item :label="$t('处理结果')+':'" required>
                   <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
-                  <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
-                             :key="dict.value" :label="dict.label" :value="dict.value"/>
+                    <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
+                      <el-option v-if="orderFee && orderFee.result && orderFee.result.indexOf(dict.value) > -1" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
+                    </template>
                   </el-select>
                 </el-form-item>
             </el-row>
@@ -267,19 +270,34 @@
             </div>
           </el-form>
           </el-card>
+
+          <!-- 只有不需要预付才需要审核 -->
+          <template v-if="showWorkFlow">
+            <div class="page-title">审批流程</div>
+            <work-flow xmlkey="commission_config" v-model="handlerParams.ccIds" />
+          </template>
           <div slot="footer" class="dialog-footer">
-            <div v-if="orderExceptionData.orderExceptionStatus!='order_pay_exception'">
+            <!-- 审核中显示 -->
+            <template v-if="orderExceptionData.bpmStatus == 1">
+              <el-button type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderExceptionData.bpmId)">{{$t('审核中')}}</el-button>
+              <el-button plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
+              <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
+            </template>
+            <div v-else>
               <el-button  type="primary" @click="submitForm">{{$t('提交')}}</el-button>
               <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
             </div>
-            <div v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&!orderExceptionData.bpmId">
+
+            <!-- <div v-else-if="orderExceptionData.orderExceptionStatus!='order_pay_exception'">
               <el-button  type="primary" @click="submitForm">{{$t('提交')}}</el-button>
               <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
             </div>
+            <div v-else-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&!orderExceptionData.bpmId">
+              <el-button  type="primary" @click="submitForm">{{$t('提交')}}</el-button>
+              <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
+            </div> -->
             <!-- <el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'"  type="primary" @click="submitForm">转交</el-button> -->
-          <el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&orderExceptionData.bpmId" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderExceptionData.bpmId)">{{$t('审核中<')}}</el-button>
-          <el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&orderExceptionData.bpmId" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
-          <el-button v-if="orderExceptionData.orderExceptionStatus=='order_pay_exception'&&orderExceptionData.bpmId" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
+          
           </div>
   </div>
 </template>
@@ -291,11 +309,11 @@
   import { getCurrencyList } from '@/api/ecw/currency'
   import {getExceptionById,handlerExceptionByExceptionId,getOrderItemById,getOrderFeeById} from "@/api/ecw/orderException"
   import {getFirstReceivableListByOrderId} from '@/api/ecw/financial'
-
+  import WorkFlow from '@/components/WorkFlow'
   export default {
     name: "PrepayDeal",
     components: {
-      FileUpload
+      FileUpload, WorkFlow
     },
     data() {
       return {
@@ -321,6 +339,7 @@
         preException:[],
         orderFee:[],
         currencyList:[],
+        showWorkFlow: false, // 是否显示工作流
       };
     },
     created() {
@@ -332,6 +351,13 @@
       }
        getCurrencyList().then(res => this.currencyList = res.data)
     },
+    watch:{
+      'handlerParams.orderExceptionHandlerResult'(val){
+        if(val == 'no_pay'){
+          this.showWorkFlow = true
+        }
+      }
+    },
     computed: {
       currentMap(){
         let map = {}
@@ -376,7 +402,7 @@
       getOrderFeeByIdData(){
         getOrderFeeById({id:this.orderId}).then(response => {
           this.orderFee = response.data
-          this.handlerParams.orderExceptionHandlerResult = this.orderFee.result
+          this.handlerParams.orderExceptionHandlerResult = this.orderFee.result[0]
         })
       },
       getPreExceptionData(){