bug修改

src/views/dashboard/index.vue

@@ -6,7 +6,7 @@
           <div class="card-left"><i class="el-icon-s-order"></i></div>
           <div class="card-right">
             <div class="card-text-title">待进行会议</div>
-            <div class="card-text-val">{{todoMeetingCount}}</div>
+            <div class="card-text-val">{{ todoMeetingCount }}</div>
           </div>
         </div>
       </el-card>
@@ -15,7 +15,7 @@
           <div class="card-left"><i class="el-icon-s-order"></i></div>
           <div class="card-right">
             <div class="card-text-title">待确认会议</div>
-            <div class="card-text-val">{{todoMeetingConfirmCount}}</div>
+            <div class="card-text-val">{{ todoMeetingConfirmCount }}</div>
           </div>
         </div>
       </el-card>
@@ -42,7 +42,7 @@
           <div class="card-left"><i class="el-icon-s-order"></i></div>
           <div class="card-right">
             <div class="card-text-title">实施待办</div>
-            <div class="card-text-val">{{enforceTasks}}</div>
+            <div class="card-text-val">{{ enforceTasks }}</div>
           </div>
         </div>
       </el-card>
@@ -52,7 +52,7 @@
           <div class="card-left"><i class="el-icon-s-order"></i></div>
           <div class="card-right">
             <div class="card-text-title">运维提醒</div>
-            <div class="card-text-val">{{enforceRemindCount}}</div>
+            <div class="card-text-val">{{ enforceRemindCount }}</div>
           </div>
         </div>
       </el-card>
@@ -88,21 +88,53 @@
             <span>{{ scope.row.beginDate + ' 至 ' + scope.row.endDate }}</span>
           </template>
         </el-table-column>
+        <el-table-column>
+          <template slot-scope="scope">
+            <el-button size="mini"
+                       type="text"
+                       icon="el-icon-coordinate"
+                       @click="handleAudit(scope.row)"
+            >审核
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
     </el-dialog>
 
-    <!--        <meeting-detail :detail-form="meetingForm" @getTodoMeetingList="getTodoMeetingList"></meeting-detail>-->
+    <!-- 详情/审核任务对话框 -->
+    <el-dialog title="审核任务" :visible.sync="auditOpen" width="800px" class="add-dialog" append-to-body
+               :close-on-click-modal="false">
+      <task-detail :detail-form="detailForm"></task-detail>
+      <div v-if="detailTitle=='审核任务'" style="margin-top: 10px">
+        <el-form ref="auditForm" :model="auditForm" :rules="auditRules" size="mini" label-width="100px">
+          <el-form-item label="审核意见" prop="auditResult">
+            <el-radio-group v-model="auditForm.auditResult">
+              <el-radio label="1">确认完成</el-radio>
+              <el-radio label="0">驳回</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="审核备注" prop="auditOpinion">
+            <el-input v-model="auditForm.auditOpinion" type="textarea"/>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="mini" @click="submitAudit">确 定</el-button>
+        <el-button size="mini" @click="auditCancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 
 import {mapGetters} from 'vuex'
-import {toDoTaskList} from "@/api/task/task";
+import {auditTask, getTask, toDoTaskList} from "@/api/task/task";
 import {personReceive} from "@/api/material/transfer";
-import { getPersonalTaskList } from '@/api/meeting/enforce'
-import { getTodoMeetinStatistics } from '@/api/meeting/meeting'
-import { getEnforceRemindCount } from '@/api/meeting/enforceRemind'
+import {getPersonalTaskList} from '@/api/meeting/enforce'
+import {getTodoMeetinStatistics} from '@/api/meeting/meeting'
+import {getEnforceRemindCount} from '@/api/meeting/enforceRemind'
 
 
 export default {
@@ -126,10 +158,13 @@ export default {
       newTaskOpen: false,
       auditTaskOpen: false,
       toBeConfirmReceiveNum: 0,
-      enforceTasks:0,
-      todoMeetingCount:0,
-      todoMeetingConfirmCount:0,
-      enforceRemindCount:0
+      enforceTasks: 0,
+      todoMeetingCount: 0,
+      todoMeetingConfirmCount: 0,
+      enforceRemindCount: 0,
+
+      detailForm: false,
+      auditOpen: false
     }
   },
   mounted() {
@@ -145,7 +180,6 @@ export default {
         this.newTasks = res.data.newTasks
         this.auditTasks = res.data.auditTasks
       })
-
     },
 
     getTodoMeetingList() {
@@ -155,7 +189,7 @@ export default {
     },
     getTaskList() {
       getPersonalTaskList().then(res => {
-      this.enforceTasks=res.data.length
+        this.enforceTasks = res.data.length
       })
     },
     confirmMeeting(row) {
@@ -177,31 +211,67 @@ export default {
         this.toBeConfirmReceiveNum = filter.length
       })
     },
-    getTodoMeetinStatisticss(){
-      getTodoMeetinStatistics().then(res=>{
-        let data=res.data
-        this.todoMeetingCount=data.todoMeetingCount
-        this.todoMeetingConfirmCount=data.todoMeetingConfirmCount
+    getTodoMeetinStatisticss() {
+      getTodoMeetinStatistics().then(res => {
+        let data = res.data
+        this.todoMeetingCount = data.todoMeetingCount
+        this.todoMeetingConfirmCount = data.todoMeetingConfirmCount
       })
     },
-    getEnforceRemindCounts(){
-      getEnforceRemindCount().then(res=>{
-        let data=res.data;
-        this.enforceRemindCount=data.enforceRemindCount
+    getEnforceRemindCounts() {
+      getEnforceRemindCount().then(res => {
+        let data = res.data;
+        this.enforceRemindCount = data.enforceRemindCount
       })
     },
     toMyReceive() {
       this.$router.push(`/material/myReceive`)
     },
-    enforceTasksClick(){
+    enforceTasksClick() {
       this.$router.push('/enforceflow/enforceflow')
     },
-    todoMeetingClick(){
+    todoMeetingClick() {
       this.$router.push('/meeting/meeting')
     },
-    enforceRemindClick(){
+    enforceRemindClick() {
       this.$router.push('/enforceflow/enforceflow')
-    }
+    },
+
+    /** 审核按钮操作 */
+    handleAudit(row) {
+      getTask(row.id).then(res => {
+        this.detailForm = res.data;
+        this.auditForm = {
+          taskId: row.id,
+          auditResult: undefined,
+          auditOpinion: undefined
+        }
+        this.detailOpen = true;
+        this.detailTitle = "审核任务";
+      })
+    },
+
+    /** 审核提交按钮 */
+    submitAudit() {
+      this.$refs["auditForm"].validate(valid => {
+        if (valid) {
+          auditTask(this.auditForm).then(res => {
+            this.resetForm("auditForm");
+            this.getTaskList();
+            this.detailOpen = false
+            this.$message.success("操作成功");
+          })
+        }
+      });
+    },
+
+    // 取消按钮（详情/审核）
+    auditCancel() {
+      this.detailOpen = false;
+      this.detailForm = {};
+      this.auditForm = {}
+      this.resetForm("auditForm");
+    },
 
   }
 }

src/views/system/components/dept.vue

@@ -266,7 +266,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       console.log(row);
-      this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function () {
+      this.$confirm('是否确认删除名称为"' + row.name + '"的数据项？').then(function () {
         return delDept(row.id);
       }).then(() => {
         this.getDeptTree();

src/views/system/menu.vue

@@ -311,7 +311,7 @@ export default {
         visible: "0",
         status: "0"
       };
-      // this.resetForm("form");
+      this.resetForm("form");
     },
     /** 新增按钮操作 */
     handleAdd(row) {

src/views/system/permission.vue

@@ -116,13 +116,7 @@
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称"/>
         </el-form-item>
-        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
+        <el-form-item label="权限字符" prop="roleKey">
           <el-input v-model="form.roleKey" placeholder="请输入权限字符"/>
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
@@ -194,7 +188,7 @@ export default {
           {required: true, message: "权限字符不能为空", trigger: "blur"}
         ],
         roleSort: [
-          {required: true, message: "角色顺序不能为空", trigger: "blur"}
+          {required: true, message: "角色顺序不能为空", trigger: "change"}
         ]
       }
     };

src/views/system/user.vue

@@ -142,8 +142,8 @@
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="员工名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入员工名称" maxlength="30"/>
+            <el-form-item label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">