Skip to content

O
office-web
Commit f398676b by 无尘
Options

fix: 修改班次

parent 09f85335
Showing with 42 additions and 5 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.1856385f2e03610f088ed25c63518981.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.f69af8462f42cf1bd63c.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.fd9c9e8a7bb33a982171.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.8d39e7e9bb423500cfa8fc68fb49b5d9.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.cf184c42108ca1e97e44.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.fd9c9e8a7bb33a982171.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.f69af8462f42cf1bd63c.js → dist/static/js/manifest.cf184c42108ca1e97e44.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:"2baca21202cf454cd7b0",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:"7882005cd5d4e4e4494b",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"f7633d51986d0c6798f1",19:"ce35e2d57d36a4283e7e",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"4a1c52078d154a141023",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"491a34d95550f930cbcc",31:"20f69d688df3827843c5",32:"0c7863fa05e5c75053c3",33:"f4e32fc6846aa744ee48",34:"0fb2eb67d47b9ecbd519",35:"e64c33855b455bcdd9a2",36:"8615782328f743c5f783",37:"8d599976023acb79bef4",38:"6620399d71206af0621b",39:"c27eb3467cf09c8ff7aa",40:"2437eb589d6ed60c9252",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(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},a={103:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;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:"2baca21202cf454cd7b0",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:"7882005cd5d4e4e4494b",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"f7633d51986d0c6798f1",19:"ce35e2d57d36a4283e7e",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"4a1c52078d154a141023",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"f821eb09683fff6f4c73",31:"20f69d688df3827843c5",32:"0c7863fa05e5c75053c3",33:"f4e32fc6846aa744ee48",34:"0fb2eb67d47b9ecbd519",35:"e64c33855b455bcdd9a2",36:"8615782328f743c5f783",37:"8d599976023acb79bef4",38:"6620399d71206af0621b",39:"c27eb3467cf09c8ff7aa",40:"2437eb589d6ed60c9252",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=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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}}([]);
\ No newline at end of file \ No newline at end of file
src/components/app/dailyAttendance/create-work-class.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-10-21 14:27:29 * @Date: 2019-10-21 14:27:29
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2019-12-26 17:03:47 * @LastEditTime : 2019-12-26 18:35:56
--> -->
<!-- <!--
...@@ -78,6 +78,7 @@ import createWorkClass from '@/components/app/dailyAttendance/create-work-class. ...@@ -78,6 +78,7 @@ import createWorkClass from '@/components/app/dailyAttendance/create-work-class.
format="HH:mm" format="HH:mm"
value-format="HH:mm" value-format="HH:mm"
placeholder="" placeholder=""
@change="changeStartBegin($event, scope.row)"
> >
</el-time-picker> </el-time-picker>
<span class="font-12 color-606266">至</span> <span class="font-12 color-606266">至</span>
...@@ -125,6 +126,7 @@ import createWorkClass from '@/components/app/dailyAttendance/create-work-class. ...@@ -125,6 +126,7 @@ import createWorkClass from '@/components/app/dailyAttendance/create-work-class.
format="HH:mm" format="HH:mm"
value-format="HH:mm" value-format="HH:mm"
placeholder="" placeholder=""
@change="changeEndEnd($event, scope.row)"
> >
</el-time-picker> </el-time-picker>
<span class="font-12 color-606266">可打下班卡</span> <span class="font-12 color-606266">可打下班卡</span>
...@@ -576,6 +578,25 @@ export default { ...@@ -576,6 +578,25 @@ export default {
that.$forceUpdate(); that.$forceUpdate();
}, },
/** /**
* 改变上班开始时间
*/
async changeStartBegin(e, row) {
const that = this;
const arrD = row.forbidEndEndTime[0].split('-');
// 01:00-23:00 ["23:01:00-23:59:00", "00:00:00-00:59:00"]
if ((await that.compareDate(row.startTime, row.endTime)) && (await that.compareDate(e, arrD[1]))) {
// 比较开始于结束，如果开始大于结束，分段计算
if (!(await that.compareDate(arrD[0], e))) {
row.forbidEndEndTime = [[arrD[0] + ':00', '23:59:00'].join('-'), ['00:00:00', e + ':00'].join('-')];
return false;
}
row.forbidEndEndTime = [[arrD[0], e + ':00'].join('-')];
return false;
}
// 如果不用限制，就需要在计算下班结束的可选时间(下面几个一样需要计算)
row.forbidEndEndTime = await that.forbidEndEndTime(row);
},
/**
* 改变上班结束时间 * 改变上班结束时间
*/ */
async changeStartEnd(e, row) { async changeStartEnd(e, row) {
...@@ -583,7 +604,9 @@ export default { ...@@ -583,7 +604,9 @@ export default {
const arrC = row.forbidEndStartTime[0].split('-'); const arrC = row.forbidEndStartTime[0].split('-');
if ((await that.compareDate(row.startTime, row.endTime)) && !(await that.compareDate(e, arrC[0]))) { if ((await that.compareDate(row.startTime, row.endTime)) && !(await that.compareDate(e, arrC[0]))) {
row.forbidEndStartTime = [[e + ':00', arrC[1]].join('-')]; row.forbidEndStartTime = [[e + ':00', arrC[1]].join('-')];
return false;
} }
row.forbidEndStartTime = await that.forbidEndStartTime(row);
}, },
/** /**
* 改变下班开始时间 * 改变下班开始时间
...@@ -593,7 +616,21 @@ export default { ...@@ -593,7 +616,21 @@ export default {
const arrB = row.forbidStartEndTime[0].split('-'); const arrB = row.forbidStartEndTime[0].split('-');
if ((await that.compareDate(row.startTime, row.endTime)) && (await that.compareDate(e, arrB[1]))) { if ((await that.compareDate(row.startTime, row.endTime)) && (await that.compareDate(e, arrB[1]))) {
row.forbidStartEndTime = [[arrB[0], e + ':00'].join('-')]; row.forbidStartEndTime = [[arrB[0], e + ':00'].join('-')];
return false;
}
row.forbidStartEndTime = await that.forbidStartEndTime(row);
},
/**
* 改变下班结束时间
*/
async changeEndEnd(e, row) {
const that = this;
const arrA = row.forbidStartBeginTime[0].split('-');
if ((await that.compareDate(row.startTime, row.endTime)) && (await that.compareDate(e, arrA[0]))) {
row.forbidStartBeginTime = [[e + ':00', arrA[1]].join('-')];
return false;
} }
row.forbidStartBeginTime = await that.forbidStartBeginTime(row);
}, },
/** /**
* 计算设置晚到的时间 * 计算设置晚到的时间
......
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