git-svn-id: https://192.168.57.71/svn/jsgkj@1152 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/java/com/xt/js/gkaq/web/ctl/ZyfzsqCtl.java

@@ -1,5 +1,6 @@
 package com.xt.js.gkaq.web.ctl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.BeanUtils;
@@ -10,8 +11,15 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.alibaba.fastjson.JSONArray;
 import com.xt.js.gkaq.common.BaseCtl;
+import com.xt.js.gkaq.common.BaseUUIDModel;
+import com.xt.js.gkaq.common.DictConsts;
+import com.xt.js.gkaq.frame.model.ComboBoxDto;
+import com.xt.js.gkaq.frame.service.CodeService;
+import com.xt.js.gkaq.web.model.GqModel;
 import com.xt.js.gkaq.web.model.ZyfzModel;
+import com.xt.js.gkaq.web.service.GqService;
 import com.xt.js.gkaq.web.service.ZyfzsqService;
 import com.xt.js.gkaq.web.vo.ZyfzsqVo;
 import com.yuanxd.tools.pagehelper.PageHelper;
@@ -25,10 +33,14 @@ import com.yuanxd.tools.utils.string.StringUtils;
  *
  */
 @Controller
-@RequestMapping(value = "/zyfzsq")
+@RequestMapping(value = "/zyfzsq", produces = "application/json; charset=utf-8")
 public class ZyfzsqCtl extends BaseCtl {
     @Autowired
     private ZyfzsqService zyfzsqService;
+    @Autowired
+    private CodeService codeService;
+    @Autowired
+    private GqService gqService;
 
     @RequestMapping("")
     public String main(Model model) {
@@ -127,4 +139,40 @@ public class ZyfzsqCtl extends BaseCtl {
     	ZyfzModel model = zyfzsqService.findById(id);
         return model;
     }
+    
+
+    /**
+     * 获取下拉所在地数据
+     * @return
+     */
+    @RequestMapping("getDdlData")
+    @ResponseBody
+    public String getDdlData(String lx) {
+        List<ComboBoxDto> list = null;
+        if("szd".equals(lx)) {
+            list = codeService.findByPcode(DictConsts.DM_SZD);
+        } else if("gq".equals(lx)) {
+            list = gqService.selectByInfo(new GqModel());
+        } else if("whdj".equals(lx)) {
+            list = codeService.findByPcode(DictConsts.DM_WHDJ);
+        } else if("rwzt".equals(lx)) {
+            ComboBoxDto dto = null;
+            list = new ArrayList<ComboBoxDto>();
+            String[] ztName= {"未提交","待填报","待形式审查","待审查","待审核","待批准","已完成"};
+            String[] ztVal= {BaseUUIDModel.STATE_DRAFT,
+                    "a",
+                    BaseUUIDModel.STATE_SUBMIT,
+                    "b",
+                    "c",
+                    "d",
+                    BaseUUIDModel.STATE_COMPLETED};
+            for(int i = 0; i < ztName.length; i++) {
+                dto = new ComboBoxDto();
+                dto.setOptName(ztName[i]);
+                dto.setOptVal(ztVal[i]);
+                list.add(dto);
+            }
+        }
+        return JSONArray.toJSONString(list);
+    }
 }

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/zyfzsq/fzzxx.jsp

@@ -4,19 +4,19 @@
 <form class="form-horizontal" id="jyrInfoform" method="post" >
     <input type="hidden" id="id" name="id">
     <div class="form-group">
-         <label class="col-sm-2 control-label" for="groupid">所在地</label>
+         <label class="col-sm-2 control-label" for="szd">所在地</label>
          <div class="col-sm-4">
-             <select class="selectpicker form-control" id="groupid" name="groupid" title="请选择..."></select>
+             <select class="selectpicker form-control" id="szd" name="szd" title="请选择..."></select>
          </div>
-         <label class="col-sm-2 control-label" for="groupid">所属港区</label>
+         <label class="col-sm-2 control-label" for="ssgq">所属港区</label>
          <div class="col-sm-4">
-             <select class="selectpicker form-control" id="groupid" name="groupid" title="请选择..."></select>
+             <select class="selectpicker form-control" style="overflow: scroll;" id="ssgq" name="ssgq" title="请选择..."></select>
          </div>
     </div>
     <div class="form-group">
-         <label class="col-sm-2 control-label" for="groupid">港口经营人名称</label>
+         <label class="col-sm-2 control-label" for="jyr">港口经营人名称</label>
          <div class="col-sm-4">
-             <select class="selectpicker form-control" id="groupid" name="groupid" title="请选择..."></select>
+             <select class="selectpicker form-control" style="overflow: scroll;" id="jyr" name="jyr" title="请选择..."></select>
          </div>
         <label class="col-sm-2 control-label" for="loginName">港口经营许可证号</label>
         <div class="col-sm-4">

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/zyfzsq/main.jsp

@@ -57,18 +57,34 @@
 		<div class="p_searchdiv">
 			<table class="tabsearch">
 				<tr class="trsearch">
-					<td class="tdname">用户名</td>
+					<td class="tdname">所在地</td>
 					<td class="tdcontent">
-						<input type="text" id="username" name="username" 
-							class="p_txt" value=""></td>
-					<td class="tdname">用户名</td>
+						<select class="p_txt" id="srchDdlSzd" name="srchDdlSzd" title="请选择..."></select>
+					</td>
+					<td class="tdname">所属港区</td>
+					<td class="tdcontent">
+						<select class="p_txt" id="srchDdlQq" name="srchDdlQq" title="请选择..."></select>
+					</td>
+					<td class="tdname">港口经营人名称 </td>
 					<td class="tdcontent">
-						<input type="text" id="username1" name="username1" 
+						<input type="text" id="srchGkjyr" name="srchGkjyr" 
 							class="p_txt" value=""></td>
-					<td class="tdname">用户名 </td>
+					<td class="tdname">
+					</td>
+				</tr>
+				<tr class="trsearch">
+					<td class="tdname">危货等级</td>
+					<td class="tdcontent">
+						<select class="p_txt" id="srchDdlWhdj" name="srchDdlWhdj" title="请选择..."></select>
+					</td>
+					<td class="tdname">法定代表人</td>
 					<td class="tdcontent">
-						<input type="text" id="username2" name="username2" 
+						<input type="text" id="srchFddbr" name="srchFddbr" 
 							class="p_txt" value=""></td>
+					<td class="tdname">任务状态 </td>
+					<td class="tdcontent">
+						<select class="p_txt" id="srchRwzt" name="srchRwzt" title="请选择..."></select>
+					</td>
 					<td class="tdname">
 						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"
 							onclick="searchRecord()"/>

gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/common.js

@@ -328,8 +328,11 @@ function hideModelDialog(modelId) {
 	$('#'+modelId).modal('hide');
 }
 
-function loadComboBox(data, select) {
+function loadComboBox(data, select, emptyFlg) {
     var optionStr = "";
+    if(emptyFlg) {
+        optionStr += "<option value=''>" + "请选择..." + "</option>";
+    }
     if ($(select).attr("data-live-search")) {
         $.each(data, function() {
             optionStr += "<option value='" + this.optVal + "' data-tokens='" + this.optName + "'>" + this.optName + "</option>";

gkaqv2/trunk/modules/web/src/main/webapp/static/js/zyfzsq/index.js

@@ -5,6 +5,8 @@ var tabName = "#tt"
 var grid_selector = "#grid-table";
 var pager_selector = "#grid-pager";
 jQuery(function($) {
+    // 初始化基本信息
+    initBasicData();
     // 初始化Grid
     initGrid();
     // 危险货物
@@ -38,6 +40,67 @@ jQuery(function($) {
     // 只启用主信息tab
     //enableMain();
 });
+
+//初始化基本信息
+function initBasicData() {
+    // 初始化所在地下拉列表
+    $.ajax({
+        type : "post",
+        url : basePath + "/zyfzsq/getDdlData",
+        data : {"lx": "szd"},
+        success : function (data) {
+            var select = "#srchDdlSzd"
+            loadComboBox(data, select, true);
+            select = "#szd"
+            loadComboBox(data, select, true);
+            $(select).selectpicker('refresh');
+        }
+    });
+    // 初始化所属港区下拉列表
+    $.ajax({
+        type : "post",
+        url : basePath + "/zyfzsq/getDdlData",
+        data : {"lx": "gq"},
+        success : function (data) {
+            var select = "#srchDdlQq"
+            loadComboBox(data, select, true);
+            select = "#ssgq"
+            loadComboBox(data, select, true);
+            $(select).selectpicker('refresh');
+        }
+    });
+    // 初始化危货等级下拉列表
+    $.ajax({
+        type : "post",
+        url : basePath + "/zyfzsq/getDdlData",
+        data : {"lx": "whdj"},
+        success : function (data) {
+            var select = "#srchDdlWhdj";
+            loadComboBox(data, select, true);
+        }
+    });
+    // 初始化状态下拉列表
+    $.ajax({
+        type : "post",
+        url : basePath + "/zyfzsq/getDdlData",
+        data : {"lx": "rwzt"},
+        success : function (data) {
+            var select = "#srchRwzt";
+            loadComboBox(data, select, true);
+        }
+    });
+    // 初始化经营人下拉列表
+    $.ajax({
+        type : "post",
+        url : basePath + "/jyr/getSelect",
+        success : function (data) {
+            var select = "#jyr";
+            loadComboBox(data, select, true);
+            $(select).selectpicker('refresh');
+        }
+    });
+}
+
 /**
  * 只启用主信息tab
  */