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

.env.production

@@ -5,10 +5,10 @@ ENV = 'production'
 VUE_APP_TITLE = 捷道管理系统
 
 # 捷道管理系统/生产环境
-VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = 'http://api2.groupage.cn'
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://jd.admtest.jdshangmen.com/'
+# PUBLIC_PATH = 'http://jd.admtest.jdshangmen.com/'
 
 # 二级部署路径
 VUE_APP_APP_NAME =''

collectI18nMessages.js

 const fs = require('fs');
 const root = "./src"
+const savePath = "./i18n-messages.txt"
 let allFiles = []
 
-
 function getFiles(dir){
     let files = fs.readdirSync(dir)
     files.forEach(file => {
@@ -14,6 +14,11 @@ function getFiles(dir){
 }
 
 getFiles(root)
+/* allFiles = [
+    'src/views/ecw/box/shippingSea/utils.js',
+    'src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js'
+]
+console.log(allFiles) */
 let messages = new Set()
 allFiles.forEach(file => {
     let data = fs.readFileSync(file, {encoding: 'utf-8'})
@@ -25,4 +30,5 @@ allFiles.forEach(file => {
     }
 })
 fs.writeFileSync("./i18n-messages.txt", Array.from(messages).join("\n"))
-console.log("done!")
\ No newline at end of file
+console.log(messages)
+console.warn(`共提取 ${messages.size} 个待翻译内容，保存于${savePath}`)
\ No newline at end of file

src/api/ecw/box.js

@@ -154,7 +154,7 @@ export function cancelBillService(id) {
 export function downloadBillService(params) {
   return request({
     url: "/shipment/make-bill-of-lading/download",
-    responseType: "arraybuffer",
+    responseType: "blob",
     method: "get",
     params,
   });
@@ -190,7 +190,7 @@ export function getBillService(params) {
 export function zipDownload(params) {
   return request({
     url: "/shipment/make-bill-of-lading/zipDownload",
-    responseType: "arraybuffer",
+    responseType: "blob",
     method: "get",
     params,
   });
@@ -284,7 +284,7 @@ export function downloadCustomFiles(params) {
 export function downloadLoadGoodsList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadLoadGoodsList",
-    responseType: "arraybuffer",
+    responseType: "blob",
     method: "get",
     params,
   });
@@ -294,7 +294,7 @@ export function downloadLoadGoodsList(params) {
 export function downloadPreloadGoodsList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadPreloadGoodsList",
-    responseType: "arraybuffer",
+    responseType: "blob",
     method: "get",
     params,
   });
@@ -304,7 +304,7 @@ export function downloadPreloadGoodsList(params) {
 export function downloadReceivableList(params) {
   return request({
     url: "/ecw/box-preload-goods/downloadReceivableList",
-    responseType: "arraybuffer",
+    responseType: "blob",
     method: "get",
     params,
   });

src/api/ecw/orderException.js

@@ -91,4 +91,13 @@ export function getOrderFeeById(query) {
     method: 'get',
     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/api/member/user.js

@@ -43,6 +43,13 @@ export function getUserPage(params) {
     params: params
   })
 }
+ export function getWaitApprovePage(params){
+  return request({
+    url:'/member/user/waitApprovePage',
+    method:'get',
+    params
+  })
+}
 
 // 导出用户 Excel
 export function exportUserExcel(query) {

src/components/RoutersSelector/index.vue

@@ -88,7 +88,7 @@ export default {
             selectedRoutes: [], // 勾选的路线渠道
             hideMap: {}, // 折叠状态
             checkAll: null,
-            groupChecker: {}, // 分组全选记录
+            groupChecker: {}, // 分组全选状态
             
         }
     },

src/components/WarehouseAreaDialog/index.vue

@@ -107,7 +107,7 @@ export default {
           const area = r.data
           area.forEach(e => {
             // 仓库
-            e.children.forEach(f => {
+            e.children?.forEach(f => {
               // 区域
               f.selected = false
               if(f.positionList) f.positionList.forEach(g => {
@@ -143,19 +143,23 @@ export default {
       this.activeWarehouse = warehouse
       if (!!warehouse.selected) {
         warehouse.selected = false
+        return
       } else if(this.activeWarehouseId !== warehouse.id) {
         this.activeWarehouseId = warehouse.id
-      } else {
-        warehouse.selected = true
+        console.log(this.inputValue.find(e => e.areaId === warehouse.id), warehouse.id)
+        if (this.inputValue.find(e => e.areaId === warehouse.id)){
+          return
+        }
+      }
+      warehouse.selected = true
 
-        // 区域被选，清空该区域下的位置
-        if(warehouse.positionList) warehouse.positionList?.forEach(g => {
-          g.selected = false
-          g.children?.forEach(k => {
-            k.selected = false
-          })
+      // 区域被选，清空该区域下的位置
+      if(warehouse.positionList) warehouse.positionList?.forEach(g => {
+        g.selected = false
+        g.children?.forEach(k => {
+          k.selected = false
         })
-      }
+      })
     },
     handleSelectPositionChild(position) {
       if (!!position.selected) {

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/box/ladingBill/index.vue

@@ -89,7 +89,6 @@ import {
   makeBillService,
   getBillService,
   deleteBillService,
-  zipDownload,
 } from "@/api/ecw/box";
 import {
   getTotlContent,
@@ -98,7 +97,6 @@ import {
 } from "../shippingSea/utils";
 import makeLadingBill from "./makeLadingBill.vue";
 import previewBill from "./previewBill.vue";
-import FileSaver from "file-saver";
 
 export default {
   name: "ladingBill",
@@ -145,11 +143,14 @@ export default {
       /* const title = `查看提单 ${this.shipmentObj.selfNo ?? ""} 柜号：${
         this.shipmentObj.cubNo ?? ""
       } 柜型：${cabinetLabel}`; */
-      const title = this.$t('查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}', {
-        selfNo: this.shipmentObj.selfNo,
-        cubNo: this.shipmentObj.cubNo,
-        cabinetLabel
-      })
+      const title = this.$t(
+        "查看提单 {selfNo} 柜号：{cubNo} 柜型：{cabinetLabel}",
+        {
+          selfNo: this.shipmentObj.selfNo,
+          cubNo: this.shipmentObj.cubNo,
+          cabinetLabel,
+        }
+      );
       this.$set(this.dialogCfg, "title", title);
     },
     closeDialog(type) {
@@ -182,7 +183,7 @@ export default {
           downloadFile(
             type,
             { shipmentId: this.shipmentObj.id },
-            this.$t('已装单') + `(${this.shipmentObj.selfNo}).xlsx`,
+            this.$t("已装单") + `(${this.shipmentObj.selfNo}).xlsx`,
             "xlsx"
           );
           return;
@@ -190,7 +191,7 @@ export default {
           downloadFile(
             type,
             { shipmentId: this.shipmentObj.id },
-            this.$t('应收汇总表') + `(${this.shipmentObj.selfNo}).xlsx`,
+            this.$t("应收汇总表") + `(${this.shipmentObj.selfNo}).xlsx`,
             "xlsx"
           );
           return;
@@ -220,14 +221,17 @@ export default {
         this.currData = {
           billContent: data?.billContent ?? "",
           orderNo: this.currRow.orderNo,
+          bpmProcessId: data.bpmProcessId,
         };
       });
     },
     clickZipDownload() {
-      zipDownload({ shipmentId: this.shipmentObj.id }).then((res) => {
-        let blob = new Blob([res], { type: "application/zip" });
-        FileSaver.saveAs(blob, this.$t('打包文件') + ".zip");
-      });
+      downloadFile(
+        "zipDownload",
+        { shipmentId: this.shipmentObj.id },
+        this.$t("打包文件") + ".zip",
+        "zip"
+      );
     },
   },
   computed: {

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -14,7 +14,7 @@
         <work-flow xmlkey="bill_lading" v-model="selectedUsers"></work-flow>
       </div>
       <div v-if="currRow.status === 1">
-        <el-button type="primary" disabled>{{$t('审核中')}}</el-button>
+        <el-button type="primary" @click="jumpReviewDetail">{{$t('审核中')}}</el-button>
         <el-button plain type="primary" @click="canclAudit">{{$t('取消审核')}}</el-button>
         <el-button plain type="primary" @click="showLoaingTemplate">{{$t('提单预览')}}</el-button>
       </div>
@@ -38,7 +38,7 @@ import {
   updateBillService,
   cancelBillService,
 } from "@/api/ecw/box";
-import { serviceMsg } from "../shippingSea/utils";
+import { serviceMsg, toReviewDetail } from "../shippingSea/utils";
 import previewBill from "./previewBill.vue";
 import { getToken } from "@/utils/auth";
 
@@ -200,6 +200,10 @@ export default {
     close(type) {
       this.$emit("closeDialog", type);
     },
+    jumpReviewDetail() {
+      const { bpmProcessId } = this.currData;
+      toReviewDetail.apply(this, [bpmProcessId]);
+    },
   },
   watch: {
     currData: {

src/views/ecw/box/ladingBill/previewBill.vue

@@ -9,9 +9,8 @@
 </template>
 
 <script>
-import { downloadBillService } from "@/api/ecw/box";
 import lodop from "@/utils/lodop";
-import FileSaver from "file-saver";
+import { downloadFile } from "../shippingSea/utils";
 
 export default {
   name: "previewBill",
@@ -22,10 +21,12 @@ export default {
   },
   methods: {
     download() {
-      downloadBillService({ id: this.currRow.id }).then((res) => {
-        let blob = new Blob([res], { type: "application/pdf" });
-        FileSaver.saveAs(blob, this.currRow.orderNo + ".pdf");
-      });
+      downloadFile(
+        "downloadBillService",
+        { id: this.currRow.id },
+        this.currRow.orderNo + ".pdf",
+        "pdf"
+      );
     },
     print() {
       lodop()

src/views/ecw/currency/index.vue

@@ -234,7 +234,7 @@ export default {
       let text = row.status === CommonStatusEnum.ENABLE ? "启用" : "停用";
       this.$modal.confirm('确认要' + text + '"' + row.titleZh + '"吗?').then(function() {
         // return changeUserStatus(row.id, row.status);
-        return updateCurrencyStatus({id:row.id,status:!row.status?CommonStatusEnum.DISABLE:CommonStatusEnum.ENABLE});
+        return updateCurrencyStatus(row);
 
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");

src/views/ecw/financial/receiptDetail.vue

@@ -242,34 +242,22 @@
     </el-card>
     <el-card class="card hexiaoCard">
       <el-descriptions :column="3" border>
-        <!-- <template v-for="(item, index) in form.receivableDetailList">
-          <el-descriptions-item :label="index === 0 ? '应收总金额' : ''" :key="index+3">
-            {{ item.amount }}
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="index + 1" />
-          </el-descriptions-item>
-          <el-descriptions-item :key="index">
-            <template v-if="showCurrencyId !== item.currencyId" slot="label">
-              汇率（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
-            </template>
-            <span v-if="showCurrencyId !== item.currencyId">{{ item.rate }}</span>
-          </el-descriptions-item>
-        </template> -->
-        <!-- <el-descriptions-item>
-          <template slot="label">
-            应收总金额（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
-          </template>
-          {{ form.receivableTotalAmount }}
-        </el-descriptions-item> -->
-
         <el-descriptions-item :label="$t('已核销总金额')">
-          <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
+          <!-- <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
           <el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag>
-          <el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag>
-
+          <el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag> -->
+          <template v-if="!Object.keys(writeOffTotal).length">
+            0
+          </template>
+          <div v-else>
+            <div v-for="(amount, currency) in writeOffTotal" :key="currency">
+              {{amount}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="currency" />
+            </div>
+          </div>
         </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 +265,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>
@@ -474,6 +462,18 @@ export default {
       }
       if (groupList.length === 1) return groupList[0].currencyId
       else return 1
+    },
+    // 已核销总金额
+    writeOffTotal(){
+      let total = {}
+      this.detailed.forEach(item => {
+        if(item.status){
+          if(!total[item.currencyId]){
+            total[item.currencyId] = item.amount
+          }else total[item.currencyId] = NP.plus(total[item.currencyId], item.amount)
+        }
+      })
+      return total
     }
   },
   watch: {

src/views/ecw/financial/voucher.vue

@@ -193,13 +193,13 @@
           >
           <el-button v-if="scope.row.state == 1 || scope.row.state == 2 || scope.row.state == 3" size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ $t('收款') }}</el-button>
           <el-button v-if="scope.row.state == 0 || scope.row.state == 1" size="mini" type="text" @click="deleteClick(scope.row)">{{ $t('删除') }}</el-button>
-          <el-button
+          <!-- <el-button
             v-if="scope.row.state != 0"
             size="mini"
             type="text"
             @click="toprint(scope.row.id)"
             >{{ $t('打印') }}</el-button
-          >
+          > -->
           <el-button
             v-if="scope.row.state != 0"
             size="mini"
@@ -231,11 +231,11 @@
             <i class="el-icon-close" @click="cancel"></i>
           </div> -->
       <div class="dialog-footer">
-        <el-button type="primary" style="width: 130px" @click="submitForm(1)"
-          >{{ $t('国内账单') }}</el-button
+        <el-button type="primary" style="width: 130px" @click="submitForm(1)" v-loading="downloading">{{ $t('国内账单') }}</el-button
         >
         <el-button
           plain
+          v-loading="downloading"
           type="primary"
           style="width: 130px; margin: 0"
           @click="submitForm(2)"
@@ -298,6 +298,7 @@ export default {
         productRecord: null,
         followUpSalesmanId: null,
       },
+      downloading: false, // 导出状态
     };
   },
   created() {
@@ -376,11 +377,12 @@ export default {
       this.exportId = id;
     },
     submitForm(type) {
+      this.downloading = true
       receiptExportExcel({ id: this.exportId, billType: type }).then((response) => {
           this.$download.excel(response, `${type === 1 ? this.$t('国内账单') : "Debite_note"}.xls`);
           this.open = false;
         }
-      );
+      ).finally(() => this.downloading = false)
     },
     /** 取消按钮 */
     //  cancel() {

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/ApprovalDetail.vue

@@ -117,9 +117,6 @@ export default {
         id: [String, Number],
         path: String
     },
-    components:{
-        PrintLandingBill: () => import('./PrintLadingBill.vue')
-    },
     data(){
         return {
             type: null,
@@ -190,15 +187,12 @@ export default {
             getChannel(this.order.channelId).then(res => {
                 this.channel = res.data
             })
-        },
-        getBillService(){
-
-        },
+        },/* 
         getBillOfLandingInProcessing(){
             getBillOfLandingInProcessing({orderId: this.detail.orderId}).then(res => {
                 console.log(res)
             })
-        }
+        } */
     }
 }
 </script>

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

+<!--拆单审核中的申请信息部分-->
+<template>
+    <div v-if="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>
+        <el-form v-if="orderFee" class="prepay_exception_detail">
+            <el-row>
+                <el-form-item :label="$t('订单总金额')+':'">
+                    <span style="margin-left: 8px;" v-for="(item, key) of orderFee.totalAmountList" :key="key">
+                        {{item}}
+                        {{currencyMap[key]}}
+                    </span>
+                </el-form-item>
+            </el-row>
+            <el-row>
+                <el-form-item :label="$t('应付预付金额')+':'">
+                    <span style="margin-left: 8px;" v-for="(item, key) of orderFee.totalPaymentAmount" :key="key">{{item}}{{currencyMap[key]}}</span>
+                </el-form-item>
+            </el-row>
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item :label="$t('已核销预付金额')+':'">
+                        <span style="margin-left: 8px;" v-for="(item, key) of orderFee.writeOffAmount" :key="key">{{item}}{{currencyMap[key]}}</span>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item :label="$t('已核销预付金额占总金额比例')+':'" label-width="200px">
+                        {{orderFee.writeOffAmountScale}}%
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item :label="$t('预付商品货值')+':'">
+                        {{orderFee.paymentGoodsWorth}} {{$t('人民币')}}
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item :label="$t('预付商品货值占佣金额比例')+':'" label-width="200px">
+                        {{orderFee.paymentGoodsWorthScale}}%
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-form-item :label="$t('预付商品方数')+':'">
+                    {{orderFee.paymentGoodsVolume}} {{$t('立方米')}}
+                </el-form-item>
+            </el-row>
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item :label="$t('订单总方数')+':'">
+                        {{orderFee.totalVolume}} {{$t('立方米')}}
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item :label="$t('预付商品方数占总方数比例')+':'" label-width="200px">
+                        {{orderFee.paymentGoodsVolumeScale}}%
+                    </el-form-item>
+                </el-col>
+            </el-row>
+        </el-form>
+    </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: 'PrepayExceptionDetail',
+    props:{
+        id: [String, Number],
+        path: String
+    },
+    data(){
+        return {
+            orderFee: null,
+            order: null,
+            channel: null,
+            unitList:[],
+            currencyList:[],
+        }
+    },
+    watch:{
+        id(){
+            this.getData()
+        },
+        order(){
+            if(this.order.channelId){
+                this.getChannel()
+            }
+        },
+        orderFee(){
+            
+        }
+    },
+    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(){
+        getCurrencyList().then(res => this.currencyList = res.data)
+        if(this.id){
+            this.getData()
+        }
+    },
+    methods:{
+        Decimal,
+        getData(){
+            getBmpDetailByBusinessId(this.id).then(res => {
+                this.orderFee = res.data
+                if(res.data.orderId){
+                    getOrder(res.data.orderId).then(res => {
+                        this.order = res.data
+                    })
+                }
+            })
+        },
+        getChannel(){
+            getChannel(this.order.channelId).then(res => {
+                this.channel = res.data
+            })
+        },
+    }
+}
+</script>
+<style scoped lang="scss">
+.title{
+    padding: 10px 0;
+    span{
+        font-size: 14px;
+        font-weight: bold;
+    }
+}
+.bold{
+    font-weight: bold;
+}
+::v-deep .prepay_exception_detail .el-form-item{
+    margin-bottom: 0;
+}
+</style>
\ No newline at end of file

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

@@ -133,7 +133,7 @@
   <div v-if="type === 4">
     <p>申请理由</p>
     <div>
-      用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ FeeDetails.details.applyInfoVOList[0].newValue }}】信息：
+      用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ prodName }}】信息：
       <ol>
         <template v-for="item in FeeDetails.details.applyInfoVOList">
           <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
@@ -184,7 +184,9 @@ export default {
       warehouseList:[],
       channelList:[],
       processInstanceID:undefined,
-      list:[]
+      list:[],
+
+      prodName: ''
     }
   },
   created() {
@@ -252,7 +254,10 @@ export default {
             getOrder(res.data.orderIds).then(r =>{
               this.FeeDetails = r.data
               this.FeeDetails.details = JSON.parse(res.data.details)
-              // this.FeeDetails.details = res.data.details
+              const orderItem = this.FeeDetails.orderItemVOList.find(e => e.brand === this.FeeDetails.details.brand)
+              if (orderItem){
+                this.prodName = orderItem.prodTitleZh + '(' + orderItem.prodTitleEn + ')'
+              }
             })
           })
           break

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">

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/pending.vue

@@ -164,6 +164,7 @@ export default {
     },
 
     handEdit(row){
+      // 未报价异常
       if(row.orderExceptionType=='order_no_quote_exception'){
         if(row.orderItemId){
           var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
@@ -181,11 +182,15 @@ export default {
 
         }
 
-      }else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){
+      }
+      // 重泡货异常
+      else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){
         this.$router.push({
           path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType,
         })
-       }else{
+       }
+       // 其他异常
+       else{
         this.$router.push({
           path:"/order/prepayDeal?id="+row.id,
         })

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

@@ -500,7 +500,6 @@ export default {
         if (this.warehousing.brand && this.warehousing.brand !== 0){
           this.form.brand = this.warehousing.brand.toString() || ''
         }
-        t
         this.handleBrandChange(this.form.brand)
         getWarehouseLastUpdateApprovalInfo({
           orderItemId: this.warehousing.orderItemId,

src/views/ecw/productPrice/edit.vue

@@ -272,7 +272,12 @@ export default {
       if (!val) return
       // 特殊需求回显
       if (val.specialList) {
-        let keyed = arrryToKeyedObjectBy(val.specialList, 'specialDictType')
+        val.specialList.forEach(item => {
+          let index = this.specialProducts.findIndex(special => special.specialDictType == item.specialDictType)
+          if(index > -1)this.specialProducts[index] = item
+        })
+        // this.specialProducts = val.specialList
+        /* let keyed = arrryToKeyedObjectBy(val.specialList, 'specialDictType')
         this.specialProducts.map((item, index) => {
           if (keyed[item.specialDictType]) {
             for (let field in item) {
@@ -281,7 +286,7 @@ export default {
               }
             }
           }
-        })
+        }) */
       }
     },
     'form.transportVolumeUnit'(val){
@@ -353,6 +358,10 @@ export default {
         if(res.data.validateEndDate){
           this.form.validateEndDate = parseTime(res.data.validateEndDate)
         }
+
+        // 特需价格更新
+
+
         this.lineList = [res.data]
       })
     }

src/views/member/user/underReview.vue

@@ -7,20 +7,8 @@
       <el-form-item :label="$t('关键字')" prop="nickname">
         <el-input v-model="queryParams.searchKey" :placeholder="$t('搜索昵称、姓名、手机、Email')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="成交" prop="mobile">
-        <el-select v-model="queryParams.isDeal">
-          <el-option v-for="item in [{label:$t('全部'),value:''},{label:$t('是'),value:true},{label:$t('否'),value:false}]" :value="item.value" :label="item.label" :key="item.value" ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="认证" prop="password">
-        <el-select v-model="queryParams.authType">
-          <el-option v-for="item in [{label: $t('全部'),value: ''},{label:$t('营业执照认证'),value:1},{label:$t('身份证认证'),value:2},{label:$t('双认证'),value:3}]" :key="item.value"  :value="item.value" :label="item.label"></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
-        <el-button :loading="exportLoading" type="primary" @click="exportFn">{{$t('导 出')}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -34,48 +22,19 @@
       <el-table-column :label="$t('公司名称')" align="center" prop="enterpriseName" />
       <el-table-column :label="$t('用户昵称')" align="center" prop="nickname" />
       <el-table-column :label="$t('真实姓名')" align="center" prop="identityName" />
-      <el-table-column :label="$t('区号')">
+      <el-table-column  align="center" :label="$t('区号')">
         <template v-slot:default = 'scope'>
           +{{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('手机号')" show-overflow-tooltip align="center" prop="mobile" >
       </el-table-column>
-      <el-table-column :label="$t('成交')" align="center" prop="" show-overflow-tooltip >
-        <template v-slot="{row}">
-          {{row.customerStatus === 3 ? $t('成交') : $t('非成交')}}
-        </template>
-      </el-table-column>
-      <el-table-column label="认证" align="center" :formatter="authentication" />
-      <el-table-column label="状态" align="center" prop="status" >
-        <template slot-scope="scope">
-          <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('身份证审核状态')" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <div v-if="!scope.row.identityAuditStatus">{{$t('未提交')}}</div>
-          <dict-tag v-else :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.identityAuditStatus" ></dict-tag>
-          <el-tooltip  v-if="scope.row.identityAuditStatus === 3" class="item" effect="dark" :content="scope.row.identityAuditRemark" placement="bottom">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('营业执照审核状态')" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <div v-if="!scope.row.enterpriseAuditStatus">{{$t('未提交')}}</div>
-          <dict-tag v-else :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.enterpriseAuditStatus" ></dict-tag>
-          <el-tooltip  v-if="scope.row.enterpriseAuditStatus === 3" class="item" effect="dark" :content="scope.row.rowenterpriseAuditRemark" placement="bottom">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('提交审核时间')" align="center" prop="createTime" width="180">
+      <el-table-column :label="$t('提交审核时间')" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.identityAuditCreateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
           <el-button v-if="scope.row.identityAuditStatus !== 0 && scope.row.identityAuditStatus !== undefined" size="mini" type="text"  @click="identityFn(scope.row , '1')">{{$t('身份证审核')}}</el-button>
         </template>
@@ -139,25 +98,20 @@
 
 <script>
 import {
-  createUser,
-  updateUser,
   deleteUser,
-  getUserPage,
   exportUserExcel,
   operationLogApi,
   seTupdateBackletter,
   memberGetAuthIdcardInfo,
   memberGetAuthEnterpriseInfo,
   memberUserAuditIdCard,
-  memberUserUpdateIdCard,
-  memberUserUpdateEnterprise, setUserUpdateStatus, userCreateAuditEnterprise
+  setUserUpdateStatus, userCreateAuditEnterprise, getWaitApprovePage
 } from "@/api/member/user";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import FileUpload  from "@/components/FileUpload"
 import ImageUpload from "@/components/ImageUpload";
 import uploadImage from "@/components/UploadImage";
 import {CommonStatusEnum} from "@/utils/constants";
-import {changeUserStatus, listServiceUser, listSimpleUsers} from "@/api/system/user";
 
 export default {
   name: "underReview",
@@ -189,8 +143,6 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
-      dateRangeLoginDate: [],
-      dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
         page: 1,
@@ -198,7 +150,7 @@ export default {
         isDeal:undefined,//	是否成交
         searchKey:undefined,//关键字
         auditStatus:1,//审核状态
-        authType:undefined,//关键字
+        authType:2,//关键字
       },
       // 表单参数
       form: {},
@@ -229,7 +181,6 @@ export default {
   },
   methods: {
     deleteFn(row){
-      console.log(row)
       this.$modal.confirm(`${this.$t('是否要删除昵称为')}${row.nickname}${this.$t('的会员')}`).then(function (){
         return deleteUser(row.id)
       }).then( res => {
@@ -267,10 +218,8 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeLoginDate, 'loginDate');
-      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getUserPage(params).then(response => {
+      getWaitApprovePage(params).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -314,8 +263,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRangeLoginDate = [];
-      this.dateRangeCreateTime = [];
       this.resetForm("queryForm");
       this.queryParams = {
         page: 1,
@@ -323,7 +270,7 @@ export default {
         isDeal:undefined,//	是否成交
         searchKey:undefined,//关键字
         auditStatus:1,//审核状态
-        authType:undefined,//关键字
+        authType:2,//关键字
       }
       this.handleQuery();
     },
@@ -386,17 +333,6 @@ export default {
         }
       })
     },
-    authentication(row){
-      if(!row.identityAuditStatus && !row.enterpriseAuditRemark){
-        return this.$t('否')
-      }else if(row.identityAuditStatus >= 0 && row.enterpriseAuditRemark >= 0){
-        return this.$t('双认证')
-      } else if(row.identityAuditStatus >= 0){
-        return this.$t('身份')
-      }else if(row.enterpriseAuditRemark >= 0){
-        return this.$t('营业')
-      }
-    },
     submit(){
       let p = {
         cardNumber:this.enterpriseFrom.cardNumber,

src/views/system/menu/index.vue

@@ -262,7 +262,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        id: undefined,
+        /* id: undefined,
         parentId: 0,
         name: undefined,
         enName: undefined,
@@ -272,9 +272,9 @@ export default {
         sort: undefined,
         keepalive: false,
         redirect: undefined,
-        status: CommonStatusEnum.ENABLE
+        status: CommonStatusEnum.ENABLE */
       };
-      this.resetForm("form");
+      /* this.resetForm("form"); */
     },
     /** 搜索按钮操作 */
     handleQuery() {