1

app/admin/controller/FileType.php

@@ -17,7 +17,8 @@ class FileType extends AdminController {
      * @return type
      */
     function index() {
-        return view();
+        $declare_types = \app\common\api\DictApi::findChildDictByCode("declare_type");
+        return view("", ["declare_types" => $declare_types]);
     }
 
     /**

app/admin/controller/IntegralMgr.php

@@ -163,4 +163,21 @@ class IntegralMgr extends AdminController {
         return json($list);
     }
 
+    public function getFilesByType() {
+        $type = $this->request->param("type") ?: 0;
+        $where[] = ["type", "=", $type];
+        $where[] = ["project", "=", 20];
+        $where[] = ["active", "=", 1];
+        $list = \app\common\api\FileTypeApi::getAll($where);
+        return json($list);
+    }
+
+    public function getItemsByProject() {
+        $projectId = $this->request->param("projectId") ?: 0;
+        $where[] = ["projectId", "=", $projectId];
+        $where[] = ["active", "=", 1];
+        $list = IntegralItemApi::getAll($where);
+        return json($list);
+    }
+
 }

app/admin/view/dict/edit.html

@@ -73,22 +73,26 @@
 </div>
 <script type="text/template" id="itemTemplate">
     <div class="form-group" name="dictItem" id="dictItem">
-    <label class="col-sm-1 control-label">值</label>
-    <div class="col-sm-2">
-    <input class="form-control" type="text" name="itemCode">
-    </div>
-    <label class="col-sm-1 control-label" >名称</label>
-    <div class="col-sm-2">
-    <input class="form-control" type="text" name="itemName">
-    </div>
-    <label class="col-sm-1 control-label" >序号</label>
-    <div class="col-sm-2">
-    <input class="form-control" type="text" name="itemNum">
-    </div>
-    <div class="col-sm-2">
-    <#button btnCss="danger" name="删除" id="cancel" icon="fa-remove" clickFun="DictInfoDlg.deleteItem(event)"/>
-    </div>
-    </div>
+            <label class="col-sm-1 control-label">值</label>
+            <div class="col-sm-2">
+                <input class="form-control" type="text" name="itemCode">
+            </div>
+            <label class="col-sm-1 control-label" >名称</label>
+            <div class="col-sm-2">
+                <input class="form-control" type="text" name="itemName">
+            </div>
+            <label class="col-sm-1 control-label" >序号</label>
+            <div class="col-sm-2">
+                <input class="form-control" type="text" name="itemNum">
+            </div>
+            <div class="col-sm-2">
+
+<button type="button" class="btn btn-sm btn-danger " onclick="DictInfoDlg.deleteItem(event)" id="cancel">
+    <i class="fa fa-remove"></i>&nbsp;删除
+</button>
+
+            </div>
+        </div>
 </script>
 
 <script src="/static/modular/system/dict/dict_info.js"></script>

app/admin/view/file_type/add.html

@@ -13,13 +13,13 @@
                                     申报优秀人才类别
                                 </button>
                             </div>
-                            <select class="form-control" id="type" name="type" selectVal="{$info.type}">
+                            <select class="form-control" id="type" name="type" selectVal="{$info.type}" onchange="UnCommonFiletypeInfoDlg.typeChange();">
                                 <option value="">---请选择---</option>
                                 <option value="1">晋江市现代产业体系人才</option>
                                 <option value="2">集成电路优秀人才</option>
                             </select>
                         </div>
-                        <div class="input-group input-group-sm">
+                        <div class="input-group input-group-sm project1" style="display:none;">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
                                     申报阶段
@@ -67,14 +67,14 @@
                                     申报项目
                                 </button>
                             </div>
-                            <select class="form-control" id="project" name="project" selectVal="{$info.project}" onchange="UnCommonFiletypeInfoDlg.typeChange(this)">
+                            <select class="form-control" id="project" name="project" selectVal="{$info.project}" onchange="UnCommonFiletypeInfoDlg.projectChange()">
                                 <option value="">---请选择---</option>
                                 {volist name="declare_types" id="item"}
                                 <option value="{$item.code}">{$item.name}</option>
                                 {/volist}
                             </select>
                         </div>
-                        <div class="input-group input-group-sm">
+                        <div class="input-group input-group-sm project1" style="display:none;">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
                                     是否为认定条件

app/admin/view/file_type/edit.html

@@ -13,13 +13,13 @@
                                     申报优秀人才类别
                                 </button>
                             </div>
-                            <select class="form-control" id="type" name="type" selectVal="{$info.type}">
+                            <select class="form-control" id="type" name="type" selectVal="{$info.type}" onchange="UnCommonFiletypeInfoDlg.typeChange();">
                                 <option value="">---请选择---</option>
                                 <option value="1">晋江市现代产业体系人才</option>
                                 <option value="2">集成电路优秀人才</option>
                             </select>
                         </div>
-                        <div class="input-group input-group-sm">
+                        <div class="input-group input-group-sm project1" style="display:none;">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
                                     申报阶段
@@ -73,14 +73,14 @@
                                     申报项目
                                 </button>
                             </div>
-                            <select class="form-control" id="project" name="project" selectVal="{$info.project}" onchange="UnCommonFiletypeInfoDlg.typeChange(this)">
+                            <select class="form-control" id="project" name="project" selectVal="{$info.project}" onchange="UnCommonFiletypeInfoDlg.projectChange()">
                                 <option value="">---请选择---</option>
                                 {volist name="declare_types" id="item"}
                                 <option value="{$item.code}">{$item.name}</option>
                                 {/volist}
                             </select>
                         </div>
-                        <div class="input-group input-group-sm">
+                        <div class="input-group input-group-sm project1" style="display:none;">
                             <div class="input-group-btn">
                                 <button data-toggle="dropdown" class="btn btn-white dropdown-toggle" type="button">
                                     是否为认定条件

app/admin/view/integral_mgr/save_item.html

@@ -96,7 +96,7 @@
                         <div class="rowGroup">
                             <label class="col-sm-2 control-label spacing">证明材料</label>
                             <div class="col-sm-4 spacing">
-                                <select class="form-control" id="fileTypeId" name="fileTypeId" selectVal="{$row.fileTypeId}">
+                                <select class="form-control" id="fileTypeId" name="fileTypeId" selectVal="{$row.fileTypeId}" multiple>
                                     <option value="">请选择</option>
                                     {volist name="fileTypes" id="fileType"}
                                     <option value="{$fileType.id}">{$fileType.name}</option>

app/common/api/FileTypeApi.php

@@ -44,6 +44,12 @@ class FileTypeApi {
         return FileType::findOrEmpty($id)->toArray();
     }
 
+    public static function getAll($where = []) {
+        $where[] = ["delete", "=", 0];
+        $list = FileType::where($where)->select()->toArray();
+        return $list;
+    }
+
     public static function edit($request) {
         $params = $request->param();
         $data["type"] = $params["type"];

app/common/api/IntegralItemApi.php

@@ -38,7 +38,7 @@ class IntegralItemApi {
         $data["unit"] = $params["unit"];
         $data["fstNeedAmount"] = $params["fstNeedAmount"];
         $data["fstGainPoints"] = $params["fstGainPoints"];
-        $data["fileTypeId"] = $params["fileTypeId"];
+        $data["fileTypeId"] = implode(",", $params["fileTypeId"]);
         $data["active"] = $params["active"];
         if (!$params["plan"] == 2) {
             $data["stepNeedAmount"] = $params["stepNeedAmount"];

public/static/modular/filetype/unCommonFiletype/unCommonFiletype_info.js

@@ -149,13 +149,31 @@ UnCommonFiletypeInfoDlg.callBack = function (data) {
     }
 }
 
-UnCommonFiletypeInfoDlg.typeChange = function (ctx) {
-    if ($(ctx).val() == 1) {
+UnCommonFiletypeInfoDlg.typeChange = function () {
+    UnCommonFiletypeInfoDlg.typeAndProjectChange();
+}
+
+UnCommonFiletypeInfoDlg.projectChange = function () {
+    var project = $("#project").val();
+    if(project == 1){
+        $(".project1").css("display","");
+    }else{
+        $(".project1").css("display","none");
+    }
+    UnCommonFiletypeInfoDlg.typeAndProjectChange();
+}
+
+UnCommonFiletypeInfoDlg.typeAndProjectChange = function () {
+    var type = $("#type").val();
+    var project = $("#project").val();
+    if (type == 1 && project == 1) {
         var options = '<option value="">---请选择---</option><option value="1">一、基础资料填报阶段</option><option value="2">二、补充认定材料阶段</option>';
     } else {
         var options = '<option value="">---请选择---</option>';
     }
     $("#step").html(options);
+    var step = $("#step").attr("selectVal");
+    $("#step").val(step);
 }
 
 UnCommonFiletypeInfoDlg.fileChange = function (context) {
@@ -170,6 +188,7 @@ $(function () {
     $("select").each(function () {
         $(this).val($(this).attr("selectVal"));
     });
+    UnCommonFiletypeInfoDlg.projectChange();
 });
 
 

public/static/modular/talentIdentify/integralMgr/IntegralItemMgr_info.js

@@ -149,6 +149,14 @@ IntegralItemMgrInfo.onTypeChange = function () {
         "type": "GET",
         "url": "/admin/integral_mgr/getProjectsByType/type/" + type
     });
+    Feng.addAjaxSelect({
+        "id": "fileTypeId",
+        "displayCode": "id",
+        "displayName": "name",
+        "type": "GET",
+        "url": "/admin/integral_mgr/getFilesByType/type/" + type
+    });
+    $("#fileTypeId").trigger('chosen:updated');
 }
 
 //切换积分方案
@@ -236,4 +244,13 @@ $(function () {
     $("select").each(function () {
         $(this).val($(this).attr("selectVal"));
     });
+    
+    $("#fileTypeId").chosen({
+        no_results_text: "没有找到结果！",
+        width:'100%',
+        search_contains:true,       //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        disable_search: false,
+        enable_split_word_search: true,
+        rtl:true
+    });
 });