Merge branch 'master' of ssh://ops.weface.com.cn:8022/zhangdishen/xichonght into dev

xichongSys/src/http/moudules/user.js

 import axios from '../axios'
 
-/* 
+/*
  * 用户管理模块
  */
 
@@ -15,7 +15,7 @@ export const save = (data) => {
 // 删除
 export const batchDelete = (data) => {
     return axios({
-        url: '/user/forbiddenUser',
+        url: '/user/updateUserStatus',
         method: 'post',
         data
     })
@@ -35,4 +35,4 @@ export const findPermissions = (params) => {
         method: 'get',
         params
     })
-}
+}
\ No newline at end of file

xichongSys/src/mock/modules/user.js

-/* 
+/*
  * 用户管理模块
  */
 
@@ -17,7 +17,7 @@ export function save() {
 // 批量删除
 export function batchDelete() {
   return {
-    url: '/user/forbiddenUser',
+    url: '/user/updateUserStatus',
     type: 'post',
     data: {
       "code": 200,
@@ -114,4 +114,4 @@ export function findPermissions() {
     type: 'get',
     data: permsData
   }
-}
+}
\ No newline at end of file

xichongSys/src/router/index.js

@@ -25,6 +25,10 @@ import receivePersonnel from "@/views/Myvue/receivePersonnel";
 import AllbaseInfo from "@/views/Myvue/allbaseInfo"
 import PayInfo from "@/views/Myvue/payInfo"
 import application from "@/views/Myvue/application"
+import importByExcel from "@/views/Myvue/importByExcel"
+import treatmentApplicationAudit from "@/views/Myvue/treatmentApplicationAudit"
+import insuranceCancellationAudit from "@/views/Myvue/insuranceCancellationAudit"
+
 Vue.use(Router)
 
 const router = new Router({
@@ -121,7 +125,23 @@ const router = new Router({
           path:"/application",
           name:"待遇申请审核",
           component: application
+        },
+        {
+          path:"/importByExcel",
+          name:"数据导入",
+          component: importByExcel
+        },
+        // {
+        //   path:"/treatmentApplicationAudit",
+        //   name:"待遇申请审核",
+        //   component: treatmentApplicationAudit
+        // },
+        {
+          path:"/insuranceCancellationAudit",
+          name:"参保注销审核",
+          component: insuranceCancellationAudit
         }
+
       ]
     },
     {

xichongSys/src/views/Core/KtTable.vue

 <template>
   <div>
     <!--表格栏-->
-    <el-table :data="data.content" :highlight-current-row="highlightCurrentRow" @selection-change="selectionChange" 
+    <el-table :data="data.content" :highlight-current-row="highlightCurrentRow" @selection-change="selectionChange"
           @current-change="handleCurrentChange" v-loading="loading" :element-loading-text="$t('action.loading')" :border="border" :stripe="stripe"
           :show-overflow-tooltip="showOverflowTooltip" :max-height="maxHeight" :height="height" :size="size" :align="align" style="width:100%;" >
       <el-table-column type="selection" width="40" v-if="showBatchDelete & showOperation"></el-table-column>
       <el-table-column v-for="column in columns" header-align="center" align="center"
-        :prop="column.prop" :label="column.label" :width="column.width" :min-width="column.minWidth" 
+        :prop="column.prop" :label="column.label" :width="column.width" :min-width="column.minWidth"
         :fixed="column.fixed" :key="column.prop" :type="column.type" :formatter="column.formatter"
         :sortable="column.sortable==null?true:column.sortable">
       </el-table-column>
       <el-table-column :label="$t('action.operation')" width="185" fixed="right" v-if="showOperation" header-align="center" align="center">
         <template slot-scope="scope">
-          <kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" />
-          <kt-button icon="fa fa-trash" label="禁用" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />
+          <kt-button icon="fa fa-edit" :label="$t('action.edit')" :perms="permsEdit" :size="size" @click="handleEdit(scope.$index, scope.row)" style="float: left"/>
+          <div v-if="scope.row.status == 1">
+            <kt-button icon="fa fa-trash" label="禁用" :perms="permsDelete" :size="size" type="danger" @click="handleDelete(scope.$index, scope.row)" />
+          </div>
+          <div v-else>
+            <kt-button icon="fa fa-check-circle" label="启用" :perms="permsDelete" :size="size" type="success" @click="handleDelete(scope.$index, scope.row)" />
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -21,7 +26,7 @@
     <div class="toolbar" style="padding:10px;">
       <!-- <kt-button :label="$t('action.batchDelete')" :perms="permsDelete" :size="size" type="danger" @click="handleBatchDelete()"  -->
         <!-- :disabled="this.selections.length===0" style="float:left;" v-if="showBatchDelete & showOperation"/> -->
-      <el-pagination layout="total, prev, pager, next, jumper" @current-change="refreshPageRequest" 
+      <el-pagination layout="total, prev, pager, next, jumper" @current-change="refreshPageRequest"
         :current-page="pageRequest.pageNum" :page-size="pageRequest.pageSize" :total="data.totalSize" style="float:right;">
       </el-pagination>
     </div>
@@ -130,7 +135,7 @@ export default {
 		},
 		// 删除操作
 		delete: function (ids) {
-			this.$confirm('确认禁用选中记录吗？', '提示', {
+			this.$confirm('确认操作选中记录吗？', '提示', {
 				type: 'warning'
 			}).then(() => {
 				let params = []
@@ -161,4 +166,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>
\ No newline at end of file

xichongSys/src/views/Myvue/drdysq.vue

@@ -60,26 +60,27 @@
     methods: {
       toPdf(s, d) {
         console.log(d)
-        // axios.get(baseUrl + '/exportPdf/insuredRegistration?id=' + d.eventId, {
-        //   headers: {
-        //     "token": Cookies.get("token")
-        //   },
-        //   responseType: 'blob'      //告诉服务器我们需要的响应格式
-        // })
-        //   .then(res => {
-        //     let a = document.createElement("a");
-        //     let blob = new Blob([res.data], {
-        //       type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
-        //     });
-        //     a.href = URL.createObjectURL(blob);  //生成一个url
-        //     a.download = "西充县城乡居民社会养老保险待遇领取审核表.pdf";
-        //     a.click();
-        //     // let objectUrl = URL.createObjectURL(blob);  //生成一个url
-        //     // window.location.href = objectUrl;   //浏览器打开这个url
-        //   })
-        //   .catch(err => {
-        //     console.log(err);
-        //   });
+        axios.get(baseUrl + '/exportPdf/specialAudit?id=' + d.eventId, {
+          headers: {
+            "token": Cookies.get("token")
+          },
+          responseType: 'blob'      //告诉服务器我们需要的响应格式
+        })
+          .then(res => {
+            let a = document.createElement("a");
+            let blob = new Blob([res.data], {
+              type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
+            });
+            a.href = URL.createObjectURL(blob);  //生成一个url
+            a.download = "西充县城乡居民社会养老保险待遇领取审核表.pdf";
+            a.click();
+            // let objectUrl = URL.createObjectURL(blob);  //生成一个url
+            // window.location.href = objectUrl;   //浏览器打开这个url
+          })
+          .catch(err => {
+            console.log(err);
+          });
+
       },
       current_change(s) {
         var data = {
@@ -93,8 +94,10 @@
             loadingInstance.close();
           });
           if (res.code == 200) {
-            this.tableData = res.data.result
-            this.totals = res.data.total
+            this.tableData = res.data.content
+            this.totals = res.data.totalSize
+            this.pageNum = res.data.pageNum
+
           }
 
         }).catch((res) => {

xichongSys/src/views/Myvue/drxxbg.vue

@@ -67,7 +67,7 @@
     >
 
     </el-pagination>
-    <el-button type="success" @click="toexcel" style="margin:50px">导出</el-button>
+    <el-button type="success" @click="toexcel" style="margin:50px">全部导出</el-button>
   </div>
 </template>
 <script>
@@ -120,7 +120,7 @@
             loadingInstance.close();
           });
           if (res.code == 200) {
-            this.tableData = res.data.result
+            this.tableData = res.data.content
             this.totals = res.data.totalSize
           }
 

xichongSys/src/views/Myvue/dryhkbg.vue

@@ -46,7 +46,7 @@
     >
 
     </el-pagination>
-    <el-button type="success" @click="toexcel" style="margin:50px">导出</el-button>
+    <el-button type="success" @click="toexcel" style="margin:50px">全部导出</el-button>
   </div>
 </template>
 <script>

xichongSys/src/views/Myvue/importByExcel.vue

+<template>
+  <div>
+    <el-tabs type="border-card">
+      <el-tab-pane label="参保覆盖人员" v-loading="loading">
+        <div style="width: 25%;float: left">
+          <el-upload
+            class="upload-demo"
+            ref="upload1"
+            :action="baseInfoUrl"
+            multiple
+            drag
+            accept=".xls,.xlsx"
+            :limit="5"
+            :headers="myHeader"
+            :before-upload="handleBeforeUpload"
+            :file-list="fileList"
+            :on-exceed="handleExceed"
+            :on-success="uploadSuccess"
+            :auto-upload="false">
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
+          </el-upload>
+          <el-button style="margin-top: 10px" size="small" type="success" @click="submitUpload1">数据导入</el-button>
+        </div>
+        <div style="width: 75%;float: left">
+          <el-alert
+            align="left"
+            title="请上传格式完全相同的excel,格式如下:"
+            type="warning"
+            description="统筹区,街道或乡镇名称,社区名称,所属组,户口所在地,户口性质,个人编号,证件号码,姓名,性别,民族,出生日期,险种类型,参保状态,是否老农保,缴费状态,缴费档次,人员类别,离退休标志,个人身份,参保日期,档案编号"
+            show-icon>
+          </el-alert>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="缴费情况明细">
+        <el-upload
+          class="upload-demo"
+          ref="upload2"
+          action="/"
+          multiple
+          accept=".xls,.xlsx"
+          :limit="5"
+          :headers="myHeader"
+          :before-upload="handleBeforeUpload"
+          :file-list="fileList"
+          :on-exceed="handleExceed"
+          :auto-upload="false">
+          <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload2">数据导入</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
+        </el-upload>
+      </el-tab-pane>
+      <el-tab-pane label="领取人员">
+        <el-upload
+          class="upload-demo"
+          ref="upload3"
+          action="/"
+          multiple
+          accept=".xls,.xlsx"
+          :limit="5"
+          :headers="myHeader"
+          :before-upload="handleBeforeUpload"
+          :file-list="fileList"
+          :on-exceed="handleExceed"
+          :auto-upload="false">
+          <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+          <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload3">数据导入</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传xls/xlsx文件,一次最多只能上传5个文件</div>
+        </el-upload>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+  import {baseUrl} from "../../utils/global";
+  import Cookies from "js-cookie";
+
+  let uploadedList = [];
+  export default {
+    name: "importByExcel",
+    data() {
+      return {
+        baseInfoUrl: baseUrl + "/baseInfo/importFromNewExcel",
+        myHeader: {
+          token: Cookies.get("token")
+        },
+        fileList: []
+      };
+    },
+    methods: {
+      submitUpload1() {
+        this.$refs.upload1.submit();
+      },
+      submitUpload2() {
+        this.$refs.upload2.submit();
+      },
+      submitUpload3() {
+        this.$refs.upload3.submit();
+      },
+      handleExceed() {
+        this.$message.warning("当前限制选择 1 个文件，请删除后继续上传");
+      },
+      handleBeforeUpload(file) {
+        if (!file.name.endsWith(".xls") && !file.name.endsWith(".xlsx")) {
+          this.$message.warning(file.name + "不是excel文件");
+          return false;
+        }
+        // if (uploadedList.includes(file.name)) {
+        //   this.$message.warning(file.name + "已被选中过,请勿重复选择");
+        //   return false;
+        // }
+        // uploadedList.push(file.name);
+      },
+      uploadSuccess(response) {
+        console.log(response)
+        this.$alert(response.data, '导入结果', {
+          confirmButtonText: '确定',
+          callback: action => {
+            // this.$message({
+            //   type: 'info',
+            //   message: `action: ${ action }`
+            // });
+          }
+        });
+        // this.$message.success({
+        //   message: response.data,
+        //   duration: 0,
+        //   showClose: true
+        // })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

xichongSys/src/views/Myvue/receivePersonnel.vue

@@ -24,8 +24,7 @@
     <el-table
       :data="tableData"
       style="width: 100%"
-      stripe
-      :row-class-name="tableRowClassName">
+      stripe>
       <el-table-column
         prop="idcard"
         label="身份证号"