修改

d9c1323e · 黄志强 · ad9dd791 · d9c1323e · d9c1323e · d9c1323e
--- a/debug.log
+++ b/debug.log
+[0615/163044:ERROR:process_reader_win.cc(142)] SuspendThread: 拒绝访问。 (0x5)
+[0615/163044:ERROR:exception_snapshot_win.cc(87)] thread ID 9244 not found in process
+[0615/163044:WARNING:crash_report_exception_handler.cc(315)] ProcessSnapshotWin::Initialize failed
+[0615/163044:ERROR:scoped_process_suspend.cc(38)] NtResumeProcess: 已尝试访问正在退出的过程。  (0xc000010a)
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><link rel=icon href=favicon.ico><title>workbook</title><link href=static/css/Feedback.7b7e31d2.css rel=prefetch><link href=static/css/Feedback~home.f74ee70d.css rel=prefetch><link href=static/css/addTask.c23ff4c0.css rel=prefetch><link href=static/css/addTask~unpublishedTask.ec957f22.css rel=prefetch><link href=static/css/approval.67760cf1.css rel=prefetch><link href=static/css/attendance.978b56f2.css rel=prefetch><link href=static/css/attendance~personList.39579e7c.css rel=prefetch><link href=static/css/departmentTask.98191334.css rel=prefetch><link href=static/css/home.91fc558d.css rel=prefetch><link href=static/css/personDetails.5e31db0a.css rel=prefetch><link href=static/css/personInfo.361c45a8.css rel=prefetch><link href=static/css/personList.f5ed450d.css rel=prefetch><link href=static/css/taskDetails.6fb73308.css rel=prefetch><link href=static/css/unpublishedTask.668a1d61.css rel=prefetch><link href=static/css/viewTask.c4de31c2.css rel=prefetch><link href=static/js/Feedback.3fd66e55.js rel=prefetch><link href=static/js/Feedback~home.ec872d28.js rel=prefetch><link href=static/js/addTask.b7374707.js rel=prefetch><link href=static/js/addTask~taskDetails~unpublishedTask.a3c21785.js rel=prefetch><link href=static/js/addTask~unpublishedTask.db0916c9.js rel=prefetch><link href=static/js/approval.504e6512.js rel=prefetch><link href=static/js/attendance.69b47543.js rel=prefetch><link href=static/js/attendance~home.4681f456.js rel=prefetch><link href=static/js/attendance~personList.1ece07fb.js rel=prefetch><link href=static/js/departmentTask.18357a81.js rel=prefetch><link href=static/js/home.7363d7b5.js rel=prefetch><link href=static/js/personDetails.9ac7e88e.js rel=prefetch><link href=static/js/personInfo.3f58b053.js rel=prefetch><link href=static/js/personList.3b65791d.js rel=prefetch><link href=static/js/taskDetails.2724fd3e.js rel=prefetch><link href=static/js/unpublishedTask.a1a4dfdf.js rel=prefetch><link href=static/js/viewTask.80d3b585.js rel=prefetch><link href=static/css/app.b279b18a.css rel=preload as=style><link href=static/css/chunk-vendors.8dee9c84.css rel=preload as=style><link href=static/js/app.15036eab.js rel=preload as=script><link href=static/js/chunk-vendors.f3e8e622.js rel=preload as=script><link href=static/css/chunk-vendors.8dee9c84.css rel=stylesheet><link href=static/css/app.b279b18a.css rel=stylesheet></head><body><noscript><strong>We're sorry but workbook doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=static/js/chunk-vendors.f3e8e622.js></script><script src=static/js/app.15036eab.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><link rel=icon href=favicon.ico><title>workbook</title><link href=static/css/Feedback.7b7e31d2.css rel=prefetch><link href=static/css/Feedback~home.f74ee70d.css rel=prefetch><link href=static/css/addTask.c23ff4c0.css rel=prefetch><link href=static/css/addTask~unpublishedTask.ec957f22.css rel=prefetch><link href=static/css/approval.67760cf1.css rel=prefetch><link href=static/css/attendance.978b56f2.css rel=prefetch><link href=static/css/attendance~personList.39579e7c.css rel=prefetch><link href=static/css/departmentTask.98191334.css rel=prefetch><link href=static/css/home.91fc558d.css rel=prefetch><link href=static/css/personDetails.5e31db0a.css rel=prefetch><link href=static/css/personInfo.361c45a8.css rel=prefetch><link href=static/css/personList.f5ed450d.css rel=prefetch><link href=static/css/taskDetails.b6a04667.css rel=prefetch><link href=static/css/unpublishedTask.668a1d61.css rel=prefetch><link href=static/css/viewTask.c4de31c2.css rel=prefetch><link href=static/js/Feedback.3fd66e55.js rel=prefetch><link href=static/js/Feedback~home.ec872d28.js rel=prefetch><link href=static/js/addTask.b7374707.js rel=prefetch><link href=static/js/addTask~taskDetails~unpublishedTask.a3c21785.js rel=prefetch><link href=static/js/addTask~unpublishedTask.db0916c9.js rel=prefetch><link href=static/js/approval.504e6512.js rel=prefetch><link href=static/js/attendance.69b47543.js rel=prefetch><link href=static/js/attendance~home.4681f456.js rel=prefetch><link href=static/js/attendance~personList.1ece07fb.js rel=prefetch><link href=static/js/departmentTask.18357a81.js rel=prefetch><link href=static/js/home.7363d7b5.js rel=prefetch><link href=static/js/personDetails.9ac7e88e.js rel=prefetch><link href=static/js/personInfo.3f58b053.js rel=prefetch><link href=static/js/personList.3b65791d.js rel=prefetch><link href=static/js/taskDetails.0ccca0db.js rel=prefetch><link href=static/js/unpublishedTask.a1a4dfdf.js rel=prefetch><link href=static/js/viewTask.80d3b585.js rel=prefetch><link href=static/css/app.b279b18a.css rel=preload as=style><link href=static/css/chunk-vendors.8dee9c84.css rel=preload as=style><link href=static/js/app.701987aa.js rel=preload as=script><link href=static/js/chunk-vendors.f3e8e622.js rel=preload as=script><link href=static/css/chunk-vendors.8dee9c84.css rel=stylesheet><link href=static/css/app.b279b18a.css rel=stylesheet></head><body><noscript><strong>We're sorry but workbook doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=static/js/chunk-vendors.f3e8e622.js></script><script src=static/js/app.701987aa.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/taskDetails.6fb73308.css
+++ b/dist/static/css/taskDetails.6fb73308.css
--- a/dist/static/js/app.15036eab.js
+++ b/dist/static/js/app.15036eab.js
--- a/dist/static/js/taskDetails.0ccca0db.js
+++ b/dist/static/js/taskDetails.0ccca0db.js
--- a/dist/static/js/taskDetails.2724fd3e.js
+++ b/dist/static/js/taskDetails.2724fd3e.js
--- a/src/axios/index.js
+++ b/src/axios/index.js
 let baseUrl = "https://workbook.zjtys.com.cn:8289"; // 120.55.57.35 localhost 8289
-let env = process.env.VUE_APP_TITLE === 'alpha' ? 'alpha' : 'production';
-switch (env) {
-  case 'production':
-    // baseUrl = "https://workbook.zjtys.com.cn"; // 测试环境
-		baseUrl = "https://workbook.zjtys.com.cn:8289"; // 测试环境
-    break;
-  case 'alpha':
-    // baseUrl = "https://workbook.zjtys.com.cn"; // 阿里云环境
-		baseUrl = "https://workbook.zjtys.com.cn:8289"; // 阿里云环境
-    break;
-}
+// let env = process.env.VUE_APP_TITLE === 'alpha' ? 'alpha' : 'production';
+// switch (env) {
+//   case 'production':
+//     // baseUrl = "https://workbook.zjtys.com.cn"; // 测试环境
+// 		baseUrl = "http://localhost:8289"; // 测试环境
+//     break;
+//   case 'alpha':
+//     // baseUrl = "https://workbook.zjtys.com.cn"; // 阿里云环境
+// 		baseUrl = "http://localhost:8289"; // 阿里云环境
+//     break;
+// }
 // https://workbook.zjtys.com.cn:8289
 export default baseUrl;
--- a/src/views/task/TaskDetails.vue
+++ b/src/views/task/TaskDetails.vue
@@ -1433,7 +1433,9 @@
 								return false;
 							}
 						} else {
-							if (this.isEditEva === true && this.isExecutor === true && this.taskForm.majordomos !== undefined && this.taskForm.majordomos.length > 0 &&
+							console.log(111111111111111111)
+							console.log(this.isEditEva, this.isExecutor, this.isPublisher)
+							if (this.isPublisher === false && this.isEditEva === true && this.isExecutor === true && this.taskForm.majordomos !== undefined && this.taskForm.majordomos.length > 0 &&
 								this.taskForm.majordomos.findIndex(item => item.id === this.userDetail.id) === -1 &&
 								this.taskForm.assistantManagers !== undefined && this.taskForm.assistantManagers.length > 0 && this.taskForm.assistantManagers.findIndex(item => item.id === this.userDetail.id) === -1 &&
 								this.taskForm.generalManagers !== undefined && this.taskForm.generalManagers.length > 0 && this.taskForm.generalManagers.findIndex(item => item.id === this.userDetail.id) === -1) {