فهرست منبع

修复津补贴审核中通用附件出现在驳回里面

sugangqiang 10 ماه پیش
والد
کامیت
58d95c51e7

+ 2 - 0
app/admin/controller/TalentAllowance.php

@@ -1541,6 +1541,7 @@ class TalentAllowance extends AdminController {
             $where[] = ["type", "=", $info["type"]];
             $where[] = ["project", "=", \app\common\state\ProjectState::JBT];
             $where[] = ["active", "=", 1];
+            $where[] = ["isConditionFile", "=", $info["allowanceType"]];
             $where[] = ["delete", "=", 0];
             $filetypes = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
             $res["files"] = $filetypes;
@@ -1585,6 +1586,7 @@ class TalentAllowance extends AdminController {
         $where[] = ["type", "=", $info["type"]];
         $where[] = ["project", "=", \app\common\state\ProjectState::JBT];
         $where[] = ["active", "=", 1];
+        $where[] = ["isConditionFile", "=", $info["allowanceType"]];
         $where[] = ["delete", "=", 0];
         $filetypes = Db::table("new_common_filetype")->where($where)->order("sn asc")->select()->toArray();
         $res["files"] = $filetypes;

+ 0 - 16
app/enterprise/view/talent_allowance/apply.html

@@ -96,22 +96,6 @@
                                                         </select>
                                                     </div>
                                                 </div>
-                                                <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>岗位类型</label>
-                                                    <div class="col-sm-2 spacing">
-                                                        <select type="text" class="form-control" id="allowanceType" name="postType" value="{$row.allowanceType}">
-                                                            <option>请选择</option>
-                                                        </select>
-                                                    </div>
-                                                </div>
-                                                <div class="rowGroup">
-                                                    <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>所属编制</label>
-                                                    <div class="col-sm-2 spacing">
-                                                        <select type="text" class="form-control" id="allowanceType" name="institution" value="{$row.allowanceType}">
-                                                            <option>请选择</option>
-                                                        </select>
-                                                    </div>
-                                                </div>
                                                 {if condition="!in_array($type,[5])"}
                                                 <div class="rowGroup" id="talentTypeSpan">
                                                     <label class="col-sm-1 control-label spacing"><span style="color: red">*</span>人才标签</label>

+ 2 - 1
public/static/modular/talentAllowance/talentAllowanceInfo.js

@@ -378,7 +378,8 @@ TalentAllowanceInfo.submitBatchVisit = function () {
 TalentAllowanceInfo.updateFieldsAndFiles = function () {
     if (this.check()) {
         var ajax = new $ax(Feng.ctxPath + "/admin/talentAllowance/findFieldsAndFiles?id=" + TalentAllowanceInfo.seItem.id, function (data) {
-            var obj = data.obj.obj;
+            console.log(data)
+            var obj = data.obj;
             if (data.code == 200) {
                 layer.open({
                     type: 1,