Skip to content

O
office-web
Commit b379d80b by 无尘
Options

fix: 修改考勤组

parent c080434f
Showing with 16 additions and 10 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.8c5b21013858ab5c1fea0b16bd7441b4.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.5c99fde50920dfc32a06.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.1b0d1c4a3af4aeb6c6a1.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.0618c35f1ac19ab3a5e60a3daa42f2f6.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.6bcb8847b794a526153a.js></script><script type=text/javascript src=./static/js/vendor.0000e68e65e4a9dc3840.js></script><script type=text/javascript src=./static/js/app.1b0d1c4a3af4aeb6c6a1.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.5c99fde50920dfc32a06.js → dist/static/js/manifest.6bcb8847b794a526153a.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:"85d82151af1ef71b271d",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"d50ec99b96f7acbb4d42",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"4a1c52078d154a141023",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"feb81cd112a60d4701eb",31:"20f69d688df3827843c5",32:"0c7863fa05e5c75053c3",33:"f4e32fc6846aa744ee48",34:"0fb2eb67d47b9ecbd519",35:"e64c33855b455bcdd9a2",36:"8615782328f743c5f783",37:"8d599976023acb79bef4",38:"6620399d71206af0621b",39:"d4c5c80a09712ce552be",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=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],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:"edc4bcf9ced54c365562",16:"f483f95dbac654c7de5a",17:"ff6edf624b982c354977",18:"d50ec99b96f7acbb4d42",19:"d7d09ae4564d64842009",20:"455fd80bd8af15457c57",21:"c1b5e15e28768af52654",22:"2a873e819c6c369d5cd1",23:"d2380bf3c276e741313b",24:"56085041ae784faf3c32",25:"e23f42a6b2180b63c129",26:"606394f2e20eb1a455fa",27:"4a1c52078d154a141023",28:"70cb3f87bd69723dbd41",29:"c5bb15e8e1bd17cdc0f7",30:"feb81cd112a60d4701eb",31:"20f69d688df3827843c5",32:"0c7863fa05e5c75053c3",33:"f4e32fc6846aa744ee48",34:"0fb2eb67d47b9ecbd519",35:"e64c33855b455bcdd9a2",36:"8615782328f743c5f783",37:"8d599976023acb79bef4",38:"6620399d71206af0621b",39:"d4c5c80a09712ce552be",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=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
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-26 11:14:19 * @LastEditTime : 2019-12-26 13:57:00
--> -->
<template> <template>
<div class="notice-list-wrap"> <div class="notice-list-wrap">
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
</div> </div>
</div> </div>
</el-form-item> --> </el-form-item> -->
<el-form-item v-if="ruleFormData.attenceType == 2" label="考勤班次：" prop=""> <el-form-item v-show="ruleFormData.attenceType == 2" label="考勤班次：" prop="classesJson">
<div v-if="!ruleFormData.classesJson.length" class="classes-btn"> <div v-if="!ruleFormData.classesJson.length" class="classes-btn">
<el-button type="primary" plain @click="toShowClassMult">选择班次</el-button> <el-button type="primary" plain @click="toShowClassMult">选择班次</el-button>
</div> </div>
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
</el-form-item> </el-form-item>
<el-form-item label="考勤方式：" prop=""> <el-form-item label="考勤方式：" prop="">
<div><el-checkbox v-model="ruleFormData.gpsFlag">GPS打卡</el-checkbox><span v-if="!ruleFormData.gpsFlag" class="p-l-10 font-12 color-909399">你尚未设置任何考勤方式，保存设置后成员可在任何地点打卡</span></div> <div><el-checkbox v-model="ruleFormData.gpsFlag">GPS打卡</el-checkbox><span v-if="!ruleFormData.gpsFlag" class="p-l-10 font-12 color-909399">你尚未设置任何考勤方式，保存设置后成员可在任何地点打卡</span></div>
<div class="gps-body p-20 bg-f7f8fa" style="width: 567px"> <div v-if="ruleFormData.gpsFlag" class="gps-body p-20 bg-f7f8fa" style="width: 567px">
<div>根据工作地点考勤（可添加多个考勤地点）</div> <div>根据工作地点考勤（可添加多个考勤地点）</div>
<div> <div>
<el-button type="primary" plain="" @click="addMap">添加考勤地点</el-button> <span class="p-l-20 p-r-6 font-14 color-606266">有效范围</span> <el-button type="primary" plain="" @click="addMap">添加考勤地点</el-button> <span class="p-l-20 p-r-6 font-14 color-606266">有效范围</span>
...@@ -306,6 +306,13 @@ export default { ...@@ -306,6 +306,13 @@ export default {
} }
}, },
data() { data() {
const checkClass = (rule, value, callback) => {
if (!value.length && this.ruleFormData.attenceType == 2) {
callback(new Error('请选择班次'));
} else {
callback();
}
};
return { return {
projectName: 'haoban-manage-web', projectName: 'haoban-manage-web',
topMenuData: [ topMenuData: [
...@@ -350,7 +357,7 @@ export default { ...@@ -350,7 +357,7 @@ export default {
lawFreeFlag: false, // 是否法定节假日自动排休 lawFreeFlag: false, // 是否法定节假日自动排休
clockDistance: 300, // 考勤距离 clockDistance: 300, // 考勤距离
storeClockFlag: false, // 是否开启门店打卡 storeClockFlag: false, // 是否开启门店打卡
gpsFlag: false, // 是否gps打卡1是0否 gpsFlag: true, // 是否gps打卡1是0否
distanceAddress: [], // 考勤地址范围集合{ address: '', longitude: '', latitude: '' } distanceAddress: [], // 考勤地址范围集合{ address: '', longitude: '', latitude: '' }
attenceRangeJson: [], attenceRangeJson: [],
// 需要打卡的范围1需要打卡的2无须打卡的 storeFlag 1门店架构0行政架构{ rangeType: '', userId: '', storeId: '', groupId: '', storeFlag: '' } // 需要打卡的范围1需要打卡的2无须打卡的 storeFlag 1门店架构0行政架构{ rangeType: '', userId: '', storeId: '', groupId: '', storeFlag: '' }
...@@ -367,8 +374,7 @@ export default { ...@@ -367,8 +374,7 @@ export default {
// receiveType: [{ required: true, message: '请选择发送对象', trigger: 'change' }], // receiveType: [{ required: true, message: '请选择发送对象', trigger: 'change' }],
// img: [{ required: true, message: '请上传封面图片', trigger: 'blur' }], // img: [{ required: true, message: '请上传封面图片', trigger: 'blur' }],
attenceGroupName: [{ required: true, message: '请输入考勤组名称', trigger: 'blur' }], attenceGroupName: [{ required: true, message: '请输入考勤组名称', trigger: 'blur' }],
content: [{ required: true, message: '请输入公告内容', trigger: 'blur' }], classesJson: [{ type: 'array', required: true, validator: checkClass, trigger: 'change' }]
sendType: [{ required: true, message: '请选择发送方式', trigger: 'change' }]
}, },
wxFlag: 1, wxFlag: 1,
actionUrl: '/haoban-manage-web/upload-img', actionUrl: '/haoban-manage-web/upload-img',
......
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