zxr hace 2 años
padre
commit
310e98d4ba

+ 43 - 51
src/views/grassrootsregistration/statistics/index.vue

@@ -8,12 +8,7 @@
       label-width="68px"
     >
       <el-form-item prop="unitName">
-        <el-input
-          placeholder="请输入单位"
-          v-model="queryParams.unitName"
-          @input="handleQuery"
-          style=""
-        />
+        <el-input placeholder="请输入单位" v-model="queryParams.unitName" @input="handleQuery" style />
       </el-form-item>
       <!-- <el-form-item label="" prop="unitId">
         <el-input
@@ -50,7 +45,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>-->
       <el-form-item>
         <!-- <el-button
           type="primary"
@@ -58,7 +53,7 @@
           size="mini"
           @click="handleQuery"
           >搜索</el-button
-        > -->
+        >-->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -72,8 +67,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['grassrootsregistration:statistics:add']"
-          >新增</el-button
-        >
+        >新增</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -109,12 +103,12 @@
           @click="handleExport"
           v-hasPermi="['grassrootsregistration:statistics:export']"
           >导出</el-button
-        > -->
+      >-->
       <!-- </el-col> -->
       <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar> -->
+      ></right-toolbar>-->
     </el-row>
 
     <el-table
@@ -126,19 +120,17 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="50" align="center">
         <template scope="scope">
-          <span>{{
+          <span>
+            {{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
-          }}</span>
+            }}
+          </span>
         </template>
       </el-table-column>
       <el-table-column label="单位名称" align="center" prop="unitName" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="时间" align="center" prop="time" />
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <el-button
             size="btk"
@@ -146,10 +138,15 @@
             @click="handleChakan(scope.row)"
             v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
             ><span class="chakan">查看</span></el-button
-          > -->
+          >-->
           <el-button size="btc" type="text" @click.native="ViewRead(scope.row)">
             <span>
-              <a target="_blank">阅读</a>
+              <a target="_blank">预览</a>
+            </span>
+          </el-button>
+          <el-button size="btu" type="text" style="background: #E6A23C;">
+            <span class="chakan1">
+              <a :href="downurl + scope.row.filePath" :download="scope.row.fileName">下载</a>
             </span>
           </el-button>
           <el-button
@@ -157,15 +154,13 @@
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['grassrootsregistration:statistics:edit']"
-            >修改</el-button
-          >
+          >修改</el-button>
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['grassrootsregistration:statistics:remove']"
-            >删除</el-button
-          >
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -216,13 +211,12 @@
             placeholder="选择时间"
             class="text"
             value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <FileUpload v-model="fielList" :limit="1" />
         <!-- <el-form-item label="上传文件" prop="unitName">
           <el-input v-model="form.unitName" placeholder="请输入单位名称" />
-        </el-form-item> -->
+        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -236,11 +230,7 @@
       id="chakan"
       :close-on-click-modal="false"
     >
-      <statistics
-        v-if="menuRoleVisible"
-        ref="menuRole"
-        :message="wordInfo"
-      ></statistics>
+      <statistics v-if="menuRoleVisible" ref="menuRole" :message="wordInfo"></statistics>
     </el-dialog>
 
     <!-- 添加预览doc文件弹框 -->
@@ -270,7 +260,7 @@ import {
   delStatistics,
   addStatistics,
   updateStatistics,
-  exportStatistics,
+  exportStatistics
 } from "@/api/grassrootsregistration/statistics";
 import { getDept } from "@/api/grassrootsregistration/bdgleven";
 // 导入树形结构
@@ -285,7 +275,7 @@ export default {
   name: "Statistics",
   components: {
     Treeselect,
-    statistics,
+    statistics
   },
   data() {
     return {
@@ -319,7 +309,7 @@ export default {
         unitId: null,
         shouldBeTo: null,
         actualArrival: null,
-        unitName: null,
+        unitName: null
       },
       // 表单参数
       form: {},
@@ -331,6 +321,8 @@ export default {
       fielList: [],
       open33: false,
       title3: "预览文件",
+      // 下载文件路径
+      downurl: process.env.VUE_APP_BASE_API
     };
   },
   created() {
@@ -349,7 +341,7 @@ export default {
         axios({
           method: "get",
           responseType: "blob", // 设置响应文件格式
-          url: process.env.VUE_APP_BASE_API + row.filePath,
+          url: process.env.VUE_APP_BASE_API + row.filePath
         }).then(({ data }) => {
           $(".doc").attr("id", "printArea");
 
@@ -365,14 +357,14 @@ export default {
     },
     /** 查询部门下拉树结构 */
     getTreeselect() {
-      getDept().then((response) => {
+      getDept().then(response => {
         this.deptOptions = response.data;
       });
     },
     /** 查询军事训练月统计班列表 */
     getList() {
       this.loading = true;
-      listStatistics(this.queryParams).then((response) => {
+      listStatistics(this.queryParams).then(response => {
         this.statisticsList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -390,7 +382,7 @@ export default {
         unitId: null,
         shouldBeTo: null,
         actualArrival: null,
-        unitName: null,
+        unitName: null
       };
       this.fielList = [];
       this.resetForm("form");
@@ -407,7 +399,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -421,10 +413,10 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getStatistics(id).then((response) => {
+      getStatistics(id).then(response => {
         this.form = response.data;
         this.fielList = [
-          { name: response.data.fileName, url: response.data.filePath },
+          { name: response.data.fileName, url: response.data.filePath }
         ];
         this.open = true;
         this.title = "修改军事训练月统计表";
@@ -443,10 +435,10 @@ export default {
     // },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateStatistics(this.form).then((response) => {
+            updateStatistics(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -457,7 +449,7 @@ export default {
               this.form.filePath = this.fielList[0].url;
               this.form.actualArrival = this.fielList[0].houZUI;
             }
-            addStatistics(this.form).then((response) => {
+            addStatistics(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -471,7 +463,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项?")
-        .then(function () {
+        .then(function() {
           return delStatistics(ids);
         })
         .then(() => {
@@ -489,13 +481,13 @@ export default {
           this.exportLoading = true;
           return exportStatistics(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>
@@ -613,4 +605,4 @@ export default {
   color: #fff;
   border-color: #fff !important;
 }
-</style>
+</style>

+ 83 - 169
src/views/peopleChuRu/leaveOne/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="" prop="unitId">
+      <el-form-item label prop="unitId">
         <treeselect
           v-model="queryParams.unitId"
           :options="deptOptions"
@@ -19,7 +19,7 @@
       <el-form-item>
         <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
-        > -->
+        >-->
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -33,8 +33,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['peopleChuRu:leaveOne:add']"
-          >新增</el-button
-        >
+        >新增</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -47,7 +46,7 @@
           v-hasPermi="['peopleChuRu:leaveOne:edit']"
           >修改</el-button
         >
-      </el-col> -->
+      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -57,8 +56,7 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['peopleChuRu:leaveOne:remove']"
-          >删除</el-button
-        >
+        >删除</el-button>
       </el-col>
     </el-row>
 
@@ -72,95 +70,56 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="请假人员" align="center" prop="peopleId" />
-      <el-table-column
-        label="单位"
-        align="center"
-        prop="unitId"
-        :formatter="unit3Format"
-      />
+      <el-table-column label="单位" align="center" prop="unitId" :formatter="unit3Format" />
       <!-- <el-table-column label="单位" align="center" prop="unitName" /> -->
-      <el-table-column
-        label="请假开始时间"
-        align="center"
-        prop="startTime"
-        width="180"
-      >
+      <el-table-column label="请假开始时间" align="center" prop="startTime" width="180">
         <!-- <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.startTime, "{y}-{m}-{d} {h}:{m}:{s}")
           }}</span>
-        </template> -->
+        </template>-->
       </el-table-column>
-      <el-table-column
-        label="请假结束时间"
-        align="center"
-        prop="endTime"
-        width="180"
-      >
+      <el-table-column label="请假结束时间" align="center" prop="endTime" width="180">
         <!-- <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.endTime, "{y}-{m}-{d} {h}:{m}:{s}")
           }}</span>
-        </template> -->
+        </template>-->
       </el-table-column>
       <el-table-column label="请假类型" align="center" prop="leaveType">
         <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.people_state"
-            :value="scope.row.leaveType"
-          />
+          <dict-tag :options="dict.type.people_state" :value="scope.row.leaveType" />
         </template>
       </el-table-column>
-      <el-table-column
-        label="请假原因"
-        align="center"
-        prop="leaveReason"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        label="离队时间"
-        align="center"
-        prop="departureTime"
-        width="180"
-      >
+      <el-table-column label="请假原因" align="center" prop="leaveReason" show-overflow-tooltip />
+      <el-table-column label="离队时间" align="center" prop="departureTime" width="180">
         <!-- <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.departureTime, "{y}-{m}-{d} {h}:{m}:{s}")
           }}</span>
-        </template> -->
+        </template>-->
       </el-table-column>
-      <el-table-column
-        label="归队时间"
-        align="center"
-        prop="returnTime"
-        width="180"
-      >
+      <el-table-column label="归队时间" align="center" prop="returnTime" width="180">
         <!-- <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.returnTime, "{y}-{m}-{d} {h}:{m}:{s}")
           }}</span>
-        </template> -->
+        </template>-->
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.returnTime == null"
             type="text"
             size="btu"
             @click="handleUpdate(scope.row)"
-            >归队</el-button
-          >
+          >归队</el-button>
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['peopleChuRu:leaveOne:remove']"
-            >删除</el-button
-          >
+          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -181,13 +140,7 @@
       width="500px"
       append-to-body
     >
-      <el-form
-        ref="form"
-        :model="form"
-        :rules="rules"
-        label-width="80px"
-        inline
-      >
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" inline>
         <el-form-item label="单位" prop="unitId">
           <treeselect
             v-model="form.unitId"
@@ -210,23 +163,17 @@
               :key="i"
               :label="item.name"
               :value="item.id"
-            >
-            </el-option>
+              @click.native="
+                renYuanname(item.name)
+              "
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="批准部门人" prop="approvalDepartment">
-          <el-input
-            v-model="form.approvalDepartment"
-            type="text"
-            placeholder="请输入批准部门人"
-          />
+          <el-input v-model="form.approvalDepartment" type="text" placeholder="请输入批准部门人" />
         </el-form-item>
         <el-form-item label="请假类型" prop="leaveType">
-          <el-select
-            v-model="form.leaveType"
-            placeholder="请选择请假类型"
-            clearable
-          >
+          <el-select v-model="form.leaveType" placeholder="请选择请假类型" clearable>
             <el-option
               v-for="dict in ziDian"
               :key="dict.dictValue"
@@ -244,8 +191,7 @@
             default-time="00:00:00"
             placeholder="选择请假开始时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="请假结束时间" prop="endTime">
           <el-date-picker
@@ -256,8 +202,7 @@
             default-time="00:00:00"
             placeholder="选择请假结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="离队时间" prop="departureTime">
           <el-date-picker
@@ -268,16 +213,11 @@
             default-time="00:00:00"
             placeholder="请选择离队时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <div class="jiben">请假原因</div>
-        <el-form-item label="" prop="leaveReason">
-          <el-input
-            v-model="form.leaveReason"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+        <el-form-item label prop="leaveReason">
+          <el-input v-model="form.leaveReason" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -293,19 +233,9 @@
       width="500px"
       append-to-body
     >
-      <el-form
-        ref="form1"
-        :model="form1"
-        :rules="rules1"
-        label-width="80px"
-        inline
-      >
+      <el-form ref="form1" :model="form1" :rules="rules1" label-width="80px" inline>
         <el-form-item label="单位" prop="unitId">
-          <treeselect
-            v-model="form1.unitId"
-            :options="deptOptions"
-            placeholder="请选择单位"
-          />
+          <treeselect v-model="form1.unitId" :options="deptOptions" placeholder="请选择单位" />
         </el-form-item>
         <el-form-item label="人员" prop="peopleId">
           <el-select
@@ -315,28 +245,14 @@
             clearable
             filterable
           >
-            <el-option
-              v-for="(item, i) in renYuan"
-              :key="i"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
+            <el-option v-for="(item, i) in renYuan" :key="i" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="批准部门" prop="approvalDepartment">
-          <el-input
-            v-model="form1.approvalDepartment"
-            type="text"
-            placeholder="请输入批准部门人"
-          />
+          <el-input v-model="form1.approvalDepartment" type="text" placeholder="请输入批准部门人" />
         </el-form-item>
         <el-form-item label="请假类型" prop="leaveType">
-          <el-select
-            v-model="form1.leaveType"
-            placeholder="请选择请假类型"
-            clearable
-          >
+          <el-select v-model="form1.leaveType" placeholder="请选择请假类型" clearable>
             <el-option
               v-for="dict in ziDian"
               :key="dict.dictValue"
@@ -354,8 +270,7 @@
             default-time="00:00:00"
             placeholder="选择请假开始时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="请假结束时间" prop="endTime">
           <el-date-picker
@@ -366,8 +281,7 @@
             default-time="00:00:00"
             placeholder="选择请假结束时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="离队时间" prop="departureTime">
           <el-date-picker
@@ -378,8 +292,7 @@
             default-time="00:00:00"
             placeholder="请选择离队时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <el-form-item label="归队时间" prop="returnTime">
           <el-date-picker
@@ -390,16 +303,11 @@
             default-time="00:00:00"
             placeholder="请选择归队时间"
             value-format="yyyy-MM-dd HH:mm:ss"
-          >
-          </el-date-picker>
+          ></el-date-picker>
         </el-form-item>
         <div class="jiben">请假原因</div>
-        <el-form-item label="" prop="leaveReason">
-          <el-input
-            v-model="form1.leaveReason"
-            type="textarea"
-            placeholder="请输入内容"
-          />
+        <el-form-item label prop="leaveReason">
+          <el-input v-model="form1.leaveReason" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -418,12 +326,12 @@ import {
   addLeaveOne,
   updateLeaveOne,
   exportLeaveOne,
-  getDept2,
+  getDept2
 } from "@/api/peopleChuRu/leaveOne";
 import {
   getUser,
   getDept,
-  getQuanBu,
+  getQuanBu
 } from "@/api/grassrootsregistration/bdglmeeting";
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
@@ -431,11 +339,12 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Cookies from "js-cookie";
 // 查询字典
 import { getDicts } from "@/api/system/dict/data";
+import { listPeople } from "@/api/peopleManage/people";
 
 export default {
   name: "LeaveOne",
   components: {
-    Treeselect,
+    Treeselect
   },
   dicts: ["people_state"],
   data() {
@@ -497,22 +406,22 @@ export default {
         peopleName4: null,
         reasons: null,
         specialApproval: null,
-        actualreturntime: null,
+        actualreturntime: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         startTime: [
-          { required: true, message: "开始不能为空", trigger: "blur" },
+          { required: true, message: "开始不能为空", trigger: "blur" }
         ],
         unitId: [{ required: true, message: "单位不能为空", trigger: "blur" }],
         peopleId: [
-          { required: true, message: "请假人员不能为空", trigger: "blur" },
+          { required: true, message: "请假人员不能为空", trigger: "blur" }
         ],
         approvalDepartment: [
-          { required: true, message: "批准部门人不能为空", trigger: "blur" },
-        ],
+          { required: true, message: "批准部门人不能为空", trigger: "blur" }
+        ]
       },
       // 树形结构列表
       deptOptions: [],
@@ -520,7 +429,7 @@ export default {
       unitlist: [],
       // 查询字典请假列表
       dictType: {
-        dictType: "people_state",
+        dictType: "people_state"
       },
       // 字典的列表
       ziDian: [],
@@ -529,20 +438,20 @@ export default {
       form1: {},
       rules1: {
         returnTime: [
-          { required: true, message: "归队时间不能为空", trigger: "blur" },
+          { required: true, message: "归队时间不能为空", trigger: "blur" }
         ],
         startTime: [
-          { required: true, message: "开始不能为空", trigger: "blur" },
+          { required: true, message: "开始不能为空", trigger: "blur" }
         ],
         unitId: [{ required: true, message: "单位不能为空", trigger: "blur" }],
         peopleId: [
-          { required: true, message: "请假人员不能为空", trigger: "blur" },
+          { required: true, message: "请假人员不能为空", trigger: "blur" }
         ],
         approvalDepartment: [
-          { required: true, message: "批准部门人不能为空", trigger: "blur" },
-        ],
+          { required: true, message: "批准部门人不能为空", trigger: "blur" }
+        ]
       },
-      open1: false,
+      open1: false
     };
   },
   created() {
@@ -552,21 +461,26 @@ export default {
     this.getdict();
   },
   mounted() {
-    getDept2().then((res) => {
+    getDept2().then(res => {
       this.unitlist = res.data;
     });
   },
   methods: {
+    renYuanname(name) {
+      listPeople({ name: name }).then(response => {
+        this.form.leaveType = response.rows[0].reign + "";
+      });
+    },
     // 查询请假类型
     getdict() {
-      getDicts(this.dictType.dictType).then((res) => {
-        res.data.splice(0, 1);
+      getDicts("people_state").then(res => {
+        // res.data.splice(0, 1);
         this.ziDian = res.data;
       });
     },
     unit3Format(row, column) {
       var deptName = "";
-      this.unitlist.map((item) => {
+      this.unitlist.map(item => {
         if (item.deptId == row.unitId) {
           deptName = item.deptName;
         }
@@ -575,7 +489,7 @@ export default {
     },
     // 获取部门列表
     getBuMeng() {
-      getDept().then((res) => {
+      getDept().then(res => {
         this.deptOptions = res.data;
       });
     },
@@ -604,13 +518,13 @@ export default {
     },
     // 获取用户列表
     getYong(id) {
-      getUser(id).then((res) => {
+      getUser(id).then(res => {
         this.yongHu = res.data;
       });
     },
     // 获取人员
     getRen(id, num) {
-      getQuanBu(id, num).then((response) => {
+      getQuanBu(id, num).then(response => {
         this.renYuan = response.data;
       });
     },
@@ -627,7 +541,7 @@ export default {
       this.loading = true;
       // 获取单位树形
       this.getBuMeng();
-      listLeaveOne(this.queryParams).then((response) => {
+      listLeaveOne(this.queryParams).then(response => {
         this.leaveOneList = response.rows;
         this.chaoFn(response.rows);
         this.total = response.total;
@@ -647,7 +561,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -697,14 +611,14 @@ export default {
         peopleName4: null,
         reasons: null,
         specialApproval: null,
-        actualreturntime: null,
+        actualreturntime: null
       };
       this.form1 = {
         id: null,
         peopleId: null,
         unitId: null,
         startTime: null,
-        endTime: null,
+        endTime: null
       };
       this.resetForm("form");
       this.resetForm("form1");
@@ -731,7 +645,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getLeaveOne(id).then((response) => {
+      getLeaveOne(id).then(response => {
         this.result = response.data;
         this.form1 = this.result;
         // 获取单位树形
@@ -743,9 +657,9 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
-          addLeaveOne(this.form).then((response) => {
+          addLeaveOne(this.form).then(response => {
             this.$modal.msgSuccess("新增成功");
             this.open = false;
             this.getList();
@@ -754,9 +668,9 @@ export default {
       });
     },
     submitForm1() {
-      this.$refs["form1"].validate((valid) => {
+      this.$refs["form1"].validate(valid => {
         if (valid) {
-          updateLeaveOne(this.form1).then((response) => {
+          updateLeaveOne(this.form1).then(response => {
             this.$modal.msgSuccess("人员归队成功");
             this.open1 = false;
             this.getList();
@@ -769,7 +683,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除人员请假的数据项?")
-        .then(function () {
+        .then(function() {
           return delLeaveOne(ids);
         })
         .then(() => {
@@ -787,13 +701,13 @@ export default {
           this.exportLoading = true;
           return exportLeaveOne(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
         .catch(() => {});
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>

+ 95 - 167
src/views/peopleManage/people/index.vue

@@ -490,10 +490,9 @@
               size="mini"
               @click="handleAdd"
               v-hasPermi="['peopleManage:people:add']"
-              >新增</el-button
-            >
+            >新增</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="success"
               plain
@@ -504,7 +503,7 @@
               v-hasPermi="['peopleManage:people:edit']"
               >修改</el-button
             >
-          </el-col>
+          </el-col>-->
           <el-col :span="1.5">
             <el-button
               type="danger"
@@ -514,8 +513,7 @@
               :disabled="multiple"
               @click="handleDelete"
               v-hasPermi="['peopleManage:people:remove']"
-              >删除</el-button
-            >
+            >删除</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -552,96 +550,49 @@
           <el-table-column label="姓名" align="center" prop="name" />
           <el-table-column label="性别" align="center" prop="sex">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.sys_user_sex"
-                :value="scope.row.sex"
-              />
+              <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
             </template>
           </el-table-column>
           <el-table-column label="年龄" align="center" prop="age" />
-          <el-table-column
-            label="身份证号"
-            align="center"
-            prop="idcard"
-            width="170"
-          />
-          <el-table-column
-            label="部职别"
-            align="center"
-            width="300"
-            prop="duty"
-          />
-          <el-table-column
-            label="职务"
-            align="center"
-            width="120"
-            prop="postId"
-          >
+          <el-table-column label="身份证号" align="center" prop="idcard" width="170" />
+          <el-table-column label="部职别" align="center" width="300" prop="duty" />
+          <el-table-column label="职务" align="center" width="120" prop="postId">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.post_Level"
-                :value="scope.row.postId"
-              />
+              <dict-tag :options="dict.type.post_Level" :value="scope.row.postId" />
             </template>
           </el-table-column>
           <!-- <el-table-column label="等级" align="center" prop="gradeId" /> -->
-          <el-table-column
-            label="职务等级时间"
-            align="center"
-            prop="postDate"
-            width="180"
-          >
+          <el-table-column label="职务等级时间" align="center" prop="postDate" width="180">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.postDate, "{y}-{m}-{d}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="籍贯"
-            align="center"
-            prop="origin"
-            width="150"
-          />
-          <el-table-column
-            label="在位情况"
-            align="center"
-            prop="reign"
-            width="90"
-          >
+          <el-table-column label="籍贯" align="center" prop="origin" width="150" />
+          <el-table-column label="在位情况" align="center" prop="reign" width="90">
             <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.people_state"
-                :value="scope.row.reign"
-              />
+              <dict-tag :options="dict.type.people_state" :value="scope.row.reign" />
             </template>
           </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="200"
-            fixed="right"
-          >
+          <el-table-column label="操作" align="center" width="200" fixed="right">
             <template slot-scope="scope">
               <el-button
                 size="btu"
                 type="text"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['peopleManage:people:edit']"
-                >修改</el-button
-              >
+              >修改</el-button>
               <el-button
                 size="btk"
                 type="text"
                 @click="handlesee(scope.row)"
                 v-hasPermi="['peopleManage:people:query']"
-                >查看</el-button
-              >
+              >查看</el-button>
               <el-button
                 size="btd"
                 type="text"
                 @click="handleDelete(scope.row)"
                 v-hasPermi="['peopleManage:people:remove']"
-                >删除</el-button
-              >
+              >删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -665,13 +616,7 @@
       :close-on-click-modal="false"
     >
       <div class="userAgree" style="overflow: -Scroll; overflow-x: hidden">
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          :inline="true"
-          label-width="120px"
-        >
+        <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
           <div class="jiben">基本信息</div>
           <div class="div-box-title1">
             <span>个人信息</span>
@@ -684,11 +629,7 @@
                   <el-input v-model="form.name" placeholder />
                 </el-form-item>
                 <el-form-item label="身份证号" prop="idcard">
-                  <el-input
-                    v-model="form.idcard"
-                    placeholder
-                    @blur="idcardfun()"
-                  />
+                  <el-input v-model="form.idcard" placeholder @blur="idcardfun()" />
                 </el-form-item>
               </el-row>
               <el-row>
@@ -745,11 +686,7 @@
                 <img src="@/assets/images/提示.png" alt />
               </div>
               <el-form-item prop="pictureUploading" class="personphoto">
-                <imageUpload
-                  :limit="1"
-                  v-model="form.avatar"
-                  style="height: 200px"
-                />
+                <imageUpload :limit="1" v-model="form.avatar" style="height: 200px" />
               </el-form-item>
             </div>
           </div>
@@ -1035,7 +972,7 @@
             v-for="(item, index) in jtlist"
             :key="index"
           >
-            <el-form-item label="姓名" prop="">
+            <el-form-item label="姓名" prop>
               <el-input v-model="item.name" placeholder />
             </el-form-item>
             <el-form-item label="与本人关系" prop="characterRelationship">
@@ -1083,12 +1020,7 @@
             <el-input v-model="form.prize" type="textarea" placeholder />
           </el-form-item>
           <div class="jiben">简历</div>
-          <el-form-item
-            label
-            label-width="0px"
-            class="laborcontractuploading"
-            prop="readmeFile"
-          >
+          <el-form-item label label-width="0px" class="laborcontractuploading" prop="readmeFile">
             <fileUpload v-model="form.readmeFile" class="m-l-20" />
           </el-form-item>
           <!-- <el-form-item label prop="readmeFile">
@@ -1097,9 +1029,7 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="btnflg"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="submitForm" v-if="btnflg">确 定</el-button>
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
@@ -1116,7 +1046,7 @@ import {
   exportPeople,
   getDept,
   listDept,
-  treeselect,
+  treeselect
 } from "@/api/peopleManage/people";
 import Cookies from "js-cookie";
 
@@ -1136,7 +1066,7 @@ export default {
     "bloodType",
     "sys_yes_no",
     "sys_yes_no",
-    "people_state",
+    "people_state"
   ],
   data() {
     return {
@@ -1227,7 +1157,7 @@ export default {
         userId: null,
         nowMilitaryRank: null,
         treatmentLevel: null,
-        rankUpgradeTime: null,
+        rankUpgradeTime: null
       },
       // 表单参数
       form: {},
@@ -1237,78 +1167,77 @@ export default {
         idcard: [
           { required: true, message: "身份证号不能为空", trigger: "blur" },
           {
-            pattern:
-              /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
+            pattern: /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/,
             message: "请输入正确的身份证号",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         nationId: [
-          { required: true, message: "民族不能为空", trigger: "blur" },
+          { required: true, message: "民族不能为空", trigger: "blur" }
         ],
         sex: [{ required: true, message: "性别不能为空", trigger: "blur" }],
         age: [{ required: true, message: "年龄不能为空", trigger: "blur" }],
         birthDate: [
-          { required: true, message: "出生年月不能为空", trigger: "blur" },
+          { required: true, message: "出生年月不能为空", trigger: "blur" }
         ],
         origin: [{ required: true, message: "籍贯不能为空", trigger: "blur" }],
         live: [
-          { required: true, message: "家庭住址不能为空", trigger: "blur" },
+          { required: true, message: "家庭住址不能为空", trigger: "blur" }
         ],
         partyId: [
-          { required: true, message: "政治面貌不能为空", trigger: "change" },
+          { required: true, message: "政治面貌不能为空", trigger: "change" }
         ],
         healthy: [
-          { required: true, message: "健康情况不能为空", trigger: "change" },
+          { required: true, message: "健康情况不能为空", trigger: "change" }
         ],
         marryList: [
-          { required: true, message: "婚姻情况不能为空", trigger: "change" },
+          { required: true, message: "婚姻情况不能为空", trigger: "change" }
         ],
         educationId: [
-          { required: true, message: "学历不能为空", trigger: "change" },
+          { required: true, message: "学历不能为空", trigger: "change" }
         ],
         admissionTime: [
-          { required: true, message: "入学时间不能为空", trigger: "change" },
+          { required: true, message: "入学时间不能为空", trigger: "change" }
         ],
         graduationDate: [
-          { required: true, message: "毕业时间不能为空", trigger: "change" },
+          { required: true, message: "毕业时间不能为空", trigger: "change" }
         ],
         school: [
-          { required: true, message: "毕业学校不能为空", trigger: "blur" },
+          { required: true, message: "毕业学校不能为空", trigger: "blur" }
         ],
         phone: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         phoneStandby: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
+            trigger: "blur"
+          }
         ],
         enlistDate: [
-          { required: true, message: "入伍时间不能为空", trigger: "change" },
+          { required: true, message: "入伍时间不能为空", trigger: "change" }
         ],
         authorizedStrength: [
-          { required: true, message: "是否编制不能为空", trigger: "change" },
+          { required: true, message: "是否编制不能为空", trigger: "change" }
         ],
         deptId: [
-          { required: true, message: "单位不能为空", trigger: "change" },
+          { required: true, message: "单位不能为空", trigger: "change" }
         ],
-        rankId:[
-          { required: true, message: "军衔不能为空", trigger: "change" },
+        rankId: [
+          { required: true, message: "军衔不能为空", trigger: "change" }
         ],
-        nowMilitaryRank:[
-          { required: true, message: "现军衔不能为空", trigger: "change" },
-        ],
-        postId:[
-          { required: true, message: "职务层级不能为空", trigger: "change" },
+        nowMilitaryRank: [
+          { required: true, message: "现军衔不能为空", trigger: "change" }
         ],
+        postId: [
+          { required: true, message: "职务层级不能为空", trigger: "change" }
+        ]
         // name: [{ required: true, message: "亲属姓名不能为空", trigger: "blur" }]
         // jtname:[{ validator: jtnameblur, trigger: "blur" }],
         // characterRelationship: [
@@ -1323,7 +1252,6 @@ export default {
         //   }
         // ],
         // unitName: [{ required: true, message: "单位不能为空", trigger: "blur" }]
-        
       },
       //性别数组
       sexList: [],
@@ -1359,16 +1287,16 @@ export default {
           name: null,
           characterRelationship: null,
           phoneNumber: null,
-          unitName: null,
-        },
+          unitName: null
+        }
       ],
       defaultProps: {
         children: "children",
-        label: "label",
+        label: "label"
       },
       deptOptions: [],
       value: null,
-      btnflg: false,
+      btnflg: false
     };
   },
   created() {
@@ -1378,64 +1306,64 @@ export default {
     // Cookies.set("shuaxin", "true");
     this.getList();
     //性别
-    this.getDicts("sys_user_sex").then((response) => {
+    this.getDicts("sys_user_sex").then(response => {
       this.sexList = response.data;
     });
     //血型
-    this.getDicts("bloodType").then((response) => {
+    this.getDicts("bloodType").then(response => {
       this.bloodType = response.data;
     });
     //政治面貌
-    this.getDicts("Caucus").then((response) => {
+    this.getDicts("Caucus").then(response => {
       this.partyIds = response.data;
     });
     //健康情况
-    this.getDicts("healthy").then((response) => {
+    this.getDicts("healthy").then(response => {
       this.healthy = response.data;
     });
     //婚姻情况
-    this.getDicts("marryList").then((response) => {
+    this.getDicts("marryList").then(response => {
       this.marryList = response.data;
     });
     //学历
-    this.getDicts("Degree_level").then((response) => {
+    this.getDicts("Degree_level").then(response => {
       this.educationId = response.data;
     });
     //婚姻情况
-    this.getDicts("degree").then((response) => {
+    this.getDicts("degree").then(response => {
       this.degree = response.data;
     });
     //是否编制
-    this.getDicts("sys_yes_no").then((response) => {
+    this.getDicts("sys_yes_no").then(response => {
       this.authorizedStrength = response.data;
     });
     //子女情况
-    this.getDicts("sys_yw").then((response) => {
+    this.getDicts("sys_yw").then(response => {
       this.childrenList = response.data;
     });
     //人员类别
-    this.getDicts("personnel_type").then((response) => {
+    this.getDicts("personnel_type").then(response => {
       this.classId = response.data;
     });
     //职务层级
-    this.getDicts("post_Level").then((response) => {
+    this.getDicts("post_Level").then(response => {
       this.postIds = response.data;
     });
     //军衔
-    this.getDicts("sys_user_rank").then((response) => {
+    this.getDicts("sys_user_rank").then(response => {
       this.rankIds = response.data;
     });
     //民族
-    this.getDicts("sys_familyName").then((response) => {
+    this.getDicts("sys_familyName").then(response => {
       this.nationIds = response.data;
     });
     //部门数据
-    getDept().then((res) => {
+    getDept().then(res => {
       if (res.code == 200) {
         this.unitId = res.data;
       }
     });
-    treeselect().then((res) => {
+    treeselect().then(res => {
       if (res.code == 200) {
         this.deptOptions = res.data;
       }
@@ -1445,7 +1373,7 @@ export default {
     //单位翻译
     deptIdformatter(row, column) {
       var deptName = "";
-      this.unitId.map((item) => {
+      this.unitId.map(item => {
         if (item.deptId == row.deptId) {
           deptName = item.deptName;
         }
@@ -1455,7 +1383,7 @@ export default {
     /** 查询人员管理列表 */
     getList() {
       this.loading = true;
-      listPeople(this.queryParams).then((response) => {
+      listPeople(this.queryParams).then(response => {
         this.peopleList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1533,7 +1461,7 @@ export default {
         rankUpgradeTime: null,
         phoneStandby: null,
         deptName: null,
-        isBianzhi: null,
+        isBianzhi: null
       };
       this.bdglPeopleList = [];
       this.resetForm("form");
@@ -1550,7 +1478,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -1565,15 +1493,15 @@ export default {
           name: null,
           characterRelationship: null,
           phoneNumber: null,
-          unitName: null,
-        },
+          unitName: null
+        }
       ];
     },
     /** 查看按钮操作 */
     handlesee(row) {
       this.reset();
       const id = row.id || this.ids;
-      getPeople(id).then((response) => {
+      getPeople(id).then(response => {
         this.form = response.data;
         this.jtlist = response.data.familyInformation;
         //家庭人员判空处理
@@ -1585,8 +1513,8 @@ export default {
               name: null,
               characterRelationship: null,
               phoneNumber: null,
-              unitName: null,
-            },
+              unitName: null
+            }
           ];
         }
         this.bdglPeopleList = response.data.bdglPeopleList;
@@ -1599,7 +1527,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getPeople(id).then((response) => {
+      getPeople(id).then(response => {
         this.form = response.data;
         //家庭人员判空处理
         if (this.form.familyInformation.length > 0) {
@@ -1610,8 +1538,8 @@ export default {
               name: null,
               characterRelationship: null,
               phoneNumber: null,
-              unitName: null,
-            },
+              unitName: null
+            }
           ];
         }
 
@@ -1623,7 +1551,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.readmeFile) {
             this.form.readmeFile = this.form.readmeFile[0].name;
@@ -1632,7 +1560,7 @@ export default {
           this.form.bdglPeopleList = this.bdglPeopleList;
           this.form.familyInformation = this.jtlist;
           if (this.form.id != null) {
-            updatePeople(this.form).then((response) => {
+            updatePeople(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -1640,7 +1568,7 @@ export default {
           } else {
             this.form.familyInformation = this.jtlist;
             this.form.deptName = this.$refs["deptId"].selectedLabel;
-            addPeople(this.form).then((response) => {
+            addPeople(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -1654,7 +1582,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除人员管理的数据项?")
-        .then(function () {
+        .then(function() {
           return delPeople(ids);
         })
         .then(() => {
@@ -1738,14 +1666,14 @@ export default {
       } else {
         const bdglPeopleList = this.bdglPeopleList;
         const checkedBdglPeople = this.checkedBdglPeople;
-        this.bdglPeopleList = bdglPeopleList.filter(function (item) {
+        this.bdglPeopleList = bdglPeopleList.filter(function(item) {
           return checkedBdglPeople.indexOf(item.index) == -1;
         });
       }
     },
     /** 复选框选中数据 */
     handleBdglPeopleSelectionChange(selection) {
-      this.checkedBdglPeople = selection.map((item) => item.index);
+      this.checkedBdglPeople = selection.map(item => item.index);
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1756,7 +1684,7 @@ export default {
           this.exportLoading = true;
           return exportPeople(queryParams);
         })
-        .then((response) => {
+        .then(response => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -1768,7 +1696,7 @@ export default {
         name: null,
         characterRelationship: null,
         phoneNumber: null,
-        unitName: null,
+        unitName: null
       });
     },
     //删除家庭成员
@@ -1789,7 +1717,7 @@ export default {
         this.form.idcard.substr(12, 2);
       var myDate = new Date();
       this.form.age = myDate.getFullYear() - this.form.idcard.substr(6, 4);
-      listPeople({ idcard: this.form.idcard }).then((response) => {
+      listPeople({ idcard: this.form.idcard }).then(response => {
         if (response.rows.length > 0) {
           this.form.idcard = null;
           this.form.age = null;
@@ -1808,8 +1736,8 @@ export default {
     handleNodeClick(data) {
       this.queryParams.deptId = data.id;
       this.getList();
-    },
-  },
+    }
+  }
 };
 </script>
 <style scoped>