From 69b6b6e33b8458295a731b96c062f6cbdddebe58 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 13 Sep 2021 17:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory

---
 src/views/qualificationExamination/paymentInquiry.vue |  156 ++++++++++++++++++++++++++++------------------------
 1 files changed, 84 insertions(+), 72 deletions(-)

diff --git a/src/views/qualificationExamination/paymentInquiry.vue b/src/views/qualificationExamination/paymentInquiry.vue
index fab2b04..14747de 100644
--- a/src/views/qualificationExamination/paymentInquiry.vue
+++ b/src/views/qualificationExamination/paymentInquiry.vue
@@ -36,6 +36,12 @@
 
             </template>
 
+
+            <template slot-scope="{ row }"
+                      slot="sex">
+                {{row.sex==1?'男':row.sex==2?'女':''}}
+            </template>
+
             <template class="tdtype"
                       slot-scope="{ row }"
                       slot="paymentStatus">
@@ -125,23 +131,88 @@
 
                 column: [
                     // {
-                    //   label: "姓名",
-                    //   prop: "securityName",
-                    //   // slot: true,
-                    //   // display: false,
+                    //     label: "缴费类型",
+                    //     prop: "type",
+                    //     dicData:[
+                    //       {
+                    //         label:"公司缴费",
+                    //         value: 1
+                    //       },
+                    //       {
+                    //         label:"个人缴费",
+                    //         value: 2
+                    //       }
+                    //     ],
+                    //     searchSpan: 4,
+                    //     search: true,
+                    //     type: "select",
                     // },
                     {
-                        label: "缴费类型",
-                        prop: "type",
-                        dicData: dic1,
-                        searchSpan: 4,
-                        search: true,
-                        type: "select",
-                        // slot: true,
-                        // display: false,
+                        label: "缴费人",
+                        prop: "realName",
+                        search:true,
+                        searchSpan:4,
                     },
                     {
-                        // label: "考试开始时间",
+                        label: "身份证号",
+                        prop: "idCardNo",
+                        search:true,
+                        searchSpan:4,
+                    },
+                    {
+                        label: "性别",
+                        prop: "sex",
+                        slot:true,
+                        dicData: [
+                            {
+                            label:"男",
+                            value:1
+                            },
+                            {
+                            label:"女",
+                            value:2
+                            }
+                        ],
+                    },
+                    {
+                        label: "联系方式",
+                        prop: "phone",
+                    },
+                    {
+                        label: "所在单位",
+                        prop: "deptName",
+                        search:true,
+                        searchSpan:6,
+                    },
+                    {
+                        label: "缴费状态",
+                        prop: "paymentStatus",
+                        searchSpan: 4,
+                        search: true,
+                        dicData: [
+                          {
+                            label:"已缴费",
+                            value:1
+                          },
+                          {
+                            label:"未缴费",
+                            value:2
+                          },
+                          {
+                            label:"部分缴费",
+                            value:3
+                          },
+                        ],
+                        type: "select",
+                    },
+                    {
+                        label: "缴费凭证",
+                        prop: "certificateUrl",
+                        overHidden: true,
+                        type: "upload",
+                        listType: "picture-img",
+                    },
+                    {
                         label: "缴费时间",
                         prop: "paymentTime",
                         type: "date",
@@ -158,65 +229,6 @@
                                 trigger: "click",
                             },
                         ],
-                        // slot: true,
-                        // display: false,
-                        // formatter: function (row, value) {
-                        //   return (value = value + "%");
-                        // },
-                    },
-                    // {
-                    //   label: "考试结束时间",
-                    //   prop: "examEndTime",
-                    //   type: "date",
-                    //   format: "yyyy-MM-dd",
-                    //   valueFormat: "yyyy-MM-dd",
-                    //   labelWidth: 120,
-                    //   searchSpan: 4,
-                    //   search: true,
-                    //   overHidden: true,
-                    //   rules: [
-                    //     {
-                    //       required: true,
-                    //       message: "请输入时间",
-                    //       trigger: "click",
-                    //     },
-                    //   ],
-                    //   // slot: true,
-                    //   // display: false,
-                    //   // formatter: function (row, value) {
-                    //   //   return (value = value + "万元");
-                    //   // },
-                    // },
-                    // {
-                    //   label: "考试类型",
-                    //   prop: "examinationaddress",
-                    //   // slot: true,
-                    //   // display: false,
-                    // },
-                    {
-                        label: "缴费人",
-                        prop: "deptName",
-                        searchSpan: 4,
-                        search: true,
-                        // slot: true,
-                        // display: false,
-                    },
-                    {
-                        label: "缴费状态",
-                        prop: "paymentStatus",
-                        searchSpan: 4,
-                        search: true,
-                        dicData: dic2,
-                        type: "select",
-                        // slot: true,
-                        // display: false,
-                    },
-                    {
-                        label: "报名编号",
-                        prop: "applyCode",
-                        overHidden: true,
-                        // slot: true,
-                        // display: false,
                     },
                 ],
             },

--
Gitblit v1.9.3