Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/coupon/index.vue

@@ -20,7 +20,7 @@
           <el-option :label="$t('已过期')" value="2" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('关键字')" prop="conditionCurrencyId">
+      <el-form-item :label="$t('关键字')" prop="searchKey">
         <el-input v-model="queryParams.searchKey" :placeholder="$t('请输入关键字')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>

src/views/ecw/customer/query.vue

@@ -109,8 +109,8 @@
           </el-table>
         </el-card>
 
-        <el-tabs style="margin-top: 15px" type="border-card">
-          <el-tab-pane :label="$t('订单')">
+        <el-tabs v-model="activeName" style="margin-top: 15px" type="border-card">
+          <el-tab-pane name="order" :label="$t('订单')">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
                 <el-form :inline="true">
@@ -207,7 +207,7 @@
               <pagination @pagination="getorderList" :page.sync="queryParams.page" :limit.sync="queryParams.rows"  :total="orderTotal" ></pagination>
             </el-card>
           </el-tab-pane>
-          <el-tab-pane :label="$t('报价')">
+          <el-tab-pane name="quote" :label="$t('报价')">
             <el-table
               :data="infoListOfferList"
               style="width: 100%"
@@ -260,13 +260,13 @@
             </el-table>
             <pagination @pagination="getInfoListOfferPage" :page.sync="infoListOfferFrom.pageNo" :limit.sync="infoListOfferFrom.pageSize"  :total="infoListOfferTotal" ></pagination>
           </el-tab-pane>
-          <el-tab-pane :label="$t('跟进')">
+          <el-tab-pane name="follow" :label="$t('跟进')">
             <customer-follow ref="customerFollow" :id="id" :customer-id="id"></customer-follow>
           </el-tab-pane>
-          <el-tab-pane :label="$t('客户投诉')">
+          <el-tab-pane name="complain" :label="$t('客户投诉')">
             <customer-complaint ref="customerComplaint" :customer-id="id" hidden-search></customer-complaint>
           </el-tab-pane>
-          <el-tab-pane :label="$t('账单')">
+          <el-tab-pane name="bill" :label="$t('账单')">
             <el-table style="width: 100%" :data="infoListReceiptList">
               <el-table-column :label="$t('序号')" type="index"></el-table-column>
               <el-table-column :label="$t('账单')" prop="receiptNo"></el-table-column>
@@ -291,7 +291,7 @@
               <el-table-column :label="$t('业务员')" prop="salesmanName"></el-table-column>
             </el-table>
           </el-tab-pane>
-          <el-tab-pane :label="$t('数据')">
+          <el-tab-pane name="data" :label="$t('数据')">
             <el-descriptions :column="2">
               <el-descriptions-item :label="$t('海空联运/海运拼柜/海运整柜/专线空运')">{{orderStatisticsObj.hklyTotal || 0}}/{{orderStatisticsObj.hypgTotal  || 0 }}/{{orderStatisticsObj.hyzgTotal  || 0}}/{{orderStatisticsObj.zxkyTotal  || 0}}</el-descriptions-item>
               <el-descriptions-item :label="$t('最后交易日期')">{{orderStatisticsObj.lastBusinessDate}}</el-descriptions-item>
@@ -302,7 +302,7 @@
               <el-descriptions-item :label="$t('已出货订单')">{{orderStatisticsObj.shipmentTotal  || 0}}</el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
-          <el-tab-pane :label="$t('品牌授权')">
+          <el-tab-pane name="empower" :label="$t('品牌授权')">
               <el-table  border style="width:100%" :data="brandAuthorizationList">
                 <el-table-column   type="index" :prop="$t('序号')"></el-table-column>
                 <el-table-column  :label="$t('中文标题')" prop="titleZh" ></el-table-column>
@@ -349,7 +349,7 @@
             <pagination v-show="brandAuthorizationTotal > 0" :total="brandAuthorizationTotal" :page.sync="brandAuthorizationFrom.pageNo" :limit.sync="brandAuthorizationFrom.pageSize"
                         @pagination="getBrankByCustomerList"/>
           </el-tab-pane>
-          <el-tab-pane :label="$t('信用日志')">
+          <el-tab-pane name="credit" :label="$t('信用日志')">
             <el-card class="box-card">
               <div slot="header" class="clearfix">
                 <el-button style="float: right;" type="primary" @click="dialogVisible = true" >{{$t('添加信用日志')}}</el-button>
@@ -381,7 +381,7 @@
               <pagination @pagination="creditLogPage" :page.sync="customerCreditLogFrom.pageNo" :limit.sync="customerCreditLogFrom.pageSize"  :total="customerCreditLogFrom.total" ></pagination>
             </el-card>
           </el-tab-pane>
-          <el-tab-pane :label="$t('等级日志')">
+          <el-tab-pane name="grade" :label="$t('等级日志')">
            <el-table style="width: 100%"  :data="getCustomerGradeList">
              <el-table-column  :label="$t('序号')" type="index"></el-table-column>
              <el-table-column :label="$t('规则名称')" prop="name"></el-table-column>
@@ -499,19 +499,49 @@ export default {
     listServiceUser().then(r => {
       this.serviceUserList = r.data
     })
-    this.getBrankByCustomerList()
+    // this.getBrankByCustomerList()//品牌授权
     this.getCustomerGrade()
-    this.creditLogPage()
-    this.getorderList()
-    this.getInfoListOfferPage()
-    this.getOrderStatistics()
-    this.creditScoreStatisticFn()
-    this.infoListReceiptFn()
+    // this.creditLogPage()//等级日志
+    this.getorderList()//订单
+    // this.getInfoListOfferPage()//报价
+    // this.getOrderStatistics()//数据
+    // this.creditScoreStatisticFn() //信用日志
+    // this.infoListReceiptFn()//账单
 
 
+  },
+  watch:{
+    activeName(val){
+      console.log(val,'val')
+      switch (val) {
+        case 'order':
+          this.getorderList()//订单
+          break
+        case 'quote':
+          this.getInfoListOfferPage()//报价
+          break
+        case 'bill':
+          this.infoListReceiptFn()//账单
+          break
+        case 'data':
+          this.getOrderStatistics()//数据
+          break
+        case 'empower':
+          this.getBrankByCustomerList()//品牌授权
+          break
+        case 'credit':
+          this.creditScoreStatisticFn() //信用日志
+          break
+        case 'grade':
+          this.creditLogPage()//等级日志
+          break
+
+      }
+    }
   },
   data() {
     return {
+      activeName:'order',
       STATUS:{
         0:this.$t('取消报价'),
         1:this.$t('特价审批中'),

src/views/ecw/deptTarget/myAchievement.vue

@@ -302,7 +302,7 @@
                 this.queryParams.pageNo = 1;
                 this.queryParams.beginStartTime=this.dateFilter[0];
                 this.queryParams.endStartTime=this.dateFilter[1];
-                
+
                 this.getList();
             },
             /** 重置按钮操作 */
@@ -412,6 +412,9 @@
                   data.sumVolume += item.completeVolume
                   data.sumNum += item.sumNum
                 })
+                  data.developVolume = data.developVolume.toFixed(2);
+                  data.companyVolume = data.companyVolume.toFixed(2);
+                  data.sumVolume = data.sumVolume.toFixed(2);
                 this.$set(this,'totalData',data)
               }else{
                     this.totalData.sumWeight =this.myAchievementData.totalWeight