领取人员

xichongSys/src/http/moudules/getlist.js

@@ -131,4 +131,11 @@ export const listAllBaseInfo = (data) => {
       data
     })
   }
-  
+//领取人员查询
\ No newline at end of file
+export const getGrantList = (data) => {
+  return axios({
+    url: '/grantInfo/getGrantList',
+    method: 'post',
+    data
+  })
+}

xichongSys/src/views/Myvue/receivePersonnel.vue

@@ -2,13 +2,13 @@
   <div>
     <div class="op">
       <div class="nam">
-        <el-input v-model="name" size="mini" placeholder="请输入姓名"></el-input>
+        <el-input v-model="name" size="mini" placeholder="请输入姓名" clearable></el-input>
       </div>
       <div class="idc">
-        <el-input v-model="idcard" size="mini" placeholder="请输入身份证号"></el-input>
+        <el-input v-model="idCard" size="mini" placeholder="请输入身份证号" clearable></el-input>
       </div>
-      <div class="ywtyoe">
-        <el-select v-model="ywtype" placeholder="请选择业务类型" size="mini">
+      <div class="grantState">
+        <el-select v-model="grantState" placeholder="请选择待遇发放状态" size="mini" clearable>
           <el-option
             v-for="item in options1"
             :key="item.value"
@@ -17,15 +17,8 @@
           </el-option>
         </el-select>
       </div>
-      <div>
-        <!-- <el-cascader
-          size="mini"
-          :options="list"
-          :props="{ checkStrictly: true }"
-          clearable></el-cascader> -->
-      </div>
       <el-button type="primary" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-search"
-                 @click="serch">搜索
+                 @click="search">搜索
       </el-button>
     </div>
     <el-table
@@ -36,87 +29,66 @@
       <el-table-column
         prop="idcard"
         label="身份证号"
-        width="180">
+        min-width="15%">
       </el-table-column>
       <el-table-column
         prop="name"
         label="姓名"
-        width="100">
-      </el-table-column>
-      <el-table-column
-        prop="recordtype"
-        width="150"
-        label="业务类型">
+        min-width="10%">
       </el-table-column>
       <el-table-column
-        prop="createtime"
-        width="200"
-        label="创建时间">
+        prop="grantState"
+        min-width="15%"
+        label="待遇发放状态">
       </el-table-column>
       <el-table-column
-        prop="townname"
-        width="150"
-        label="镇">
+        prop="lastGrantMonth"
+        min-width="10%"
+        label="最大发放期">
       </el-table-column>
       <el-table-column
-        prop="villagename"
-        label="村">
+        prop="treatAsMonths"
+        min-width="10%"
+        label="视同缴费月数">
       </el-table-column>
       <el-table-column
-        prop="nowExamine"
-        label="当前状态">
+        prop="realMonths"
+        min-width="10%"
+        label="实际缴费月数">
       </el-table-column>
       <el-table-column
-        width="180"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-s-check"
-            @click="handle(scope.$index, scope.row)">查看
-          </el-button>
-          <el-popover
-            placement="right"
-            width="180"
-            trigger="click">
-            <el-timeline>
-              <el-timeline-item
-                v-for="(activity, index) in activities"
-                :key="index"
-                :icon="activity.icon"
-                :type="activity.type"
-                :color="activity.color"
-                :size="activity.size"
-                :timestamp="activity.timestamp"
-                :timestamp2="123">
-                {{activity.content}}
-                <p style="font-size:13px;color:#909399" v-show="activity.timestamp">审核人:{{activity.name}}</p>
-                <p style="font-size:13px;color:#909399" v-show="activity.examineRemark">
-                  原因:{{activity.examineRemark}}</p>
-              </el-timeline-item>
-            </el-timeline>
-            <el-button
-              @click="progress(scope.$index, scope.row)"
-              size="mini"
-              slot="reference"
-              type="success"
-            >流程
-            </el-button>
-          </el-popover>
-        </template>
+        prop="presentBenchmark"
+        min-width="15%"
+        label="当前月领取标准">
       </el-table-column>
+<!--      <el-table-column-->
+<!--        min-width="15%"-->
+<!--        label="操作">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            type="primary"-->
+<!--            size="mini"-->
+<!--            icon="el-icon-s-check"-->
+<!--            @click="drawer = true">详情-->
+<!--          </el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <el-pagination
       class="pone"
       :page-size='10'
       layout="total, prev, pager, next, jumper"
       :total="totals"
-      :current-page.sync="PageNum"
+      :current-page.sync="pageNum"
       @current-change="current_change"
     >
-
     </el-pagination>
+<!--    <el-drawer-->
+<!--      title="我是标题"-->
+<!--      :visible.sync="drawer"-->
+<!--      :before-close="handleClose">-->
+<!--      <span>我来啦!</span>-->
+<!--    </el-drawer>-->
   </div>
 </template>
 
@@ -129,15 +101,15 @@
 
   .idc {
 
-    width: 200px
+    min-width: 200px
   }
 
   .nam {
     margin-right: 20px
   }
 
-  .ywtyoe {
-    width: 200px;
+  .grantState {
+    min-width: 200px;
     margin-left: 20px
   }
 
@@ -163,55 +135,52 @@
   import {Loading} from 'element-ui';
   import {listtown} from '../../utils/address'
   // import baseUrl from "../../globe/globeUrl"
+
   export default {
     data() {
-
       return {
         list: [],
         name: "",
         activities: [],
         options1: [{
-          value: '1',
-          label: '参保登记'
+          value: '正常发放',
+          label: '正常发放'
         }, {
-          value: '2',
-          label: '信息变更'
+          value: '暂停发放',
+          label: '暂停发放'
         }, {
-          value: '3',
-          label: '待遇申请'
+          value: '终止发放',
+          label: '终止发放'
         }],
-        PageNum: 1,
+        pageNum: 1,
         totals: 0,
-        idcard: "",
-        ywtype: "",
+        idCard: "",
+        grantState: "",
         info: '',
-        tableData: []
+        tableData: [],
+        drawer: false,
       }
     },
     methods: {
       //搜索
-      serch() {
-
-        var data = {
-          idcard: this.idcard ? this.Encrypt(this.idcard) : "",
-          recordType: this.ywtype ? parseInt(this.ywtype) : "",
-          townName: '',
-          villageName: ''
-
-        }
-        this.$api.getlist.record(data).then((res) => {
+      search() {
+        let data = {
+          idCard: this.idCard ? this.Encrypt(this.idCard) : "",
+          name: this.name ? this.Encrypt(this.name) : "",
+          grantState: this.grantState
+        };
+        this.$api.getlist.getGrantList(data).then((res) => {
           for (var i in res.data.list) {
             res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
             res.data.list[i].name = this.decrypt(res.data.list[i].name)
-            var d = new Date(res.data.list[i].createtime)
-            var mon = (parseInt(d.getMonth()) + 1)
-            res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
-            res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
+            // var d = new Date(res.data.list[i].createtime)
+            // var mon = (parseInt(d.getMonth()) + 1)
+            // res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
+            // res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
           }
-          this.tableData = res.data.list
-          this.totals = res.data.total
-          this.page = res.data.total.pageNum
-
+          this.tableData = res.data.content
+          this.totals = res.data.totalSize
+          this.pageNum = res.data.pageNum
         }).catch((res) => {
 
         });
@@ -234,8 +203,6 @@
                 size: 'large'
               })
             } else {
-
-
               if (res.data[i].examineState == "审核失败") {
                 this.activities.push({
                   content: res.data[i].role + ":" + "审核失败",
@@ -270,14 +237,15 @@
         // return '';
       },
       current_change(ss) {
-        var data = {
+        let data = {
           pageNum: ss,
           pageSize: 10,
-          idcard: this.idcard,
-          type: this.ywtype
-        }
+          idCard: this.idCard ? this.Encrypt(this.idCard) : "",
+          name: this.name ? this.Encrypt(this.name) : "",
+          grantState: this.grantState
+        };
         Loading.service();
-        this.$api.getlist.record(data).then((res) => {
+        this.$api.getlist.getGrantList(data).then((res) => {
           let loadingInstance = Loading.service();
           this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
             loadingInstance.close();
@@ -285,14 +253,14 @@
           for (var i in res.data.list) {
             res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
             res.data.list[i].name = this.decrypt(res.data.list[i].name)
-            var d = new Date(res.data.list[i].createtime)
-            var mon = (parseInt(d.getMonth()) + 1)
-            res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
-            res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
+            // var d = new Date(res.data.list[i].createtime)
+            // var mon = (parseInt(d.getMonth()) + 1)
+            // res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
+            // res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
           }
-          this.tableData = res.data.list
-          this.totals = res.data.total
-          this.page = res.data.total.pageNum
+          this.tableData = res.data.content
+          this.totals = res.data.totalSize
+          this.pageNum = res.data.pageNum
         }).catch((res) => {
           let loadingInstance = Loading.service();
           this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
@@ -302,36 +270,7 @@
       },
       //查看
       handle(s, d) {
-        if (d.recordtype == "参保登记") {
-          sessionStorage.setItem("recordId", this.tableData[s].recordId)
-          this.$router.push({
-            name: "参保登记审核",
-            params: {
-              info: this.tableData[s].info,
-              bankpic: this.tableData[s].bankpic,
-              idcardbackpic: this.tableData[s].idcardbackpic,
-              idcardfrontpic: this.tableData[s].idcardfrontpic,
-              signpic: this.tableData[s].signpic,
 
-              show: false
-            }
-          })
-        } else if (d.recordtype == "信息变更") {
-          sessionStorage.setItem("recordId", this.tableData[s].recordId)
-          this.$router.push({
-            name: "信息变更审核",
-            params: {
-              info: this.tableData[s].info,
-              bankpic: this.tableData[s].bankpic,
-              idcardbackpic: this.tableData[s].idcardbackpic,
-              idcardfrontpic: this.tableData[s].idcardfrontpic,
-              signpic: this.tableData[s].signpic,
-              specialPhotoPic: this.tableData[s].specialPhotoPic,
-              bookPic: this.tableData[s].bookPic,
-              show: false
-            }
-          })
-        }
       },
       handleDelete(g, h) {
         console.log(g)
@@ -360,9 +299,15 @@
           padding: CryptoJS.pad.Pkcs7
         });
         return decrypted.toString(CryptoJS.enc.Utf8);
+      },
+      handleClose(done) {
+        this.$confirm('确认关闭？')
+          .then(_ => {
+            done();
+          })
+          .catch(_ => {});
       }
     },
-
     created() {
       for (var i in listtown) {
         this.list.push({
@@ -379,12 +324,8 @@
       }
       console.log(this.list)
       Loading.service();
-      var data = {
-        idcard: '',
-        recordType: '3'
-
-      }
-      this.$api.getlist.record(data).then((res) => {
+      let data = {};
+      this.$api.getlist.getGrantList(data).then((res) => {
         let loadingInstance = Loading.service();
         this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭
           loadingInstance.close();
@@ -392,14 +333,14 @@
         for (var i in res.data.list) {
           res.data.list[i].idcard = this.decrypt(res.data.list[i].idcard)
           res.data.list[i].name = this.decrypt(res.data.list[i].name)
-          var d = new Date(res.data.list[i].createtime)
-          var mon = (parseInt(d.getMonth()) + 1)
-          res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
-          res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
+          // var d = new Date(res.data.list[i].createtime)
+          // var mon = (parseInt(d.getMonth()) + 1)
+          // res.data.list[i].createtime = d.getFullYear() + "-" + mon + "-" + d.getDate() + " " + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
+          // res.data.list[i].recordtype = res.data.list[i].recordtype == 1 ? "参保登记" : res.data.list[i].recordtype == 2 ? "信息变更" : ''
         }
-        this.tableData = res.data.list
-        this.totals = res.data.total
-        this.page = res.data.total.pageNum
+        this.tableData = res.data.content
+        this.totals = res.data.totalSize
+        this.pageNum = res.data.pageNum
 
       }).catch((res) => {
         let loadingInstance = Loading.service();
@@ -424,8 +365,6 @@
       //      that.tableData=res.data.list
       //     that.totals=res.data.total
       //     that.page=res.data.total.pageNum
-
-
       //     }
       //   })
     }