Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/api/ecw/order.js

@@ -540,4 +540,31 @@ export function orderDeptStatistics(params){
     method: 'GET',
     params
   })
+}
+
+// 参数搜索导出订单管理 Excel
+export function orderExportSearch(params){
+  return request({
+    url: '/ecw/order/export/search',
+    method: 'GET',
+    params
+  })
+}
+
+// 参数搜索导出我的订单管理 Excel
+export function orderExportMySearch(params){
+  return request({
+    url: '/ecw/order/export/my/search',
+    method: 'GET',
+    params
+  })
+}
+
+// 参数搜索导出部门订单管理 Excel
+export function orderExportDeptSearch(params){
+  return request({
+    url: '/ecw/order/export/dept/search',
+    method: 'GET',
+    params
+  })
 }
\ No newline at end of file

src/i18n/languages/zh_CN.json

 {
+  "编号":"编号",
     "登录": "登录",
     	"上传附件": "上传附件",
     	"不需要": "不需要",

src/views/bpm/model/modelEditor.vue

@@ -96,7 +96,7 @@ export default {
     },
     /** 关闭按钮 */
     close() {
-      this.$tab.closeOpenPage({ path: "/bpm/manager/model" });
+      this.$tab.closeOpenPage({ path: "/manager/model" });
     },
   }
 };

src/views/bpm/task/todo.vue

@@ -33,8 +33,8 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('流程编号')" align="center" prop="processInstance.id" width="320"/>
-      <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="320"/>
+      <el-table-column :label="$t('流程编号')" align="center" prop="processInstance.id" width="220"/>
+      <el-table-column :label="$t('流程名称')" align="center" prop="processInstance.name" width="220"/>
       
       <el-table-column :label="$t('流程分类')" align="center" prop="category">
         <template slot-scope="scope">
@@ -66,7 +66,7 @@
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
           <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCancel(scope.row)"
                      v-hasPermi="['bpm:task:update']">{{ $t('取消') }}

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

@@ -182,6 +182,7 @@ export default {
 
         const imgWidth = canvas.width
         const imgHeight = canvas.height
+        console.log(imgHeight, imgWidth)
         let _w = 595.28;
 		    let _h = 595.28/imgWidth*imgHeight;
         if(_h>841.89){
@@ -194,12 +195,13 @@ export default {
         return Promise.reject() */
         let form = new FormData()
         let file = this.selfNo + '-' + this.currRow.tidanNo + '.pdf'
+
         form.append('file', new File([doc.output('arraybuffer')], file, {type: 'application/pdf'}))
         form.append('path', `admin/shipment/${this.selfNo}/pdf/${file}`) // 最前面不能有/，否则返回的url会有两个/
 
         /* let blob = new Blob([doc.output('arraybuffer')], {type: "application/pdf"})
-            FileSaver.saveAs(blob, file); 
-          return    */
+        FileSaver.saveAs(blob, file); 
+        return */
         return uploadFile(form)
       }).then(res => {
         return this.submit(res.data)

src/views/ecw/coupon/index.vue

@@ -159,7 +159,7 @@
       </el-table-column>
       <el-table-column :label="$t('结束时间')" align="center" prop="endTime" width="180">
         <template slot-scope="{row}">
-          <div :style="{red: row.overdueStatus ==0 ? 'red' : null}">{{ parseTime(row.endTime, '{y}-{m}-{d}') }}</div>
+          <div :style="{red: row.overdueStatus == 0 ? 'red' : null}">{{ parseTime(row.endTime, '{y}-{m}-{d}') }}</div>
           <div v-if="row.overdueStatus == 0" style="color: red">{{ $t('已过期') }}</div>
         </template>
       </el-table-column>
@@ -188,7 +188,7 @@
                      v-hasPermi="['ecw:coupon:update']">{{ $t('编辑') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)"
                      v-hasPermi="['ecw:coupon:create']">{{ $t('复制') }}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="updateEndtimeItem = scope.row"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="updateEndtimeItem = scope.row" v-if="scope.row.endTime"
                      v-hasPermi="['ecw:coupon:update']">{{ $t('延期') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['ecw:coupon:delete']">{{ $t('删除') }}</el-button>
@@ -202,14 +202,14 @@
     <el-dialog :title="$t('延期活动时间')" :visible="!!updateEndtimeItem" :before-close="() => updateEndtimeItem=null">
       <div v-if="updateEndtimeItem">
         {{$t('优惠活动“{name}”的当前结束时间：{time}',{
-          name: updateEndtimeItem.name,
+          name: $l(updateEndtimeItem, 'title'),
           time: updateEndtimeItem.endTime || $t('永久有效')
           })}}
       </div>
       <div>{{$t('请问您确定延长活动吗？')}}</div>
       <el-form :model="updateEndtimeForm" :rules="updateEndtimeRules" label-position="left" >
         <el-form-item :label="$t('活动结束时间')" prop="endTime">
-          <el-date-picker type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="updateEndtimeForm.endTime" placeholder=""></el-date-picker>
+          <el-date-picker v-if="!updateEndtimeForm.forever" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="updateEndtimeForm.endTime" placeholder=""></el-date-picker>
           <el-checkbox :label="$t('永久有效')" v-model="updateEndtimeForm.forever" class="ml-10"></el-checkbox>
         </el-form-item>
       </el-form>
@@ -296,6 +296,11 @@ export default {
       }
     }
   },
+  watch:{
+    updateEndtimeItem(){
+      this.updateEndtimeForm = {}
+    }
+  },
   created() {
     this.getList();
   },

src/views/ecw/currency/index.vue

@@ -60,11 +60,7 @@
       </template>
       </el-table-column>
       <el-table-column label="100外币兑人民币汇率" align="center" prop="huilv" />
-      <el-table-column label="100人民币兑外币汇率" align="center" prop="huilv">
-        <template slot-scope="scope">
-          {{ scope.row.huilv ? (10000 / scope.row.huilv).toFixed(6) : ''}}
-        </template>
-      </el-table-column>
+      <el-table-column label="100人民币兑外币汇率" align="center" prop="exchangeToFc" />
       <el-table-column :label="$t('排序')" align="center" prop="aorder" />
 <!--      <el-table-column label="" align="center" prop="createAt" width="180">-->
 <!--        <template slot-scope="scope">-->

src/views/ecw/customerToBeAssigned/index.vue

@@ -398,7 +398,7 @@ export default {
     /** 移交按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('是否确认删除客户编号为"') + id + this.$t('"的数据项?')).then(function() {
+      this.$modal.confirm(this.$t('是否确认删除客户编号为"') + row.number + this.$t('"的数据项?')).then(function() {
         return deleteCustomer(id);
       }).then(() => {
         this.getList();

src/views/ecw/deptTarget/index.vue

@@ -229,7 +229,7 @@ import { parseTime } from '@/utils/ruoyi';
                     for (let index in this.channelList) {
                         let channelItem = this.channelList[index];
                         if (channelItem.channelId == shippingChannelId) {
-                            return $l(channelItem, 'name');
+                            return this.$l(channelItem, 'name');
                         }
                     }
                     return '/'

src/views/ecw/myCustomerService/index.vue

@@ -388,7 +388,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
-      this.$modal.confirm(this.$t('是否确认删除客户编号为"') + id + this.$t('"的数据项?')).then(function() {
+      this.$modal.confirm(this.$t('是否确认删除客户编号为"') + row.number + this.$t('"的数据项?')).then(function() {
         return deleteCustomer(id);
       }).then(() => {
         this.getList();

src/views/ecw/offer/edit.vue

@@ -750,6 +750,21 @@ export default {
             arr.push(it)
         })
 
+        // 没有累加保价费(没有美元计价)但是有保价费则需要加上去
+        if(!withInsuranceFee && this.fee && this.fee.insuranceFee){
+            let fee = Decimal(this.fee.insuranceFee)
+            // 如果没有美元费用，且保价费和其他费用币种相同（都是美元）
+            if(this.form.otherFeeCurrencyId == 1 && this.form.otherFee){
+                withOtherFee = true
+                fee = fee.plus(new Decimal(this.form.otherFee || 0))
+            }
+
+            arr.push({
+                currencyId: 1,
+                amount: fee
+            })
+        }
+
         // 如果没有累加其他费用，则另外增加货币
         if(!withOtherFee && this.form.otherFee){
             let fee = {
@@ -765,13 +780,7 @@ export default {
             arr.push(fee)
         }
 
-        // 没有累加保价费(没有美元计价)但是有保价费则需要加上去
-        if(!withInsuranceFee && this.fee && this.fee.insuranceFee){
-            arr.push({
-                currencyId: 1,
-                amount: Decimal(this.fee.insuranceFee)
-            })
-        }
+        
 
         return arr
     },

src/views/ecw/order/edit.vue

@@ -835,7 +835,7 @@ export default {
     'form.isCargoControl'(isCargoControl){
         console.log('form.isCargoControl', this.form.isCargoControl, this.initing)
         if(!this.initing){
-            this.$set(this.form, 'drawee', isCargoControl ? 1 : 2)
+            this.$set(this.form, 'drawee', isCargoControl ? 2 : 2)
         }
     },
     /* 'form.orderItemVOList'(){
@@ -852,6 +852,12 @@ export default {
             }
         })
 
+    },
+    // 送货上门变化后需要判断当前选择的收货方式，如果选择了送货上门但是当前不支持送货上门则需要重置
+    homeDeliveryService(enable){
+        if(!enable && this.form.harvestMethod != 1){
+            this.form.harvestMethod = 1
+        }
     }
   },
   activated(){

src/views/ecw/order/index.vue

@@ -102,7 +102,7 @@
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item :label="$t('审核状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditResult"
+        <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditType"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
 
@@ -126,21 +126,23 @@
       <el-col :span="1.5">
         <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           :loading="exportLoading" v-hasPermi="['ecw:order:export']">{{$t('导出')}}</el-button> -->
-        <el-dropdown v-hasPermi="['ecw:order:export']">
+        <el-dropdown v-hasPermi="isAll ? ['ecw:order:export','ecw:order:export:other']:[exportPermiString]">
           <el-button type="primary" :loading="exportLoading" size="mini">
             导出 <i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click.native="exportChecked">导出勾选</el-dropdown-item>
-            <el-dropdown-item @click.native="exportSearch">导出搜索</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">异常单统计</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">重货单统计</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">退仓单统计</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">售后赔偿金额统计</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">报关数据统计</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">客户出货量统计</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">预付运费统计</el-dropdown-item>
-            <el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item>
+            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportChecked">导出勾选</el-dropdown-item>
+            <el-dropdown-item v-hasPermi="[exportPermiString]" @click.native="exportSearch">导出搜索</el-dropdown-item>
+            <template v-if="isAll" v-hasPermi="['ecw:order:export:other']">
+              <el-dropdown-item @click.native="$message('// TODO')">异常单统计</el-dropdown-item>
+              <el-dropdown-item @click.native="$message('// TODO')">重货单统计</el-dropdown-item>
+              <el-dropdown-item @click.native="$message('// TODO')">退仓单统计</el-dropdown-item>
+              <el-dropdown-item @click.native="$message('// TODO')">售后赔偿金额统计</el-dropdown-item>
+              <el-dropdown-item @click.native="$message('// TODO')">报关数据统计</el-dropdown-item>
+              <el-dropdown-item @click.native="$message('// TODO')">客户出货量统计</el-dropdown-item>
+              <el-dropdown-item @click.native="$message('// TODO')">预付运费统计</el-dropdown-item>
+              <el-dropdown-item @click.native="$message('// TODO')">卸货费统计</el-dropdown-item>
+            </template>
           </el-dropdown-menu>
         </el-dropdown>
       </el-col>
@@ -443,7 +445,10 @@ import {
   deptOrderPage,
   orderStatistics,
   orderMyStatistics,
-  orderDeptStatistics
+  orderDeptStatistics,
+  orderExportSearch,
+  orderExportMySearch,
+  orderExportDeptSearch
 } from "@/api/ecw/order";
 /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
 import PrintTag from './components/PrintTag'
@@ -537,6 +542,18 @@ export default {
     }
   },
   computed: {
+    // 导出的权限字符串
+    exportPermiString(){
+      let arr = ['ecw:order:export']
+      if(this.mine)arr.push('my')
+      if(this.dept)arr.push('dept')
+      if(this.transportId)arr.push(this.transportId)
+      return arr.join(":")
+    },
+    // 是否全部订单
+    isAll(){
+      return !(this.mine || this.dept || this.transportId)
+    },
     isChinese(){
       return this.$i18n.locale === 'zh_CN'
     },
@@ -592,16 +609,23 @@ export default {
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
   },
   methods: {
+    // 获得导出函数
+    getExportFunc(){
+      let func = orderExportSearch
+      if(this.mine)func = orderExportMySearch
+      if(this.dept)func = orderExportDeptSearch
+      return func
+    },
     // 导出勾选
     exportChecked(){
       if(!this.ids.length){
         return this.$message.error(this.$t('请勾选需要导出的订单'))
       }
-      return this.exportExcel(exportOrderExcel, {orderIdList: this.ids})
+      return this.exportExcel(this.getExportFunc(), {orderIdList: this.ids}, this.$t("导出勾选"))
     },
     // 导出搜索
     exportSearch(){
-      return this.exportExcel(exportOrderExcel, this.combinedQueryParams)
+      return this.exportExcel(this.getExportFunc(), this.combinedQueryParams, this.$t("导出搜索"))
     },
     // 通用导出函数
     exportExcel(func, params, fileName = null){

src/views/system/internalMessage/index.vue

@@ -35,16 +35,16 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                    v-hasPermi="['ecw:internal-message:create']">{{ $t('新增') }}</el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                    v-hasPermi="['ecw:internal-message:export']">{{ $t('导出') }}</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="" align="center" prop="id" />
+      <el-table-column :label="$t('编号')" align="center" prop="id" />
       <el-table-column :label="$t('来源')" align="center" prop="fromId" />
       <el-table-column :label="$t('发送时间')" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">

src/views/system/myInternalMessage/index.vue

@@ -38,7 +38,7 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column label="" align="center" prop="id" />
+      <el-table-column :label="$t('编号')" align="center" prop="id" />
 <!--      <el-table-column :label="$t('来源')" align="center" prop="fromId" />-->
       <el-table-column :label="$t('发送时间')" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
@@ -209,7 +209,7 @@ export default {
       })
     },
     deleteFn(row){
-      this.$confirm(`是否要删除id:[${row.id}]的站内信?`, this.$t('提示'), {
+      this.$confirm(`是否要删除编号为“${row.id}”的站内信?`, this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'