fix: 修改设置模板

657cf78e · 无尘 · 4388ff7b · 657cf78e · 4388ff7b · 657cf78e
Commit 657cf78e authored Jun 24, 2020 by 无尘
7 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.314a0c200e88a210607476f10a03043f.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.a1e7acdcab27aefac6a1.js></script><script type=text/javascript src=./static/js/vendor.04714449d6ef1a8af053.js></script><script type=text/javascript src=./static/js/app.af871129c98d2d40f9c3.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.28.css><link href=./static/css/app.b285ce3232e81661fc9f383506d5292a.css rel=stylesheet></head><body style="min-width: 1400px;" class=damolish><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.649762b45edfb078dbca.js></script><script type=text/javascript src=./static/js/vendor.04714449d6ef1a8af053.js></script><script type=text/javascript src=./static/js/app.af871129c98d2d40f9c3.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.314a0c200e88a210607476f10a03043f.css
+++ b/dist/static/css/app.314a0c200e88a210607476f10a03043f.css
--- a/dist/static/css/app.b285ce3232e81661fc9f383506d5292a.css
+++ b/dist/static/css/app.b285ce3232e81661fc9f383506d5292a.css
--- a/dist/static/js/25.5d18f3d119eeaecce6da.js
+++ b/dist/static/js/25.5d18f3d119eeaecce6da.js
--- a/dist/static/js/25.7045fa89133c06ac0136.js
+++ b/dist/static/js/25.7045fa89133c06ac0136.js
--- a/dist/static/js/manifest.a1e7acdcab27aefac6a1.js
+++ b/dist/static/js/manifest.a1e7acdcab27aefac6a1.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={82:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"cbedb09f8527f7df9eb0",1:"954a8a70c5f1171933ac",2:"a280cacc2b4b43a244e1",3:"2e98b772134d59713cff",4:"7fb54b0d6edc84c910b5",5:"3c335bf1dd72ca957262",6:"987ab930d70320e9de11",7:"32c3458a147e64da242e",8:"990e6fcff10d77217764",9:"4c87b59db1c88ddd3ced",10:"72fccf60a68381f76d55",11:"931f12c564ff8f7e5f81",12:"854e8c9b91578876bea1",13:"8676feea9b0f73967926",14:"028743f6135cde80b9a8",15:"e465654e5ec23ef8208d",16:"a4996da602831cc95d74",17:"770b18ce8b116b017976",18:"96baa73f6f02ed43eb8e",19:"f36008a4491a333b3887",20:"480830311c825da1c075",21:"014d8a819156c10c014d",22:"bb593e90b41132f15c1d",23:"da634068aad0d43b1782",24:"948d941c94d6427e742a",25:"5d18f3d119eeaecce6da",26:"131de4aa19cded3e450a",27:"fb8fb618015fae7bcfa6",28:"87049d73048403debd2d",29:"29d767b9b57b7b477a1e",30:"deb96d8d1217a169ea30",31:"a491ec6fa2128e9a2b0f",32:"b1660e9c7305e6c986bf",33:"b6534effa7ee91a472a2",34:"0d984ccb2e42da5924f7",35:"9e75b4e42a0d26a7436e",36:"e9756fb4a91bc2c5d182",37:"1b5ed61134b909a92c84",38:"e974eb2b0071fc939ca5",39:"17ea73c5352156f25f5a",40:"86d063d5621228eff837",41:"19c89dc42386611fd352",42:"58113ea95a9ed345c1cd",43:"1a2a5e909950b94e1679",44:"e0a3c98dc6912e2002a1",45:"ea77600af5dfaba7e122",46:"b799f1004b7641f2312d",47:"ec55a75b65a98e3479d6",48:"d063499fc53f109861e6",49:"335a1ee0f127917485a9",50:"a613c9b52259eb192c68",51:"cef48bb077d7adfd0393",52:"e201923c185c46bbad64",53:"8511a52e731f88850f56",54:"20d1fa1d7197fb03f561",55:"01c81c2b62e87fc0851d",56:"c5ddcc6eace690ee3eec",57:"f87843745cd8e1505453",58:"484d023d296320e05ff9",59:"158333f6b34429a46231",60:"477c7c18563940f46b31",61:"217c2352e374e3c4e438",62:"7e6e0052d51c7547d70a",63:"0f8d3111b2b4e4f8c57b",64:"ce82fb945a44f47f1c1f",65:"52304eb24aada488c91f",66:"806271562f576dd0122c",67:"371a3d9f0e8c7aa3be9b",68:"5b0ebf4833498e06a8ed",69:"5426a9f80e3808aac128",70:"8a4e19e07ca2c824bcbd",71:"1d4dee37d61cd52c7811",72:"32294223b65e7e02d8bb",73:"9da15ba0c7a781bac67f",74:"61f8d00f7b5daf9b315a",75:"db3fed59d5479f7a0e68",76:"17e932433f889bef98c9",77:"1ca8827ee674c2bf8322",78:"925a2c05ec6516adf1e6",79:"a059cde671ec44316e79"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var c={},f={82:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});a[2]=c;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"cbedb09f8527f7df9eb0",1:"954a8a70c5f1171933ac",2:"a280cacc2b4b43a244e1",3:"2e98b772134d59713cff",4:"7fb54b0d6edc84c910b5",5:"3c335bf1dd72ca957262",6:"987ab930d70320e9de11",7:"32c3458a147e64da242e",8:"990e6fcff10d77217764",9:"4c87b59db1c88ddd3ced",10:"72fccf60a68381f76d55",11:"931f12c564ff8f7e5f81",12:"854e8c9b91578876bea1",13:"8676feea9b0f73967926",14:"028743f6135cde80b9a8",15:"e465654e5ec23ef8208d",16:"a4996da602831cc95d74",17:"770b18ce8b116b017976",18:"96baa73f6f02ed43eb8e",19:"f36008a4491a333b3887",20:"480830311c825da1c075",21:"014d8a819156c10c014d",22:"bb593e90b41132f15c1d",23:"da634068aad0d43b1782",24:"948d941c94d6427e742a",25:"7045fa89133c06ac0136",26:"131de4aa19cded3e450a",27:"fb8fb618015fae7bcfa6",28:"87049d73048403debd2d",29:"29d767b9b57b7b477a1e",30:"deb96d8d1217a169ea30",31:"a491ec6fa2128e9a2b0f",32:"b1660e9c7305e6c986bf",33:"b6534effa7ee91a472a2",34:"0d984ccb2e42da5924f7",35:"9e75b4e42a0d26a7436e",36:"e9756fb4a91bc2c5d182",37:"1b5ed61134b909a92c84",38:"e974eb2b0071fc939ca5",39:"17ea73c5352156f25f5a",40:"86d063d5621228eff837",41:"19c89dc42386611fd352",42:"58113ea95a9ed345c1cd",43:"1a2a5e909950b94e1679",44:"e0a3c98dc6912e2002a1",45:"ea77600af5dfaba7e122",46:"b799f1004b7641f2312d",47:"ec55a75b65a98e3479d6",48:"d063499fc53f109861e6",49:"335a1ee0f127917485a9",50:"a613c9b52259eb192c68",51:"cef48bb077d7adfd0393",52:"e201923c185c46bbad64",53:"8511a52e731f88850f56",54:"20d1fa1d7197fb03f561",55:"01c81c2b62e87fc0851d",56:"c5ddcc6eace690ee3eec",57:"f87843745cd8e1505453",58:"484d023d296320e05ff9",59:"158333f6b34429a46231",60:"477c7c18563940f46b31",61:"217c2352e374e3c4e438",62:"7e6e0052d51c7547d70a",63:"0f8d3111b2b4e4f8c57b",64:"ce82fb945a44f47f1c1f",65:"52304eb24aada488c91f",66:"806271562f576dd0122c",67:"371a3d9f0e8c7aa3be9b",68:"5b0ebf4833498e06a8ed",69:"5426a9f80e3808aac128",70:"8a4e19e07ca2c824bcbd",71:"1d4dee37d61cd52c7811",72:"32294223b65e7e02d8bb",73:"9da15ba0c7a781bac67f",74:"61f8d00f7b5daf9b315a",75:"db3fed59d5479f7a0e68",76:"17e932433f889bef98c9",77:"1ca8827ee674c2bf8322",78:"925a2c05ec6516adf1e6",79:"a059cde671ec44316e79"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/views/business/syncLog.vue
+++ b/src/views/business/syncLog.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors: 无尘
- * @LastEditTime: 2020-06-23 09:49:25
+ * @LastEditTime: 2020-06-24 16:25:54
 -->
 <template>
  <div class="my-customer-wrap common-set-wrap">
@@ -69,38 +69,56 @@
                  </div>
                </div>
                <div class="m-t-20">
-                  <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%' }">
+                  <el-input placeholder="请输入导购手机号或code" prefix-icon="el-icon-search" v-model="searchInput" class="w-293" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"> </el-input>
+                  <el-select v-model="enterpriseId" placeholder="全部品牌" @change="getBindist" class="w-168 m-l-10">
+                    <el-option label="全部品牌" value=""></el-option>
+                    <el-option v-for="item in brandOptions" :key="item.enterpriseId" :label="item.enterpriseName" :value="item.enterpriseId"> </el-option> </el-select
+                  ><el-select v-model="optType" placeholder="请选择" @change="getBindist" class="w-168 m-l-10">
+                    <el-option label="全部状态" value=""></el-option>
+                    <el-option label="绑定" value="0"></el-option>
+                    <el-option label="解绑" value="1"></el-option>
+                  </el-select>
+                </div>
+                <div class="m-t-20">
+                  <el-table class="select-table" ref="multipleTable" :data="tableBindData" tooltip-effect="dark" :style="{ width: '100%' }">
                    <el-table-column label="导购账号" show-overflow-tooltip>
-                      <template slot-scope="scope">{{ scope.row.userName }}</template>
+                      <template slot-scope="scope">{{ scope.row.clerkName || '--' }}</template>
                    </el-table-column>
                    <el-table-column prop="" label="code" show-overflow-tooltip>
-                      <template slot-scope="scope">{{ scope.row.taskDesc | '--' }}</template>
+                      <template slot-scope="scope">{{ scope.row.clerkCode | '--' }}</template>
                    </el-table-column>
                    <el-table-column label="企微用户" show-overflow-tooltip>
-                      <template slot-scope="scope">{{ scope.row.userName }}</template>
+                      <template slot-scope="scope">{{ scope.row.userName || '--' }}</template>
                    </el-table-column>
                    <el-table-column label="账号" show-overflow-tooltip>
-                      <template slot-scope="scope">{{ scope.row.userName }}</template>
+                      <template slot-scope="scope">{{ scope.row.userName || '--' }}</template>
                    </el-table-column>
                    <el-table-column label="手机号" show-overflow-tooltip>
-                      <template slot-scope="scope">{{ scope.row.userName }}</template>
+                      <template slot-scope="scope">{{ scope.row.userName || '--' }}</template>
                    </el-table-column>
                    <el-table-column prop="" label="更新时间" show-overflow-tooltip>
                      <template slot-scope="scope">
-                        <div class="line-18">{{ scope.row.createTime | timeStampToYmd }}</div>
+                        <div class="line-18">{{ scope.row.updateTime | timeStampToYmd }} {{ !scope.row.updateTime ? '--' : '' }}</div>
-                        <div class="line-18">{{ scope.row.createTime | timeStampToHms }}</div>
+                        <div class="line-18">{{ scope.row.updateTime | timeStampToHms }} {{ !scope.row.updateTime ? '--' : '' }}</div>
                      </template>
                    </el-table-column>
                    <el-table-column prop="" label="类型" show-overflow-tooltip>
-                      <template slot-scope="scope">{{ scope.row.taskDesc | '--' }}</template>
+                      <template slot-scope="scope">{{ scope.row.optType == 0 ? '绑定' : '解绑' }}</template>
                    </el-table-column>
                    <el-table-column prop="" label="原因" show-overflow-tooltip>
                      <template slot-scope="scope">
-                        <el-button v-if="scope.row.statusFlag == 5 || scope.row.statusFlag == 6" type="text" @click="toShowLog(scope.$index, scope.row)">查看失败日志</el-button>
+                        <el-button v-if="scope.row.channelCode == 1001" type="text">后台管理员绑定</el-button>
+                        <el-button v-if="scope.row.channelCode == 1002" type="text">好办客户端绑定</el-button>
+                        <el-button v-if="scope.row.channelCode == 1003" type="text">审核绑定</el-button>
+                        <el-button v-if="scope.row.channelCode == 1004" type="text">同步绑定</el-button>
+                        <el-button v-if="scope.row.channelCode == 2001" type="text">后台管理员解绑</el-button>
+                        <el-button v-if="scope.row.channelCode == 2002" type="text">好办客户端解绑</el-button>
+                        <el-button v-if="scope.row.channelCode == 2003" type="text">同步解绑</el-button>
+                        <el-button v-if="scope.row.channelCode == 2004" type="text">成员删除解绑</el-button>
                      </template>
                    </el-table-column>
                  </el-table>
-                  <div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
+                  <div class="block common-wrap__page text-right m-t-24" v-if="tableBindData.length != 0">
                    <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
                  </div>
                </div>
@@ -118,9 +136,9 @@
 import failLog from '@/components/company/fail-log.vue';
 import navCrumb from '@/components/nav/nav.vue';
 import setDepartment from '@/components/company/set-department.vue';
-import { getRequest } from '@/api/api';
+import { getRequest, postRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
-// import { _debounce } from '@/common/js/public';
+import { _debounce } from '@/common/js/public';
 export default {
  name: 'reviewed',
  data() {
@@ -154,12 +172,33 @@ export default {
      tableData: [],
      tableBindData: [],
      logShow: false,
-      taskId: ''
+      taskId: '',
+      // 解绑日志
+      optType: '',
+      enterpriseId: '',
+      brandOptions: []
    };
  },
  computed: {},
  methods: {
    /**
+     * 搜索标签清空
+     */
+    clearInput() {
+      const that = this;
+      that.currentPage = 1;
+      that.getBindist();
+    },
+    /**
+     * 搜索标签
+     */
+    toInput: _debounce(function(e) {
+      const that = this;
+      that.currentPage = 1;
+      that.getBindist();
+    }, 200),
+    /**
     * 切换tab
     */
    handleClick(tab, event) {
@@ -170,6 +209,7 @@ export default {
      if (tab.name == 'first') {
        that.getTableList();
      } else {
+        that.getBrandData();
        that.getBindist();
      }
    },
@@ -219,16 +259,41 @@ export default {
      }
    },
    /**
+     * 获取品牌
+     */
+    getBrandData() {
+      const that = this;
+      postRequest('/haoban-manage3-web/wx-enterprise-list', {})
+        .then(res => {
+          let resData = res.data;
+          if (resData.errorCode == 1) {
+            if (!!resData.result && !!resData.result.length) {
+              that.brandOptions = resData.result;
+            }
+            return;
+          }
+          errMsg.errorMsg(resData);
+        })
+        .catch(function(error) {
+          that.$message.error({
+            duration: 1000,
+            message: error.message
+          });
+        });
+    },
+    /**
     * 获取解绑数据
     */
    getBindist() {
      const that = this;
      let para = {
-        keyWord: that.searchInput || '', // 搜索字段
+        search: that.searchInput || '', // 搜索字段
+        enterpriseId: that.enterpriseId,
+        optType: that.optType,
        pageNum: that.currentPage, // 当前页
        pageSize: that.pageSize // 一页显示个数
      };
-      getRequest('/haoban-manage3-web/sync-task', para)
+      getRequest('/haoban-manage3-web/staff-clerk-bind-log', para)
        .then(res => {
          let resData = res.data;
          if (resData.errorCode == 1) {
@@ -336,6 +401,9 @@ export default {
 .w-191 {
  width: 191px;
 }
+.w-168 {
+  width: 168px;
+}
 .el-alert--info {
  background: rgba(240, 245, 255, 1);
  border-radius: 2px;