2023-5-26

src/HDrpManagement/workReport/modules/createReport/index.vue

@@ -20,7 +20,7 @@
         <template v-for="item in detail">
           <div v-if="item.editable" style="margin-bottom:40px">
             <p class="normal-title" style="margin-bottom:20px">{{ item.title }}</p>
-            <p ref="content" contenteditable="true" style="font-size:12px">
+            <p ref="content" contenteditable="true" class="content">
               <template v-for="item2 in item.content">
                 {{ item2.content }}<br/>
               </template>
@@ -148,4 +148,10 @@ export default {
   font-size: 14px;
   font-weight: normal;
 }
+.content {
+  font-size:12px;
+  border: 1px solid #dcdfe6;
+  border-radius:4px;
+  padding: 15px 10px;
+}
 </style>

src/HDrpManagement/workReport/modules/reportSet/components/addOption.vue

@@ -73,7 +73,7 @@ export default {
  
   },
   created () {
-    this.tablecols = this.tool.tabelCol(this.$route.name).optionTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).optionTable.tablecols.splice(0,2)
   }
 }
 </script>

src/HDrpManagement/workReport/modules/reportSet/components/addPeople.vue

@@ -6,6 +6,16 @@
         添加人员
       </div>
       <div class="drawer__panel">
+        <el-input 
+          class="inline-16"
+          style="margin-bottom:10px;width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          placeholder="搜索" 
+          v-model="params.content.where.condition"
+          @keyup.enter.native="params.content.pageNumber=1;listData()" 
+          @clear="params.content.pageNumber=1;listData()" clearable></el-input>
+        <el-button class="inline-16" type="primary" size="mini" @click="allData">一键全选</el-button>
         <selectTable @selectChange="selectChange" v-if="dialog" idName="hrid" ref="table" v-model="result" :layout="tablecols" :data="list" :custom="true" @upDateData="upDateData">
            <template v-slot:customcol="scope">
               <div>{{scope.column.data[scope.column.columnname]}}</div>
@@ -75,6 +85,28 @@ export default {
       this.$emit('selectPeople',this.selectPeople)
       this.dialog = false
     },
+    async allData () {
+      let res = await this.$api.requested({
+        "id": "20230522101302",
+        "content": {
+            "sys_workreportmodelid": this.data ? this.data.sys_workreportmodelid : 0,
+            "type": 1, //汇报人员,汇报对象
+            "pageNumber": 1,
+            "pageSize": 999999999,
+            "where": {
+                "condition": ""
+            }
+        },
+      })
+      this.$confirm(`总共有${res.total}位员工,是否选中`,'提示',{
+        confirmButtonText:'确定',
+        cancelButtonText:'取消',
+        type:'warning'
+      }).then(() => {
+        if (res.data.length) this.$emit('selectPeople',res.data)
+        this.dialog = false
+      })
+    },
     selectChange (data) {
       this.selectPeople = data
     },
@@ -89,7 +121,7 @@ export default {
   },
   created () {
     this.listData()
-    this.tablecols = this.tool.tabelCol(this.$route.name).reportPeopleTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).reportPeopleTable.tablecols.splice(0,3)
   }
 }
 </script>

src/HDrpManagement/workReport/modules/reportSet/components/teamSelect.vue

@@ -95,7 +95,7 @@ export default {
     },
   },
   created () {
-    this.tablecols = this.tool.tabelCol(this.$route.name).reportPeopleTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).reportPeopleTable.tablecols.splice(0,3)
   }
 }
 </script>

src/HDrpManagement/workReport/modules/reportSet/index.vue

@@ -18,8 +18,11 @@
             label="模板名称">
           </el-table-column>
           <el-table-column
-            prop="status"
+            prop="isused"
             label="状态">
+            <template slot-scope="scope">
+              {{ scope.row.isused ? '启用' : '关闭' }}
+            </template>
           </el-table-column>
           <el-table-column
             label="操作"