Merge branch 'dev' into dev1.6

src/i18n/languages/zh_CN.json

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

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/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/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'