样式修改

src/utils/common.js

@@ -8,7 +8,7 @@ export function parseTime(time, pattern) {
   if (arguments.length === 0 || !time) {
     return null
   }
-  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  const format = pattern || '{y}-{m}-{d} {h}:{i}'
   let date
   if (typeof time === 'object') {
     date = time

src/views/dashboard/index.vue

@@ -146,7 +146,7 @@
       </el-col>
     </el-row>
 
-    <el-dialog :visible.sync="workFlowVisble" width="75%" title="实施流程明细">
+    <el-dialog :visible.sync="workFlowVisble" width="75%" title="实施流程明细" :close-on-click-modal="false">
       <el-steps :active="activeFlow" finish-status="success" align-center>
         <el-step title="开始"/>
         <el-step title="项目启动会"/>
@@ -257,7 +257,7 @@
     </el-dialog>
 
 
-    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog">
+    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog" :close-on-click-modal="false">
       <el-tree
         ref="dept"
         :data="userList"

src/views/document/techparam.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+    <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
       <el-form-item label="参数名称" prop="menuName">
         <el-input
           v-model="queryParams.name"
@@ -52,7 +52,7 @@
       v-if="refreshTable"
       :data="techParamList"
       row-key="id"
-      size="small"
+      size="mini"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column prop="name" label="参数名称" :show-overflow-tooltip="true" width="160"></el-table-column>
@@ -87,7 +87,7 @@
     </el-table>
 
     <!-- 添加或修改参数对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" class="form" :model="form" :rules="rules" size="mini" label-width="80px">
         <el-row>
           <el-col :span="12">

src/views/enforceflow/enforceflow.vue

@@ -5,13 +5,13 @@
         <el-input v-model="formInline.name" placeholder="项目名称"></el-input>
       </el-form-item>
       <el-form-item label="所属医院：">
-        <el-select size="small"  clearable filterable v-model="formInline.hname" placeholder="请选择医院" >
+        <el-select size="mini"  clearable filterable v-model="formInline.hname" placeholder="请选择医院" >
           <el-option  v-for="(item,index) in hnos" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="所属系统：">
-        <el-select size="small"  clearable filterable v-model="formInline.hsytem" placeholder="请选择系统" >
-          <el-option  v-for="(item,index) in hsytem" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        <el-select size="mini"  clearable filterable v-model="formInline.hsytem" placeholder="请选择系统" >
+          <el-option  v-for="(item,index) in hsytem" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="状态：">
@@ -43,7 +43,7 @@
       <el-table-column label="实施医院" prop="hname" width="150" align="center">
       </el-table-column>
       <el-table-column label="实施日期" prop="time" width="300" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           <div>{{scope.row.beginTime}}——{{scope.row.endTime}}</div>
         </template>
       </el-table-column>
@@ -54,7 +54,7 @@
         label="创建时间" width="140" align="center">
       </el-table-column>
       <el-table-column prop="status" label="状态" width="80" align="center">
-        <template scope="scope">
+        <template slot-scope="scope">
           <div v-if="scope.row.status===0" style="color: green">待开始</div>
           <div v-else-if="scope.row.status===1" style="color: red">进行中</div>
           <div v-else>已结束</div>
@@ -73,22 +73,22 @@
 
 
     <!-- 编辑界面 -->
-    <el-dialog :title="title" :visible.sync="editFormVisible" width="40%" @click="closeDialog">
+    <el-dialog :title="title" :visible.sync="editFormVisible" width="40%" @click="closeDialog" :close-on-click-modal="false">
       <el-form label-width="120px" :model="editForm" >
         <el-form-item label="实施项目名称:" >
-          <el-input size="small" v-model="editForm.name"></el-input>
+          <el-input size="mini" v-model="editForm.name"></el-input>
         </el-form-item>
         <el-form-item label="实施负责人:">
-          <el-input size="small" v-model="editForm.enforcer"></el-input>
+          <el-input size="mini" v-model="editForm.enforcer"></el-input>
         </el-form-item>
         <el-form-item label="实施医院:">
-          <el-select size="small"  clearable filterable v-model="editForm.hname" placeholder="请选择医院" >
+          <el-select size="mini"  clearable filterable v-model="editForm.hname" placeholder="请选择医院" >
               <el-option  v-for="(item,index) in hnos" :label="item.dictLabel" :value="item.dictValue"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="实施系统:">
-          <el-select size="small"  clearable filterable v-model="editForm.hsytem" placeholder="请选择医院" >
-            <el-option  v-for="(item,index) in hsytem" :label="item.dictLabel" :value="item.dictValue"></el-option>
+          <el-select size="mini"  clearable filterable v-model="editForm.hsytem" placeholder="请选择医院" >
+            <el-option  v-for="(item,index) in hsytem" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="实施日期:">
@@ -103,16 +103,16 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="实施内容:">
-          <el-input size="small" type="textarea" :rows="4" v-model="editForm.content"></el-input>
+          <el-input size="mini" type="textarea" :rows="4" v-model="editForm.content"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="closeDialog">取消</el-button>
-        <el-button size="small" type="primary"  class="title" @click="submitForm('editForm')">保存</el-button>
+        <el-button size="mini" @click="closeDialog">取消</el-button>
+        <el-button size="mini" type="primary"  class="title" @click="submitForm('editForm')">保存</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="启动实施流程" :visible.sync="editEnforceFormVisible" width="45%" @click="closeEnforceDialog">
+    <el-dialog title="启动实施流程" :visible.sync="editEnforceFormVisible" width="45%" @click="closeEnforceDialog" :close-on-click-modal="false">
       <el-form label-width="120px" :model="enforceForm" >
         <el-descriptions  title="" :column="2"  border>
           <el-descriptions-item>
@@ -161,19 +161,19 @@
             <template slot="label">
               项目启动人
             </template>
-            <el-input size="small" v-model="enforceForm.director" :disabled="true" @keyup.enter.native="openUsers()">
+            <el-input size="mini" v-model="enforceForm.director" :disabled="true" @keyup.enter.native="openUsers()">
               <el-button @click="openUsers" icon="el-icon-search" slot="append"></el-button>
             </el-input>
           </el-descriptions-item>
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="closeEnforceDialog">取消</el-button>
-        <el-button size="small" type="primary" class="title" @click="submitEnforceForm('editForm')">启动流程</el-button>
+        <el-button size="mini" @click="closeEnforceDialog">取消</el-button>
+        <el-button size="mini" type="primary" class="title" @click="submitEnforceForm('editForm')">启动流程</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog">
+    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog" :close-on-click-modal="false">
       <el-tree
         ref="dept"
         :data="userList"
@@ -181,12 +181,12 @@
         :props="{label:'name'}" default-expand-all="true">
       </el-tree>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="closeUserDialog">取消</el-button>
-        <el-button size="small" type="primary" class="title" @click="submitUserForm('editForm')">确定</el-button>
+        <el-button size="mini" @click="closeUserDialog">取消</el-button>
+        <el-button size="mini" type="primary" class="title" @click="submitUserForm('editForm')">确定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="实施详情"  :visible.sync="enforceFlowVisble" width="85%" @click="enforceFlowDialog">
+    <el-dialog title="实施详情"  :visible.sync="enforceFlowVisble" width="85%" @click="enforceFlowDialog" :close-on-click-modal="false">
       <el-table
         border
         :data="enforceTableData"
@@ -425,7 +425,7 @@ export default {
       startEnforceFlow(data).then(res =>{
         this.$message({
           message: '操作成功!',
-          type: 'info'
+          type: 'success'
         });
       })
       this.closeEnforceDialog();

src/views/material/receive.vue

@@ -134,7 +134,7 @@
     </div>
 
     <!-- 添加或修改物料配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" @close="dialogClose" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" @close="dialogClose" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="数据周期">
           <div v-if="form.monthOrWeek==='1'">

src/views/meeting/meeting.vue

@@ -41,8 +41,8 @@
       </el-table-column>
       <el-table-column label="会议主题" prop="meetingName" fixed>
       </el-table-column>
-      <el-table-column label="会议类型" prop="meetingType" width="120" fixed>
-        <template scope="scope">
+      <el-table-column label="会议类型" prop="meetingType" width="80" fixed>
+        <template slot-scope="scope">
           <!--会议类型（1-周例会，2-项目会议，3-实施会议，4-其他会议）-->
           <div v-if="scope.row.meetingType===1">周例会</div>
           <div v-else-if="scope.row.meetingType===2">项目会议</div>
@@ -52,21 +52,21 @@
       </el-table-column>
       <el-table-column label="会议地点" prop="meetingPlace" width="120">
       </el-table-column>
-      <el-table-column prop="status" label="会议状态" width="120">
-        <template scope="scope">
+      <el-table-column prop="status" label="会议状态" width="80">
+        <template slot-scope="scope">
           <!--会议状态，0待开始，1进行中，2已结束-->
           <div v-if="scope.row.status===0" style="color: green">待开始</div>
           <div v-else-if="scope.row.status===1" style="color: #3A71A8">进行中</div>
           <div v-else>已结束</div>
         </template>
       </el-table-column>
-      <el-table-column prop="name" label="会议时间" width="300">
-        <template scope="scope">
-          <div>{{ scope.row.beginTime }}——{{ scope.row.endTime }}</div>
+      <el-table-column prop="name" label="会议时间" width="240">
+        <template slot-scope="scope">
+          <div>{{ parseTime(scope.row.beginTime) }}——{{ parseTime(scope.row.endTime) }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="参会人员">
-        <template scope="scope">
+      <el-table-column prop="address" label="参会人员" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
           <span>{{ scope.row.outAttendees }}</span>
           <span v-if="scope.row.outAttendees!=''">、</span>
           <span v-for="(item,index) in JSON.parse(scope.row.innerAttendees) ">
@@ -75,8 +75,10 @@
            </span>
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建时间" width="150">
-
+      <el-table-column prop="createTime" label="创建时间" width="130">
+        <template slot-scope="scope">
+          <span>{{parseTime(scope.row.createTime)}}</span>
+        </template>
       </el-table-column>
       <el-table-column label="操作" prop="op" width="180">
         <template slot-scope="scope">
@@ -94,10 +96,10 @@
 
     <!--编辑会议窗体-->
     <!-- 编辑界面 -->
-    <el-dialog :title="title" :visible.sync="editFormVisible" width="950px" @click="closeDialog">
+    <el-dialog :title="title" :visible.sync="editFormVisible" width="950px" @click="closeDialog" :close-on-click-modal="false">
       <el-form label-width="120px" ref="form" :model="editForm">
         <el-form-item label="会议主题:">
-          <el-input size="small" v-model="editForm.meetingName"></el-input>
+          <el-input size="mini" v-model="editForm.meetingName"></el-input>
         </el-form-item>
         <el-form-item label="会议类别:">
           <el-radio-group v-model="editForm.external">
@@ -128,7 +130,7 @@
           </el-col>
         </el-row>
         <el-form-item label="会议地点:">
-          <el-input size="small" v-model="editForm.meetingPlace"></el-input>
+          <el-input size="mini" v-model="editForm.meetingPlace"></el-input>
         </el-form-item>
         <el-form-item label="会议时间:">
           <el-date-picker
@@ -142,26 +144,26 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="外部参会人员:">
-          <el-input size="small" v-model="editForm.outAttendees"></el-input>
+          <el-input size="mini" v-model="editForm.outAttendees"></el-input>
         </el-form-item>
         <el-form-item label="内部参会人员:">
-          <el-input size="small" v-model="editForm.innerAttendUsers" readonly="true" @keyup.enter.native="openUsers()">
+          <el-input size="mini" v-model="editForm.innerAttendUsers" readonly="true" @keyup.enter.native="openUsers()">
             <el-button @click="openUsers" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="主持人:">
-          <el-input size="small" v-model="editForm.emcee" readonly="true" @keyup.enter.native="openUsers1('emcee')">
+          <el-input size="mini" v-model="editForm.emcee" readonly="true" @keyup.enter.native="openUsers1('emcee')">
             <el-button @click="openUsers1('emcee')" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="记录人:">
-          <el-input size="small" v-model="editForm.recorder" readonly="true"
+          <el-input size="mini" v-model="editForm.recorder" readonly="true"
                     @keyup.enter.native="openUsers1('recorder')">
             <el-button @click="openUsers1('recorder')" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
         <el-form-item label="参会情况:">
-          <el-input size="small" v-model="editForm.remark"></el-input>
+          <el-input size="mini" v-model="editForm.remark"></el-input>
         </el-form-item>
         <el-form-item label="会议内容:">
           <el-table
@@ -169,7 +171,7 @@
             <el-table-column type="index" label="序号" width="40">
             </el-table-column>
             <el-table-column label="工作内容" prop="content">
-              <template scope="scope">
+              <template slot-scope="scope">
                 <el-input size="mini" v-model="scope.row.content"></el-input>
               </template>
             </el-table-column>
@@ -183,13 +185,13 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="closeDialog">取消</el-button>
-        <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">保存
+        <el-button size="mini" @click="closeDialog">取消</el-button>
+        <el-button size="mini" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">保存
         </el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog">
+    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog" :close-on-click-modal="false">
       <el-tree
         ref="dept"
         :data="userList"
@@ -198,12 +200,12 @@
         :props="{label:'name'}" default-expand-all="true">
       </el-tree>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="closeUserDialog">取消</el-button>
-        <el-button size="small" type="primary" class="title" @click="submitUserForm('editForm')">确定</el-button>
+        <el-button size="mini" @click="closeUserDialog">取消</el-button>
+        <el-button size="mini" type="primary" class="title" @click="submitUserForm('editForm')">确定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="选择人员" :visible.sync="users1Visble" width="30%" @click="closeUser1Dialog">
+    <el-dialog title="选择人员" :visible.sync="users1Visble" width="30%" @click="closeUser1Dialog" :close-on-click-modal="false">
       <el-tree
         ref="dept1"
         :data="userList"
@@ -211,12 +213,12 @@
         :props="{label:'name'}" default-expand-all="true">
       </el-tree>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" @click="closeUser1Dialog">取消</el-button>
-        <el-button size="small" type="primary" class="title" @click="submitUser1Form('editForm')">确定</el-button>
+        <el-button size="mini" @click="closeUser1Dialog">取消</el-button>
+        <el-button size="mini" type="primary" class="title" @click="submitUser1Form('editForm')">确定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog">
+    <el-dialog :visible.sync="projectMeetingDetailVisble" width="95%" @click="closeProjectMeetingDailog" :close-on-click-modal="false">
       <el-descriptions title="会议记录详情" border :column="2">
         <el-descriptions-item label="会议主题">
           {{ pro.meetingName }}
@@ -242,7 +244,7 @@
         <el-descriptions-item label="内部参会人员">
           {{ pro.innerAttendees }}
         </el-descriptions-item>
-        <el-descriptions-item label="参会情况" >
+        <el-descriptions-item label="参会情况">
           {{ pro.remark }}
         </el-descriptions-item>
       </el-descriptions>
@@ -251,18 +253,18 @@
         <el-table-column label="序号" width="60" type="index"></el-table-column>
         <el-table-column label="会议内容" prop="content"></el-table-column>
         <el-table-column label="会议问题" prop="question">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input size="mini" v-model="scope.row.question"></el-input>
           </template>
         </el-table-column>
         <el-table-column label="会议方案" prop="optionss">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input size="mini" v-model="scope.row.optionss"></el-input>
           </template>
 
         </el-table-column>
         <el-table-column label="执行人" width="180">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-input size="mini" v-model="scope.row.executorName" readonly
                       @keyup.enter.native="openUsers1('executorName',scope.row)">
               <el-button @click="openUsers1('executorName',scope.row)" icon="el-icon-search" slot="append"></el-button>
@@ -291,7 +293,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="otherMeetingDetailVisble" width="95%" @click="closeotherMeetingDailog">
+    <el-dialog :visible.sync="otherMeetingDetailVisble" width="95%" @click="closeotherMeetingDailog" :close-on-click-modal="false">
       <el-descriptions title="会议记录详情" border :column="2">
         <el-descriptions-item label="会议主题">
           {{ pro.meetingName }}
@@ -317,7 +319,7 @@
         <el-descriptions-item label="内部参会人员">
           {{ pro.innerAttendees }}
         </el-descriptions-item>
-        <el-descriptions-item label="参会情况" >
+        <el-descriptions-item label="参会情况">
           {{ pro.remark }}
         </el-descriptions-item>
       </el-descriptions>
@@ -332,7 +334,6 @@
     </el-dialog>
 
 
-
   </div>
 </template>
 
@@ -353,7 +354,7 @@ export default {
   data() {
     return {
       projectMeetingDetailVisble: false,
-      otherMeetingDetailVisble:false,
+      otherMeetingDetailVisble: false,
       tableData: [],
       pageparm: {
         current: 1,
@@ -384,7 +385,7 @@ export default {
         innerAttendees: '',
         innerAttendesss: null,
         innerAttendUsers: '',
-        remark:'',
+        remark: '',
         emcee: '',
         recorder: '',
         meetingContents: [
@@ -406,8 +407,8 @@ export default {
         innerAttendees: '',
         emcee: '',
         recorder: '',
-        remark:'',
-        status:null,
+        remark: '',
+        status: null,
         meetingContents: [{
           id: null,
           meetingId: null,
@@ -457,7 +458,7 @@ export default {
         this.title = '创建会议'
         this.editFormVisible = true
       })
-      this.editForm={
+      this.editForm = {
         id: null,
         meetingName: '',
         external: 0,
@@ -469,7 +470,7 @@ export default {
         innerAttendees: '',
         innerAttendesss: null,
         innerAttendUsers: '',
-        remark:'',
+        remark: '',
         emcee: '',
         recorder: '',
         meetingContents: [
@@ -549,9 +550,9 @@ export default {
       let meetingType = row.meetingType
 
       if (meetingType !== 1) {
-        if(row.meetingType==2){
+        if (row.meetingType == 2) {
           this.projectMeetingDetailVisble = true
-        }else{
+        } else {
           this.otherMeetingDetailVisble = true
         }
 
@@ -587,21 +588,21 @@ export default {
         }
         innerPeople = innerPeople.substring(0, innerPeople.length - 1);
         this.pro.innerAttendees = innerPeople
-        this.pro.remark=row.remark
-        this.pro.status=row.status
+        this.pro.remark = row.remark
+        this.pro.status = row.status
         let meetingId = row.id
-        this.pro.id=row.id
+        this.pro.id = row.id
         getMeetingDetailsById(meetingId).then(res => {
           let data = res.data.meetingContents
           this.pro.meetingContents = data
         });
       }
-      if(meetingType===1){
-        let params={
+      if (meetingType === 1) {
+        let params = {
           meetingId: row.id,
-          weeks:row.weeks
+          weeks: row.weeks
         }
-        this.$router.push({ path: '/meeting/weeklyRecords',query:params });
+        this.$router.push({path: '/meeting/weeklyRecords', query: params});
       }
     },
     openUsers() {
@@ -725,13 +726,13 @@ export default {
       saveMeetingOptionss(data).then(res => {
         this.$message({
           message: '操作成功!',
-          type: 'info'
+          type: 'success'
         });
         this.closeProjectMeetingDailog();
       });
     },
-    closeotherMeetingDailog(){
-      this.otherMeetingDetailVisble=false;
+    closeotherMeetingDailog() {
+      this.otherMeetingDetailVisble = false;
     }
   }
 

src/views/meeting/weekly.vue

@@ -37,15 +37,16 @@
         <el-table-column  type="index" label="序号" width="60">
         </el-table-column>
         <el-table-column label="工作计划" prop="workPlan">
-          <template scope="scope">
-            <el-input size="mini" v-model="scope.row.planContent" ></el-input>
+          <template slot-scope="scope">
+            <el-input size="mini" type="textarea" autosize v-model="scope.row.planContent" ></el-input>
           </template>
         </el-table-column>
         <el-table-column label="预计完成时间" prop="completionTimes">
-          <template scope="scope">
+          <template slot-scope="scope">
             <el-date-picker
               v-model="scope.row.completionTimes"
               type="date"
+              size="mini"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               placeholder="选择日期">
@@ -63,7 +64,7 @@
 
     </div>
     <div style="margin-top: 50px;margin-right: 150px;  width: 65%;text-align: center">
-      <el-button size="small" type="primary" @click="saveWorkPlan()" v-if="currentWeek===weeks">保存工作计划</el-button>
+      <el-button size="mini" type="primary" @click="saveWorkPlan()" v-if="currentWeek===weeks">保存工作计划</el-button>
     </div>
   </div>
 </template>

src/views/meeting/weeklyRecords.vue

@@ -1,48 +1,48 @@
 <template>
-  <div class="app-container" >
+  <div class="app-container">
     <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
       <div style="font-size: 24px">{{ m.meetingName }}</div>
       <el-button size="mini" @click="exportPdf" icon="el-icon-download" style="margin-right: 20px">导出</el-button>
     </div>
-    <el-descriptions  title="" :column="2" :size="size" border>
+    <el-descriptions title="" :column="2" :size="size" border>
       <el-descriptions-item>
         <template slot="label">
           <i class="el-icon-user"></i>
-         会议时间
+          会议时间
         </template>
-        {{m.beginTime}}至{{m.endTime}}
+        {{ m.beginTime }}至{{ m.endTime }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
           <i class="el-icon-user"></i>
-         会议主持人
+          会议主持人
         </template>
-      {{m.emcee}}
+        {{ m.emcee }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
           <i class="el-icon-location-outline"></i>
           会议地点
         </template>
-        {{m.meetingPlace}}
+        {{ m.meetingPlace }}
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
           <i class="el-icon-user"></i>
           会议记录人
         </template>
-        {{m.recorder}}
+        {{ m.recorder }}
       </el-descriptions-item>
       <el-descriptions-item :span="2">
         <template slot="label">
           <i class="el-icon-user"></i>
-         参会人员
+          参会人员
         </template>
         <span v-if="m.innerAttendees!=''" v-for="(item,index) in JSON.parse(m.innerAttendees)">
-          {{item.name}}
+          {{ item.name }}
         </span>
       </el-descriptions-item>
-     <el-descriptions-item :span="2" >
+      <el-descriptions-item :span="2">
         <template slot="label">
           <i class="el-icon-office-building"></i>
           参会情况
@@ -52,18 +52,18 @@
     </el-descriptions>
     <el-table
       style="width: 100%" border stripe :data="tableData" :highlight-current-row="true"
-      :span-method="objectSpanMethod" >
-      <el-table-column prop="group"  label="序号" width="60" align="center">
+      :span-method="objectSpanMethod">
+      <el-table-column prop="group" label="序号" width="60" align="center">
       </el-table-column>
       <el-table-column
         prop="userName"
         label="姓名" align="center"
         width="120">
       </el-table-column>
-      <el-table-column  label="本周工作总结"  min-width="450">
-        <el-table-column label="工作内容"  prop="taskName">
+      <el-table-column label="本周工作总结" min-width="450">
+        <el-table-column label="工作内容" prop="taskName">
         </el-table-column>
-        <el-table-column label="是否上周遗留"  width="120" prop="lastWeekFlag">
+        <el-table-column label="是否上周遗留" width="120" prop="lastWeekFlag">
           <template slot-scope="scope">
             <div v-if="scope.row.lastWeekFlag==='0'" style="color: darkred">是</div>
             <div v-else="scope.row.lastWeekFlag==='1'">否</div>
@@ -71,11 +71,12 @@
         </el-table-column>
         <el-table-column label="完成情况说明" prop="progressValue" width="150">
           <template slot-scope="scope">
-            <div  style="color: darkgreen" @click="getTaskScheduleRemarks(scope.row)">{{scope.row.progressValue}}%</div>
+            <div style="color: darkgreen" @click="getTaskScheduleRemarks(scope.row)">{{ scope.row.progressValue }}%
+            </div>
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column prop="workplan" label="下周工作计划" >
+      <el-table-column prop="workplan" label="下周工作计划">
         <el-table-column label="工作内容与完成时间" prop="planContent">
           <template slot-scope="scope">
             <div v-html="scope.row.planContent">
@@ -83,24 +84,25 @@
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column prop="scores" label="评分"  width="150" align="center">
+      <el-table-column prop="scores" label="评分" width="150" align="center">
         <template slot-scope="scope">
-            <el-input-number size="mini" :precision="2" :step="0.1" :max="10" min="5" v-model="scope.row.score"  @change="workComment(scope.row)">
-              {{scope.row.score}}
-            </el-input-number>
+          <el-input-number size="mini" :precision="2" :step="0.1" :max="10" min="5" v-model="scope.row.score"
+                           @change="workComment(scope.row)">
+            {{ scope.row.score }}
+          </el-input-number>
         </template>
       </el-table-column>
-      <el-table-column prop="remarks" label="备注" >
+      <el-table-column prop="remarks" label="备注">
         <template slot-scope="scope">
-           <el-input v-model="scope.row.remark"  type="textarea"
-                     :autosize="{ minRows: 4}" @change="workComment(scope.row)">
+          <el-input v-model="scope.row.remark" type="textarea"
+                    :autosize="{ minRows: 4}" @change="workComment(scope.row)">
 
-           </el-input>
+          </el-input>
         </template>
       </el-table-column>
       <el-table-column prop="workComments" label="工作评论">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.workComment"  type="textarea"
+          <el-input v-model="scope.row.workComment" type="textarea"
                     :autosize="{ minRows: 4}" @change="workComment(scope.row)">
 
           </el-input>
@@ -112,8 +114,8 @@
       :title="taskFeedbackTitle"
       :visible.sync="taskFeedbackVisible"
       width="30%"
-        >
-        <div v-html="taskFeedbackContent"></div>
+      :close-on-click-modal="false">
+      <div v-html="taskFeedbackContent"></div>
       <span slot="footer" class="dialog-footer">
       <el-button @click="taskFeedbackVisible = false" size="mini">取 消</el-button>
       <el-button type="primary" @click="taskFeedbackVisible = false" size="mini">确 定</el-button>
@@ -123,7 +125,7 @@
 </template>
 <script>
 
-import { getMeetingByWeekss, getTaskScheduleRemark, getWeeksRecordsByWeeks, workComments } from '@/api/meeting/meeting'
+import {getMeetingByWeekss, getTaskScheduleRemark, getWeeksRecordsByWeeks, workComments} from '@/api/meeting/meeting'
 
 import {downloadPdf} from "@/api/meeting/meeting";
 
@@ -132,16 +134,16 @@ export default {
   name: 'weeklyRecords',
   data() {
     return {
-      taskFeedbackTitle:'',
-      taskFeedbackVisible:false,
-      taskFeedbackContent:'',
-      title : '技术部周会',
+      taskFeedbackTitle: '',
+      taskFeedbackVisible: false,
+      taskFeedbackContent: '',
+      title: '技术部周会',
       size: '',
-      tableData:[],
-      meetingId:null,
-      weeks:null,
-      m:{
-        id:null,
+      tableData: [],
+      meetingId: null,
+      weeks: null,
+      m: {
+        id: null,
         meetingName: '',
         external: 0,
         meetingType: 1,
@@ -157,12 +159,12 @@ export default {
         status: 1,
         weeks: 46
       },
-      workContents:{
-        col:0,
-        row:0
+      workContents: {
+        col: 0,
+        row: 0
       },
       mergeObj: {}, // 用来记录需要合并行的下标
-      mergeArr: ['group','userName','planContent','scores','remarks','workComments'], // 表格中的列名
+      mergeArr: ['group', 'userName', 'planContent', 'scores', 'remarks', 'workComments'], // 表格中的列名
 
 
     }
@@ -171,21 +173,21 @@ export default {
 
   },
   mounted() {
-    this.meetingId=this.$route.query.meetingId;
-    this.weeks=this.$route.query.weeks;
+    this.meetingId = this.$route.query.meetingId;
+    this.weeks = this.$route.query.weeks;
     this.getData()
   },
   methods: {
     getData() {
-      let meetingId=this.meetingId
-      let weeks=this.weeks
-      if(meetingId!=null && weeks!=null){
-        getWeeksRecordsByWeeks(meetingId,weeks).then(res => {
-          this.tableData=res.data.workContent
+      let meetingId = this.meetingId
+      let weeks = this.weeks
+      if (meetingId != null && weeks != null) {
+        getWeeksRecordsByWeeks(meetingId, weeks).then(res => {
+          this.tableData = res.data.workContent
           this.getSpanArr(this.tableData);
-          this.m=res.data.meeting
+          this.m = res.data.meeting
         })
-      }else {
+      } else {
         //获取当前周会会议id与所属周数
         getMeetingByWeekss().then(res => {
           let data = res.data;
@@ -205,10 +207,10 @@ export default {
 
     },
 
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      if(this.mergeArr.indexOf(column.property) !== -1) {
+    objectSpanMethod({row, column, rowIndex, columnIndex}) {
+      if (this.mergeArr.indexOf(column.property) !== -1) {
         // 判断其值是不是为0
-        if(this.mergeObj[column.property][rowIndex]) {
+        if (this.mergeObj[column.property][rowIndex]) {
           return [this.mergeObj[column.property][rowIndex], 1]
         } else {
           // 如果为0则为需要合并的行
@@ -224,12 +226,12 @@ export default {
 
         data.forEach((item, index) => {
           // index == 0表示数据为第一行，直接 push 一个 1
-          if(index === 0) {
+          if (index === 0) {
             this.mergeObj[key].push(1);
             //item.group=index;
           } else {
             // 判断当前行是否与上一行其值相等 如果相等 在 count 记录的位置其值 +1 表示当前行需要合并 并push 一个 0 作为占位
-            if(item[key] === data[index - 1][key]) {
+            if (item[key] === data[index - 1][key]) {
               this.mergeObj[key][count] += 1;
               this.mergeObj[key].push(0);
               //item.group = this.tableData[index - 1].group;
@@ -237,62 +239,62 @@ export default {
               // 如果当前行和上一行其值不相等
               count = index; // 记录当前位置
               this.mergeObj[key].push(1); // 重新push 一个 1
-             // item.group = this.tableData[index - 1].group + 1; //如果不一样 将组号设置为上一个数据的组号加1
+              // item.group = this.tableData[index - 1].group + 1; //如果不一样 将组号设置为上一个数据的组号加1
             }
           }
         })
 
       })
     },
-    workComment(row){
-      let scoreId=row.scoreId
-      let score=row.score
-      let remark=row.remark
-      let meetingId=row.meetingId
-      let weeks=row.weeks;
-      let userId=row.executor
-      let workComment=row.workComment
-      if(scoreId===meetingId){
-        scoreId=null
+    workComment(row) {
+      let scoreId = row.scoreId
+      let score = row.score
+      let remark = row.remark
+      let meetingId = row.meetingId
+      let weeks = row.weeks;
+      let userId = row.executor
+      let workComment = row.workComment
+      if (scoreId === meetingId) {
+        scoreId = null
       }
-      let data={
-        id:scoreId,
-        score:score,
-        remark:remark,
-        weeks:weeks,
-        userId:userId,
-        workComment:workComment
+      let data = {
+        id: scoreId,
+        score: score,
+        remark: remark,
+        weeks: weeks,
+        userId: userId,
+        workComment: workComment
       }
 
       workComments(data).then(res => {
         this.$message({
           message: '操作成功!',
-          type: 'info'
+          type: 'success'
         });
         this.getData()
       });
 
     },
-    getTaskScheduleRemarks(row){
-      this.taskFeedbackTitle=row.userName+":"+row.taskName
+    getTaskScheduleRemarks(row) {
+      this.taskFeedbackTitle = row.userName + ":" + row.taskName
 
-      getTaskScheduleRemark(row.taskId).then(res =>{
-        let content=res.data;
-        let feedbackContent='';
-        let j=1;
-        for(let i=0;i<content.length;i++){
-          feedbackContent+=j+":"+ content[i].description+"&nbsp;&nbsp;&nbsp;&nbsp;"+content[i].value+"%"+"&nbsp;&nbsp;&nbsp"+'</br>'
+      getTaskScheduleRemark(row.taskId).then(res => {
+        let content = res.data;
+        let feedbackContent = '';
+        let j = 1;
+        for (let i = 0; i < content.length; i++) {
+          feedbackContent += j + ":" + content[i].description + "&nbsp;&nbsp;&nbsp;&nbsp;" + content[i].value + "%" + "&nbsp;&nbsp;&nbsp" + '</br>'
           j++;
         }
-        if(content.length===0){
-          feedbackContent='暂无反馈'
+        if (content.length === 0) {
+          feedbackContent = '暂无反馈'
         }
-       this.taskFeedbackContent=feedbackContent
+        this.taskFeedbackContent = feedbackContent
       });
-      this.taskFeedbackVisible=true
+      this.taskFeedbackVisible = true
     },
     exportPdf() {
-      downloadPdf(this.meetingId,this.weeks)
+      downloadPdf(this.meetingId, this.weeks)
     },
   }
 

src/views/system/dept.vue

@@ -97,7 +97,7 @@
     </el-table>
 
     <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">

src/views/system/menu.vue

@@ -103,7 +103,7 @@
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">

src/views/system/role.vue

@@ -96,7 +96,7 @@
     </div>
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称"/>
@@ -146,7 +146,7 @@
     </el-dialog>
 
     <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body :close-on-click-modal="false">
       <el-form :model="form" label-width="80px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" :disabled="true"/>

src/views/system/user.vue

@@ -149,7 +149,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
           <el-col :span="12">

src/views/task/category.vue

@@ -94,7 +94,7 @@
     </div>
 
     <!-- 添加或修改分类配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
         <el-form-item label="分类名称" prop="categoryName">
           <el-input v-model="form.categoryName" placeholder="请输入分类名称"/>

src/views/task/project.vue

@@ -57,8 +57,8 @@
       <el-table-column label="项目描述" prop="description" :show-overflow-tooltip="true"/>
       <el-table-column label="状态" align="center">
         <template slot-scope="scope">
-          <el-tag type="success" size="small" v-if="scope.row.status==0">正常</el-tag>
-          <el-tag type="info" size="small" v-else>停用</el-tag>
+          <el-tag type="success" size="mini" v-if="scope.row.status==0">正常</el-tag>
+          <el-tag type="info" size="mini" v-else>停用</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
@@ -102,7 +102,7 @@
     </div>
 
     <!-- 添加或修改项目配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
         <el-form-item label="项目名称" prop="projectName">
           <el-input v-model="form.projectName" placeholder="请输入项目名称"/>

src/views/task/task.vue

@@ -135,7 +135,7 @@
     </div>
 
     <!-- 添加或修改任务配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称"/>
@@ -208,7 +208,8 @@
     </el-dialog>
 
     <!-- 详情/审核任务对话框 -->
-    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="680px" append-to-body>
+    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="680px" 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">
@@ -230,7 +231,7 @@
     </el-dialog>
 
     <!-- 分解任务对话框 -->
-    <el-dialog title="分解任务" :visible.sync="splitOpen" width="500px" append-to-body>
+    <el-dialog title="分解任务" :visible.sync="splitOpen" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="splitForm" class="split-form" size="mini">
         <el-form-item label="任务名称：">
           <div>{{ splitForm.taskName }}</div>
@@ -246,7 +247,7 @@
             <el-button type="text" icon="el-icon-delete" @click="delChild(index)"
                        style="float: right;color: red; padding: 3px 0"></el-button>
           </div>
-          <el-form ref="splitChild" :rules="rules" size="mini" label-width="80px">
+          <el-form ref="splitChild" :model="child" :rules="rules" size="mini" label-width="80px">
             <el-form-item label="任务名称" prop="taskName">
               <el-input v-model="child.taskName" size="small" style="width: 350px"/>
             </el-form-item>

src/views/task/view.vue

@@ -103,7 +103,7 @@
       </el-table-column>
     </el-table>
 
-    <el-dialog title="反馈任务" :visible.sync="open" width="680px" append-to-body>
+    <el-dialog title="反馈任务" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="任务名称">
           <div>{{ form.taskName }}</div>
@@ -138,7 +138,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" append-to-body>
+    <el-dialog title="任务详情" :visible.sync="openDetail" width="680px" append-to-body :close-on-click-modal="false">
       <task-detail :detailForm="detailForm"></task-detail>
     </el-dialog>