From 9fa45bfbc90a14715ca2eb5067bc2be67cc6160b Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Fri, 8 Jul 2022 11:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=82=85=E7=89=B9=E6=AE=8A=E6=8A=80?=
 =?UTF-8?q?=E8=83=BD=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../worker/certification/certification.html   | 85 +++++--------------
 1 file changed, 19 insertions(+), 66 deletions(-)

diff --git a/ghy-admin/src/main/resources/templates/worker/certification/certification.html b/ghy-admin/src/main/resources/templates/worker/certification/certification.html
index 00d9bd1d..67b171e8 100644
--- a/ghy-admin/src/main/resources/templates/worker/certification/certification.html
+++ b/ghy-admin/src/main/resources/templates/worker/certification/certification.html
@@ -10,74 +10,14 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <li>
-                                <label>师傅者id：</label>
-                                <input type="text" name="workerId"/>
-                            </li>
                             <li>
                                 <label>真实姓名：</label>
                                 <input type="text" name="name"/>
                             </li>
-                            <li>
-                                <label>身份证号：</label>
-                                <input type="text" name="idCardNum"/>
-                            </li>
-                            <li>
-                                <label>身份证照片1：</label>
-                                <input type="text" name="idCardUrl1"/>
-                            </li>
-                            <li>
-                                <label>身份证照片2：</label>
-                                <input type="text" name="idCardUrl2"/>
-                            </li>
-                            <li>
-                                <label>品牌名称：</label>
-                                <input type="text" name="brandName"/>
-                            </li>
-                            <li>
-                                <label>公司规模 0:1-3人 1:3-10人 2:10-50人：</label>
-                                <input type="text" name="companySize"/>
-                            </li>
                             <li>
                                 <label>公司名称：</label>
                                 <input type="text" name="companyName"/>
                             </li>
-                            <li>
-                                <label>执照号码：</label>
-                                <input type="text" name="businessLicenseNum"/>
-                            </li>
-                            <li>
-                                <label>执照号码照片：</label>
-                                <input type="text" name="businessLicenseUrl"/>
-                            </li>
-                            <li>
-                                <label>公司地址所在省id：</label>
-                                <input type="text" name="companyProvinceId"/>
-                            </li>
-                            <li>
-                                <label>公司地址所在市id：</label>
-                                <input type="text" name="companyCityId"/>
-                            </li>
-                            <li>
-                                <label>公司地址所在区id：</label>
-                                <input type="text" name="companyCountryId"/>
-                            </li>
-                            <li>
-                                <label>公司详细地址：</label>
-                                <input type="text" name="companyAddress"/>
-                            </li>
-                            <li>
-                                <label>法人名称：</label>
-                                <input type="text" name="legalPersionName"/>
-                            </li>
-                            <li>
-                                <label>法人联系电话：</label>
-                                <input type="text" name="legalPersionPhoneNum"/>
-                            </li>
-                            <li>
-                                <label>其他服务 0:货拉拉/速运 1:提供搬货 2本地跑腿：</label>
-                                <input type="text" name="otherServ"/>
-                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -110,6 +50,10 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('worker:certification:edit')}]];
         var removeFlag = [[${@permission.hasPermi('worker:certification:remove')}]];
+
+        var workerStatus = [[${@dict.getType('worker_certification_status')}]];
+        var companySize = [[${@dict.getType('worker_company_size')}]];
+
         var prefix = ctx + "worker/certification";
 
         $(function() {
@@ -130,7 +74,8 @@
                 },
                 {
                     field: 'workerId',
-                    title: '师傅者id'
+                    title: '师傅者id',
+                    visible: false
                 },
                 {
                     field: 'name',
@@ -142,11 +87,11 @@
                 },
                 {
                     field: 'idCardUrl1',
-                    title: '身份证照片1'
+                    title: '身份证照片'
                 },
                 {
                     field: 'idCardUrl2',
-                    title: '身份证照片2'
+                    title: '身份证照片'
                 },
                 {
                     field: 'brandName',
@@ -154,7 +99,11 @@
                 },
                 {
                     field: 'companySize',
-                    title: '公司规模 0:1-3人 1:3-10人 2:10-50人'
+                    title: '公司规模',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(companySize, value);
+                    }
                 },
                 {
                     field: 'companyName',
@@ -194,11 +143,15 @@
                 },
                 {
                     field: 'otherServ',
-                    title: '其他服务 0:货拉拉/速运 1:提供搬货 2本地跑腿'
+                    title: '其他服务'
                 },
                 {
                     field: 'status',
-                    title: '状态0审核中 1审核通过 2审核未通过'
+                    title: '状态',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(workerStatus, value);
+                    }
                 },
                 {
                     field: 'remark',