Skip to content

O
office-web
Commit 0d68e2b7 by 无尘
Options

fix: 修改考勤组数据

parent eb6fbb34
Showing with 86 additions and 107 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.fe90169e105f672f4099780ab65f5c28.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.68369f7a6f5bff351a51.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.0fdd6f9db01df4317e29.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.9a4bf4115a85a686888e71a788fe8438.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.2265f86cc35c034eadc4.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.9c584469c2b22effc5a0.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.68369f7a6f5bff351a51.js → dist/static/js/manifest.2265f86cc35c034eadc4.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],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:"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:"09bd7cff5ebf3ac736ef",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"3fd10a3380b9d3fddb35",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"a03cfb5cd6c9069b179f",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"b5b324cb1a4e5fe6a395",31:"5d5e618d2ceadec7e8cb",32:"fc2213c2b57da6c25ea2",33:"f4c48aa4b6adbdec738a",34:"e5ba3c1688f3038d3d09",35:"d8abf87eeb477b4bc1f3",36:"2cadbd4ded3457625f52",37:"8dc3e1f0f3e416135406",38:"9f4a46d2ce3c9477a06b",39:"b33ea830129fb895dd77",40:"b0211e85af913b5307f8",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:"2629d20834840d0da10e"}[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}}([]); !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:"b9d0cf0cc0231fa10357",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"3fd10a3380b9d3fddb35",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"a03cfb5cd6c9069b179f",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"b5b324cb1a4e5fe6a395",31:"20f69d688df3827843c5",32:"0c7863fa05e5c75053c3",33:"f4e32fc6846aa744ee48",34:"0fb2eb67d47b9ecbd519",35:"e64c33855b455bcdd9a2",36:"7b2e2fedc166438ee6b0",37:"8dc3e1f0f3e416135406",38:"9f4a46d2ce3c9477a06b",39:"b33ea830129fb895dd77",40:"b0211e85af913b5307f8",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:"2629d20834840d0da10e"}[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-24 15:37:14 * @LastEditTime : 2019-12-25 14:25:47
--> -->
<!-- <!--
...@@ -45,7 +45,7 @@ import classSelectMult from '@/components/app/dailyAttendance/class-select-mult. ...@@ -45,7 +45,7 @@ import classSelectMult from '@/components/app/dailyAttendance/class-select-mult.
</template> </template>
<script> <script>
import { getRequest } from '@/api/api'; import { getRequest } from '@/api/api';
// import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
export default { export default {
...@@ -223,7 +223,9 @@ export default { ...@@ -223,7 +223,9 @@ export default {
} }
that.tableData = resData.result || []; that.tableData = resData.result || [];
that.handleData(); that.handleData();
return false;
} }
errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.error({
......
src/components/app/dailyAttendance/class-select.vue
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
* @version: 1.0.0 * @version: 1.0.0
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-12-17 09:40:42 * @Date: 2019-12-17 09:40:42
* @LastEditors: 无尘 * @LastEditors : 无尘
* @LastEditTime: 2019-12-18 12:53:47 * @LastEditTime : 2019-12-25 14:26:50
--> -->
<!-- <!--
...@@ -49,7 +49,7 @@ import classSelect from '@/components/app/dailyAttendance/class-select.vue' ...@@ -49,7 +49,7 @@ import classSelect from '@/components/app/dailyAttendance/class-select.vue'
</template> </template>
<script> <script>
import { getRequest } from '@/api/api'; import { getRequest } from '@/api/api';
// import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
export default { export default {
...@@ -155,7 +155,9 @@ export default { ...@@ -155,7 +155,9 @@ export default {
}); });
} }
that.tableData = resData.result || []; that.tableData = resData.result || [];
return false;
} }
errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.error({
......
src/components/app/dailyAttendance/cycle-set.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-23 18:31:27 * @LastEditTime : 2019-12-25 14:39:42
--> -->
<!-- <!--
...@@ -53,7 +53,7 @@ import cycleSet from '@/components/app/dailyAttendance/cycle-set.vue' ...@@ -53,7 +53,7 @@ import cycleSet from '@/components/app/dailyAttendance/cycle-set.vue'
<script> <script>
import limitInput from '@/components/limit-input.vue'; import limitInput from '@/components/limit-input.vue';
import { getRequest } from '@/api/api'; import { getRequest } from '@/api/api';
// import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
export default { export default {
...@@ -77,28 +77,7 @@ export default { ...@@ -77,28 +77,7 @@ export default {
attenceGroupData: { attenceGroupData: {
type: [Array, Object], type: [Array, Object],
default() { default() {
return { return {};
classesRangeId: '',
days: 3,
rangeName: '',
classes: [
{
classesId: '',
classesName: '',
classessTimesJson: []
},
{
classesId: '',
classesName: '',
classessTimesJson: []
},
{
classesId: '',
classesName: '',
classessTimesJson: []
}
]
};
} }
} }
}, },
...@@ -117,18 +96,15 @@ export default { ...@@ -117,18 +96,15 @@ export default {
classes: [ classes: [
{ {
classesId: '', classesId: '',
classesName: '', classesName: ''
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '', classesName: ''
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '', classesName: ''
classessTimesJson: []
} }
] ]
}, },
...@@ -159,8 +135,7 @@ export default { ...@@ -159,8 +135,7 @@ export default {
for (let index = 0; index < e - length; index++) { for (let index = 0; index < e - length; index++) {
that.ruleFormData.classes.push({ that.ruleFormData.classes.push({
classesId: '', classesId: '',
classesName: '', classesName: ''
classessTimesJson: []
}); });
} }
} }
...@@ -211,18 +186,15 @@ export default { ...@@ -211,18 +186,15 @@ export default {
classes: [ classes: [
{ {
classesId: '', classesId: '',
classesName: '', classesName: ''
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '', classesName: ''
classessTimesJson: []
}, },
{ {
classesId: '', classesId: '',
classesName: '', classesName: ''
classessTimesJson: []
} }
] ]
}; };
...@@ -258,7 +230,7 @@ export default { ...@@ -258,7 +230,7 @@ export default {
*/ */
getClassifyData() { getClassifyData() {
const that = this; const that = this;
if (that.classesJson && that.classesJson.length) { /* if (that.classesJson && that.classesJson.length) {
that.classesJson.forEach(ele => { that.classesJson.forEach(ele => {
ele.label = ' '; ele.label = ' ';
if (!!ele.classessTimesJson && ele.classessTimesJson.length) { if (!!ele.classessTimesJson && ele.classessTimesJson.length) {
...@@ -268,7 +240,40 @@ export default { ...@@ -268,7 +240,40 @@ export default {
} }
}); });
} }
that.tableData = that.classesJson || []; that.tableData = that.classesJson || []; */
let para = {
enterpriseId: that.enterpriseId
};
getRequest('/haoban-app-attence-web/attence-classes-list', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
if (resData.result && resData.result.length) {
resData.result.forEach(ele => {
if (ele.classessTimesJson) {
ele.classessTimesJson = JSON.parse(ele.classessTimesJson);
}
});
resData.result.forEach(ele => {
ele.label = ' ';
if (!!ele.classessTimesJson && ele.classessTimesJson.length) {
ele.classessTimesJson.forEach(child => {
ele.label += child.startTime + '-' + child.endTime;
});
}
});
}
that.tableData = resData.result || [];
return false;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {
that.$message.error({
duration: 1000,
message: error.message
});
});
}, },
/** /**
* 获取周期 * 获取周期
...@@ -283,8 +288,15 @@ export default { ...@@ -283,8 +288,15 @@ export default {
.then(res => { .then(res => {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
that.ruleFormData = resData.result || []; if (!!resData.result && !!resData.result.length) {
resData.result.forEach(ele => {
ele.classes = ele.classesList;
});
that.ruleFormData = resData.result[0] || [];
}
return false;
} }
errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.error({
...@@ -307,32 +319,8 @@ export default { ...@@ -307,32 +319,8 @@ export default {
}, },
attenceGroupData(newData) { attenceGroupData(newData) {
const that = this; const that = this;
// console.log(newData);
if (Object.keys(newData).length) { if (Object.keys(newData).length) {
const ruleFormData = JSON.parse(JSON.stringify(newData)); that.ruleFormData = JSON.parse(JSON.stringify(newData));
that.ruleFormData.days = ruleFormData.days;
that.ruleFormData.rangeName = ruleFormData.rangeName;
that.ruleFormData.classes = ruleFormData.classes || [];
} else {
that.ruleFormData.days = 3;
that.ruleFormData.rangeName = '';
that.ruleFormData.classes = [
{
classesId: '',
classesName: '',
classessTimesJson: []
},
{
classesId: '',
classesName: '',
classessTimesJson: []
},
{
classesId: '',
classesName: '',
classessTimesJson: []
}
];
} }
}, },
classesJson(newData) { classesJson(newData) {
...@@ -347,34 +335,8 @@ export default { ...@@ -347,34 +335,8 @@ export default {
if (that.attenceGroupId) { if (that.attenceGroupId) {
that.getRangeData(); that.getRangeData();
} }
if (Object.keys(that.attenceGroupData).length) { if (Object.keys(that.attenceGroupData).length) {
that.$nextTick(() => { that.ruleFormData = JSON.parse(JSON.stringify(that.attenceGroupData));
const ruleFormData = JSON.parse(JSON.stringify(that.attenceGroupData));
that.ruleFormData.days = ruleFormData.days;
that.ruleFormData.rangeName = ruleFormData.rangeName;
that.ruleFormData.classes = ruleFormData.classes || [];
});
} else {
that.ruleFormData.days = 3;
that.ruleFormData.rangeName = '';
that.ruleFormData.classes = [
{
classesId: '',
classesName: '',
classessTimesJson: []
},
{
classesId: '',
classesName: '',
classessTimesJson: []
},
{
classesId: '',
classesName: '',
classessTimesJson: []
}
];
} }
if (that.classesJson.length) { if (that.classesJson.length) {
that.getClassifyData(); that.getClassifyData();
......
src/views/enterpriseApp/dailyAttendance/workGroupSet.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-04-12 17:56:45 * @Date: 2019-04-12 17:56:45
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2019-12-24 16:36:15 * @LastEditTime : 2019-12-25 14:26:37
--> -->
<template> <template>
<div class="notice-list-wrap"> <div class="notice-list-wrap">
...@@ -288,7 +288,7 @@ import limitTextarea from '@/components/limit-textarea.vue'; ...@@ -288,7 +288,7 @@ import limitTextarea from '@/components/limit-textarea.vue';
import { getRequest, postRequest } from '@/api/api'; import { getRequest, postRequest } from '@/api/api';
import showMsg from '@/common/js/showmsg'; import showMsg from '@/common/js/showmsg';
import { _debounce } from '@/common/js/public'; import { _debounce } from '@/common/js/public';
// import errMsg from '@/common/js/error'; import errMsg from '@/common/js/error';
export default { export default {
name: 'workGroupSet', name: 'workGroupSet',
props: { props: {
...@@ -840,7 +840,9 @@ export default { ...@@ -840,7 +840,9 @@ export default {
}); });
} }
that.classifyList = resData.result.list || []; that.classifyList = resData.result.list || [];
return false;
} }
errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.error({
...@@ -905,12 +907,19 @@ export default { ...@@ -905,12 +907,19 @@ export default {
child.classessTimesJson = child.classessTimesJson? JSON.parse(child.classessTimesJson): [] child.classessTimesJson = child.classessTimesJson? JSON.parse(child.classessTimesJson): []
}); });
} }
if (!!data.result.classesJson && data.result.classesJson.length) {
data.result.classesJson.forEach(child => {
child.classessTimesJson = child.classessTimesJson? JSON.parse(child.classessTimesJson): []
});
}
that.mustSelection = data.result.adminList; that.mustSelection = data.result.adminList;
that.mustStoreList = data.result.storeList; that.mustStoreList = data.result.storeList;
that.noSelection = data.result.noAdminList; that.noSelection = data.result.noAdminList;
that.noStoreList = data.result.noStoreList; that.noStoreList = data.result.noStoreList;
that.ruleFormData = JSON.parse(JSON.stringify(data.result)); that.ruleFormData = JSON.parse(JSON.stringify(data.result));
return false;
} }
errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.error({
......
src/views/enterpriseApp/dailyAttendance/workTimeManage.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-09-18 15:25:12 * @Date: 2019-09-18 15:25:12
* @LastEditors : 无尘 * @LastEditors : 无尘
* @LastEditTime : 2019-12-23 16:40:07 * @LastEditTime : 2019-12-25 14:27:51
--> -->
<template> <template>
...@@ -338,7 +338,9 @@ export default { ...@@ -338,7 +338,9 @@ export default {
that.classes = resData.result || []; that.classes = resData.result || [];
that.getCycleData(); that.getCycleData();
that.getTableList(); that.getTableList();
return false;
} }
errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.error({
...@@ -374,7 +376,9 @@ export default { ...@@ -374,7 +376,9 @@ export default {
}); });
} }
that.cycleData = resData.result || []; that.cycleData = resData.result || [];
return false;
} }
errMsg.errorMsg(resData);
}) })
.catch(function(error) { .catch(function(error) {
that.$message.error({ that.$message.error({
......
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