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

src/api/ecw/orderException.js

@@ -92,3 +92,12 @@ export function getOrderFeeById(query) {
     params: query
   })
 }
+
+// 根据工作流中传的业务ID,获取异常审核详情
+export function getBmpDetailByBusinessId(businessId) {
+  return request({
+    url: '/ecw/order-exception/getBmpDetailByBusinessId',
+    method: 'get',
+    params: {businessId}
+  })
+}
\ No newline at end of file

src/components/RoutersSelector/index.vue

@@ -26,7 +26,7 @@
             </el-radio-group>
         </div>
         <el-row class="" :gutter="10">
-            <template v-for="item in filteredRouterList">
+            <template v-for="(item, index) in filteredRouterList">
                 <el-col :span="12" :key="item.value">
                     <el-card  class="mb-10">
                         <div slot="header">
@@ -51,6 +51,9 @@
                                 </template>
                             </el-table-column>
                             <el-table-column :label="$t('操作')" prop="">
+                                <template slot="header">
+                                    <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>
                                 </template>
@@ -85,6 +88,7 @@ export default {
             selectedRoutes: [], // 勾选的路线渠道
             hideMap: {}, // 折叠状态
             checkAll: null,
+            groupChecker: {}, // 分组全选状态
             
         }
     },
@@ -197,6 +201,14 @@ export default {
         
     },
     methods:{
+        // 全选、全不选 某个运输方式所有线路
+        toggleGroupChecker(index, selected){
+            let routerList = this.filteredRouterList[index].routerList
+            console.log(routerList.length, selected)
+            routerList.forEach(router => {
+                this.toggleChecker(router, selected)
+            })
+        },
         getOpenedRouterList(){
             let params = {}
             if(this.exportCity){

src/views/bpm/processInstance/detail.vue

@@ -321,6 +321,12 @@ export default {
           id: this.processInstance.businessKey,
           path: this.processInstance.processDefinition?.formCustomViewPath
         },
+        // 预付异常审核
+        prepay_excetion:{
+          component: () => import('@/views/ecw/order/components/PrepayExceptionDetail'),
+          id: this.processInstance.businessKey,
+          path: this.processInstance.processDefinition?.formCustomViewPath
+        },
       }
       return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
     }

src/views/bpm/task/done.vue

@@ -3,12 +3,12 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
-      <el-form-item label="流程编号" prop="processInstanceId">
-        <el-input v-model="queryParams.processInstanceId" :placeholder="$t('流程编号')" clearable
+      <el-form-item label="编号" prop="processInstanceId">
+        <el-input v-model="queryParams.processInstanceId" :placeholder="$t('编号')" clearable
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('任务名称')" prop="name">
-        <el-input v-model="queryParams.name" :placeholder="$t('任务名称')" clearable @keyup.enter.native="handleQuery"/>
+      <el-form-item :label="$t('流程名')" prop="name">
+        <el-input v-model="queryParams.name" :placeholder="$t('流程名')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('流程分类')" prop="category">
         <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
@@ -34,8 +34,8 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed/>
-      <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200"/>
+      <el-table-column :label="$t('编号')" align="center" prop="id" width="320" fixed/>
+      <el-table-column :label="$t('流程名')" align="center" prop="processInstance.name" width="200"/>
       <el-table-column :label="$t('业务编号')" align="center" prop="businessNo"/>
       <el-table-column :label="$t('流程分类')" align="center" prop="category" width="200">
         <template slot-scope="scope">

src/views/ecw/bannerPop/index.vue

@@ -101,12 +101,12 @@
         <el-form-item label="有效期" prop="validateStart">
           <el-date-picker v-model="form.validateStart" @change="startChange"
             type="date"
-            placeholder="选择日期">
+            placeholder="选择日期" value-format="yyyy-MM-dd">
           </el-date-picker>
           ~
           <el-date-picker v-model="form.validateEnd"
             type="date"
-            placeholder="选择日期">
+            placeholder="选择日期" value-format="yyyy-MM-dd">
           </el-date-picker>
           <span style="color:red;font-size:14px;">注意：留空则表示永久有效</span>
         </el-form-item>

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/financial/creatCollection.vue

@@ -266,7 +266,7 @@
           </el-table-column>
           <el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount">
             <template slot-scope="scope" v-if="scope.row.type !== 'total'">
-              {{ `${NP.minus(scope.row.receivableAmount, scope.row.discountTotal)}${scope.row.discountTotal > 0 ? `(${scope.row.receivableAmount} - ${scope.row.discountTotal})` : ''}` }}
+              {{ `${NP.minus(scope.row.receivableAmount, scope.row.discountTotal || 0)}${scope.row.discountTotal > 0 ? `(${scope.row.receivableAmount} - ${scope.row.discountTotal})` : ''}` }}
             </template>
           </el-table-column>
           <el-table-column align="center" width="220">
@@ -1147,6 +1147,7 @@ export default {
                 this.saveBtnLoading = false
               })
             } else {
+              params.currencyId = this.showCurrencyId
               createReceipt(params).then(res => {
                 this.$modal.msgSuccess(this.$t('保存成功'));
                 this.$router.back();
@@ -1170,6 +1171,7 @@ export default {
               this.saveBtnLoading = false
             })
           } else {
+            params.currencyId = this.showCurrencyId
             createReceipt(params).then(res => {
               this.$modal.msgSuccess(this.$t('新增成功'));
               this.$router.back();

src/views/ecw/financial/receiptDetail.vue

@@ -269,7 +269,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            {{ $t('已核销金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+            {{ $t('核销基准金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
           {{ verificationData.writtenOff.toFixed(6) }}
         </el-descriptions-item>
@@ -277,7 +277,7 @@
           <template slot="label">
             {{ $t('已核销比例') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
-          {{ parseFloat(verificationData.WriteOffProportion/100).toFixed(2) }}%
+          {{ verificationData.WriteOffProportion }}%
         </el-descriptions-item>
       </el-descriptions>
     </el-card>

src/views/ecw/offer/edit.vue

@@ -23,7 +23,7 @@
                     <div class="contact">
                         <el-input v-model="form.consignorName" placeholder="选择或新建" disabled style="width:120px"/>
                         <img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignor'" />
-                        <img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" />
+                        <img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='0'" />
                     </div>
                 </el-form-item>
                 <el-form-item :label="$t('发货人电话')" prop="consignorPhone">
@@ -42,7 +42,7 @@
                     <div class="contact">
                         <el-input v-model="form.consigneeName" placeholder="请选择或新建" :disabled="true"  style="width:120px"/>
                         <img src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignee'" />
-                        <img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='2'" />
+                        <img src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" />
                     </div>
                 </el-form-item>
                 <el-form-item :label="$t('收货人电话')" prop="consigneePhone">

src/views/ecw/order/cargoControlDetail.vue

@@ -48,7 +48,7 @@
             <el-table-column :label="$t('体积') + '(m³)'" prop="pickVolume"></el-table-column>
             <el-table-column :label="$t('提单号')" prop="tidanNo"></el-table-column>
             <el-table-column :label="$t('备注')" prop="remarks"></el-table-column>
-            <el-table-column :label="$t('操作人')" prop="name"></el-table-column>
+            <el-table-column :label="$t('操作人')" prop="operator"></el-table-column>
             <el-table-column :label="$t('日期')" prop="createTime">
                 <template slot-scope="{row}">
                     {{row.createTime|parseTime}}

src/views/ecw/order/components/PrepayExceptionDetail.vue

+<!--拆单审核中的申请信息部分-->
+<template>
+    <div v-if="detail && order">
+        <el-descriptions :column="4" v-if="order" :colon="false">
+            <el-descriptions-item :label="$t('订单号')">{{order.orderNo}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('运输方式')">
+                <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('出货方式')">
+                {{channel ? channel.nameZh : '/'}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('订单状态')">
+                {{order.statusMsg}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('始发仓')">
+                {{order.logisticsInfoDto.startTitleZh}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('目的仓')" :span="2">
+                {{order.logisticsInfoDto.destAddressZh}}
+            </el-descriptions-item>
+            
+            
+        </el-descriptions>
+
+    </div>
+</template>
+<script>
+import {getOrder} from '@/api/ecw/order'
+import {getChannel} from '@/api/ecw/channel'
+import {getUnitList} from "@/api/ecw/unit"
+import { getCurrencyList } from '@/api/ecw/currency'
+import Decimal from 'decimal.js'
+import {getBmpDetailByBusinessId} from '@/api/ecw/orderException'
+
+export default {
+    name: 'OrderApprovalDetail',
+    props:{
+        id: [String, Number],
+        path: String
+    },
+    components:{
+        PrintLandingBill: () => import('./PrintLadingBill.vue')
+    },
+    data(){
+        return {
+            type: null,
+            detail: null,
+            order: null,
+            channel: null,
+            ShowLandingBill: false,
+
+            unitList:[],
+            currencyList:[],
+        }
+    },
+    watch:{
+        id(){
+            this.getData()
+        },
+        detail(){
+            this.getOrder()
+        },
+        order(){
+            if(this.order.channelId){
+                this.getChannel()
+            }
+        },
+    },
+    computed:{
+        currencyMap(){
+            let map = {}
+            this.currencyList.forEach(item => {
+                map[item.id] = this.$l(item, 'title')
+            })
+            return map
+        },
+        unitMap(){
+            let map = {}
+            this.unitList.forEach(item => {
+                map[item.id] = this.$l(item, 'title')
+            })
+            return map
+        }
+    },
+    created(){
+        if(this.id){
+            this.getData()
+        }
+    },
+    methods:{
+        Decimal,
+        getData(){
+            getBmpDetailByBusinessId(this.id).then(res => {
+                this.type = res.data.type
+                this.detail = JSON.parse(res.data.details)
+            })
+        },
+        getOrder(){
+            getOrder(this.detail.orderId).then(res => {
+                this.order = res.data
+            })
+        },
+        getChannel(){
+            getChannel(this.order.channelId).then(res => {
+                this.channel = res.data
+            })
+        },
+        getBillService(){
+
+        },
+        getBillOfLandingInProcessing(){
+            getBillOfLandingInProcessing({orderId: this.detail.orderId}).then(res => {
+                console.log(res)
+            })
+        }
+    }
+}
+</script>
+<style scoped lang="scss">
+.title{
+    padding: 10px 0;
+    span{
+        font-size: 14px;
+        font-weight: bold;
+    }
+}
+.bold{
+    font-weight: bold;
+}
+</style>
\ No newline at end of file

src/views/ecw/order/edit.vue

@@ -18,7 +18,7 @@
                     <div class="contact">
                         <el-input v-model="form.consignorName" placeholder="" :disabled="inWarehouse"/>
                         <img v-if="!inWarehouse" src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignor'" />
-                        <img v-if="!inWarehouse" src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" />
+                        <img v-if="!inWarehouse" src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='0'" />
                     </div>
                 </el-form-item>
                 <el-form-item :label="$t('发货人电话')" prop="consignorPhone">
@@ -38,7 +38,7 @@
                     <div class="contact">
                         <el-input v-model="form.consigneeName" placeholder="" :disabled="inWarehouse"/>
                         <img v-if="!inWarehouse" src="@/assets/images/phonebook.png" class="phonebook" @click="contactChooseType='consignee'" />
-                        <img v-if="!inWarehouse" src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='2'" />
+                        <img v-if="!inWarehouse" src="@/assets/images/new_customer.png" class="phonebook" @click="quickCreateType='1'" />
                     </div>
                 </el-form-item>
                 <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
@@ -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/exception/index.vue

@@ -55,7 +55,7 @@
         </el-form-item>
       </el-row>
       <el-row>
-        <el-form-item :label="$t('跟进业务')+':'">
+        <el-form-item :label="$t('客户经理')+':'">
          <el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')" clearable>
           <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
           </el-select>

src/views/ecw/order/splitApply.vue

@@ -482,11 +482,12 @@ export default {
         this.shopForm.orderItemId = list[0].orderItemId
         this.shopForm.prodTitleEn = list[0].prodTitleEn
         this.shopForm.prodTitleZh = list[0].prodTitleZh
+        var orderItemData = this.orderData.orderItemVOList.find(item=>item.orderItemId==this.shopForm.orderItemId)
         var params = {
-          'seaFreightVolume':list[0].seaFreightVolume,
-          'clearanceFreightVolume':list[0].clearanceFreightVolume
+          'seaFreightVolume':orderItemData.seaFreightVolume,
+          'clearanceFreightVolume':orderItemData.clearanceFreightVolume
         }
-        console.log(params)
+        console.log(orderItemData)
         this.numcheck(params)
     },
     numcheck(params){

src/views/ecw/order/warehousing/components/editDialog.vue

@@ -406,19 +406,12 @@ export default {
 
   mounted() {
     getProductBrankPage({pageSize: 100000}).then(r => {
-      this.brandList = [
-        {
-          "titleZh":"无",
-          "titleEn":"",
-          "id":'0'
-        },
-        ...r.data.list.map(e => {
+      this.brandList = r.data.list.map(e => {
         if(e.id){
           e.id = e.id.toString()
         }
         return e
       })
-      ]
     })
   },
 
@@ -504,7 +497,9 @@ export default {
     opened(val) {
       if (val) {
         this.form.material = this.warehousing.material
-        this.form.brand = this.warehousing.brand?.toString() || ''
+        if (this.warehousing.brand && this.warehousing.brand !== 0){
+          this.form.brand = this.warehousing.brand.toString() || ''
+        }
         this.handleBrandChange(this.form.brand)
         getWarehouseLastUpdateApprovalInfo({
           orderItemId: this.warehousing.orderItemId,
@@ -773,7 +768,7 @@ export default {
           return brand.titleZh
         }
       }
-      return '0'
+      return ''
     }
   }
 }