Skip to content

O
office-web
Commit cc86d79a by 无尘
Options

fix: 修改考勤组排班班次数据

parent b61661bd
Showing with 83 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.3465e818590f863ba02daf438a8cc494.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.8ce8e882e03826a9ca12.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.dfbc683176804c12ccc5.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.b5f3eb5f575c548fa734d4dce005896f.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.f889594c08161d97d651.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.239ad02542ffc06e142e.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/33.f4c48aa4b6adbdec738a.js → dist/static/js/32.0c7863fa05e5c75053c3.js
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}}); 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 \ No newline at end of file
dist/static/js/manifest.8ce8e882e03826a9ca12.js → dist/static/js/manifest.f889594c08161d97d651.js
!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:"d3125ce0da1fa2e0113c",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:"6edaf5eadaf0d00bf7cf",31:"73b526c8f5f428964943",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}}([]); !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:"330c91a0a9fe8490c0e7",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"879536ae7ce46f0c54ec",13:"57e51fc1b6342003f25d",14:"9cf830eb000e3ac61f70",15:"2d7e130b0ac15815db5e",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:"6edaf5eadaf0d00bf7cf",31:"20f69d688df3827843c5",32:"0c7863fa05e5c75053c3",33:"f4e32fc6846aa744ee48",34:"0fb2eb67d47b9ecbd519",35:"878b1286f80a30dd0234",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,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}}([]);
\ No newline at end of file \ No newline at end of file
src/components/app/dailyAttendance/class-select-mult.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-12-17 09:40:42 * @Date: 2019-12-17 09:40:42
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2019-12-18 21:12:48 * @LastEditTime : 2019-12-21 09:46:48
--> -->
<!-- <!--
...@@ -105,7 +105,19 @@ export default { ...@@ -105,7 +105,19 @@ export default {
showMsg.showmsg('请选择班次', 'warning'); showMsg.showmsg('请选择班次', 'warning');
return false; return false;
} }
that.$emit('hideMultClassDialog', that.selClassesData); if (that.selClassesData.length > 10) {
showMsg.showmsg('最多选择10个班次', 'warning');
return false;
}
let returnObj = [];
that.selClassesData.forEach(ele => {
returnObj.push({
classesId: ele.classesId,
classesName: ele.classesName,
classessTimesJson: ele.classessTimesJson
});
});
that.$emit('hideMultClassDialog', returnObj);
that.$nextTick(() => { that.$nextTick(() => {
that.selClassesData = []; that.selClassesData = [];
}); });
......
src/components/app/dailyAttendance/cycle-set.vue
...@@ -33,7 +33,7 @@ import cycleSet from '@/components/app/dailyAttendance/cycle-set.vue' ...@@ -33,7 +33,7 @@ import cycleSet from '@/components/app/dailyAttendance/cycle-set.vue'
<div class="range-classes"> <div class="range-classes">
<ul> <ul>
<li v-for="(item, index) in ruleFormData.classesList" :key="index + 'class'"> <li v-for="(item, index) in ruleFormData.classes" :key="index + 'class'">
<span>第{{ index + 1 }}天：</span> <span>第{{ index + 1 }}天：</span>
<el-select v-model="item.classesId" placeholder="请选择" @change="changeClass($event, item)"> <el-select v-model="item.classesId" placeholder="请选择" @change="changeClass($event, item)">
<el-option v-for="item in tableData" :key="item.classesId" :label="'班次' + item.classesName + item.label" :value="item.classesId"> </el-option> <el-option v-for="item in tableData" :key="item.classesId" :label="'班次' + item.classesName + item.label" :value="item.classesId"> </el-option>
...@@ -81,18 +81,21 @@ export default { ...@@ -81,18 +81,21 @@ export default {
classesRangeId: '', classesRangeId: '',
days: 3, days: 3,
rangeName: '', rangeName: '',
classesList: [ classes: [
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
} }
] ]
}; };
...@@ -111,18 +114,21 @@ export default { ...@@ -111,18 +114,21 @@ export default {
classesRangeId: '', classesRangeId: '',
days: 3, days: 3,
rangeName: '', rangeName: '',
classesList: [ classes: [
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
} }
] ]
}, },
...@@ -148,19 +154,20 @@ export default { ...@@ -148,19 +154,20 @@ export default {
*/ */
handleRangeDay(e) { handleRangeDay(e) {
const that = this; const that = this;
const length = that.ruleFormData.classesList.length; const length = that.ruleFormData.classes.length;
if (e - length > 0) { if (e - length > 0) {
for (let index = 0; index < e - length; index++) { for (let index = 0; index < e - length; index++) {
that.ruleFormData.classesList.push({ that.ruleFormData.classes.push({
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
}); });
} }
} }
if (e - length < 0) { if (e - length < 0) {
// console.log(e, length, length - e); // console.log(e, length, length - e);
that.ruleFormData.classesList.splice(e - 1, length - e); that.ruleFormData.classes.splice(e - 1, length - e);
} }
}, },
/** /**
...@@ -179,7 +186,7 @@ export default { ...@@ -179,7 +186,7 @@ export default {
customConfirm: _debounce(async function(formName) { customConfirm: _debounce(async function(formName) {
const that = this; const that = this;
let flag = true; let flag = true;
that.ruleFormData.classesList.forEach(ele => { that.ruleFormData.classes.forEach(ele => {
flag = !ele.classesId ? false : true; flag = !ele.classesId ? false : true;
}); });
if (!flag) { if (!flag) {
...@@ -201,18 +208,21 @@ export default { ...@@ -201,18 +208,21 @@ export default {
classesRangeId: '', classesRangeId: '',
days: 3, days: 3,
rangeName: '', rangeName: '',
classesList: [ classes: [
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '' classesName: '',
classessTimesJson: []
} }
] ]
}; };
...@@ -311,7 +321,6 @@ export default { ...@@ -311,7 +321,6 @@ export default {
}, },
mounted() { mounted() {
const that = this; const that = this;
that.getClassifyData();
if (that.attenceGroupId) { if (that.attenceGroupId) {
that.getRangeData(); that.getRangeData();
} }
......
src/components/app/dailyAttendance/people-day-class.vue
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* @version: 1.0.0 * @version: 1.0.0
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-11-07 17:30:04 * @Date: 2019-11-07 17:30:04
* @LastEditors: 无尘 * @LastEditors : 无尘
* @LastEditTime: 2019-11-12 19:50:39 * @LastEditTime : 2019-12-20 16:26:32
--> -->
<!-- <!--
...@@ -30,12 +30,12 @@ ...@@ -30,12 +30,12 @@
<ul> <ul>
<template v-for="(item, index) in classData"> <template v-for="(item, index) in classData">
<li class="day-class-item p-lr-20" :key="index + 'class'" @click.stop="daySet(item)"> <li class="day-class-item p-lr-20" :key="index + 'class'" @click.stop="daySet(item)">
<p class="class-item day-tag-red">{{ item.serial }}</p> <p class="class-item day-tag-red">{{ item.classesName }}</p>
</li> </li>
</template> </template>
<template v-for="(item, index) in defaultData"> <template v-for="(item, index) in defaultData">
<li class="day-class-item p-lr-20" :key="index + 'defaultClass'" @click.stop="daySet(item)"> <li class="day-class-item p-lr-20" :key="index + 'defaultClass'" @click.stop="daySet(item)">
<p :class="['class-item', item.id == '0' ? 'class-rest' : 'class-clear']">{{ item.serial }}</p> <p :class="['class-item', item.id == '0' ? 'class-rest' : 'class-clear']">{{ item.classesName }}</p>
</li> </li>
</template> </template>
</ul> </ul>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div class="day-item-title" title="从该天开始周期排班至月底">从该天开始周期排班至月底</div> <div class="day-item-title" title="从该天开始周期排班至月底">从该天开始周期排班至月底</div>
<ul> <ul>
<li class="day-class-item p-lr-20" @click.stop="dayWeekSet"> <li class="day-class-item p-lr-20" @click.stop="dayWeekSet">
<p class="class-item day-tag-blue">{{ cycleData[0].cycleName }} {{ cycleData[0].itemList.map(item => item.className).join('-') }}</p> <p class="class-item day-tag-blue">{{ cycleData[0].rangeName }} {{ cycleData[0].classes.map(item => item.classesName).join('-') }}</p>
</li> </li>
</ul> </ul>
</li> </li>
...@@ -98,11 +98,11 @@ export default { ...@@ -98,11 +98,11 @@ export default {
defaultData: [ defaultData: [
{ {
id: '0', id: '0',
serial: '休息' classesName: '休息'
}, },
{ {
id: '-2', id: '-2',
serial: '清空' classesName: '清空'
} }
] ]
}; };
...@@ -131,10 +131,10 @@ export default { ...@@ -131,10 +131,10 @@ export default {
if (arr.includes(that.workDate)) { if (arr.includes(that.workDate)) {
that.itemSchedule.schedules.forEach(ele => { that.itemSchedule.schedules.forEach(ele => {
if (ele.workDate == that.workDate) { if (ele.workDate == that.workDate) {
ele.serial = item.serial; ele.classesName = item.classesName;
ele.classes = { ele.classes = {
id: item.id, id: item.id,
serial: item.serial classesName: item.classesName
}; };
ele.isRest = true; ele.isRest = true;
} }
...@@ -145,9 +145,9 @@ export default { ...@@ -145,9 +145,9 @@ export default {
newData.push({ newData.push({
classes: { classes: {
id: item.id, id: item.id,
serial: item.serial classesName: item.classesName
}, },
serial: item.serial, classesName: item.classesName,
isRest: true, isRest: true,
workDate: that.workDate workDate: that.workDate
}); });
...@@ -160,9 +160,9 @@ export default { ...@@ -160,9 +160,9 @@ export default {
that.itemSchedule.schedules.push({ that.itemSchedule.schedules.push({
classes: { classes: {
id: item.id, id: item.id,
serial: item.serial classesName: item.classesName
}, },
serial: item.serial, classesName: item.classesName,
isRest: true, isRest: true,
workDate: that.workDate workDate: that.workDate
}); });
...@@ -188,10 +188,10 @@ export default { ...@@ -188,10 +188,10 @@ export default {
let cycleLength = that.cycleData[0].itemList.length; // 排班有几个班次，相当于一个周期是几天 let cycleLength = that.cycleData[0].itemList.length; // 排班有几个班次，相当于一个周期是几天
// 然后在这个日期区间内按照排班周期设置 // 然后在这个日期区间内按照排班周期设置
newDates.forEach((date, index) => { newDates.forEach((date, index) => {
date.serial = that.cycleData[0].itemList[index % cycleLength].className; date.classesName = that.cycleData[0].itemList[index % cycleLength].classesName;
date.classes = { date.classes = {
id: that.cycleData[0].itemList[index % cycleLength].classId, id: that.cycleData[0].itemList[index % cycleLength].classId,
serial: that.cycleData[0].itemList[index % cycleLength].className classesName: that.cycleData[0].itemList[index % cycleLength].classesName
}; };
date.isRest = true; date.isRest = true;
date.workDate = date.timeStamp; date.workDate = date.timeStamp;
......
src/views/enterpriseApp/dailyAttendance/workGroupSet.vue
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="name" label="周期班次" show-overflow-tooltip> <el-table-column prop="name" label="周期班次" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="(item, index) in scope.row.classesList" :key="index + 'time'">{{ index > 1 ? '-' : '' }}{{ item.classesName }}</span> <span v-for="(item, index) in scope.row.classes" :key="index + 'time'">{{ index > 1 ? '-' : '' }}{{ item.classesName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ranageName" label="周期天数"> <el-table-column prop="ranageName" label="周期天数">
...@@ -437,7 +437,7 @@ export default { ...@@ -437,7 +437,7 @@ export default {
classesRangeId: '', classesRangeId: '',
days: 3, days: 3,
rangeName: '', rangeName: '',
classesList: [ classes: [
{ {
classesId: '', classesId: '',
classesName: '' classesName: ''
......
src/views/enterpriseApp/dailyAttendance/workTimeManage.vue
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
<span class="fl font-13 color-303133">排班周期：</span> <span class="fl font-13 color-303133">排班周期：</span>
<div class="class-row-tags"> <div class="class-row-tags">
<div class="class-tag" v-for="(item, index) in cycleData" :key="index + 'cycle'"> <div class="class-tag" v-for="(item, index) in cycleData" :key="index + 'cycle'">
<span class="ant-tag-text">{{ item.ranageName }}：</span> <span class="ant-tag-text">{{ item.rangeName }}：</span>
<span>{{ item.classesList.map(ele => ele.classesName).join('-') }}</span> <span>{{ item.classes.map(ele => ele.classesName).join('-') }}</span>
</div> </div>
<el-button type="text" @click="toWorkGroup">设置</el-button> <el-button type="text" @click="toWorkGroup">设置</el-button>
</div> </div>
...@@ -82,13 +82,13 @@ ...@@ -82,13 +82,13 @@
<people-day-class :dates="dates" :itemSchedule="scope.row" :workDate="item.timeStamp" :classData="classes" :cycleData="cycleData" @refreshData="refreshData"></people-day-class> <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="tool-tip-body" slot="reference">
<div class="day-work-cell schedule_del_class"> <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' : '' }} --> <!-- {{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].classesName + '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-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].classesName : ''" 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 class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].classesName : '清空' }}</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 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> --> </el-tooltip> -->
<!-- <div v-if="!scope.row.schedules || !scope.row.schedules[index]"> --> <!-- <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 class="day-work-cell_text">{{ scope.row.schedules && scope.row.schedules[index] && scope.row.schedules[index].workDate == item.timeStamp ? scope.row.schedules[index].classesName : '清空' }}</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 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>
...@@ -164,10 +164,10 @@ export default { ...@@ -164,10 +164,10 @@ export default {
// 排班周期 // 排班周期
cycleData: [ cycleData: [
{ {
ranageName: '555555', rangeName: '555555',
id: 287955018, id: 287955018,
isValid: true, isValid: true,
classesList: [{ classId: 468090517, classesName: '3', isValid: true }, { classId: 468770499, classesName: '默认班次', isValid: true }, { classId: 468770499, classesName: '默认班次', isValid: true }, { classId: 468770499, classesName: '默认班次', isValid: true }, { classId: 468770499, classesName: '默认班次', isValid: true }] classes: [{ classesId: 468090517, classesName: '3', isValid: true }, { classesId: 468770499, classesName: '默认班次', isValid: true }, { classesId: 468770499, classesName: '默认班次', isValid: true }, { classesId: 468770499, classesName: '默认班次', isValid: true }, { classesId: 468770499, classesName: '默认班次', isValid: true }]
} }
], ],
// 班次 // 班次
...@@ -243,36 +243,36 @@ export default { ...@@ -243,36 +243,36 @@ export default {
{ {
classes: { classes: {
id: 468090517, id: 468090517,
serial: '3' classesName: '3'
}, },
serial: '3', classesName: '3',
isRest: false, isRest: false,
workDate: 1575129600000 workDate: 1575129600000
}, },
{ {
classes: { classes: {
id: 468770499, id: 468770499,
serial: '默认班次' classesName: '默认班次'
}, },
serial: '默认班次', classesName: '默认班次',
isRest: false, isRest: false,
workDate: 1575216000000 workDate: 1575216000000
}, },
{ {
classes: { classes: {
id: 468090517, id: 468090517,
serial: '3' classesName: '3'
}, },
serial: '3', classesName: '3',
isRest: false, isRest: false,
workDate: 1575302400000 workDate: 1575302400000
}, },
{ {
classes: { classes: {
id: 460445486, id: 460445486,
serial: '2' classesName: '2'
}, },
serial: '2', classesName: '2',
isRest: false, isRest: false,
workDate: 1575388800000 workDate: 1575388800000
} }
...@@ -292,9 +292,9 @@ export default { ...@@ -292,9 +292,9 @@ export default {
{ {
classes: { classes: {
id: 468090517, id: 468090517,
serial: '3' classesName: '3'
}, },
serial: '3', classesName: '3',
isRest: false, isRest: false,
workDate: 1575129600000 workDate: 1575129600000
} }
......
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