Skip to content

O
office-web
Commit 0a6f42e8 by 无尘
Options

feat: 增加考勤组编辑

parent 1126e0b4
Showing with 90 additions and 62 deletions
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.3a4a04e53545b15a9abc1d542aece914.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.44266600c9fb1a2815f0.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.1f969cdde0e4733310c1.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.7790c9e65b445b3ebee1759dcb268ff9.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.9d1afec22ab14cb70da4.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.8842616a132b220d9dcf.js></script></body></html>
\ No newline at end of file
dist/static/css/app.3a4a04e53545b15a9abc1d542aece914.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.7790c9e65b445b3ebee1759dcb268ff9.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/32.0c7863fa05e5c75053c3.js → dist/static/js/33.f4c48aa4b6adbdec738a.js
webpackJsonp([32],{"4HoI":function(t,s){},B9Yg:function(t,s,e){t.exports=e.p+"static/img/gic-error.8aba914.png"},"Q3j/":function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var i=e("B9Yg"),a=e.n(i),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"登录遇到错误啦！请确认您是否已是好办管理员，如不是，请联系管理员。"}},mounted:function(){}},r={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_404,alt:"404"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/login",rel:"noopener noreferrer"}},[this._v("返回好办登录页")])])])])},staticRenderFns:[]};var c=e("VU/8")(n,r,!1,function(t){e("4HoI")},"data-v-45ea1cc1",null);s.default=c.exports}});
\ No newline at end of file
webpackJsonp([33],{"4HoI":function(t,s){},B9Yg:function(t,s,e){t.exports=e.p+"static/img/gic-error.8aba914.png"},"Q3j/":function(t,s,e){"use strict";Object.defineProperty(s,"__esModule",{value:!0});var i=e("B9Yg"),a=e.n(i),n={name:"page404",data:function(){return{img_404:a.a}},computed:{message:function(){return"登录遇到错误啦！请确认您是否已是好办管理员，如不是，请联系管理员。"}},mounted:function(){}},r={render:function(){var t=this.$createElement,s=this._self._c||t;return s("div",{staticStyle:{background:"#f0f2f5","margin-top":"-20px",height:"100%"}},[s("div",{staticClass:"wscn-http404"},[s("div",{staticClass:"pic-404"},[s("img",{staticClass:"pic-404__parent",attrs:{src:this.img_404,alt:"404"}})]),this._v(" "),s("div",{staticClass:"bullshit"},[s("div",{staticClass:"bullshit__headline"},[this._v(this._s(this.message))]),this._v(" "),s("a",{staticClass:"bullshit__return-home",attrs:{href:"#/login",rel:"noopener noreferrer"}},[this._v("返回好办登录页")])])])])},staticRenderFns:[]};var c=e("VU/8")(n,r,!1,function(t){e("4HoI")},"data-v-45ea1cc1",null);s.default=c.exports}});
\ No newline at end of file
dist/static/js/manifest.44266600c9fb1a2815f0.js → dist/static/js/manifest.9d1afec22ab14cb70da4.js
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(c&&c(a,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var a={},f={103:0};function b(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,b),f.l=!0,f.exports}b.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,b){c=f[e]=[a,b]});c[2]=a;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"ab616832b6f6019a8690",1:"fe9dec1f31b04053fd7e",2:"54aabab28c7735d34c10",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"330c91a0a9fe8490c0e7",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"879536ae7ce46f0c54ec",13:"57e51fc1b6342003f25d",14:"9cf830eb000e3ac61f70",15:"0dadaaaa62fa31697636",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"447fe4adcec70a86ea14",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"b1832faa7c26cd1e9d72",25:"550aafc88ac4d0c8a14f",26:"e0ba8ad05ad14e4c0abc",27:"80efeaa8fe902850d85c",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"c97e1c8ed1fca52c7eb7",31:"20f69d688df3827843c5",32:"0c7863fa05e5c75053c3",33:"0271e97189f869db78c7",34:"e5ba3c1688f3038d3d09",35:"d8abf87eeb477b4bc1f3",36:"2cadbd4ded3457625f52",37:"8dc3e1f0f3e416135406",38:"9f4a46d2ce3c9477a06b",39:"b33ea830129fb895dd77",40:"52567857be12ee835446",41:"7264f33d2c3cf44d63a5",42:"9cacb9b0dc2a83864afe",43:"2324b3155ba3e3fe67b2",44:"a899f81af77b5d1b6daf",45:"d4e2ecd5b9efc4c430de",46:"03ae66bfca82c8ffa033",47:"393792502b1faedfd75b",48:"e413bb6ddbf0598e75ed",49:"8be0d341bf9560ab91d8",50:"edc711153403cc5a63ed",51:"5996349b24bab60188ec",52:"4b670e09f79ed49e862d",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:"9617b600ff0f73479a43",89:"8d513b9c9d7970a612c0",90:"57319965505945b3ae7e",91:"446342439ce97b19c84f",92:"09a5823b00d6180576b9",93:"e801fdd8bbd27a68d8ee",94:"0667cc1720cd56e116d9",95:"a08b7e730d57a7f096a5",96:"37acaa2f6f812ee7216b",97:"84d009afd65fa1e0cb42",98:"d54541a3a62bae3a075b",99:"b2c0b52f472168172ad5",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,d.appendChild(n),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,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 d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var c={},f={103:0};function b(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,b),f.l=!0,f.exports}b.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,b){a=f[e]=[c,b]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"ab616832b6f6019a8690",1:"fe9dec1f31b04053fd7e",2:"54aabab28c7735d34c10",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"330c91a0a9fe8490c0e7",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"879536ae7ce46f0c54ec",13:"57e51fc1b6342003f25d",14:"9cf830eb000e3ac61f70",15:"49663feab7c4a4ba6e7d",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"447fe4adcec70a86ea14",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"b1832faa7c26cd1e9d72",25:"550aafc88ac4d0c8a14f",26:"e0ba8ad05ad14e4c0abc",27:"80efeaa8fe902850d85c",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"d4a223f719003a8d9079",31:"902a19b7f2b6f0b29807",32:"fc2213c2b57da6c25ea2",33:"f4c48aa4b6adbdec738a",34:"e5ba3c1688f3038d3d09",35:"d8abf87eeb477b4bc1f3",36:"2cadbd4ded3457625f52",37:"8dc3e1f0f3e416135406",38:"9f4a46d2ce3c9477a06b",39:"b33ea830129fb895dd77",40:"52567857be12ee835446",41:"7264f33d2c3cf44d63a5",42:"9cacb9b0dc2a83864afe",43:"2324b3155ba3e3fe67b2",44:"a899f81af77b5d1b6daf",45:"d4e2ecd5b9efc4c430de",46:"03ae66bfca82c8ffa033",47:"393792502b1faedfd75b",48:"e413bb6ddbf0598e75ed",49:"8be0d341bf9560ab91d8",50:"edc711153403cc5a63ed",51:"5996349b24bab60188ec",52:"4b670e09f79ed49e862d",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:"9617b600ff0f73479a43",89:"8d513b9c9d7970a612c0",90:"57319965505945b3ae7e",91:"446342439ce97b19c84f",92:"09a5823b00d6180576b9",93:"e801fdd8bbd27a68d8ee",94:"0667cc1720cd56e116d9",95:"a08b7e730d57a7f096a5",96:"37acaa2f6f812ee7216b",97:"84d009afd65fa1e0cb42",98:"d54541a3a62bae3a075b",99:"b2c0b52f472168172ad5",102:"2c7e1d628bd2f4ac709c"}[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,d.appendChild(n),c},b.m=e,b.c=c,b.d=function(e,a,c){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/app/dailyAttendance/create-work-class.vue
......@@ -3,8 +3,8 @@
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-10-21 14:27:29
* @LastEditors: 无尘
* @LastEditTime: 2019-12-18 12:49:48
* @LastEditors : 无尘
* @LastEditTime : 2019-12-20 10:09:46
-->
<!--
......@@ -234,6 +234,7 @@ export default {
times: '1', // 次数设置
classessTimesJson: [
{
times: 1,
startTime: '9:00',
endTime: '18:00',
allowStartBeginTime: '',
......@@ -787,6 +788,7 @@ export default {
/**
* 提交
*/
/* eslint-disable */
customConfirm: _debounce(async function(formName) {
const that = this;
if (that.formData.relaxFlag && (!that.formData.relaxStartDate || !that.formData.relaxEndDate)) {
......@@ -826,6 +828,18 @@ export default {
showMsg.showmsg('晚走晚到后面的规则时间必须大于前面的时间', 'warning');
return false;
}
if (!that.formData.clockType) {
that.formData.classessTimesJson.forEach(ele => {
const arrA = ele.forbidStartBeginTime[0].split('-');
ele.allowStartBeginTime = arrA[0].split(':')[0] + arrA[0].split(':')[1];
const arrB = ele.forbidStartEndTime[0].split('-');
ele.allowStartEndTime = arrB[0].split(':')[0] + arrB[0].split(':')[1];
const arrC = ele.forbidEndStartTime[0].split('-');
ele.allowEndStartTime = arrC[0].split(':')[0] + arrC[0].split(':')[1];
const arrD = ele.forbidEndEndTime[0].split('-');
ele.allowEndEndTime = arrD[0].split(':')[0] + arrD[0].split(':')[1];
});
}
that.$refs[formName].validate(valid => {
if (valid) {
that.setData();
......@@ -947,6 +961,7 @@ export default {
times: '1', // 次数设置
classessTimesJson: [
{
times: 1,
startTime: '9:00',
endTime: '18:00',
allowStartBeginTime: '',
......
src/views/enterpriseApp/dailyAttendance/workGroupSet.vue
......@@ -16,7 +16,7 @@
</el-form-item>
<el-form-item label="参与考勤人员：" class="input-item" prop="">
<div class="flex">
<el-checkbox :disabled="$route.query.attenceGroupId ? true : false" v-model="ruleFormData.attenceRangeType">行政架构</el-checkbox>
<el-checkbox v-model="ruleFormData.attenceRangeType">行政架构</el-checkbox>
<div v-if="ruleFormData.attenceRangeType" class="flex-column item-cell-select inline-block m-l-10">
<div class="depart-item-wrap">
<div style="width:470px" class="el-select el-select--large depart-item-content" @click="showDialogMust('depart', ruleFormData.adminList)">
......@@ -36,7 +36,7 @@
</div>
</div>
<div class="flex m-t-20">
<el-checkbox :disabled="$route.query.attenceGroupId ? true : false" v-model="ruleFormData.attenceRangeStoreType">门店架构</el-checkbox>
<el-checkbox v-model="ruleFormData.attenceRangeStoreType">门店架构</el-checkbox>
<div v-if="ruleFormData.attenceRangeStoreType" class="flex-column item-cell-select inline-block m-l-10">
<div class="depart-item-wrap">
<div style="width:470px" class="el-select el-select--large depart-item-content" @click="showDialogMust('store', ruleFormData.storeList)">
......@@ -58,7 +58,7 @@
</el-form-item>
<el-form-item label="考勤白名单：" class="input-item" prop="">
<div class="flex">
<el-checkbox :disabled="$route.query.attenceGroupId ? true : false" v-model="ruleFormData.noAttenceRangeType">行政架构</el-checkbox>
<el-checkbox v-model="ruleFormData.noAttenceRangeType">行政架构</el-checkbox>
<div v-if="ruleFormData.noAttenceRangeType" class="flex-column item-cell-select inline-block m-l-10">
<div class="depart-item-wrap">
<div style="width:470px" class="el-select el-select--large depart-item-content" @click="showDialogNo('depart', ruleFormData.noAdminList)">
......@@ -78,7 +78,7 @@
</div>
</div>
<div class="flex m-t-20">
<el-checkbox :disabled="$route.query.attenceGroupId ? true : false" v-model="ruleFormData.noAttenceRangeStoreType">门店架构</el-checkbox>
<el-checkbox v-model="ruleFormData.noAttenceRangeStoreType">门店架构</el-checkbox>
<div v-if="ruleFormData.noAttenceRangeStoreType" class="flex-column item-cell-select inline-block m-l-10">
<div class="depart-item-wrap">
<div style="width:470px" class="el-select el-select--large depart-item-content" @click="showDialogNo('store', ruleFormData.noStoreList)">
......@@ -812,11 +812,15 @@ export default {
classesJson: JSON.stringify(that.ruleFormData.classesJson)
};
if (that.saveDataBool) {
postRequest('/haoban-app-attence-web/attence-add', para).then(res => {
postRequest(that.$route.query.attenceGroupId?'/haoban-app-attence-web/attence-edit':'/haoban-app-attence-web/attence-add', para).then(res => {
let data = res.data;
if (data.errorCode == 1) {
that.$message.success('保存成功');
that.$router.go(-1);
if (that.ruleFormData.attenceType == 1) {
that.$message.success('保存成功');
that.$router.go(-1);
}else {
that.$router.push(`/workTimeManage?appIcon=${this.$route.query.appIcon}`);
}
} else {
that.$message.error(data.message);
}
......@@ -841,7 +845,6 @@ export default {
if (ele.classessTimesJson) {
ele.classessTimesJson = JSON.parse(ele.classessTimesJson);
}
});
}
that.classifyList = resData.result.list || [];
......@@ -905,7 +908,11 @@ export default {
ele.workType = ele.workType==1? true : false;
})
}
if (!!data.result.attenceWorkJson && data.result.attenceWorkJson.length) {
data.result.attenceWorkJson.forEach(child => {
child.classessTimesJson = child.classessTimesJson? JSON.parse(child.classessTimesJson): []
});
}
that.mustSelection = data.result.adminList;
that.mustStoreList = data.result.storeList;
that.noSelection = data.result.noAdminList;
......
src/views/enterpriseApp/dailyAttendance/workTimeManage.vue
......@@ -3,8 +3,8 @@
* @version: 1.0.0
* @Author: 无尘
* @Date: 2019-09-18 15:25:12
* @LastEditors: 无尘
* @LastEditTime: 2019-11-11 19:03:00
* @LastEditors : 无尘
* @LastEditTime : 2019-12-20 10:55:49
-->
<template>
......@@ -12,55 +12,57 @@
<div class="work-time border-box">
<common-detail-top :topMenuData="topMenuData" :activeId="activeId"></common-detail-top>
<div class="work-time-content border-box">
<el-table class="select-table" border ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: calc(100% - 3px);">
<el-table-column prop="" show-overflow-tooltip fixed :resizable="false">
<template slot="header" slot-scope="scope">
姓名
</template>
<template slot-scope="scope">
<div class="row-username">
<el-popover placement="bottom" width="231" trigger="click">
<div class="work-time-table">
<el-table class="select-table" border ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: calc(100% - 20px);">
<el-table-column prop="" show-overflow-tooltip fixed :resizable="false">
<template slot="header" slot-scope="scope">
姓名
</template>
<template slot-scope="scope">
<div class="row-username">
{{ scope.row.user.name }}
<!-- 设置该员工当月所有班次 -->
<!-- <el-popover placement="bottom" width="231" trigger="click">
<div class="tool-tip-body" slot="reference">
<el-tooltip class="item" effect="dark" :content="scope.row.user.name" placement="top-start">
<p>{{ scope.row.user.name }}</p>
</el-tooltip>
</div>
</el-popover>
</div>
</template>
</el-table-column>
<template v-for="(item, index) in dates">
<el-table-column prop="" show-overflow-tooltip :key="index + 'thead'" :resizable="false">
<template slot="header" slot-scope="scope">
{{ item.timeStamp | filterDay }} <br />
{{ weekData[item.dayOfWeek] }}
</el-popover> -->
</div>
</template>
<template slot-scope="scope">
<div class="day-work">
<el-popover placement="bottom" width="231" trigger="click">
<!-- 当前员工当天排版设置 -->
<people-day-class :dates="dates" :itemSchedule="scope.row" :workDate="item.timeStamp" :classData="classes" :cycleData="cycleData" @refreshData="refreshData"></people-day-class>
<div class="tool-tip-body" slot="reference">
<div class="day-work-cell schedule_del_class">
<!-- {{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial + '6' : '' }} -->
<!-- <el-tooltip v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp" class="item" effect="dark" :content="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial : ''" placement="top-start">
</el-table-column>
<template v-for="(item, index) in dates">
<el-table-column prop="" show-overflow-tooltip :key="index + 'thead'" :resizable="false">
<template slot="header" slot-scope="scope">
{{ item.timeStamp | filterDay }} <br />
{{ weekData[item.dayOfWeek] }}
</template>
<template slot-scope="scope">
<div class="day-work">
<el-popover placement="bottom" width="231" trigger="click">
<!-- 当前员工当天排版设置 -->
<people-day-class :dates="dates" :itemSchedule="scope.row" :workDate="item.timeStamp" :classData="classes" :cycleData="cycleData" @refreshData="refreshData"></people-day-class>
<div class="tool-tip-body" slot="reference">
<div class="day-work-cell schedule_del_class">
<!-- {{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial + '6' : '' }} -->
<!-- <el-tooltip v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp" class="item" effect="dark" :content="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial : ''" placement="top-start">
<div class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial : '清空' }}</div>
<div v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp && scope.row.schedules[index].isRest" class="day-work-cell_icon"></div>
</el-tooltip> -->
<!-- <div v-if="!scope.row.schedules || !scope.row.schedules[index]"> -->
<div class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial : '清空' }}</div>
<div v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp && scope.row.schedules[index].isRest" class="day-work-cell_icon"></div>
<!-- </div> -->
<!-- <div v-if="!scope.row.schedules || !scope.row.schedules[index]"> -->
<div class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].serial : '清空' }}</div>
<div v-if="scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp && scope.row.schedules[index].isRest" class="day-work-cell_icon"></div>
<!-- </div> -->
</div>
</div>
</div>
</el-popover>
</div>
</template>
</el-table-column>
</template>
</el-table>
</el-popover>
</div>
</template>
</el-table-column>
</template>
</el-table>
</div>
<div class="block common-wrap__page text-right m-t-24" v-if="tableData.length != 0">
<el-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"> </el-pagination>
</div>
......@@ -69,6 +71,7 @@
</div>
</template>
<script>
import commonDetailTop from '@/components/app/common-detail-top.vue';
// import { postRequest, postExcel } from '@/api/api';
// import errMsg from '@/common/js/error';
// import { _debounce } from '@/common/js/public';
......@@ -91,7 +94,8 @@ export default {
}
},
components: {
peopleDayClass
peopleDayClass,
commonDetailTop
},
filters: {
filterDay(timeStamp) {
......@@ -107,12 +111,12 @@ export default {
topMenuData: [
{
id: '1',
name: '在线沟通设置',
path: `/onlineChatSet?appIcon=${this.$route.query.appIcon}&activeTab=${this.$route.query.activeTab}`
name: '考勤组管理',
path: `/workSet?appIcon=${this.$route.query.appIcon}`
},
{
id: '2',
name: this.$route.query.activeTab == 3 ? '图文发送记录' : this.$route.query.tabType == 1 ? '微商城商品发送记录' : this.$route.query.tabType == 2 ? '积分商城商品发送记录' : ''
name: '编辑排班表'
}
],
// 分页参数
......@@ -369,7 +373,9 @@ export default {
width: 100%;
.work-time-content {
padding: 20px;
.work-time-table {
width: 100%;
}
.row-username {
white-space: nowrap;
position: relative;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment