Merge remote-tracking branch 'origin/master' into master

src/views/enforceflow/enforceflow.vue

@@ -103,7 +103,7 @@
           <el-input size="mini" v-model="editForm.name"></el-input>
         </el-form-item>
         <el-form-item label="实施负责人:" prop="recorder">
-          <el-input size="mini" v-model="editForm.enforcer" readonly="true"
+          <el-input size="mini" v-model="editForm.enforcer" :readonly="true"
                     @keyup.enter.native="openUsers1()">
             <el-button @click="openUsers1()" icon="el-icon-search" slot="append"></el-button>
           </el-input>
@@ -133,7 +133,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="实施内容:">
-          <el-input size="mini" type="textarea" :rows="4" v-model="editForm.content"></el-input>
+          <el-input size="mini" type="textarea" :rows="6" v-model="editForm.content"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -142,13 +142,16 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="选择人员" :visible.sync="users1Visble" width="30%" @click="closeUser1Dialog"
-               :close-on-click-modal="false">
+    <el-dialog title="选择人员" :visible.sync="users1Visble" width="30%" @click="closeUser1Dialog" :close-on-click-modal="false">
+      <el-input placeholder="输入关键字进行过滤" v-model="filterText">
+      </el-input>
       <el-tree
         ref="dept1"
         :data="userList"
         node-key="id"
-        :props="{label:'name'}" default-expand-all="true">
+        :props="{label:'name'}"
+        :default-expand-all="true"
+        :filter-node-method="filterNode">
       </el-tree>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeUser1Dialog">取消</el-button>
@@ -225,7 +228,8 @@
         ref="dept"
         :data="userList"
         node-key="id"
-        :props="{label:'name'}" default-expand-all="true">
+        :props="{label:'name'}" default-expand-all="true"
+      >
       </el-tree>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeUserDialog">取消</el-button>
@@ -531,8 +535,14 @@ import {deleteFile, uploadFileUrl} from '@/api/file/file'
 
 export default {
   name: 'enforceflow',
+  watch: {
+    filterText(val) {
+      this.$refs.dept1.filter(val);
+    }
+  },
   data() {
     return {
+      filterText: '',
       editEnforceRecord: {
         id: null,
         enforceType: '',
@@ -1088,6 +1098,12 @@ export default {
       if (active === '2') {
         this.getEnforceRecordLists();
       }
+    },
+    filterNode(value, data) {
+      if (!value) {
+        return true
+      };
+      return data.name.indexOf(value) !== -1;
     }
   }
 

src/views/meeting/weekly.vue

@@ -53,7 +53,7 @@
           </el-table-column>
           <el-table-column label="工作计划" prop="workPlan">
             <template slot-scope="scope">
-              <el-input size="mini" type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="scope.row.planContent" ></el-input>
+              <el-input size="mini" type="textarea" :autosize="{ minRows: 4, maxRows: 10}" v-model="scope.row.planContent" placeholder="请填写工作计划信息"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="预计完成时间" prop="completionTimes">
@@ -170,7 +170,7 @@ export default {
           this.workPlans = response.data.workPlan
         }else{
           this.workPlans=[{
-            planContent: '请填写工作计划信息',
+            planContent: '',
             id: null,
             meetingId: null,
             completionTimes: null,

src/views/meeting/weeklyRecords.vue

@@ -43,7 +43,12 @@
           参会人员
         </template>
         <span v-if="m.innerAttendees!=''" v-for="(item,index) in JSON.parse(m.innerAttendees)">
-          {{ item.name }}
+          <el-badge is-dot v-if="item.flag==='1'">
+          &nbsp;&nbsp;&nbsp; {{ item.name }}
+          </el-badge>
+           <el-badge is-dot v-else type="info">
+          &nbsp;&nbsp;&nbsp; {{ item.name }}
+          </el-badge>
         </span>
       </el-descriptions-item>
       <el-descriptions-item >
@@ -238,6 +243,7 @@ export default {
       projects:[],
       row:null,
       workScoreVisible:false,
+      meetingConfirms:[]
     }
   },
   created() {
@@ -267,6 +273,7 @@ export default {
           this.tableData = res.data.workContent
           this.getSpanArr(this.tableData);
           this.m = res.data.meeting
+
         })
       } else {
         //获取当前周会会议id与所属周数
@@ -291,7 +298,6 @@ export default {
       }
 
     },
-
     objectSpanMethod({row, column, rowIndex, columnIndex}) {
       if (this.mergeArr.indexOf(column.property) !== -1) {
         // 判断其值是不是为0