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

src/views/ecw/customer/index.vue

@@ -721,8 +721,8 @@ export default {
           return exportCustomerExcel(params);
         }).then(response => {
           this.$download.excel(response, `${this.$t('客户信息')}.xls`);
-          console.log(response,'response')
-          this.$download.excel(response, `${this.$t('全部客户信息')}.xls`);
+          /* console.log(response,'response')
+          this.$download.excel(response, `${this.$t('全部客户信息')}.xls`); */
           this.exportLoading = false;
         }).catch(() => {});
     },

src/views/ecw/customerCommissionInfo/index.vue

@@ -7,7 +7,7 @@
             <el-col :span="5">
               <el-form-item label="客户名称" prop="customerId">
               <div style="display: flex">
-                <el-input placeholder="请输入选择客户" v-model="customerName"></el-input>
+                <el-input readonly="readonly"   placeholder="请输入选择客户" v-model="customerName"></el-input>
                 <img style="width: 40px;height: 40px;margin-left: 40px;" src="@/assets/images/phonebook.png" class="phonebook" @click="customerNameShow= true" />
               </div>
 <!--                <el-select-->
@@ -284,7 +284,7 @@ export default {
       //明佣
       mingServantFrom: [
         {
-          refund: 1,
+          refund: '',
           refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),
           refundUnit:undefined,
         }
@@ -302,10 +302,10 @@ export default {
       //暗佣+达标返佣
       darkServantAndRebateForm: [
         {
-          amount: 1,//	暗佣-满减金额
+          amount: '',//	暗佣-满减金额
           amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
           amountUnit:undefined,//	暗佣-满减金额对应单位,
-          refund: 1,//暗佣-满之后返还金额
+          refund: '',//暗佣-满之后返还金额
           refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
           refundUnit:undefined,//暗佣-满之后返还金额的单位
         }
@@ -313,10 +313,10 @@ export default {
       //暗佣+明金
       mingServantAnddarkServant: [
         {
-          refund: 1,//	暗佣+明佣 上调金额
+          refund: '',//	暗佣+明佣 上调金额
           refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣+明佣 上调对应的货币
           refundUnit: undefined,//暗佣+明佣 上调对应的单位
-          darkAdjustCommission: 1,//暗佣+明佣 上调金额
+          darkAdjustCommission: '',//暗佣+明佣 上调金额
           darkAdjustCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣+明佣 上调对应的货币
           darkAdjustUnit:undefined,//暗佣+明佣 上调对应的单位
         }
@@ -357,32 +357,32 @@ export default {
       if(r.code === 0){
         this.weightList = r.data
         this.$set(this.mingServantFrom,0, {
-            refund: 1,
+            refund: '',
             refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),
             refundUnit: parseInt(this.weightList[0].id),})
         this.$set(this.darkServantAndProductForm, 0,
           {
             productType: 0,//商品类型
             productAttr: 0,//暗佣 产品属性
-            darkCommission: 1,//暗佣 佣金
+            darkCommission: '',//暗佣 佣金
             darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
             darkUnit: parseInt(this.weightList[0].id),//	暗佣 单位
           })
         this.$set(this.darkServantAndRebateForm, 0,
           {
-            amount: 1,//	暗佣-满减金额
+            amount: '',//	暗佣-满减金额
             amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
             amountUnit:parseInt (this.weightList[0].id),//	暗佣-满减金额对应单位,
-            refund: 1,//暗佣-满之后返还金额
+            refund: '',//暗佣-满之后返还金额
             refundCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
             refundUnit:parseInt(this.weightList[0].id),//暗佣-满之后返还金额的单位
           })
         this.$set(this.mingServantAnddarkServant, 0,
           {
-            refund: 1,//	暗佣+明佣 上调金额
+            refund: '',//	暗佣+明佣 上调金额
             refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣+明佣 上调对应的货币
             refundUnit: parseInt(this.weightList[0].id),//暗佣+明佣 上调对应的单位
-            darkAdjustCommission: 1,//暗佣+明佣 上调金额
+            darkAdjustCommission: '',//暗佣+明佣 上调金额
             darkAdjustCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣+明佣 上调对应的货币
             darkAdjustUnit:parseInt(this.weightList[0].id),//暗佣+明佣 上调对应的单位
           })
@@ -480,16 +480,16 @@ export default {
          this.darkServantAndProductForm.push({
            productType:0,//商品类型
            productAttr:0,//暗佣 产品属性
-           darkCommission: 1,//暗佣 佣金
+           darkCommission: '',//暗佣 佣金
            darkCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣 货币
            darkUnit:this.darkServantAndProductForm[0].darkUnit,//	暗佣 单位
          })
       }else {
         this.darkServantAndRebateForm.push( {
-          amount: 1,//	暗佣-满减金额
+          amount: '',//	暗佣-满减金额
           amountCurrency:parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//	暗佣-满减金额对应货币
           amountUnit: parseInt(this.weightList[0].id),//	暗佣-满减金额对应单位,
-          refund: 1,//暗佣-满之后返还金额
+          refund: '',//暗佣-满之后返还金额
           refundCurrency: parseInt(this.getDictDatas(this.DICT_TYPE.COMMISSION_CURRENCY_TYPE)[0].value),//暗佣-满之后返还金额的货币
           refundUnit: this.darkServantAndRebateForm[0].refundUnit,//暗佣-满之后返还金额的单位
         })
@@ -508,11 +508,11 @@ export default {
             if(this.darkServantAndProductForm.some(i => i.darkCommission <= 0 || isNaN(i.darkCommission))) return this.$message.warning('请输入大于0的金额')
             this.form.customerCommissionInfoBaseVOList = this.darkServantAndProductForm
           } else {
-            if(this.darkServantAndRebateForm.some(i => i.amount <= 0 || i.refund <=0)) return this.$message.warning('请输入大于0的金额')
+            if(this.darkServantAndRebateForm.some(i => i.amount <= 0 ||isNaN(Number(i.amount)) || i.refund <=0 ||isNaN(Number(i.refund)))) return this.$message.warning('请输入大于0的金额')
             this.form.customerCommissionInfoBaseVOList = this.darkServantAndRebateForm
           }
         } else if (this.form.type == 3) {
-          if(this.mingServantAnddarkServant[0].darkAdjustCommission <= 0 || this.mingServantAnddarkServant[0].refund <= 0 ) return this.$message.warning('请输入大于0的金额')
+          if(this.mingServantAnddarkServant[0].darkAdjustCommission <= 0 || isNaN(Number(this.mingServantAnddarkServant[0].darkAdjustCommission)) || this.mingServantAnddarkServant[0].refund <= 0 || isNaN(Number(this.mingServantAnddarkServant[0].refund))) return this.$message.warning('请输入大于0的金额')
           this.form.customerCommissionInfoBaseVOList = this.mingServantAnddarkServant
         }
         if(this.$route.params.dictId == 0){
@@ -520,7 +520,7 @@ export default {
             console.log('添加',r)
             if(r.code == 0){
               this.$message.success('添加成功！');
-              this.$router.go(-1)
+              this.$tab.closeOpenPage({path:'/customer/customerCommission'});
             }
           })
         }else {

src/views/ecw/myCustomerService/index.vue

@@ -5,13 +5,13 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item :label="$t('客户编号')" prop="number">
-        <el-input v-model="queryParams.number" placeholder="请输入客户编号" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.number" :placeholder="$t('请输入客户编号')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('客户名称')" prop="name">
-        <el-input v-model="queryParams.name" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.name" :placeholder="$t('请输入客户名称')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('客户等级')" prop="level">
-        <el-select clearable  v-model="queryParams.level" placeholder="请选择客户等级" clearable size="small">
+        <el-select clearable  v-model="queryParams.level" :placeholder="$t('请选择客户等级')" clearable size="small">
           <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_LEVEL)"
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>

src/views/ecw/offer/edit.vue

@@ -28,7 +28,7 @@
                 </el-form-item>
                 <el-form-item :label="$t('发货人电话')" prop="consignorPhone">
                     <!-- <area-code-selector v-model="form.consignorCountryCode" class="w-200 mr-10" disabled /> -->
-                    <el-input :value="`${form.consignorCountryCode || ''} ${form.consignorPhone || ''}`" class="w-200" disabled/>
+                    <el-input :value="`${form.consignorCountryCode ? '+' + form.consignorCountryCode : ''} ${form.consignorPhone || ''}`" class="w-200" disabled/>
                 </el-form-item>
                 <el-form-item :label="$t('发货人公司')" prop="consignorCompany">
                     <el-input v-model="form.consignorCompany" disabled  class="w-200"/>
@@ -47,7 +47,7 @@
                 </el-form-item>
                 <el-form-item :label="$t('收货人电话')" prop="consigneePhone">
                     <!-- <area-code-selector v-model="form.consigneeCountryCode" class="w-200 mr-10" disabled/> -->
-                    <el-input :value="`${form.consigneeCountryCode || ''} ${form.consigneePhone || ''}`" class="w-200"/>
+                    <el-input :value="`${form.consigneeCountryCode ? '+' + form.consigneeCountryCode : ''} ${form.consigneePhone || ''}`" disabled class="w-200"/>
                 </el-form-item>
                 <el-form-item :label="$t('收货人公司')" prop="consigneeCompany">
                     <el-input v-model="form.consigneeCompany" :disabled="true"  class="w-200"/>
@@ -355,9 +355,11 @@
                     </div>
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('预计费用')" :span="1">
+                    <div>
                         <template v-for="item in estimatedCosts">
                             <div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div>
                         </template>
+                    </div>
                 </el-descriptions-item>
             </el-descriptions>
         </el-card>
@@ -627,7 +629,7 @@ export default {
             sum.totalNum = sum.totalNum.plus(item.num || 0)
             sum.totalVolume = sum.totalVolume.plus(item.volume || 0)
             sum.totalWeight = sum.totalWeight.plus(item.weight || 0)
-            sum.totaltotalWorthNum = sum.totalWorth.plus(item.worth || 0)
+            sum.totalWorth = sum.totalWorth.plus(item.worth || 0)
             sum.totalQuatity = sum.totalQuatity.plus(item.quantity || 0)
         })
         return sum
@@ -695,6 +697,7 @@ export default {
     estimatedCosts(){
         let arr = []
         let withInsuranceFee = false
+        let withOtherFee = false
         this.originalFeeList.forEach(item => {
             let it = {
                 currencyId: item.currencyId,
@@ -706,6 +709,7 @@ export default {
             }
             if(this.form.otherFee && this.form.otherFeeCurrencyId == item.currencyId){
                 it.amount = it.amount.plus(this.form.otherFee)
+                withOtherFee = true
             }
             // 保价费（美元）
             if(item.currencyId == 1 && this.fee && this.fee.insuranceFee){
@@ -715,6 +719,21 @@ export default {
             arr.push(it)
         })
 
+        // 如果没有累加其他费用，则另外增加货币
+        if(!withOtherFee && this.form.otherFee){
+            let fee = {
+                currencyId: this.form.otherFeeCurrencyId,
+                amount: Decimal(this.form.otherFee)
+            }
+            
+            // 如果保价费跟其他费用是同一种货币（都是美元）
+            if(!withInsuranceFee && this.fee && this.fee.insuranceFee && this.form.otherFeeCurrencyId == 1){
+                fee.amount = fee.amount.plus(this.fee.insuranceFee)
+            }
+
+            arr.push(fee)
+        }
+
         // 没有累加保价费(没有美元计价)但是有保价费则需要加上去
         if(!withInsuranceFee && this.fee && this.fee.insuranceFee){
             arr.push({
@@ -953,7 +972,7 @@ export default {
             }
             updateOffer(data).then(response => {
                 this.$modal.msgSuccess(this.$t("修改成功"));
-                this.$router.back()
+                this.$redirect('index')
             });
             return;
         }

src/views/ecw/offer/index.vue

@@ -76,7 +76,11 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list" border>
-      <el-table-column :label="$t('报价单号')" align="left" prop="number" width="200px" />
+      <el-table-column :label="$t('报价单号')" align="left" prop="number" width="200px">
+        <template slot-scope="{row}">
+          <el-link type="primary" @click.native="$router.push('detail?offerId=' + row.offerId)">{{row.number}}</el-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('订单编号')" align="left" prop="orderNo" />
       <el-table-column :label="$t('客户名称')" align="left" prop="relationName" />
       <el-table-column :label="$t('目的地')" align="center" prop="objectiveName" />

src/views/ecw/order/singleApplication.vue

-<template>
-<div class="single-application">
-  <h1 class="title">
-    调仓申请-EC00123132N
-  </h1>
-  <el-divider></el-divider>
-  <h1>订单信息</h1>
-   <orde-details-form></orde-details-form>
-  <el-divider></el-divider>
-  <h1>货物信息</h1>
-  <el-table border >
-    <el-table-column label="序号"></el-table-column>
-    <el-table-column label="品名">
-      <template v-slot:default = "scope">
-      </template>
-    </el-table-column>
-    <el-table-column label="填单货物属性">
-      <template v-slot:default = "scope"></template>
-    </el-table-column>
-    <el-table-column label="入库货物属性">
-      <template v-slot:default = "scope"></template>
-    </el-table-column>
-    <el-table-column label="入库统计">
-      <template v-slot:default = "scope"></template>
-    </el-table-column>
-    <el-table-column label="收款货物属性">
-      <template v-slot:default = "scope"></template>
-    </el-table-column>
-    <el-table-column label="最后操作时间">
-      <template v-slot:default = "scope"></template>
-    </el-table-column>
-    <el-table-column label="状态"></el-table-column>
-  </el-table>
-  <el-row style="margin-top: 20px;line-height: 3;" type="flex" justify="center" align="center">
-    <el-col :span="3">
-     <div>
-       从  广州仓   调至
-     </div>
-    </el-col>
-    <el-col :span="3">
-      <el-input></el-input>
-    </el-col>
-  </el-row>
-  <el-divider></el-divider>
-  <h1>审批流程</h1>
- <div style="height: 50px"></div>
- <el-form label-width="100px">
-   <el-form-item label="抄送"></el-form-item>
-   <el-form-item label="抄送人"></el-form-item>
- </el-form>
- <div style="text-align:center">
-   <el-button style="margin-right: 50px">提交申请</el-button>
-   <el-button>取消</el-button>
- </div>
-</div>
-</template>
-
-<script>
-import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
-export default {
-  name: "singleApplication",
-  components: {ordeDetailsForm}
-}
-</script>
-
-<style scoped lang="scss">
-.single-application{
- padding: 20px;
-  box-sizing: border-box;
-  .title{
-    font-size: 30px;
-    font-weight: 600;
-  }
-  .el-form {
-    .content{
-      min-width:230px ;
-      max-width: 300px;
-    }
-  }
-}
-</style>