解决冲突

src/api/system/dept.js

@@ -9,6 +9,15 @@ export function listDept(query) {
   })
 }
 
+// 查询当前登陆人的所属部门列表
+export function myListDept(query) {
+  return request({
+    url: '/system/dept/myListDept',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询部门列表（排除节点）
 export function listDeptExcludeChild(deptId) {
   return request({

src/i18n/languages/en_US.json

@@ -1132,7 +1132,6 @@
     "会计": "Accounting",
     "出纳": "Cashier",
     "经手人": "Handler",
-    "确订打印": "OK to print",
     "收款日期": "Payment Date",
     "应收合计": "Total Receivable",
     "收款金额": "Receipt Amount",
@@ -3791,24 +3790,49 @@
     "内部号不能为空": "Internal number cannot be empty",
     "版本链接不能为空": "Version link cannot be empty",
     "强制更新不能为空": "Forced update cannot be empty",
-    "货物毛重(KGS)": "",
-    "请输入货物毛重": "",
-    "提单确认件.xlsx": "",
-    "提交佣金付款单反核销申请成功，请耐心等待审核结果": "",
-    "客户档案未设置银行账户。": "",
-    "反核销审核详情": "",
-    "全部核销审核详情": "",
-    "取消全部核销审核": "",
-    "提交收款单反核销": "",
-    "输入金额不对": "",
-    "确定要取消此报价单么？": "",
-    "确定要恢复此报价单么？": "",
-    "确定要删除此报价单么？": "",
-    "标签超过1000需要耐心等候标签生成，请稍候": "",
-    "首次入仓时间": "",
-    "订单{no}的放货箱数不能大于可放货箱数": "",
-    "请填写合作开始时间": "",
-    "请填写合作结束时间": "",
-    "境内外": "",
+    "请输入名称-中文": "Please enter a name - Chinese",
+    "请输入名称-英文": "Please enter a name - English",
+    "请输入内部名称-中文": "Please enter internal name - Chinese",
+    "请输入内部名称-英文": "Please enter the internal name - English",
+    "备注-中文": "Remarks - Chinese",
+    "备注-英文": "Remarks - English",
+    "请输入备注-英文": "Please enter remarks - English",
+    "货物毛重(KGS)": "Gross weight of goods (KGS)",
+    "请输入货物毛重": "Please enter the gross weight of the goods",
+    "提单确认件.xlsx": "Bill of Lading Confirmation.xlsx",
+    "提交佣金付款单反核销申请成功，请耐心等待审核结果": "Successfully submitted the commission payment form cancellation application. Please be patient and wait for the review result",
+    "客户档案未设置银行账户。": "The customer profile does not have a bank account set up.",
+    "反核销审核详情": "Details of anti verification approval",
+    "全部核销审核详情": "Full verification and review details",
+    "取消全部核销审核": "Cancel All Write-off Review",
+    "提交收款单反核销": "Submit payment receipt for reverse verification",
+    "输入金额不对": "Incorrect input amount",
+    "标签超过1000需要耐心等候标签生成，请稍候": "Tags exceeding 1000 require patience to wait for tag generation, please wait",
+    "首次入仓时间": "First entry time",
+    "订单{no}的放货箱数不能大于可放货箱数": "The number of delivery boxes for order {no} cannot be greater than the number of available delivery boxes",
+    "请填写合作开始时间": "Please fill in the start time of cooperation",
+    "请填写合作结束时间": "Please fill in the cooperation end time",
+    "境内外": "domestic and foreign",
+    "佣金付款单反审核": "De-approval of commission payment documents",
+    "佣金付款单核销申请": "Commission Payment Document Verification Application",
+    "佣金付款单反核销申请": "Commission Payment Document Reverse Write-off Application",
+    "取消佣金付款单反审核": "Cancel the approval of commission payment documents",
+    "提交取消反审核": "Submit Cancel De-approval",
+    "取消佣金付款单核销": "Cancel commission payment document verification",
+    "取消付款单核销": "Cancel Payment Order Write-off",
+    "取消佣金付款单反核销": "Cancel Commission Payment Document Cancellation",
+    "取消付款单反核销": "Cancel Payment Document Cancellation Write-off",
+    "零": "zero",
+    "玖": "nine",
+    "仟": "Thousand",
+    "兆": "Megabyte",
+    "角": "horn",
+    "厘": "Centimeters",
+    "取消付款单反审核": "Cancel Payment Order De-approval",
+    "提交核销": "Submit for verification",
+    "是否确认删除渠道管理编号为{channelId}的数据项?": "Are you sure to delete the data item with channel management number {channelId}?",
+    "流程详情":"Flow details",
+    "收款单核销审核":"The payment voucher verification review",
+    "系统提示": "System prompt",
     "合计：{totalNum}箱，{totalVolume}m³(测) {totalChargeVolume}m³(重) {totalWeight}KG": "Total：{totalNum}Box，{totalVolume}m³(Test) {totalChargeVolume}m³(Weight) {totalWeight}KG"
-}
\ No newline at end of file
+}

src/i18n/languages/zh_CN.json

@@ -161,7 +161,7 @@
     	"目的仓": "目的仓",
     	"目的地": "目的地",
     	"确定": "确定",
-    	"确订打印": "确订打印",
+    	"确定打印": "确定打印",
     	"确认添加": "确认添加",
     	"税率": "税率",
     	"箱数": "箱数",

src/plugins/modal.js

 import { Message, MessageBox, Notification, Loading } from 'element-ui'
-
+import i18n from "@/i18n";
 let loadingInstance;
-
+console.log(i18n.t,'i18n')
 export default {
   // 消息提示
   msg(content) {
@@ -21,19 +21,19 @@ export default {
   },
   // 弹出提示
   alert(content) {
-    MessageBox.alert(content, "系统提示")
+    MessageBox.alert(content, i18n.t("系统提示"))
   },
   // 错误提示
   alertError(content) {
-    MessageBox.alert(content, "系统提示", { type: 'error' })
+    MessageBox.alert(content, i18n.t("系统提示"), { type: 'error' })
   },
   // 成功提示
   alertSuccess(content) {
-    MessageBox.alert(content, "系统提示", { type: 'success' })
+    MessageBox.alert(content, i18n.t("系统提示"), { type: 'success' })
   },
   // 警告提示
   alertWarning(content) {
-    MessageBox.alert(content, "系统提示", { type: 'warning' })
+    MessageBox.alert(content, i18n.t("系统提示"), { type: 'warning' })
   },
   // 通知提示
   notify(content) {
@@ -52,18 +52,19 @@ export default {
     Notification.warning(content)
   },
   // 确认窗体
+
   confirm(content) {
-    return MessageBox.confirm(content, "系统提示", {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
+    return MessageBox.confirm(content, i18n.t("系统提示"), {
+      confirmButtonText: i18n.t('确定'),
+      cancelButtonText: i18n.t('取消'),
       type: "warning",
     })
   },
   // 提交内容
   prompt(content) {
-    return MessageBox.prompt(content, "系统提示", {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
+    return MessageBox.prompt(content, i18n.t("系统提示"), {
+      confirmButtonText: i18n.t('确定'),
+      cancelButtonText: i18n.t('取消'),
       type: "warning",
     })
   },

src/router/index.js

@@ -157,8 +157,8 @@ export const constantRoutes = [
       }, {
         path: 'process-instance/detail',
         component: (resolve) => require(['@/views/bpm/processInstance/detail'], resolve),
-        name: '流程详情',
-        meta: {title: '流程详情', activeMenu: '/bpm/task/my'}
+        name: 'Flow details',
+        meta: {title: '流程详情',titleEn:'Flow details', activeMenu: '/bpm/task/my'}
       }
     ]
   },
@@ -171,13 +171,13 @@ export const constantRoutes = [
       path: 'empAchievement',
       component: (resolve) => require(['@/views/ecw/deptTarget/empAchievement'], resolve),
       name: '员工业绩',
-      meta: {title: '员工业绩', activeMenu: '/deptTarget/index'}
+      meta: {title: '员工业绩',titleEn: 'Emp Achievement', activeMenu: '/deptTarget/index'}
     },
       {
         path: 'myDeptAchievement',
         component: (resolve) => require(['@/views/ecw/deptTarget/myDeptAchievement'], resolve),
         name: '我的部门业绩',
-        meta: {title: '我的部门业绩', activeMenu: '/deptTarget/myDeptAchievement'}
+        meta: {title: '我的部门业绩',titleEn: 'My dept Achievement', activeMenu: '/deptTarget/myDeptAchievement'}
       }
     ]
   },

src/views/ecw/box/query.vue

@@ -140,9 +140,9 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center">
                 <template slot-scope="scope">
-                  <el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;">{{$t('编辑')}}</el-button>
+                  <el-button type="primary" size="small" @click="editCostClick(scope.row)" style="marginRight:10px;" v-hasPermi="['ecw:box-cost:update']">{{$t('编辑')}}</el-button>
                   <el-popconfirm :title="$t('确定是否删除')" @confirm="deleteCostClick(scope.row)">
-                    <el-button type="danger" size="small" slot="reference">{{$t('删除')}}</el-button>
+                    <el-button type="danger" size="small" slot="reference" v-hasPermi="['ecw:box-cost:delete']">{{$t('删除')}}</el-button>
                   </el-popconfirm>
                 </template>
               </el-table-column>

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

@@ -244,6 +244,7 @@
 import dayjs from "dayjs";
 import supplementOrder from "./supplementOrder.vue";
 import { getCabinetPage } from "@/api/ecw/cabinet";
+import { getbox } from "@/api/ecw/box";
 import {
   loadSecGoodsList,
   orderTagList,
@@ -333,6 +334,7 @@ export default {
       selectedUsers: [],
       // 订单信息
       boxOrderInfo: {},
+      newshipmentObj: {}
     };
   },
   created() {
@@ -341,9 +343,16 @@ export default {
     getCabinetPage(null).then((response) => {
       this.cabinetList = response.data.list;
     });
+    // this.getBoxInfo()
   },
   methods: {
     getTotlContent,
+    getBoxInfo() {
+      getbox(this.shipmentObj.id).then((res) => {
+        const { data } = res;
+        this.newshipmentObj = data ?? {};
+      });
+    },
     /* 装柜部分列表 */
     getLoadSecGoodsList() {
       loadSecGoodsList({ shipmentId: this.shipmentObj.id }).then((res) => {
@@ -420,6 +429,7 @@ export default {
           this.$set(this.dialogConfig, "fullscreen", false);
           this.modifyCabinetObj = {};
           this.$set(this.modifyCabinetObj,'cabinetId',this.shipmentObj.cabinetId)
+          this.$set(this.modifyCabinetObj,'cubNo',this.shipmentObj.cubNo)
           break;
         case "splitOrder":
           this.$set(this.dialogConfig, "fullscreen", true);
@@ -535,6 +545,8 @@ export default {
       };
       boxUpdate(params).then((res) => {
         serviceMsg(res, this);
+        // this.getBoxInfo()
+        this.$emit('getBoxInfo')
         this.closeDialog2();
       });
     },

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

@@ -2,7 +2,7 @@
   <div>
     <el-form ref="subMaterialForm" :model="subMaterialObj" label-width="140px">
       <el-form-item :label="$t('代理商AGENT')">
-        <supplierSelect v-model="subMaterialObj.agentId" :placeholder="$t('请选择供应商')" :allSupplier="this.$attrs.allSupplier" disabled />
+        <supplierSelect v-model="subMaterialObj.agentId" :areaType="1" :placeholder="$t('请选择供应商')" :allSupplier="this.$attrs.allSupplier" disabled />
       </el-form-item>
       <el-form-item :label="$t('提单号M/BL NO.')" class="two-element">
         <el-input v-model="subMaterialObj.blMblNo" :placeholder="$t('请输入提单号')"></el-input>
@@ -35,10 +35,7 @@
       </el-form-item>
       <el-form-item :label="$t('包装数量与单位')" class="two-element">
         <el-input v-model="subMaterialObj.packageNum" :placeholder="$t('请输入包装数量')"></el-input>
-        <!-- <el-select v-model="subMaterialObj.packageUnit" :placeholder="$t('请选择单位')">
-          <el-option v-for="unit in units" :key="unit.id" :value="unit.id" :label="$l(unit, 'title')"></el-option>
-        </el-select> -->
-        <el-input v-model="subMaterialObj.packageUnit" :placeholder="$t('请输入包装单位')"></el-input>
+        <dict-selector v-model="subMaterialObj.packageUnit" type="packaging_type" />
       </el-form-item>
       <el-form-item :label="$t('货物毛重(KGS)')">
         <el-input v-model="subMaterialObj.kgs" :placeholder="$t('请输入货物毛重') + '(KGS)'"></el-input>
@@ -144,6 +141,7 @@ export default {
       this.$set(this.subMaterialObj,'destPortId',this.shipmentObj.bookSeaInfo?.destPortId||undefined)
       this.$set(this.subMaterialObj,'kgs',this.shipmentObj.customsInfo?.dcGoodsWgt||undefined)
       this.$set(this.subMaterialObj,'containerSealNo',(this.shipmentObj.trailerInfo?.tlContainerNo||'')+'/'+(this.shipmentObj.trailerInfo?.tlStripSeal||'/'))
+      this.subMaterialObj.containerSealNo = this.subMaterialObj.containerSealNo.replace('//','')
     }
     
     this.getSup(this.subMaterialObj.agentId)
@@ -156,7 +154,7 @@ export default {
           this.$set(this.subMaterialObj,'notifyingName',response.data.externalBackVO?.notifyCompanyName||'/')
           this.$set(this.subMaterialObj,'packageNum',response.data.externalBackVO?.packNum)
           this.$set(this.subMaterialObj,'packageUnit',response.data.externalBackVO?.packUnit)
-          this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||'')
+          this.$set(this.subMaterialObj,'goodsDesc',response.data.externalBackVO?.goodName||''+response.data.externalBackVO?.fromNo||''+response.data.externalBackVO?.baNo||''+response.data.externalBackVO?.ctnNo||'')
           if(this.subMaterialObj.goodsDesc == null){
             this.$set(this.subMaterialObj,'goodsDesc','/')
           }

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -73,7 +73,11 @@
               <el-table-column :label="$t('重量')" align="center" prop="warehouseInInfo.weight">
               </el-table-column>
               <el-table-column :label="$t('数量（个）')" align="center" prop="quantity"></el-table-column>
-              <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px"></el-table-column>
+              <el-table-column :label="$t('储位')" align="center" prop="positionNo" width="250px">
+                <template slot-scope="scope">
+                  {{notset(scope.row.positionNo)}}
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('状态')" align="center" prop="tallyStatus">
                 <template slot-scope="scope">
                   {{scope.row.tallyStatus === 1 ? $t('已理货') : $t('未理货')}}
@@ -150,6 +154,13 @@ export default {
   methods: {
     // 格式化日期
     formatDate,
+    //去重
+    notset(string){
+      if(!string) return string
+      let arr = string.split(',')
+      arr = arr.filter((item,index)=>{return arr.indexOf(item)==index})
+      return arr.toString()
+    },
     // 查询理货列表
     getList() {
       getTallyList({ shipmentId: this.shipmentObj.id }).then((res) => {

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

@@ -64,7 +64,7 @@ export default {
   },
   created() {
     const { currNode, shipmentObj } = this.$attrs;
-    const voName = currNode.voName;
+    const voName = currNode.voName;console.log(shipmentObj[voName])
     let oldData = { ...shipmentObj[voName] };
     oldData = formatNumberString(oldData, ["tlContainerStatus"]);
     oldData = formatStringNumber(oldData, ["tlCompanyId"]);

src/views/ecw/channel/edit.vue

@@ -10,19 +10,19 @@
                 <el-row>
                     <el-col :span="12">
                         <el-form-item :label="$t('中文名称')" prop="nameZh">
-                            <el-input v-model="form.nameZh" placeholder="请输入名称-中文" />
+                            <el-input v-model="form.nameZh" :placeholder="$t('请输入名称-中文')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item :label="$t('名称英文')" prop="nameEn">
-                            <el-input v-model="form.nameEn" placeholder="请输入名称-英文" />
+                            <el-input v-model="form.nameEn" :placeholder="$t('请输入名称-英文')" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
                         <el-form-item :label="$t('内部名称中文')" prop="internalNameZh">
                             <el-input
                                 v-model="form.internalNameZh"
-                                placeholder="请输入内部名称-中文"
+                                :placeholder="$t('请输入内部名称-中文')"
                             />
                         </el-form-item>
                     </el-col>
@@ -30,7 +30,7 @@
                         <el-form-item :label="$t('内部名称英文')" prop="internalNameEn">
                             <el-input
                                 v-model="form.internalNameEn"
-                                placeholder="请输入内部名称-英文"
+                                :placeholder="$t('请输入内部名称-英文')"
                             />
                         </el-form-item>
                     </el-col>
@@ -95,16 +95,16 @@
                     </el-col> -->
                 </el-row>
 
-                <el-form-item label="备注-中文" prop="remarksZh">
+                <el-form-item :label="$t('备注-中文')" prop="remarksZh">
                     <el-input
                         v-model="form.remarksZh"
-                        placeholder="请输入备注-中文"
+                        :placeholder="$t('请输入备注-中文')"
                     />
                 </el-form-item>
-                <el-form-item label="备注-英文" prop="remarksEn">
+                <el-form-item :label="$t('备注-英文')" prop="remarksEn">
                     <el-input
                         v-model="form.remarksEn"
-                        placeholder="请输入备注-英文"
+                        :placeholder="$t('请输入备注-英文')"
                     />
                 </el-form-item>
                 <!-- <el-form-item label="状态(0:禁用 1:启用)" prop="status">

src/views/ecw/channel/index.vue

@@ -201,7 +201,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const channelId = row.channelId;
-      this.$modal.confirm('是否确认删除渠道管理编号为"' + channelId + '"的数据项?').then(function() {
+      this.$modal.confirm(this.$t('是否确认删除渠道管理编号为{channelId}的数据项?'),{channelId} ).then(function() {
           return deleteChannel(channelId);
         }).then(() => {
           this.getList();

src/views/ecw/customer/edit.vue

@@ -802,12 +802,19 @@ export default {
             // 重货标准和泡货标准，未打开就不传，提交前清空一下
             if(!this.showZhong) {
               this.form.weightUnit = null
-              this.form.zhongLines = null
+              this.zhongLines = []
+            }
+            if (!this.showZhong1) {
+              this.zhongLines = []
             }
             if(!this.showPao) {
               this.form.lightUnit = null
-              this.form.paoLines = null
+              this.paoLines = []
+            }
+            if (!this.showPao1) {
+              this.paoLines = []
             }
+            this.updateCustomerLines()
           const form = {...this.form, type: this.form.type?.join(','), transportType: (this.form.transportType || [])?.join(','), taxRate: Number(this.form.taxRate)}
 
           // 检查路线是否启用了但是没选择目的仓

src/views/ecw/customer/query.vue

@@ -113,27 +113,27 @@
         <el-card style="margin-top: 15px;">
           <h3>{{$t('银行账户')}}</h3>
           <el-table :data="customer.customerBankBackVOList" border>
-            <el-table-column label="编号" type="index"></el-table-column>
-            <el-table-column label="账户名称" prop="accountName"></el-table-column>
-            <el-table-column label="币别">
+            <el-table-column :label="$t('编号')" type="index"></el-table-column>
+            <el-table-column :label="$t('账户名称')" prop="accountName"></el-table-column>
+            <el-table-column :label="$t('币别')">
               <template v-slot="{row}">
                {{$l(currecyList.find(i => row.currency == i.id),'title')}}
               </template>
             </el-table-column>
-            <el-table-column label="银行名称" prop="bankName"></el-table-column>
-            <el-table-column label="银行账户" prop="bankAccount"></el-table-column>
-            <el-table-column label="银行代码" prop="bankCode"></el-table-column>
-            <el-table-column label="账户类型">
+            <el-table-column :label="$t('银行名称')" prop="bankName"></el-table-column>
+            <el-table-column :label="$t('银行账户')" prop="bankAccount"></el-table-column>
+            <el-table-column :label="$t('银行代码')" prop="bankCode"></el-table-column>
+            <el-table-column :label="$t('账户类型')">
               <template v-slot="{row}">
                 {{Number(row.accountType) === 1 ? $t('公账') : $t('私账')}}
               </template>
             </el-table-column>
-            <el-table-column label="状态">
+            <el-table-column :label="$t('状态')">
             <template v-slot="{row}">
-              {{row.status ? '正常' :'停用'}}
+              {{row.status ? $t('正常') : $t('停用')}}
             </template>
             </el-table-column>
-            <el-table-column label="银行地址" prop="bankAddress"></el-table-column>
+            <el-table-column :label="$t('银行地址')" prop="bankAddress"></el-table-column>
           </el-table>
         </el-card>
 

src/views/ecw/deptTarget/allAchievement.vue

@@ -444,13 +444,11 @@
                 // this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
                 // this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
                 // 执行导出
-                this.$modal.confirm(this.$t('是否确认导出所有部门业绩数据项?')).then(() => {
-                    this.exportLoading = true;
-                    return exportDetailExcel(params);
-                }).then(response => {
-                    this.$download.excel(response, `${this.$t('业绩明细')}.xls`);
+                this.exportLoading = true;
+                exportDetailExcel(params).then(response => {
+                this.$download.excel(response, `${this.$t('业绩明细')}.xls`);
 
-                    this.exportLoading = false;
+                this.exportLoading = false;
                 }).catch(() => {
                 });
             },
@@ -466,13 +464,11 @@
                 // this.addBeginAndEndTime(params, this.dateRangeStartTime, 'startTime');
                 // this.addBeginAndEndTime(params, this.dateRangeEndTime, 'endTime');
                 // 执行导出
-                this.$modal.confirm(this.$t('是否确认导出所有部门业绩统计?')).then(() => {
-                    this.exportLoading = true;
-                    return exportStatisticsExcel(params);
-                }).then(response => {
-                    this.$download.excel(response, `${this.$t('业绩统计')}.xls`);
+                this.exportLoading = true;
+                exportStatisticsExcel(params).then(response => {
+                this.$download.excel(response, `${this.$t('业绩统计')}.xls`);
 
-                    this.exportLoading = false;
+                this.exportLoading = false;
                 }).catch(() => {
                 });
             }

src/views/ecw/deptTarget/myDeptTarget.vue

@@ -27,14 +27,14 @@
     </el-form>
 
     <!-- 操作工具栏 -->
-<!--    <el-row :gutter="10" class="mb8">-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
-<!--                   v-hasPermi="['ecw:dept-target:create']">{{$t('目标设置')}}-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-<!--    </el-row>-->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['ecw:dept-target:create']">{{$t('目标设置')}}
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
@@ -149,7 +149,7 @@
         getPersonTargetPage,
         getMyDeptTargetPage
     } from "@/api/ecw/deptTarget";
-    import {listDept, listSimpleDepts} from "@/api/system/dept";
+    import {myListDept, listSimpleDepts} from "@/api/system/dept";
     import {getChannelList} from '@/api/ecw/channel';
     import dayjs from "dayjs";
 import { parseTime } from '@/utils/ruoyi';
@@ -271,7 +271,7 @@ import { parseTime } from '@/utils/ruoyi';
           /** 查询部门列表 */
           getDeptList(){
             this.loading = true;
-            listDept(this.queryParams).then(response => {
+            myListDept(this.queryParams).then(response => {
               this.deptList = this.handleTree(response.data, "id");
               console.log("this.deptList:"+JSON.stringify(this.deptList));
               this.deptList.forEach((item) => {

src/views/ecw/financial/commission-Payment.vue

@@ -40,6 +40,7 @@
               <el-date-picker
                 v-model="selectDate"
                 type="datetimerange"
+                 value-format="yyyy-MM-DD hh:mm:ss"
                 range-separator="至"
                 :start-placeholder="$t('开始日期')"
                 :end-placeholder="$t('结束日期')">
@@ -63,7 +64,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item>
-              <el-button size="mini" type="primary" @click="getList">{{$t('查找')}}</el-button>
+              <el-button size="mini" type="primary" @click="queryParams.page = 1;getList()">{{$t('查找')}}</el-button>
               <el-button type="success" size="mini" @click="$router.push({path:'/financial/commission-requestFunds',query:{payableId:0}})"  v-has-permi="['ecw:commission-Payment:add']" >{{$t('新增请款单')}}</el-button>
             </el-form-item>
           </el-col>
@@ -108,14 +109,14 @@
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:edit']" v-if="[0,2].includes(row.state)" @click="$router.push({path:'/financial/commission-requestFunds',query:{id:row.id}})" >{{$t('编辑')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:delete']" @click="deleteFn(row)" v-if="[0,2].includes(row.state)" > {{$t('删除')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:details']"  v-if="[7,3,1,5].includes(row.state)" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})"   >{{$t('审核详情')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn('取消审核',7, row, '取消审核' )"  >{{$t('取消审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单反审核', 1, row, '提交反审核',)" >{{$t('反审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn('佣金付款单核销申请', 2, row, '提交核销')"  >{{$t('核销')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Unapprove']" v-if="[1].includes(row.state)" @click="bridgeFn($t('取消审核'),7, row, $t('取消审核') )"  >{{$t('取消审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:De-approval']" v-if="[4,].includes(row.state)" @click="bridgeFn($t('佣金付款单反审核'), 1, row, $t('提交反审核'),)" >{{$t('反审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:Write-off']" v-if="[4,].includes(row.state)" @click="bridgeFn($t('佣金付款单核销申请'), 2, row, $t('提交核销'))"  >{{$t('核销')}}</el-button>
          <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:print']" v-if="[4,6].includes(row.state)" @click="$router.push({path:'/financial/printPaymentVoucherCommission',query:{id:row.id}})"  >{{$t('打印')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn('佣金付款单反核销申请', 3, row, '提交反核销')" >{{$t('反核销')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn('取消佣金付款单反审核',4, row, '提交取消反审核' )" >{{$t('取消反审核')}}</el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)"  @click="bridgeFn('取消佣金付款单核销',5, row, '取消付款单核销' )" > {{$t('取消核销')}} </el-button>
-         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']"  v-if="[7].includes(row.state)"  @click="bridgeFn('取消佣金付款单反核销',6, row, '取消付款单反核销' )" > {{$t('取消反核销')}} </el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[6,].includes(row.state)" @click="bridgeFn($t('佣金付款单反核销申请'), 3, row, $t('提交反核销'))" >{{$t('反核销')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelDe-approval']" v-if="[3].includes(row.state)" @click="bridgeFn($t('取消佣金付款单反审核'),4, row, $t('提交取消反审核') )" >{{$t('取消反审核')}}</el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelWrite-off']" v-if="[5].includes(row.state)"  @click="bridgeFn($t('取消佣金付款单核销'),5, row, $t('取消付款单核销') )" > {{$t('取消核销')}} </el-button>
+         <el-button type="text" size="mini" v-has-permi="['ecw:commission-Payment:CancelCancellingWrite-off']"  v-if="[7].includes(row.state)"  @click="bridgeFn($t('取消佣金付款单反核销'),6, row, $t('取消付款单反核销') )" > {{$t('取消反核销')}} </el-button>
        </template>
       </el-table-column>
     </el-table>
@@ -166,6 +167,17 @@ export default {
     listSimpleUsers().then((res) => (this.creatorData = res.data));
     this.getList();
     },
+  watch:{
+    selectDate(val){
+      if(val.length){
+         this.queryParams.beginCreateTime = val[0]
+         this.queryParams.endCreateTime = val[0]
+      }else {
+        this.queryParams.beginCreateTime = ''
+        this.queryParams.endCreateTime = ''
+      }
+    }
+  },
   data(){
     return {
       queryParams:{
@@ -175,7 +187,8 @@ export default {
         salesmanName:null,
         searchKey:null,
         paymentNo:null,
-
+        beginCreateTime:null,
+        endCreateTime:null,
         page:1,
         rows:10,
       },

src/views/ecw/financial/commission-requestFunds.vue

@@ -55,6 +55,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.id"
+                  @click.native="selectFn('departmentName', item.name)"
                 />
               </el-select>
             </el-form-item>
@@ -68,12 +69,13 @@
               :rules="{required:true,message:$t('业务员不能为空')}"
               :error="$t('业务员不能为空')"
             >
-              <el-select filterable  v-model="form.salesmanName" :placeholder="$t('请选择业务员')">
+              <el-select filterable  v-model="form.salesmanId" :placeholder="$t('请选择业务员')">
                 <el-option
+                  @click.native="selectFn('salesmanName', item.nickname)"
                   v-for="item in creatorData"
                   :key="item.id"
                   :label="item.nickname"
-                  :value="item.nickname"
+                  :value="item.id"
                 />
               </el-select>
             </el-form-item>
@@ -595,6 +597,10 @@ export default {
     },
   },
   methods: {
+    selectFn(keyVal, name){
+      this.form[keyVal] = name;
+      console.log(this.form,'form:')
+    },
     getCurrencyLabel(id) {
       var label = this.currencyList.filter(item => item.id == id)
       if (label.length > 0) return this.$i18n.locale == 'zh_CN' ? label[0].titleZh : label[0].titleEn
@@ -751,13 +757,13 @@ export default {
     },
     convertCurrency(money) {
       //汉字的数字
-      var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
+      var cnNums = new Array(this.$t('零'), this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), this.$t('玖'));
       //基本单位
-      var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
+      var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), this.$t('仟'));
       //对应整数部分扩展单位
-      var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
+      var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), this.$t('兆'));
       //对应小数部分单位
-      var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
+      var cnDecUnits = new Array(this.$t('角'), this.$t('分'), this.$t('毫'), this.$t('厘'));
       //整数金额时后面跟的字符
       var cnInteger = this.$t('整');
       //整型完以后的单位

src/views/ecw/financial/components/commissionPaymentDetails.vue

 <template>
 <div>
   <el-descriptions :column="5"  size="mini">
-    <el-descriptions-item label="付款单">{{record.paymentNo}}</el-descriptions-item>
-    <el-descriptions-item label="客户名称">{{record.customerName}}</el-descriptions-item>
-    <el-descriptions-item label="创建时间">{{parseTime(record.createTime)}}</el-descriptions-item>
-    <el-descriptions-item label="业务员">{{record.salesmanName}}</el-descriptions-item>
-    <el-descriptions-item label="付款金额">{{record.totalAmount}}rmb</el-descriptions-item>
-    <el-descriptions-item v-if="record.reason" label="申请理由">{{record.reason}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('付款单')">{{record.paymentNo}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('客户名称')">{{record.customerName}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('创建时间')">{{parseTime(record.createTime)}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('业务员')">{{record.salesmanName}}</el-descriptions-item>
+    <el-descriptions-item :label="$t('付款金额')">{{record.totalAmount}}rmb</el-descriptions-item>
+    <el-descriptions-item v-if="record.reason" :label="$t('申请理由')">{{record.reason}}</el-descriptions-item>
   </el-descriptions>
   <router-link :to="{path:'/financial/commission-requestFunds',query:{lookId: this.record.id}}">
-    <el-button type="primary">查看详情</el-button>
+    <el-button type="primary">{{$t('查看详情')}}</el-button>
   </router-link>
 </div>
 </template>
@@ -37,6 +37,7 @@ export default {
     id:{
       handler:function (newVal){
         commissionPaymentGetPaymentApprove({id:newVal}).then(r => {
+          console.log(r,'rrr');
           getCommissionPayment({id:r.data.paymentId}).then(res => {
             this.record = res.data;
             this.record.reason = r.data.reason //申请理由

src/views/ecw/financial/creatCollection.vue

@@ -926,14 +926,14 @@ export default {
       this.rateChange(row, index)
     },
     writeOffRateChange(row, index) {
-      row.writeOffAmount = NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal))
+      row.writeOffAmount = NP.times(row.writeOffRate || 0, NP.minus(row.receivableAmount, row.discountTotal)).toFixed(2)
 
       const writeOffAmountTotal = this.form.receiptAccountList.filter(v => v.type !== 'total').reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
       this.form.receiptAccountList[this.form.receiptAccountList.length -1].writeOffAmount = writeOffAmountTotal
     },
     rateChange(row, index) {
       console.log(row)
-      row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(6))
+      row.receivableAmount && (row.collectionAmount = NP.times(row.collectionRate || 0, NP.minus(row.receivableAmount, row.discountTotal||0)).toFixed(2))
       this.form.receiptAccountList[index] = {...row}
 
       setTimeout(() => {
@@ -942,7 +942,7 @@ export default {
         this.currencyList.forEach((item,index)=>{
           var dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == item.id)
           if(dollarList.length>0){
-            var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(6)
+            var dollar = dollarList.reduce((total, currentValue) => NP.plus(total, currentValue.collectionAmount), 0).toFixed(2)
             amountList.push({currencyId:item.id,currencyNameEn:item.titleEn,currencyNameZh:item.titleZh,amount:dollar})
           }
         })
@@ -1081,7 +1081,7 @@ export default {
         const totalt = this.form.receiptAccountList.reduce((total, currentValue) => NP.plus(total, currentValue.writeOffAmount || 0), 0)
         this.form.receiptAccountList = [...this.form.receiptAccountList, {
           type: 'total',
-          writeOffAmount: totalt,
+          writeOffAmount: totalt.toFixed(2),
           collectionAmount: [this.form.receiptAccountList.discountNaira, 0, 0]
         }]
 
@@ -1125,7 +1125,7 @@ export default {
       const index = this.form.receiptAccountList.findIndex(v => v.currencyId == type)
       const t = this.form.receiptAccountList[index]
       if (t) {
-        t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount)
+        t.writeOffAmount = NP.times(t.writeOffRate || 0, usCount).toFixed(2)
         this.rateChange(t, index)
       }
     },

src/views/ecw/financial/payable.vue

@@ -102,7 +102,7 @@
           <el-form-item :label="$t('供应商名称')">
             <el-input
               style="max-width: 188px"
-              v-model="queryParams.orderNo"
+              v-model="queryParams.supplierName"
               :placeholder="$t('请输入供应商名称')"
               clearable
               @keyup.enter.native="handleQuery"
@@ -154,9 +154,9 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button 
-           size="mini" 
-           type="text" 
+          <el-button
+           size="mini"
+           type="text"
            v-hasPermi="['ecw:payable:edit']"
            @click="editClick(scope.row)"
             >{{ $t('编辑') }}</el-button>

src/views/ecw/financial/paymentVoucher.vue

@@ -141,25 +141,25 @@
                      v-hasPermi="['ecw:paymentVoucher:edit']" type="text">{{ $t('编辑') }}
           </el-button>
           <!--          <el-button v-if="[1,3].includes(row.state)" size="mini" v-hasPermi="['ecw:paymentVoucher:process']" type="text" @click="examineClick(scope.row.id)">{{ $t('审核') }}</el-button>-->
-          <el-button size="mini"  type="text" v-show="[1].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Unapprove']"  @click="bridgeFn(1, '取消审核',row)">
+          <el-button size="mini"  type="text" v-show="[1].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Unapprove']"  @click="bridgeFn(1, $t('取消审核'),row)">
             {{ $t('取消审核') }}
           </el-button>
           <el-button size="mini" type="text" v-show="[7,3,1,5].includes(row.state)"  v-hasPermi="['ecw:paymentVoucher:details']" @click="$router.push({path:'/bpm/process-instance/detail',query:{id:row.bmpId}})" >{{ $t('审核详情') }}</el-button>
-          <el-button size="mini" type="text"  v-if="[3].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-De-approval']" @click="bridgeFn(2, '取消付款单反审核',row)" >{{ $t('取消反审核') }}</el-button>
-          <el-button size="mini"  type="text" v-if="[5].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Write-off']" @click="bridgeFn(3, '取消付款单核销',row)"  >{{ $t('取消核销') }}</el-button>
+          <el-button size="mini" type="text"  v-if="[3].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-De-approval']" @click="bridgeFn(2, $t('取消付款单反审核'),row)" >{{ $t('取消反审核') }}</el-button>
+          <el-button size="mini"  type="text" v-if="[5].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Write-off']" @click="bridgeFn(3, $t('取消付款单核销'),row)"  >{{ $t('取消核销') }}</el-button>
 
           <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:De-approval']"
-                     @click="bridgeFn(4, '反审核',row)">{{ $t('反审核') }}
+                     @click="bridgeFn(4, $t('反审核'),row)">{{ $t('反审核') }}
           </el-button>
           <el-button v-if="[4].includes(row.state)" size="mini" type="text" v-hasPermi="['ecw:paymentVoucher:writeOff']"
-                     @click="bridgeFn(5, '核销',row)">{{ $t('核销') }}
+                     @click="bridgeFn(5, $t('核销'),row)">{{ $t('核销') }}
           </el-button>
 
           <el-button v-if="[6].includes(row.state)" size="mini" type="text"
-                     v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, '反核销',row)">
+                     v-hasPermi="['ecw:paymentVoucher:cancelWriteOff']" @click="bridgeFn(6, $t('反核销'),row)">
             {{ $t('反核销') }}
           </el-button>
-          <el-button  v-if="[7].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Cancelling-Write-off']" size="mini" type="text" @click="bridgeFn(7, '取消付款单反核销',row)" > {{ $t('取消反核销') }}</el-button>
+          <el-button  v-if="[7].includes(row.state)" v-hasPermi="['ecw:paymentVoucher:Cancel-Cancelling-Write-off']" size="mini" type="text" @click="bridgeFn(7, $t('取消付款单反核销'),row)" > {{ $t('取消反核销') }}</el-button>
           <!-- <el-button v-if="scope.row.state == 3" size="mini" type="text">{{ $t('开票') }}</el-button> -->
 
           <el-button v-if="[6,4].includes(row.state)" size="mini" type="text" @click="toprint(row.id)"

src/views/ecw/financial/printPaymentVoucher.vue

@@ -77,7 +77,7 @@
         </div>
       </div>
       <div slot="footer" class="card">
-        <el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
+        <el-button type="primary" @click="print">{{ $t('确定打印') }}</el-button>
       </div>
   </div>
 </template>
@@ -198,13 +198,13 @@
       },
       convertCurrency(money) {
         //汉字的数字
-        var cnNums = new Array('零', this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), '玖');
+        var cnNums = new Array(this.$t('零'), this.$t('壹'), this.$t('贰'), this.$t('叁'), this.$t('肆'), this.$t('伍'), this.$t('陆'), this.$t('柒'), this.$t('捌'), this.$t('玖'));
         //基本单位
-        var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), '仟');
+        var cnIntRadice = new Array('', this.$t('拾'), this.$t('佰'), this.$t('仟'));
         //对应整数部分扩展单位
-        var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), '兆');
+        var cnIntUnits = new Array('', this.$t('万'), this.$t('亿'), this.$t('兆'));
         //对应小数部分单位
-        var cnDecUnits = new Array('角', this.$t('分'), this.$t('毫'), '厘');
+        var cnDecUnits = new Array(this.$t('角'), this.$t('分'), this.$t('毫'), this.$t('厘'));
         //整数金额时后面跟的字符
         var cnInteger = this.$t('整');
         //整型完以后的单位

src/views/ecw/financial/printPaymentVoucherCommission.vue

@@ -40,7 +40,7 @@
              <th style="width:10%;">{{ $t('税率') }}</th>
             <th style="width: 15%;">{{ $t('发票号') }}</th>
             <th style="width: 10%;">{{ $t('应付金额') }}</th>
-            <th style="width: 10%;">{{ $t('申请金额') }}</th>
+            <th style="width: 10%;">{{ $t('申请金额')}}(RMB)</th>
           </tr>
           <tr v-for="(item, index) in list" :key="index">
             <td>{{ index + 1 }}</td>
@@ -77,7 +77,7 @@
         </div>
       </div>
       <div slot="footer" class="card">
-        <el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
+        <el-button type="primary" @click="print">{{ $t('确定打印') }}</el-button>
       </div>
   </div>
 </template>

src/views/ecw/financial/printVoucher.vue

@@ -80,7 +80,7 @@
         </div>
       </div>
       <div slot="footer" class="card">
-        <el-button type="primary" @click="print">{{ $t('确订打印') }}</el-button>
+        <el-button type="primary" @click="print">{{ $t('确定打印') }}</el-button>
       </div>
   </div>
 </template>

src/views/ecw/financial/voucher.vue

@@ -32,12 +32,14 @@
             <dict-selector
               :type="DICT_TYPE.ECW_RECEIPT_STATE"
               v-model="queryParams.state"
+              clearable
             />
           </el-form-item>
           <el-form-item :label="$t('业务员')">
             <el-select
               v-model="queryParams.salesmanId"
               :placeholder="$t('请选择业务员')"
+              clearable
             >
               <el-option
                 v-for="item in creatorData"
@@ -471,29 +473,29 @@ export default {
       }
       const receiptIdData = this.list[this.writeOffIndex]
       if(this.writeOffType==1){
-        this.$modal
-          .confirm(this.$t('您确认要反审核吗')+'?')
-          .then(()=>{
+        // this.$alert()
+        //   .confirm(this.$t('您确认要反审核吗')+'?')
+        //   .then(()=>{
             financeApproveNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
               this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
               // this.$store.dispatch('tagsView/delCurrentView')
             });
-          })
-          .catch(() => {this.dialogVisible = false});
+          // })
+          // .catch(() => {this.dialogVisible = false});
       }else{
-        this.$modal
-          .confirm(this.$t('您确认要反核销吗')+'?')
-          .then(()=>{
+        // this.$modal
+        //   .confirm(this.$t('您确认要反核销吗')+'?')
+        //   .then(()=>{
             financeReceiptWriteOffNo({receiptId:receiptIdData.id,receiptNo:receiptIdData.receiptNo,remark:this.reason}).then(res=>{
               this.getList();
               this.$message.success(this.$t("提交成功"));
               this.dialogVisible = false
               // this.$store.dispatch('tagsView/delCurrentView')
             });
-          })
-          .catch(() => {this.dialogVisible = false});
+          // })
+          // .catch(() => {this.dialogVisible = false});
       }
 
     },

src/views/ecw/order/batchSingleApplication.vue

@@ -19,8 +19,12 @@
           <template v-slot="{row}">
             <div v-if="row.costVO">
               {{$t('箱数')}}：{{ row.costVO.totalNum }}
-              {{ row.costVO.totalVolume }}m³
-              {{ row.costVO.totalWeight }}kg
+               <div>
+                 体积：{{ row.costVO.totalVolume }}CBM
+               </div>
+                <div>
+                  重量：{{ row.costVO.totalWeight }}kg
+                </div>
             </div>
           </template>
         </el-table-column>

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

@@ -20,9 +20,9 @@
       :label="$t('下单统计')">
       <template v-slot="{row}">
         <div v-if="row.costVO">
-          箱数：{{row.costVO.totalNum}}
-          {{row.costVO.totalVolume}}m³
-          {{row.costVO.totalWeight}}kg
+          <div>箱数：{{row.costVO.totalNum}}</div>
+           <div>体积：{{row.costVO.totalVolume}}CMB</div>
+           <div>重量：{{row.costVO.totalWeight}}kg</div>
         </div>
       </template>
     </el-table-column>

src/views/ecw/order/transferWarehousing.vue

@@ -366,8 +366,8 @@ export default {
           Wweight += Number(m.weight || 0)
         })
        })
-      let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume}m³ ${weight}Kg`
-      let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume}m³ ${Wweight}Kg`
+      let text = `${this.$t('下单统计')}：${num}${this.$t('箱')} ${volume.toFixed(2)}m³ ${weight.toFixed(2)}Kg`
+      let text2 =` ${this.$t('入仓统计')}：${Wnum}${this.$t('箱')} ${Wvolume.toFixed(2)}m³ ${Wweight.toFixed(2)}Kg`
       return [this.$t('合计：'),text,text2]
     },
     cancellationOfOrder(){

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

@@ -55,7 +55,7 @@
         prop="expressNo"
         v-slot="{row}"
         :label="$t('快递单号')">
-        {{ row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '' }}
+        {{ row.expressNo || (row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '') }}
       </el-table-column>
       <el-table-column
         prop="createTime"

src/views/ecw/supplier/index.vue

@@ -21,7 +21,7 @@
       </el-form-item>
 
       <el-form-item :label="$t('境内外')" prop="areaType">
-        <el-select v-model="queryParams.areaType" placeholder="请选择" clearable="true">
+        <el-select v-model="queryParams.areaType" placeholder="请选择" clearable>
           <el-option
             v-for="item in areaTypes"
             :key="item.value"