fix客户管理编辑bug，传真闭环管理修改

CallCenterWeb.UI/README-zh.md

@@ -129,14 +129,14 @@ Copyright (c) 2017-present PanJiaChen
 
 ```javascript
   resetZIndex: function() {
-    //修改t的值 500 =》 1500 t+1 => t+2 增加了给遮罩层添加 z-index
+    //修改t的值 500 =》 1900 t+1 => t+2 增加了给遮罩层添加 z-index
     var doms = document.querySelectorAll(".vl-notify-mask")
-    for (var t = 1500, e = document.querySelectorAll(".vl-notify-iframe"), n = 0, o = 0, r = e.length; o < r; o++) {
+    for (var t = 1900, e = document.querySelectorAll(".vl-notify-iframe"), n = 0, o = 0, r = e.length; o < r; o++) {
       var i = parseInt(this.getStyle(e[o].id, "z-index"));
       this.options.id == e[o].id && (n = i), t < i && (t = i)
       var ms = document.getElementById(doms[o].id)
     }
-    n == t && 1500 != t || (this.zindex = t + 2)
+    n == t && 1900 != t || (this.zindex = t + 2)
     ms.style.zIndex = this.zindex - 1
   },
 

CallCenterWeb.UI/package.json

@@ -92,7 +92,7 @@
     "vue-template-compiler": "2.5.17",
     "webpack": "4.16.5",
     "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "3.1.14",
     "webpack-merge": "4.1.4"
   },

CallCenterWeb.UI/src/App.vue

@@ -10,4 +10,7 @@ export default {
 };
 </script>
 <style lang="scss">
+  .vl-notify-content{
+    height: auto !important;
+  }
 </style>

CallCenterWeb.UI/src/views/callScreen/components/faxlist.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="">
+  <div>
 
     <el-table
       :data="dataLists"
@@ -747,6 +747,9 @@ export default {
 </script>
 
 <style>
+  .vl-notify-content{
+    height: auto !important;
+  }
 .colorsize {
   height: 30px;
   line-height: 30px;

CallCenterWeb.UI/src/views/customerManagement/customerList/components/addOrEdit.vue

@@ -330,7 +330,7 @@ export default {
     ...mapGetters(["groupid"]),
   },
   created() {
-    this.getcode();
+    // this.getcode();
     this.getList();
     this.ruleForm.cusSign = this.groupid;
     this.getSeatGroup();
@@ -341,6 +341,8 @@ export default {
         clientId: this.rowid,
       };
       this.getDetail(data);
+    } else{
+      this.getcode();
     }
 
     // })

CallCenterWeb.UI/src/views/customerManagement/customerList/index.vue

@@ -87,7 +87,7 @@
             prop="cusName"
             label="客户名称"
             align="center"
-            min-width="200"
+            min-width="300"
           ></el-table-column>
           <el-table-column
             prop="salMan"

CallCenterWeb.UI/src/views/faxManager/faxManagement/index.vue

@@ -124,7 +124,7 @@
       :row-class-name="tableRowClassName"
       border
       stripe
-      max-height="500"
+      height="660"
       highlight-current-row
       @row-click="linkcus"
       @row-dblclick="detailfax"

CallCenterWeb.UI/src/views/faxManager/faxTransmission/customSend.vue

@@ -97,7 +97,8 @@ export default {
       const mm = this.recvTime.split(' ')[0].split('-')[1]
       const dd = this.recvTime.split(' ')[0].split('-')[2]
       const hh = this.recvTime.split(' ')[1].split(':')[0]
-      const resultData = "您好！我公司于" + yyyy +'年' + mm+ '月' + dd + '日'+ hh+'点'+"收到贵司" +this.faxPage + "页传真。"
+      const min = this.recvTime.split(' ')[1].split(':')[1]
+      const resultData = "您好！我公司于" + yyyy +'年' + mm+ '月' + dd + '日'+ hh+'点'+ min+'分'+"收到贵司" +this.faxPage + "页传真。"
       return resultData
     },
     submitForm() {
@@ -110,6 +111,7 @@ export default {
         })
         return
       }
+      console.log(this.SMScontent);
       
       return new Promise((resolve) => {
         const params = {

CallCenterWeb.UI/src/views/faxManager/faxTransmission/index.vue

@@ -52,8 +52,8 @@
             >导出Excel</el-button
           >
         </el-col>
-        <el-col :span="10">
-          <label style="font-size: 12px; margin-left: 62%">客户性质：</label>
+        <el-col :span="7">
+          <label style="font-size: 12px; margin-left: 43%">客户性质：</label>
           <el-select
             v-model="searchData.cusSign"
             class="form_select"
@@ -71,6 +71,23 @@
             />
           </el-select>
         </el-col>
+        <el-col :span="3">
+          <label style="font-size: 12px">短信状态：</label>
+          <el-select
+            v-model="searchData.smsStatus"
+            size="mini"
+            style="width: 88px"
+            clearable
+            filterable
+          >
+            <el-option
+              v-for="item in smsStatusData"
+              :key="item.value"
+              :label="item.faxStatus"
+              :value="item.value"
+            />
+          </el-select>
+        </el-col>
         <el-col :span="4" class="colorsize">
           <div style="float: right; font-size: 12px">
             浅绿:有经办人；浅灰:不用编号
@@ -300,7 +317,7 @@
         label="传真号码"
         align="left"
         prop="qh"
-        min-width="100"
+        min-width="120"
       />
 
       <el-table-column
@@ -318,14 +335,14 @@
         prop="cusCode"
         label="客户代码"
         align="left"
-        min-width="120"
+        min-width="100"
       />
       <el-table-column
         :show-overflow-tooltip="true"
         prop="companyName"
         label="单位名称"
         align="left"
-        min-width="270"
+        min-width="250"
       />
       <el-table-column
         :show-overflow-tooltip="true"
@@ -339,7 +356,7 @@
         :show-overflow-tooltip="true"
         label="付款方式"
         align="left"
-        min-width="140"
+        min-width="138"
       >
         <template slot-scope="scope">
           {{ scope.row.payment | CusCcFilter }}
@@ -417,7 +434,7 @@
         :show-overflow-tooltip="true"
         label="备注"
         align="left"
-        min-width="58"
+        min-width="80"
       >
         <template slot-scope="scope">
           {{ scope.row.remark }}
@@ -473,6 +490,13 @@ export default {
       }
       return statusMap[status]
     },
+    faxSmsStatusFilter(status) {
+      const statusMap = {
+        1: '已发送',
+        0: '未发送'
+      }
+      return statusMap[status]
+    },
     isCloseFilter(status) {
       const statusMap = {
         1: '关闭',
@@ -579,6 +603,16 @@ export default {
       autoWidth: true,
       bookType: 'xlsx',
       sale: '',
+      smsStatusData: [
+        {
+          value: '1',
+          faxStatus: '已发送'
+        },
+        {
+          value: '0',
+          faxStatus: '未发送'
+        }
+      ], // 下拉框
       signList: [
         {
           value: '1',
@@ -753,6 +787,7 @@ export default {
           cusSign: this.searchData.cusSign, // 客户类型
           faxNumber: this.searchData.faxNumber, // 传真编号
           faxPhone: this.searchData.faxPhone, // 传真号码
+          smsStatus:this.searchData.smsStatus, // 短信状态
           faxStatus: this.searchData.faxStatus, // 传真状态
           companyName: this.searchData.companyName, // 单位名称
           cusCode: this.searchData.cusCode, // 客户代码
@@ -834,6 +869,7 @@ export default {
           cusSign: this.searchData.cusSign, // 客户类型
           faxNumber: this.searchData.faxNumber, // 传真编号
           faxPhone: this.searchData.faxPhone, // 传真号码
+          smsStatus: this.searchData.smsStatus,
           faxStatus: this.searchData.faxStatus, // 传真状态
           companyName: this.searchData.companyName, // 单位名称
           cusCode: this.searchData.cusCode, // 客户代码
@@ -972,6 +1008,7 @@ export default {
           '销售经理',
           '要求完成日期',
           '闭环日期',
+          '短信状态',
           '是否关闭',
           '是否发起',
           '备注'
@@ -989,6 +1026,7 @@ export default {
           'saleManager',
           'requiredCompletionTime',
           'completionTime',
+          'sendSMS',
           'isClose',
           'isInitiate',
           'remark'
@@ -1061,17 +1099,9 @@ export default {
             return this.faxStatusFilter(v[j])
           } else if (j == 'faxStatus' && v[j] === '3') {
             return this.faxStatusFilter(v[j])
-          } else if (j == 'faxStatus' && v[j] === '4') {
-            return this.CusCcFilter(v[j])
-          } else if (j == 'payment' && v[j] === 'A') {
-            return this.CusCcFilter(v[j])
-          } else if (j == 'payment' && v[j] === 'B') {
-            return this.CusCcFilter(v[j])
-          } else if (j == 'payment' && v[j] === 'C') {
-            return this.CusCcFilter(v[j])
-          } else if (j == 'payment' && v[j] === 'D') {
-            return this.CusCcFilter(v[j])
-          } else if (j == 'payment' && v[j] === 'E') {
+          } else if (j == 'sendSMS') {
+            return this.faxSmsStatusFilter(v[j])
+          } else if (j == 'payment' && v[j]) {
             return this.CusCcFilter(v[j])
           } else if (j == 'cusSign' && v[j] === '101') {
             return this.cusSignFilter(v[j])
@@ -1103,6 +1133,13 @@ export default {
       }
       return statusMap[status]
     },
+    faxSmsStatusFilter(status) {
+      const statusMap = {
+        '1': '已发送',
+        '0': '未发送'
+      }
+      return statusMap[status]
+    },
     cusSignFilter(status) {
       const statusMap = {
         101: '军品业务',
@@ -1198,6 +1235,7 @@ export default {
       this.searchData.cusSign = '' // 客户类型
       this.searchData.faxNumber = '' // 传真编号
       this.searchData.faxPhone = '' // 传真号码
+      this.searchData.smsStatus = ''
       this.searchData.faxStatus = '' // 传真状态
       this.searchData.companyName = '' // 单位名称
       this.searchData.cusCode = '' // 客户代码

CallCenterWeb.UI/src/views/reportFormManagement/clientGrade/index.vue

@@ -244,6 +244,7 @@ export default {
 
 <!-- 需要注意的是，修改elementUI的默认样式的css不能使用scoped. -->
 <style rel="stylesheet/scss" lang="scss">
+  
 .dic_setup {
   .el-table tr {
     cursor: pointer;

CallCenterWeb.UI/src/views/reportFormManagement/clientGrade/listDetail.vue

@@ -1,16 +1,31 @@
 <template>
   <div>
+    <div style="text-align: right;">
+      <el-button
+        style="margin-right: 15px;"
+        :loading="downloadLoading"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-upload2"
+        @click="handleDownload"
+        >导出</el-button
+      >
+    </div>
     <el-table
       :data="dataLists"
       border
+      max-height="650"
       highlight-current-row
       stripe>
-      <el-table-column prop="level" label="客户等级" align="center"/>
+      <el-table-column prop="level" label="客户等级" min-width="220"align="center"/>
+      <el-table-column prop="cusname" label="客户名称" min-width="260" align="center"/>
+      <el-table-column prop="cuscode" label="客户代码" align="center"/>
       <el-table-column prop="salman" label="销售经理" align="center" min-width />
       <el-table-column prop="records" label="来电数量" align="center" min-width />
       <el-table-column prop="jindu" label="查询进度" align="center" min-width />
       <el-table-column prop="per" label="占比" align="center" min-width />
     </el-table>
+
     <!-- <pagination
       v-show="pageParams.total > 0"
       :total="pageParams.total"
@@ -46,6 +61,7 @@ export default {
   },
   data() {
     return {
+      downloadLoading:false,
       dataLists: [],
       pageParams: {
         pageindex: 1, // 当前第几页
@@ -96,7 +112,52 @@ export default {
       })
     },
     handleChange() {},
+    // 导出
+    handleDownload() {
+      this.downloadLoading = true;
+      import("@/vendor/Export2Excel").then((excel) => {
+        const tHeader = [
+          "客户等级",
+          "客户名称",
+          "客户代码",
+          "销售经理",
+          "来电数量",
+          "查询进度",
+          "占比",
+        ];
+        const filterVal = [
+          "level",
+          "cusname",
+          "cuscode",
+          "salman",
+          "records",
+          "jindu",
+          "per",
+        ];
+        const list = this.dataLists;
+        const data = this.formatJson(filterVal, list);
 
+        excel.export_json_to_excel({
+          header: tHeader, // 表头 必填
+          data, // 具体数据 必填
+          filename: "客户等级详情", // 非必填
+          autoWidth: this.autoWidth, // 非必填
+          bookType: this.bookType, // 非必填
+        });
+        this.downloadLoading = false;
+      });
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map((v) =>
+        filterVal.map((j) => {
+          if (j === "") {
+            return timestampToTime(v[j]);
+          } else {
+            return v[j];
+          }
+        })
+      );
+    },
     formtTime(val) {
       if (!val) {
         return '0秒'
@@ -139,8 +200,13 @@ export default {
   }
 }
 </script>
-
+<style>
+  .vl-notify-content {
+    height: auto !important;
+  }
+</style>
 <style scoped>
+  
   /deep/.el-tabs__item {
     width: 185px !important;
     text-align: center;