linwu 4 månader sedan
förälder
incheckning
baa6f404c3

+ 9 - 7
app/admin/controller/Jfm.php

@@ -23,7 +23,7 @@ class Jfm extends AdminBaseController
 
     public function listAppeal()
     {
-        $map   = $this->dealEqualInput(['status']);
+        $map       = $this->dealEqualInput(['status']);
         $daterange = input('daterange/s', "");
         if (!empty($daterange)) {
             $daterangearr = explode("~", $daterange);
@@ -31,7 +31,7 @@ class Jfm extends AdminBaseController
             $map[]        = ['create_time', '<= time', strtotime(trim($daterangearr[1]))];
         }
         $list  = AppealModel::where($map)
-            ->order(['status' => 'asc','create_time'=>'desc'])
+            ->order(['status' => 'asc', 'create_time' => 'desc'])
             ->limit(input('limit'))
             ->page(input('page'))
             ->append(['status_text'])
@@ -52,7 +52,7 @@ class Jfm extends AdminBaseController
 
     public function exportAppeal()
     {
-        $map  = $this->dealInInput(['id'],$this->dealEqualInput(['status']));
+        $map       = $this->dealInInput(['id'], $this->dealEqualInput(['status']));
         $daterange = input('daterange/s', "");
         if (!empty($daterange)) {
             $daterangearr = explode("~", $daterange);
@@ -60,7 +60,7 @@ class Jfm extends AdminBaseController
             $map[]        = ['create_time', '<= time', strtotime(trim($daterangearr[1]))];
         }
         $list = AppealModel::where($map)
-            ->order(['status' => 'asc','create_time'=>'desc'])
+            ->order(['status' => 'asc', 'create_time' => 'desc'])
             ->append(['status_text'])
             ->select();
 
@@ -85,12 +85,13 @@ class Jfm extends AdminBaseController
     {
         return view('', [
             'status_list' => PolicyModel::STATUS,
+            'type_list'   => PolicyModel::TYPE,
         ]);
     }
 
     public function listPolicy()
     {
-        $map   = $this->dealEqualInput(['status']);
+        $map   = $this->dealEqualInput(['status', 'type']);
         $list  = PolicyModel::where($map)
             ->order(['status' => 'desc'])
             ->limit(input('limit'))
@@ -116,12 +117,13 @@ class Jfm extends AdminBaseController
      */
     public function policyForm()
     {
-        $id      = input('id/d, 0');
+        $id   = input('id/d, 0');
         $info = PolicyModel::find($id);
 
         return view('', [
-            'info'     => $info,
+            'info'        => $info,
             'status_list' => PolicyModel::STATUS,
+            'type_list'   => PolicyModel::TYPE,
         ]);
     }
 

+ 3 - 3
app/admin/view/company/info.html

@@ -233,12 +233,12 @@
                                 <tr>
                                     <td colspan="2" onclick="copyMobileUrl('https://110.88.129.62:8443');">IP:https://110.88.129.62:8443</td>
                                     <td onclick="copyMobileUrl('jjrencai');">用户名:jjrencai</td>
-                                    <td onclick="copyMobileUrl('dwPtJLPhQd#E%2AB');">密码:dwPtJLPhQd#E%2AB</td>
+                                    <td onclick="copyMobileUrl('KZ7AFAb7m!sHle4H');">密码:KZ7AFAb7m!sHle4H</td>
                                 </tr>
                                 <tr>
                                     <td onclick="copyMobileUrl('https://172.21.134.92');">网址:https://172.21.134.92</td>
                                     <td onclick="copyMobileUrl('jjrencai');">用户名:jjrencai</td>
-                                    <td onclick="copyMobileUrl('iow&kC5GCL11jPSS');">密码:iow&kC5GCL11jPSS</td>
+                                    <td onclick="copyMobileUrl(')Rr+sRZjnL.mh~T0');">密码:)Rr+sRZjnL.mh~T0</td>
                                     <td onclick="copyMobileUrl('D:\\install\\Navicat Premium 15\\navicat.exe');">navicate:D:\install\Navicat Premium 15\navicat.exe</td>
                                 </tr>
                             </tbody>
@@ -253,7 +253,7 @@
                                 <tr>
                                     <td>服务器</td>
                                     <td onclick="copyMobileUrl('zmw');">用户名:zmw</td>
-                                    <td onclick="copyMobileUrl('!QAZ3edc@WSX');">密码:LpQ3(p^4)5odnJSy</td>
+                                    <td onclick="copyMobileUrl('LpQ3(p^4)5odnJSy');">密码:LpQ3(p^4)5odnJSy</td>
                                 </tr>
                                 <tr>
                                     <td>数据库</td>

+ 11 - 0
app/admin/view/jfm/policy.html

@@ -13,6 +13,17 @@
                         </select>
                     </div>
                 </div>
+                <div class="layui-inline">
+                    <label class="layui-form-label">类型</label>
+                    <div class="layui-input-block">
+                        <select name="status">
+                            <option value="">全部类型</option>
+                            {volist name="type_list" id="v"}
+                            <option value="{$key}">{$v}</option>
+                            {/volist}
+                        </select>
+                    </div>
+                </div>
                 <div class="layui-inline">
                     <button class="layui-btn" lay-submit lay-filter="{$lay_btn}">
                         <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>

+ 8 - 0
app/admin/view/jfm/policy_form.html

@@ -45,6 +45,14 @@
                                 <div class="layui-form-mid layui-word-aux">倒序,值越大越靠前</div>
                             </div>
                         </div>
+                        <div class="layui-form-item" pane>
+                            <label class="layui-form-label"><span style="color:#f90c05;">*</span>类型</label>
+                            <div class="layui-input-block">
+                                {volist name="type_list" id="v"}
+                                <input type="radio" name="type" value="{$key}" title="{$v}" {eq name=":array_get($info,'type',1)" value="$key" }checked{/eq}>
+                                {/volist}
+                            </div>
+                        </div>
                         <div class="layui-form-item" pane>
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>状态</label>
                             <div class="layui-input-block">

+ 7 - 0
app/common/model/PolicyModel.php

@@ -12,13 +12,20 @@ class PolicyModel extends BaseModel
 
     // 常量
     const STATUS = [1 => '已发布', 2 => '待修改'];
+    const TYPE = [1 => '晋福码', 2 => '卫健局'];
 
     const STATUS_PUBLISH = 1;
     const STATUS_MODIFY  = 2;
+    const TYPE_JFM = 1;
+    const TYPE_HEALTH = 2;
 
     public function getStatusTextAttr($value, $data)
     {
         return self::STATUS[$data['status']];
     }
 
+    public function getTypeTextAttr($value, $data)
+    {
+        return self::STATUS[$data['status']];
+    }
 }

+ 2 - 1
app/mobile/controller/Jfm.php

@@ -61,7 +61,8 @@ class Jfm extends MobileBaseController
 
     public function policy1()
     {
-        $list = PolicyModel::where('status', PolicyModel::STATUS_PUBLISH)->select();
+        $type = input('type', PolicyModel::TYPE_HEALTH);
+        $list = PolicyModel::where('status', PolicyModel::STATUS_PUBLISH)->where('type', $type)->select();
 
         return view('', [
             'list' => $list,

+ 1 - 1
app/mobile/view/jfm/policy1.html

@@ -18,7 +18,7 @@
         @click-left="onBack"
 >
     <template #title>
-        <span class="text-white">服务事项</span>
+        <span class="text-white">政策服务</span>
     </template>
 </van-nav-bar>
 <div class="policy-list">