From 24fcfc4b90a5fdd95b621b27565a1236e33dfe63 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Thu, 24 Dec 2020 16:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SocietyInfoController.class.php      | 6 ++++++
 Application/Admin/View/SocietyInfo/add.html               | 8 ++++----
 Application/Admin/View/SocietyInfo/lists.html             | 4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index 25c26f736..223e026fe 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -62,6 +62,10 @@ class SocietyInfoController extends ThinkController
         $count = $query->count();
         if($is_export){
             $parseData = $query->field("*")->select();
+            foreach ($parseData as &$v) {
+                if ($v['is_potential'] == 1) $v['is_potential'] = "是";
+                else $v['is_potential'] = "否";
+            }
             $this->assign('listData', $parseData);
             $GetData = $_GET;
             unset($GetData['export']);
@@ -223,6 +227,8 @@ class SocietyInfoController extends ThinkController
 
         if ($_POST) {
             $save = I("post.");
+            if ($save['province'] == "请选择省份") $save['province'] = '';
+            if ($save['city'] == "请选择城市") $save['city'] = '';
             $save['create_time'] = time();
             $save['update_time'] = time();
             $save['communication_time'] = time();
diff --git a/Application/Admin/View/SocietyInfo/add.html b/Application/Admin/View/SocietyInfo/add.html
index 1cb0425a1..ed8c389bd 100644
--- a/Application/Admin/View/SocietyInfo/add.html
+++ b/Application/Admin/View/SocietyInfo/add.html
@@ -48,7 +48,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="l">公司：</td>
+                                <td class="l"><span style="color:red">*</span>公司：</td>
                                 <td class="r table_radio">
                                   <input type="text" name="company_name" id="company_name" class="input" placeholder="请输入公司名称">
                                 </td>
@@ -227,13 +227,13 @@
             var cres = $('form').serializeArray();
             console.log(cres);
             if ($("#province").val() == "请选择省份" || !$("#province").val()) {
-                layer.msg('请选择省份');return ;
+                // layer.msg('请选择省份');return ;
             }
             if (!$("#city").val()) {
-                layer.msg('请选择城市');return ;
+                // layer.msg('请选择城市');return ;
             }
             if (!$("#company_name").val()) {
-                layer.msg('请输入公司名');return ;
+                 layer.msg('请输入公司名');return ;
             }
 
             //添加
diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index 0e8ec59b8..7d3906d5d 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -171,7 +171,9 @@
                             <td rowspan="{$data.row}">{$data.turnover}</td>
                             <td rowspan="{$data.row}">{$data.address}</td>
                             <td rowspan="{$data.row}">{$data.league_info}</td>
-                            <td rowspan="{$data.row}">{$data.is_potential}</td>
+                            <td rowspan="{$data.row}">
+                                <if condition="$data['is_potential'] eq 1">是<else />否</if>
+                            </td>
                             <td rowspan="{$data.row}">{$data.remark}</td>
                             <td rowspan="{$data.row}">{$data.interface_person}</td>
                             <td rowspan="{$data.row}">{$data.create_time|date='Y-m-d H:i:s', ###}</td>