Merge pull request 'master-客户管理' (#46) from master-客户管理 into master

Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/46

src/views/emis/emisCommissionQuote/index.vue

@@ -256,10 +256,10 @@
       </el-table-column>
       <el-table-column label="启用状态" align="center" prop="blOpen" min-width="100" >
           <template slot-scope="scope">
-              <el-tag v-if="scope.row.blOpen==1" type="success">启用</el-tag>
+              <el-tag v-if="scope.row.blOpen==1 && (queryParams.blOpen =='1' || queryParams.blOpen ==null || queryParams.blOpen == '')" type="success">启用</el-tag>
-              <el-tag v-if="scope.row.blOpen==0" type="danger">停用</el-tag>
+              <el-tag v-else-if="scope.row.blOpen==0" type="danger">停用</el-tag>
-              <el-tag v-if="scope.row.blOpen==2" type="warning">启用已过期</el-tag>
+              <el-tag v-else-if="scope.row.blOpen==1 && queryParams.blOpen =='2'" type="warning">启用已过期</el-tag>
-              <el-tag v-if="scope.row.blOpen==3" type="success">启用未过期</el-tag>
+              <el-tag v-else-if="scope.row.blOpen==1 && queryParams.blOpen =='3'" type="success">启用未过期</el-tag>
           </template>
         </el-table-column>
       <!-- <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" /> -->
@@ -365,6 +365,15 @@ export default {
   created() {
     this.getList();
   },
+  //watch 监听blOpen
+  watch: {
+    'queryParams.blOpen': {
+      handler(newVal, oldVal) {
+        this.getList();
+      },
+      immediate: true
+    }
+  },
   methods: {
     /** 查询员工提成方案报价列表 */
     getList() {

src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue

@@ -234,12 +234,12 @@
       <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('预计进仓日期')" align="center" prop="entryDate" min-width="170" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('客户确认状态')" align="center" prop="confirmStatus" min-width="150" /> -->
-      <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" :show-overflow-tooltip="true">
+      <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="100" :show-overflow-tooltip="true">
        <template slot-scope="scope" v-if="scope.row.waybillDetail.transLineTypeName">
          {{scope.row.waybillDetail.transLineTypeName}}
        </template>
       </el-table-column>
-      <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" :show-overflow-tooltip="true">
+      <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="100" :show-overflow-tooltip="true">
        <template slot-scope="scope"> 
          {{scope.row.waybillDetail.productTypeName}}
        </template>
@@ -848,6 +848,12 @@ export default {
         if (j === 'waybillDetail.paymentType') {
           return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
         }
+        if(j === 'waybillDetail.transLineTypeName'){
+         return  v['waybillDetail']['transLineTypeName'];
+        }
+        if(j === 'waybillDetail.productTypeName'){
+         return  v['waybillDetail']['productTypeName'];
+        }
         return v[j]
       }))
     },

src/views/emis/emisWaybillAjustApply/adjustPanel.vue

@@ -347,7 +347,7 @@
                     </el-col>
                     <el-col :span="14">
                       <el-form-item  :label="$t('支付方式')" prop="paymentType" >
-                          <el-select v-model="form.paymentType" placeholder="" >
+                          <el-select v-model="form.paymentType" placeholder="" @change="calcBillFee">
                             <el-option
                               v-for="dict in dict.type.emis_payment_type"
                               :key="dict.value"
@@ -1505,6 +1505,7 @@ export default {
       newValue: {
         handler (newVa, oldValue) {
           this.form=this.newValue;
+          this.form.blSpecialQuote = Number(this.newValue.blSpecialQuote);
           console.log("====>newValue this.form==>",this.form);
 
           console.log("====>newValue this.form.packType==>",this.form.packType);
@@ -1599,6 +1600,7 @@ export default {
         this.form.payee=item.payee;
         this.form.salesmen=item.salesmen;
       }
+      this.calcBillFee()
     },
     initData(){
 

src/views/emis/salesCommissionRatio/editForm.vue

@@ -51,6 +51,7 @@
               type="datetime"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择结束时间"
+              @change="changeEndDate"
             />
           </el-form-item>
         </el-col>
@@ -147,6 +148,9 @@ export default {
         });
       }
     },
+    changeEndDate(val){
+      this.form.endDate = val.split(' ')[0] + ' 23:59:59';
+    },
     // 取消按钮
     cancel() {
       this.reset();

src/views/emis/salesCommissionRatio/index.vue

@@ -260,6 +260,15 @@ export default {
             return '停用';
           }
         }
+        if(j === 'salesExecutiveRatio'){
+          return v[j] + '%';
+        }
+        if(j === 'salesmenRatio'){
+          return v[j] + '%';
+        }
+        if(j === 'salesSupportRatio'){
+          return v[j] + '%';
+        }
         return v[j]
       }))
     },

src/views/emis/salesMonthlyReview/draftSubmitReview.vue

@@ -2,8 +2,8 @@
     <XdPageContainer class="app-container">
         <div slot="pageHeader"></div>
         <XdTable slot="pageContent" slot-scope="slotProps" :height="(slotProps.contentHeight) + 'px'"
-            storageName="batchWaybillRecord_main" ref="multipleTable" :row-class-name="tableRowClassName"
+            storageName="draftSubmitReview_main" ref="multipleTable" :row-class-name="tableRowClassName"
-            v-loading="loading" border size="mini" :data="emisQuotePriceList" :showSearch.sync="showSearch"
+            v-loading="loading" border size="mini" :data="list" :showSearch.sync="showSearch"
             :queryParams="queryParams" :total="total" @queryTable="getList" @selection-change="handleSelectionChange"
             @sort-change="handleSortChange">
 
@@ -110,7 +110,7 @@ export default {
             // 总条数
             total: 0,
             // 报价列表表格数据
-            emisQuotePriceList: [],
+            list: [],
             tmpDataList: [],
             selectionList: [],
             selectionIndexList: [],
@@ -211,7 +211,7 @@ export default {
             let loadingInstance = this.$loading({
                 text: '正在解析 ' + _index + ' 数据...'
             })
-            this.emisQuotePriceList = [];
+            this.list = [];
             this.tmpDataList = [];
             // 组装提交的数据
             for (let index = 0; index < results.length; index++) {
@@ -277,7 +277,7 @@ export default {
                 return;
             }
 
-            this.emisQuotePriceList = this.emisQuotePriceList.concat(this.tmpDataList);
+            this.list = this.list.concat(this.tmpDataList);
 
             this.tmpDataList = [];
 
@@ -310,9 +310,9 @@ export default {
             let that = this;
             this.$modal.confirm('是否确认删除').then(function () {
                 that.selectionList.forEach((item, index) => {
-                    that.emisQuotePriceList.forEach((v, i) => {
+                    that.list.forEach((v, i) => {
                         if (item.index === v.index) {
-                            that.emisQuotePriceList.splice(i, 1)
+                            that.list.splice(i, 1)
                         }
                     })
                 })