diff --git a/src/api/task/unit.js b/src/api/task/unit.js index 3e18b75..a1e6f4e 100644 --- a/src/api/task/unit.js +++ b/src/api/task/unit.js @@ -51,3 +51,10 @@ export function unDoTotal(params) { }) } +export function saveNotice(data) { + return request({ + url: '/api/admin/notice/save', + method: 'post', + data + }) +} diff --git a/src/permission.js b/src/permission.js index 7e4416e..721588b 100644 --- a/src/permission.js +++ b/src/permission.js @@ -14,7 +14,7 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration -const whiteList = ['/login'] // no redirect whitelist +const whiteList = ['/login','/task/list/unit_5'] // no redirect whitelist router.beforeEach(async (to, from, next) => { // start progress bar diff --git a/src/utils/index.js b/src/utils/index.js index db2b48f..72e428d 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -127,3 +127,45 @@ export function debounce(fn,delay=500){ } } +//深拷贝数据 +export function deepCopy(data) { + //string,number,bool,null,undefined,symbol + //object,array,date + if (data && typeof data === "object") { + //针对函数的拷贝 + if (typeof data === "function") { + let tempFunc = data.bind(null); + tempFunc.prototype = deepCopy(data.prototype); + return tempFunc; + } + + switch (Object.prototype.toString.call(data)) { + case "[object String]": + return data.toString(); + case "[object Number]": + return Number(data.toString()); + case "[object Boolean]": + return Boolean(data.toString()); + case "[object Date]": + return new Date(data.getTime()); + case "[object Array]": + let arr = []; + for (let i = 0; i < data.length; i++) { + arr[i] = deepCopy(data[i]); + } + return arr; + + //js自带对象或用户自定义类实例 + case "[object Object]": + let obj = {}; + for (let key in data) { + //会遍历原型链上的属性方法，可以用hasOwnProperty来控制 （obj.hasOwnProperty(prop) + obj[key] = deepCopy(data[key]); + } + return obj; + } + } else { + //string,number,bool,null,undefined,symbol + return data; + } +} diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 45fb353..39244a5 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -128,6 +128,7 @@ - +
@@ -225,7 +227,7 @@ - 任务分解
- + -->
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue index 9c4ac86..da03877 100644 --- a/src/views/task/list/components/addUnit.vue +++ b/src/views/task/list/components/addUnit.vue @@ -231,7 +231,10 @@ --> - + + @@ -488,7 +491,8 @@ userOptions: [], deptOptionsList: [], checkAll: false, - isIndeterminate: true, + isIndeterminate: true, + douserdata:[], userdata: [], userdatabefore: [], valueMultiple: [], @@ -803,7 +807,15 @@ this.userdatabefore = data; let contactData = this.contactUser(data) this.userdata = this.sortDepartment(contactData, 'department_id') - console.log("this.userdata", this.userdata) + console.log("this.userdata11", this.userdata) + // 非处长 承办人员只能选自己科室下的 + if(!this.stateObj.is_chuzhang){ + this.douserdata = this.userdata.filter(item=>item.department_id===this.stateObj.department_id) + console.log("this.douserdata11",this.douserdata) + }else{ + this.douserdata = this.userdata + } + }).catch(error => { console.log(error) }) @@ -1135,6 +1147,7 @@ return } if(!(this.form.audit_status==3||this.form.audit_status==5)){ + console.log("this.betweenSe",this.form.start_date, this.form.end_date) this.betweenSe(this.form.start_date, this.form.end_date) } if (this.type === 'add' || this.type=== 'pid') { @@ -1151,7 +1164,7 @@ table_name:"missions_logs", mission_name:this.form.name, mission_id:this.form.pid>0?this.form.pid:res.id, - op_name:this.type === 'add'?'新增任务':(this.type=== 'pid'?'新增子任务':'新增任务'), + op_name:this.type === 'add'?'新增任务':(this.type=== 'pid'?'任务分解':'新增任务'), remark:'' }).then(res=>{ this.isShow = false @@ -1164,7 +1177,8 @@ // this.$emit("uploadOa") }) return - } + } + if (this.type === 'editor' || this.type === 'send') { save({ id: this.id, @@ -1178,7 +1192,7 @@ table_name:"missions_logs", mission_id:this.id, mission_name:this.form.name, - op_name:this.type === 'editor'?'编辑任务':(this.type=== 'send'?'派发任务':'编辑任务'), + op_name:this.type === 'editor'?'编辑任务':(this.type=== 'send'?'任务转办':'编辑任务'), remark:'' }).then(res=>{ this.isShow = false @@ -1189,21 +1203,24 @@ } }, betweenSe(start, end) { - var now = new Date() - var year = now.getFullYear() - var month = now.getMonth() + 1 - var day = now.getDate() - var nowTime = new Date(year + '-' + month + '-' + day).getTime() - var startTime = new Date(start).getTime() - var endTime = new Date(end).getTime() - + const startTime = new Date(start + "T00:00:00"); + const endTime = new Date(end + "T23:59:59"); + const nowTime = new Date(); + nowTime.setHours(0, 0, 0, 0); + if(endTime endTime) { this.form.audit_status = 1 } - if (nowTime >= new Date(start).getTime() && nowTime <= new Date(end).getTime()) { + if (nowTime >= startTime && nowTime <= endTime) { this.form.audit_status = 1 } }, diff --git a/src/views/task/list/components/checkUnit copy.vue b/src/views/task/list/components/checkUnit copy.vue new file mode 100644 index 0000000..a0585b1 --- /dev/null +++ b/src/views/task/list/components/checkUnit copy.vue @@ -0,0 +1,2019 @@ + + + + + diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue index 5ad3bce..53fcd19 100644 --- a/src/views/task/list/components/checkUnit.vue +++ b/src/views/task/list/components/checkUnit.vue @@ -1,6 +1,6 @@