Merge remote-tracking branch 'origin/master'

src/views/record/list/index.vue

@@ -4,97 +4,301 @@
       <!--部门数据-->
       <el-col :span="2" :xs="24">
         <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
+          <el-input
+            v-model="deptName"
+            placeholder="请输入部门名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
         </div>
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-            @node-click="handleNodeClick" />
+          <el-tree
+            :data="deptOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="22" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
           <el-form-item label="项目编号" prop="projectNumber">
-            <el-input v-model="queryParams.projectNumber" placeholder="请输入项目编号" clearable style="width: 240px"
-              @keyup.enter.native="handleQuery" />
+            <el-input
+              v-model="queryParams.projectNumber"
+              placeholder="请输入项目编号"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="项目名称" prop="projectName">
-            <el-input v-model="queryParams.projectName" placeholder="请输入项目名称" clearable style="width: 240px"
-              @keyup.enter.native="handleQuery" />
+            <el-input
+              v-model="queryParams.projectName"
+              placeholder="请输入项目名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
           <el-form-item label="时间">
-            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
           </el-form-item>
           <el-form-item label="兼职全职" prop="fullJob">
-            <el-select v-model="queryParams.fullJob" placeholder="兼职/全职" clearable style="width: 240px">
-              <el-option v-for="dict in dict.type.sys_user_fulljob" :key="dict.value" :label="dict.label"
-                :value="dict.value" />
+            <el-select
+              v-model="queryParams.fullJob"
+              placeholder="兼职/全职"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_user_fulljob"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="创段任务" prop="projectStatus">
-            <el-select v-model="queryParams.projectStatus" placeholder="创段任务" clearable style="width: 240px">
-              <el-option v-for="dict in pStatusList" :key="dict.value" :label="dict.label" :value="dict.value" />
+            <el-select
+              v-model="queryParams.projectStatus"
+              placeholder="创段任务"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in pStatusList"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >搜索</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
           </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
-              v-hasPermi="['system:user:import']">导入</el-button>
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+              >导入</el-button
+            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-              v-hasPermi="['system:user:export']">导出</el-button>
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['system:user:export']"
+              >导出</el-button
+            >
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDownload"
+              v-hasPermi="['system:user:export']"
+              >下载附件</el-button
+            >
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+            :columns="columns"
+          ></right-toolbar>
         </el-row>
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table
+          v-loading="loading"
+          :data="userList"
+          @selection-change="handleSelectionChange"
+        >
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="员工工号" align="center" key="jobNumber" prop="jobNumber" v-if="columns[0].visible" />
-          <el-table-column label="员工姓名" align="center" key="name" prop="name" v-if="columns[1].visible"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="部门编号" align="center" key="deptId" prop="deptId" v-if="columns[2].visible"
-            :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="deptName" v-if="columns[3].visible" />
-          <el-table-column label="打卡时间" width="100" align="center" key="recordTime" prop="recordTime"
-            v-if="columns[4].visible" />
-          <el-table-column label="工时" align="center" width="50" key="duration" prop="duration"
-            v-if="columns[5].visible" />
-          <el-table-column label="打卡月份" align="center" key="createMonth" prop="createMonth" v-if="columns[6].visible" />
-          <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber"
-            v-if="columns[7].visible" />
-          <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" v-if="columns[8].visible" />
-          <el-table-column label="创段任务" align="center" key="projectStatus" prop="projectStatus"
-            v-if="columns[9].visible" />
-          <el-table-column label="日报内容" align="center" key="content" prop="content" v-if="columns[10].visible"
-            :show-overflow-tooltip="true" />
+          <el-table-column
+            label="员工工号"
+            align="center"
+            key="jobNumber"
+            prop="jobNumber"
+            v-if="columns[0].visible"
+          />
+          <el-table-column
+            label="员工姓名"
+            align="center"
+            key="name"
+            prop="name"
+            v-if="columns[1].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="部门编号"
+            align="center"
+            key="deptId"
+            prop="deptId"
+            v-if="columns[2].visible"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="部门"
+            align="center"
+            key="deptName"
+            prop="deptName"
+            v-if="columns[3].visible"
+          />
+          <el-table-column
+            label="打卡时间"
+            width="100"
+            align="center"
+            key="recordTime"
+            prop="recordTime"
+            v-if="columns[4].visible"
+          />
+          <el-table-column
+            label="工时"
+            align="center"
+            width="50"
+            key="duration"
+            prop="duration"
+            v-if="columns[5].visible"
+          />
+          <el-table-column
+            label="打卡月份"
+            align="center"
+            key="createMonth"
+            prop="createMonth"
+            v-if="columns[6].visible"
+          />
+          <el-table-column
+            label="项目编号"
+            align="center"
+            key="projectNumber"
+            prop="projectNumber"
+            v-if="columns[7].visible"
+          />
+          <el-table-column
+            label="项目名称"
+            align="center"
+            key="projectName"
+            prop="projectName"
+            v-if="columns[8].visible"
+          />
+          <el-table-column
+            label="创段任务"
+            align="center"
+            key="projectStatus"
+            prop="projectStatus"
+            v-if="columns[9].visible"
+          />
+          <el-table-column
+            label="日报内容"
+            align="center"
+            key="content"
+            prop="content"
+            v-if="columns[10].visible"
+            :show-overflow-tooltip="true"
+          />
           <!-- :show-overflow-tooltip="true" -->
-          <el-table-column label="审核人员" align="center" key="examineName" prop="examineName" v-if="columns[11].visible" />
-          <el-table-column label="审核时间" width="100" align="center" key="examineTime" prop="examineTime"
-            v-if="columns[12].visible" />
-          <el-table-column label="附件" align="center" width="160" class-name="small-padding fixed-width">
+          <el-table-column
+            label="审核人员"
+            align="center"
+            key="examineName"
+            prop="examineName"
+            v-if="columns[11].visible"
+          />
+          <el-table-column
+            label="审核时间"
+            width="100"
+            align="center"
+            key="examineTime"
+            prop="examineTime"
+            v-if="columns[12].visible"
+          />
+          <el-table-column
+            label="附件"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleSelect(scope.row)"
-                v-hasPermi="['system:user:edit']">查看</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleSelect(scope.row)"
+                >查看</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
       </el-col>
     </el-row>
     <!-- 项目导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+    <el-dialog
+      :title="upload.title"
+      :visible.sync="upload.open"
+      width="400px"
+      append-to-body
+    >
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -102,8 +306,13 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
-            @click="importTemplate">下载模板</el-link>
+          <el-link
+            type="primary"
+            :underline="false"
+            style="font-size: 12px; vertical-align: baseline"
+            @click="importTemplate"
+            >下载模板</el-link
+          >
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -120,20 +329,19 @@
         <ImagePreview :src="srcList" :width="100" :height="100" />
       </template>
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-import { listRecord, } from "@/api/system/record";
-import { deptTreeSelect, } from "@/api/system/user";
+import { listRecord } from "@/api/system/record";
+import { deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Record",
-  dicts: ['sys_user_fulljob'],
+  dicts: ["sys_user_fulljob"],
   components: { Treeselect },
   data() {
     return {
@@ -171,11 +379,14 @@ export default {
       form: {},
       // 附件
       srcList: "",
-      year: [{ label: "非跨年", value: 0 }, { label: "跨年", value: 1 }],
-      pStatusList: [{ label: "正常", value: 1 },],
+      year: [
+        { label: "非跨年", value: 0 },
+        { label: "跨年", value: 1 },
+      ],
+      pStatusList: [{ label: "正常", value: 1 }],
       defaultProps: {
         children: "children",
-        label: "label"
+        label: "label",
       },
       // 用户导入参数
       upload: {
@@ -190,7 +401,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/api/project/listRecord/importData"
+        url: process.env.VUE_APP_BASE_API + "/api/project/listRecord/importData",
       },
       // 查询参数
       queryParams: {
@@ -201,7 +412,7 @@ export default {
         staffId: undefined,
         projectYear: undefined,
         crossYear: undefined,
-        deptId: undefined
+        deptId: undefined,
       },
       // 列信息
       columns: [
@@ -246,19 +457,19 @@ export default {
         //     trigger: "blur"
         //   }
         // ]
-      }
+      },
     };
   },
   watch: {
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
-    }
+    },
   },
   created() {
     this.getList();
     this.getDeptTree();
-    this.getConfigKey("sys.user.initPassword").then(response => {
+    this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
     });
   },
@@ -271,7 +482,7 @@ export default {
         this.queryParams.endTime = this.dateRange[1];
       }
       this.queryParams.roleType = 3;
-      listRecord(this.queryParams).then(response => {
+      listRecord(this.queryParams).then((response) => {
         this.userList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -279,7 +490,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
       });
     },
@@ -310,7 +521,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
     },
@@ -320,11 +531,38 @@ export default {
       this.srcList = row.annexUrl;
       this.open = true;
     },
+    /** 下载附件 */
+    handleDownload(row) {
+      const ids = this.ids.toString();
+      const url = "/api/project/download?ids=" + ids;
+      const _this = this;
+      var date = new Date();
+      var year = date.getFullYear();
+      var month =
+        date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+      var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+      var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+      var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+      var time = year + "" + month + "" + day + "" + hours + "" + minutes + "" + seconds;
+      this.$modal
+        .confirm("确认下载已经勾选的项目附件吗？")
+        .then(function () {
+          _this.$download.zip(url, `项目打卡数据_${time}`);
+          _this.$modal.msgSuccess("下载成功");
+        })
+        .then(() => {})
+        .catch(() => {});
+    },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('api/project/listRecord/export', {
-        ...this.queryParams
-      }, `project_record_${new Date().getTime()}.xlsx`)
+      this.download(
+        "api/project/listRecord/export",
+        {
+          ...this.queryParams,
+        },
+        `project_record_${new Date().getTime()}.xlsx`
+      );
     },
     /** 导入按钮操作 */
     handleImport() {
@@ -333,8 +571,11 @@ export default {
     },
     /** 下载模板操作 */
     importTemplate() {
-      this.download('api/project/listRecord/importTemplate', {
-      }, `project_record_template_${new Date().getTime()}.xlsx`)
+      this.download(
+        "api/project/listRecord/importTemplate",
+        {},
+        `project_record_template_${new Date().getTime()}.xlsx`
+      );
     },
     // 文件上传中处理
     handleFileUploadProgress(event, file, fileList) {
@@ -345,13 +586,19 @@ export default {
       this.upload.open = false;
       this.upload.isUploading = false;
       this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.$alert(
+        "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+          response.msg +
+          "</div>",
+        "导入结果",
+        { dangerouslyUseHTMLString: true }
+      );
       this.getList();
     },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();
     },
-  }
+  },
 };
-</script>
+</script>