fix: 修改考勤组

28de1e3c · 无尘 · bde3d889 · 28de1e3c · 28de1e3c · 28de1e3c
Commit 28de1e3c authored Dec 23, 2019 by 无尘
11 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 href=./static/css/app.3a8fc819dc579d268a0ef05f44d706a5.css rel=stylesheet></head><body style="min-width: 1400px;"><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>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.f6e549aeae6e504047d5.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.f67ca049ebc128688c20.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.dedc1a671ae1c85f81a4fcc08319fca9.css rel=stylesheet></head><body style="min-width: 1400px;"><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>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.9d3b9a92e9a666cc76ab.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.f67ca049ebc128688c20.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.3a8fc819dc579d268a0ef05f44d706a5.css
+++ b/dist/static/css/app.3a8fc819dc579d268a0ef05f44d706a5.css
--- a/dist/static/js/0.ab616832b6f6019a8690.js
+++ b/dist/static/js/0.ab616832b6f6019a8690.js
--- a/dist/static/js/15.0d4e89433a96db4935ef.js
+++ b/dist/static/js/15.0d4e89433a96db4935ef.js
--- a/dist/static/js/15.38ebbc29bea00d217b42.js
+++ b/dist/static/js/15.38ebbc29bea00d217b42.js
--- a/dist/static/js/30.683f91df7ee55e3c6cb9.js
+++ b/dist/static/js/30.683f91df7ee55e3c6cb9.js
--- a/dist/static/js/manifest.f6e549aeae6e504047d5.js
+++ b/dist/static/js/manifest.f6e549aeae6e504047d5.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[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(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={103:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;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:"ab616832b6f6019a8690",1:"fe9dec1f31b04053fd7e",2:"54aabab28c7735d34c10",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"b5e24a58d047a2ec70f5",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"879536ae7ce46f0c54ec",13:"57e51fc1b6342003f25d",14:"dce1b92c12422c24e840",15:"0d4e89433a96db4935ef",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"84c9fa629e0261d109eb",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"c3f7fb68797f235ad906",28:"5c93d8a260522a61d27e",29:"c5bb15e8e1bd17cdc0f7",30:"683f91df7ee55e3c6cb9",31:"5d5e618d2ceadec7e8cb",32:"fc2213c2b57da6c25ea2",33:"f4c48aa4b6adbdec738a",34:"e5ba3c1688f3038d3d09",35:"d8abf87eeb477b4bc1f3",36:"2cadbd4ded3457625f52",37:"8dc3e1f0f3e416135406",38:"9f4a46d2ce3c9477a06b",39:"b33ea830129fb895dd77",40:"6a72d08fe0ffa0a16cf6",41:"17121c9227dddf24b37d",42:"54f2f4850c109391114a",43:"fb46c0bad10552e7ef89",44:"3d32c7e1954754671303",45:"c0accd45711184d0044d",46:"785c8076b8d217da747e",47:"b477848570e876912bdb",48:"32a6d29de6b93cd9201c",49:"1a7182d9cdf2e08ff7f0",50:"4235ecfe09e1fc4e1ca4",51:"2f363aaad04264e9f159",52:"d56e883ddcbef7c6b221",53:"ec91f2b143d0b1e708b5",54:"31eed9c38748896262d1",55:"4f96191ae2c44c6f18f7",56:"99063bd3b07926595af4",57:"ba6530916d934b70d218",58:"2241679269f18e7f14c3",59:"5c336f6f4d119300c1d8",60:"d43c13d5c29feb45e864",61:"0806aac37bd2b86e8bc2",62:"8ef5c75f77376ecd8873",63:"bbe4da77ef31a0aa9150",64:"f26939887c305ec6f7fc",65:"069ccaf5f8e5b5f3c59d",66:"5f0382c9cb76b57ba778",67:"745b9621e5297c575b33",68:"aaaa125fb978b59c2cbf",69:"bb6a8bab41cac9f11bd4",70:"a226d330de7ebb2a4c5f",71:"9551ae81326c57064dec",72:"cb1b3985b92be4556fc1",73:"b6b1fb51b601c0fafcda",74:"6206c00744e77bc84fec",75:"93eb5a61daaa3a1df425",76:"78e5a422e9fecbbd255a",77:"b3f7cf4d2b54d306c522",78:"1fc3472c5f95a0a66979",79:"69811ba75d1fceae9737",80:"12442b543aff65f2c05d",81:"00a94b58ac2affb758dc",82:"1fa56152d6bdcfd4ec14",83:"976088a6ee120b8caa17",84:"45dae077c86a1a0050ff",85:"0c7635a15cceae31d981",86:"d0d0607a424156f2d88d",87:"aee44c25b8d252c44b6e",88:"6583c4b0dc7a8f908fa2",89:"8d513b9c9d7970a612c0",90:"57319965505945b3ae7e",91:"446342439ce97b19c84f",92:"09a5823b00d6180576b9",93:"e801fdd8bbd27a68d8ee",94:"c50da77d4e1d5a44b971",95:"04507f6fadd31b01a746",96:"d4a4beef007fa347bd93",97:"8b0f08b3974b32d7bc2a",98:"69c8efc82743796dc255",99:"58cc1884c4f80303999a",102:"2c7e1d628bd2f4ac709c"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},d={103:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"e02bb013de875e5ccbb7",1:"fe9dec1f31b04053fd7e",2:"54aabab28c7735d34c10",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"b5e24a58d047a2ec70f5",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"879536ae7ce46f0c54ec",13:"57e51fc1b6342003f25d",14:"dce1b92c12422c24e840",15:"38ebbc29bea00d217b42",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"84c9fa629e0261d109eb",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"c3f7fb68797f235ad906",28:"5c93d8a260522a61d27e",29:"c5bb15e8e1bd17cdc0f7",30:"91cd2c7b75ba4aec78dc",31:"5d5e618d2ceadec7e8cb",32:"fc2213c2b57da6c25ea2",33:"f4c48aa4b6adbdec738a",34:"e5ba3c1688f3038d3d09",35:"d8abf87eeb477b4bc1f3",36:"2cadbd4ded3457625f52",37:"8dc3e1f0f3e416135406",38:"9f4a46d2ce3c9477a06b",39:"b33ea830129fb895dd77",40:"6a72d08fe0ffa0a16cf6",41:"17121c9227dddf24b37d",42:"54f2f4850c109391114a",43:"fb46c0bad10552e7ef89",44:"3d32c7e1954754671303",45:"c0accd45711184d0044d",46:"785c8076b8d217da747e",47:"b477848570e876912bdb",48:"32a6d29de6b93cd9201c",49:"1a7182d9cdf2e08ff7f0",50:"4235ecfe09e1fc4e1ca4",51:"2f363aaad04264e9f159",52:"d56e883ddcbef7c6b221",53:"ec91f2b143d0b1e708b5",54:"31eed9c38748896262d1",55:"4f96191ae2c44c6f18f7",56:"99063bd3b07926595af4",57:"ba6530916d934b70d218",58:"2241679269f18e7f14c3",59:"5c336f6f4d119300c1d8",60:"d43c13d5c29feb45e864",61:"0806aac37bd2b86e8bc2",62:"8ef5c75f77376ecd8873",63:"bbe4da77ef31a0aa9150",64:"f26939887c305ec6f7fc",65:"069ccaf5f8e5b5f3c59d",66:"5f0382c9cb76b57ba778",67:"745b9621e5297c575b33",68:"aaaa125fb978b59c2cbf",69:"bb6a8bab41cac9f11bd4",70:"a226d330de7ebb2a4c5f",71:"9551ae81326c57064dec",72:"cb1b3985b92be4556fc1",73:"b6b1fb51b601c0fafcda",74:"6206c00744e77bc84fec",75:"93eb5a61daaa3a1df425",76:"78e5a422e9fecbbd255a",77:"b3f7cf4d2b54d306c522",78:"1fc3472c5f95a0a66979",79:"69811ba75d1fceae9737",80:"12442b543aff65f2c05d",81:"00a94b58ac2affb758dc",82:"1fa56152d6bdcfd4ec14",83:"976088a6ee120b8caa17",84:"45dae077c86a1a0050ff",85:"0c7635a15cceae31d981",86:"d0d0607a424156f2d88d",87:"aee44c25b8d252c44b6e",88:"6583c4b0dc7a8f908fa2",89:"8d513b9c9d7970a612c0",90:"57319965505945b3ae7e",91:"446342439ce97b19c84f",92:"09a5823b00d6180576b9",93:"e801fdd8bbd27a68d8ee",94:"c50da77d4e1d5a44b971",95:"04507f6fadd31b01a746",96:"d4a4beef007fa347bd93",97:"8b0f08b3974b32d7bc2a",98:"69c8efc82743796dc255",99:"58cc1884c4f80303999a",102:"2c7e1d628bd2f4ac709c"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/app/common-app-top.vue
+++ b/src/components/app/common-app-top.vue
@@ -21,7 +21,7 @@
        <span class="app-icon "><img class="" :src="appIcon"/></span><span class="p-l-8">{{ appName }}</span>
      </div>
      <el-button class="border-radius-18 my-customer-return" @click="returnBack">返回</el-button>
-      <div class="my-customer-brand">
+      <div v-if="$route.path != '/workGroupSet' && $route.path != '/dayStatistics' && $route.path != '/workGroupSet' && $route.path != '/dayStatistics' && $route.path != '/workTimeManage'" class="my-customer-brand">
        <el-tooltip class="item" effect="dark" content="不同品牌的工作台可分别进行管理。点击后切换，可以管理不同品牌下的应用" placement="top-start">
          <span class="font-14 color-606266" style="cursor: pointer;">品牌名称<span class="el-icon-info font-12 color-909399 p-l-6"></span> </span>
        </el-tooltip>

--- a/src/components/app/dailyAttendance/class-select-mult.vue
+++ b/src/components/app/dailyAttendance/class-select-mult.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-12-17 09:40:42
 * @LastEditors  : 无尘
- * @LastEditTime : 2019-12-21 09:46:48
+ * @LastEditTime : 2019-12-23 18:04:48
 -->
 <!--
@@ -74,9 +74,12 @@ export default {
  },
  methods: {
    toggleSelection(rows) {
+      const that = this;
      if (rows) {
-        rows.forEach(row => {
+        that.$nextTick(() => {
-          this.$refs.multipleTable.toggleRowSelection(row);
+          rows.forEach(row => {
+            that.$refs.multipleTable.toggleRowSelection(row, true);
+          });
        });
      }
    },
@@ -149,6 +152,19 @@ export default {
        that.selClassesData = [];
      });
    },
+    handleData() {
+      const that = this;
+      let ids = that.selClassesData.map(ele => ele.classesId);
+      let rows = [];
+      if (that.selClassesData.length) {
+        that.tableData.forEach(ele => {
+          if (ids.includes(ele.classesId)) {
+            rows.push(ele);
+          }
+        });
+        that.toggleSelection(rows);
+      }
+    },
    /**
     * 获取班次
     */
@@ -170,6 +186,7 @@ export default {
              });
            }
            that.tableData = resData.result || [];
+            that.handleData();
          }
        })
        .catch(function(error) {
@@ -184,6 +201,7 @@ export default {
    workClassMultShow: function(newData, oldData) {
      const that = this;
      that.customDialog = newData;
+      that.getClassifyData();
    },
    classesData(newData) {
      const that = this;
@@ -196,7 +214,6 @@ export default {
  },
  mounted() {
    const that = this;
-    // console.log(that.classesData);
    that.getClassifyData();
    if (that.classesData) {
      that.selClassesData = JSON.parse(JSON.stringify(that.classesData));

--- a/src/views/enterpriseApp/dailyAttendance/workGroupSet.vue
+++ b/src/views/enterpriseApp/dailyAttendance/workGroupSet.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-04-12 17:56:45
 * @LastEditors  : 无尘
- * @LastEditTime : 2019-12-23 16:29:40
+ * @LastEditTime : 2019-12-23 17:37:39
 -->
 <template>
  <div class="notice-list-wrap">
@@ -217,9 +217,7 @@
          </el-table>
        </el-form-item>
        <el-form-item label="考勤方式：" prop="">
-          <div>
+          <div><el-checkbox v-model="ruleFormData.gpsFlag">GPS打卡</el-checkbox><span v-if="!ruleFormData.gpsFlag" class="p-l-10 font-12 color-909399">你尚未设置任何考勤方式，保存设置后成员可在任何地点打卡</span></div>
-            <el-checkbox v-model="ruleFormData.gpsFlag">GPS打卡</el-checkbox>
-          </div>
          <div class="gps-body p-20 bg-f7f8fa" style="width: 567px">
            <div>根据工作地点考勤（可添加多个考勤地点）</div>
            <div>

--- a/src/views/enterpriseApp/dailyAttendance/workSet.vue
+++ b/src/views/enterpriseApp/dailyAttendance/workSet.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-03-20 14:36:37
 * @LastEditors  : 无尘
- * @LastEditTime : 2019-12-21 17:45:26
+ * @LastEditTime : 2019-12-23 17:45:36
 -->
 <!--
@@ -71,7 +71,7 @@
            </el-table-column>
            <el-table-column label="操作">
              <template slot-scope="scope">
-                <el-button v-if="scope.row.attenceType == 2 && !scope.row.personCount" type="text" size="small" @click="toEditWorkTime(scope.$index, scope.row)">编辑排班</el-button>
+                <el-button v-if="scope.row.attenceType == 2 && scope.row.personCount" type="text" size="small" @click="toEditWorkTime(scope.$index, scope.row)">编辑排班</el-button>
                <el-button type="text" size="small" @click="toEditGroup(scope.$index, scope.row)">修改规则</el-button>
                <el-button type="text" size="small" @click="toDel(scope.$index, scope.row)">删除</el-button>
              </template>