zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

计费模块重构，可以在线配置SQl，更灵活面对不同计费方式

master
erzhongxmu 2022-07-25 12:14:08 +08:00
parent d88f5d0900
commit 376aaecbe2
14 changed files with 258 additions and 20124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
database/SQL_log
View File

@ -1,3 +0,0 @@
ALTER TABLE `wms`.`wm_in_qm_i`
ADD COLUMN `base_in_goodscount` VARCHAR(45) NULL AFTER `IM_CUS_CODE`,
ADD COLUMN `base_out_goodscount` VARCHAR(45) NULL AFTER `base_in_goodscount`;

9950
database/wms20220321.sql
View File

File diff suppressed because one or more lines are too long

10077
database/wms20220613.sql
View File

File diff suppressed because one or more lines are too long

22
database/wms20220702.sql → database/wms20220725.sql
View File

File diff suppressed because one or more lines are too long

39
src/main/java/com/zzjee/ba/entity/BaCostConfEntity.java
View File

@ -18,12 +18,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
/** /**
* @Title: Entity * @Title: Entity
* @Description: 计费配置 * @Description: 计费配置
* @author erzhongxmu * @author erzhongxmu
* @date 2017-09-26 15:11:40 * @date 2017-09-26 15:11:40
* @version V1.0 * @version V1.0
* *
*/ */
@Entity @Entity
@ -51,6 +51,12 @@ public class BaCostConfEntity implements java.io.Serializable {
/**费用名称*/ /**费用名称*/
@Excel(name="费用名称") @Excel(name="费用名称")
private java.lang.String costCode; private java.lang.String costCode;
@Excel(name="免费天数")
private java.lang.String freeDay;
// @Excel(name="免费天数2")
private java.lang.String freeDay2;
@Excel(name="数据SQL")
private java.lang.String dataSql;
/**价格RMB*/ /**价格RMB*/
@Excel(name="价格RMB") @Excel(name="价格RMB")
private java.lang.String costJg; private java.lang.String costJg;
@ -66,7 +72,7 @@ public class BaCostConfEntity implements java.io.Serializable {
/**含税价RMB*/ /**含税价RMB*/
@Excel(name="含税价RMB") @Excel(name="含税价RMB")
private java.lang.String costHs; private java.lang.String costHs;
/** /**
*方法: 取得java.lang.String *方法: 取得java.lang.String
*@return: java.lang.String 主键 *@return: java.lang.String 主键
@ -310,4 +316,31 @@ public class BaCostConfEntity implements java.io.Serializable {
public void setCostHs(java.lang.String costHs){ public void setCostHs(java.lang.String costHs){
this.costHs = costHs; this.costHs = costHs;
} }
@Column(name ="free_day",nullable=true,length=36)
public String getFreeDay() {
return freeDay;
}
public void setFreeDay(String freeDay) {
this.freeDay = freeDay;
}
@Column(name ="free_day2",nullable=true,length=36)
public String getFreeDay2() {
return freeDay2;
}
public void setFreeDay2(String freeDay2) {
this.freeDay2 = freeDay2;
}
@Column(name ="data_sql",nullable=true,length=36)
public String getDataSql() {
return dataSql;
}
public void setDataSql(String dataSql) {
this.dataSql = dataSql;
}
} }

47
src/main/java/com/zzjee/wm/controller/WmCusCostHController.java
View File

@ -71,12 +71,12 @@ import org.jeecgframework.web.cgform.entity.upload.CgUploadEntity;
import org.jeecgframework.web.cgform.service.config.CgFormFieldServiceI; import org.jeecgframework.web.cgform.service.config.CgFormFieldServiceI;
import java.util.HashMap; import java.util.HashMap;
/** /**
* @Title: Controller * @Title: Controller
* @Description: 客户费用 * @Description: 客户费用
* @author erzhongxmu * @author erzhongxmu
* @date 2017-09-26 15:12:32 * @date 2017-09-26 15:12:32
* @version V1.0 * @version V1.0
* *
*/ */
@Controller @Controller
@ -98,7 +98,7 @@ public class WmCusCostHController extends BaseController {
/** /**
* 客户费用列表 页面跳转 * 客户费用列表 页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "list") @RequestMapping(params = "list")
@ -108,7 +108,7 @@ public class WmCusCostHController extends BaseController {
/** /**
* easyui AJAX请求数据 * easyui AJAX请求数据
* *
* @param request * @param request
* @param response * @param response
* @param dataGrid * @param dataGrid
@ -132,7 +132,7 @@ public class WmCusCostHController extends BaseController {
/** /**
* 删除客户费用 * 删除客户费用
* *
* @return * @return
*/ */
@RequestMapping(params = "doDel") @RequestMapping(params = "doDel")
@ -155,7 +155,7 @@ public class WmCusCostHController extends BaseController {
/** /**
* 批量删除客户费用 * 批量删除客户费用
* *
* @return * @return
*/ */
@RequestMapping(params = "doBatchDel") @RequestMapping(params = "doBatchDel")
@ -182,7 +182,7 @@ public class WmCusCostHController extends BaseController {
/** /**
* 添加客户费用 * 添加客户费用
* *
* @param ids * @param ids
* @return * @return
*/ */
@ -206,7 +206,7 @@ public class WmCusCostHController extends BaseController {
} }
/** /**
* 更新客户费用 * 更新客户费用
* *
* @param ids * @param ids
* @return * @return
*/ */
@ -230,7 +230,7 @@ public class WmCusCostHController extends BaseController {
/** /**
* 客户费用新增页面跳转 * 客户费用新增页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goAdd") @RequestMapping(params = "goAdd")
@ -241,10 +241,10 @@ public class WmCusCostHController extends BaseController {
} }
return new ModelAndView("com/zzjee/wm/wmCusCostH-add"); return new ModelAndView("com/zzjee/wm/wmCusCostH-add");
} }
/** /**
* 客户费用编辑页面跳转 * 客户费用编辑页面跳转
* *
* @return * @return
*/ */
@RequestMapping(params = "goUpdate") @RequestMapping(params = "goUpdate")
@ -255,16 +255,16 @@ public class WmCusCostHController extends BaseController {
} }
return new ModelAndView("com/zzjee/wm/wmCusCostH-update"); return new ModelAndView("com/zzjee/wm/wmCusCostH-update");
} }
/** /**
* 加载明细列表[费用项目] * 加载明细列表[费用项目]
* *
* @return * @return
*/ */
@RequestMapping(params = "wmCusCostIList") @RequestMapping(params = "wmCusCostIList")
public ModelAndView wmCusCostIList(WmCusCostHEntity wmCusCostH, HttpServletRequest req) { public ModelAndView wmCusCostIList(WmCusCostHEntity wmCusCostH, HttpServletRequest req) {
//=================================================================================== //===================================================================================
//获取参数 //获取参数
Object id0 = wmCusCostH.getId(); Object id0 = wmCusCostH.getId();
@ -284,6 +284,9 @@ public class WmCusCostHController extends BaseController {
t.setCostZk(baCostConfEntity.getCostZk()); t.setCostZk(baCostConfEntity.getCostZk());
t.setCostBhs(baCostConfEntity.getCostBhs()); t.setCostBhs(baCostConfEntity.getCostBhs());
t.setCostHs(baCostConfEntity.getCostHs()); t.setCostHs(baCostConfEntity.getCostHs());
t.setFreeDay(baCostConfEntity.getFreeDay());
t.setFreeDay2(baCostConfEntity.getFreeDay2());
t.setDataSql(baCostConfEntity.getDataSql());
wmCusCostIEntityList.add(t); wmCusCostIEntityList.add(t);
} }
}catch(Exception e){ }catch(Exception e){
@ -403,14 +406,14 @@ public class WmCusCostHController extends BaseController {
return new ModelAndView("common/upload/pub_excel_upload"); return new ModelAndView("common/upload/pub_excel_upload");
} }
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET)
@ResponseBody @ResponseBody
public List<WmCusCostHEntity> list() { public List<WmCusCostHEntity> list() {
List<WmCusCostHEntity> listWmCusCostHs=wmCusCostHService.getList(WmCusCostHEntity.class); List<WmCusCostHEntity> listWmCusCostHs=wmCusCostHService.getList(WmCusCostHEntity.class);
return listWmCusCostHs; return listWmCusCostHs;
} }
@RequestMapping(value = "/{id}", method = RequestMethod.GET) @RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody @ResponseBody
public ResponseEntity<?> get(@PathVariable("id") String id) { public ResponseEntity<?> get(@PathVariable("id") String id) {
@ -420,7 +423,7 @@ public class WmCusCostHController extends BaseController {
} }
return new ResponseEntity(task, HttpStatus.OK); return new ResponseEntity(task, HttpStatus.OK);
} }
@RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody @ResponseBody
public ResponseEntity<?> create(@RequestBody WmCusCostHPage wmCusCostHPage, UriComponentsBuilder uriBuilder) { public ResponseEntity<?> create(@RequestBody WmCusCostHPage wmCusCostHPage, UriComponentsBuilder uriBuilder) {
@ -432,7 +435,7 @@ public class WmCusCostHController extends BaseController {
//保存 //保存
List<WmCusCostIEntity> wmCusCostIList = wmCusCostHPage.getWmCusCostIList(); List<WmCusCostIEntity> wmCusCostIList = wmCusCostHPage.getWmCusCostIList();
WmCusCostHEntity wmCusCostH = new WmCusCostHEntity(); WmCusCostHEntity wmCusCostH = new WmCusCostHEntity();
try{ try{
MyBeanUtils.copyBeanNotNull2Bean(wmCusCostH,wmCusCostHPage); MyBeanUtils.copyBeanNotNull2Bean(wmCusCostH,wmCusCostHPage);
@ -449,7 +452,7 @@ public class WmCusCostHController extends BaseController {
return new ResponseEntity(headers, HttpStatus.CREATED); return new ResponseEntity(headers, HttpStatus.CREATED);
} }
@RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> update(@RequestBody WmCusCostHPage wmCusCostHPage) { public ResponseEntity<?> update(@RequestBody WmCusCostHPage wmCusCostHPage) {
//调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息. //调用JSR303 Bean Validator进行校验，如果出错返回含400错误码及json格式的错误信息.
@ -460,7 +463,7 @@ public class WmCusCostHController extends BaseController {
//保存 //保存
List<WmCusCostIEntity> wmCusCostIList = wmCusCostHPage.getWmCusCostIList(); List<WmCusCostIEntity> wmCusCostIList = wmCusCostHPage.getWmCusCostIList();
WmCusCostHEntity wmCusCostH = new WmCusCostHEntity(); WmCusCostHEntity wmCusCostH = new WmCusCostHEntity();
try{ try{
MyBeanUtils.copyBeanNotNull2Bean(wmCusCostH,wmCusCostHPage); MyBeanUtils.copyBeanNotNull2Bean(wmCusCostH,wmCusCostHPage);
@ -481,7 +484,7 @@ public class WmCusCostHController extends BaseController {
} }
/** /**
* 获取文件附件信息 * 获取文件附件信息
* *
* @param id wmCusCostH主键id * @param id wmCusCostH主键id
*/ */
@RequestMapping(params = "getFiles") @RequestMapping(params = "getFiles")

13
src/main/java/com/zzjee/wm/entity/WmCusCostIEntity.java
View File

@ -53,8 +53,10 @@ public class WmCusCostIEntity implements java.io.Serializable {
/**费用名称*/ /**费用名称*/
@Excel(name="免费天数") @Excel(name="免费天数")
private java.lang.String freeDay; private java.lang.String freeDay;
@Excel(name="免费天数2") // @Excel(name="免费天数2")
private java.lang.String freeDay2; private java.lang.String freeDay2;
@Excel(name="数据SQL")
private java.lang.String dataSql;
/**价格RMB*/ /**价格RMB*/
@Excel(name="价格RMB") @Excel(name="价格RMB")
private java.lang.String costJg; private java.lang.String costJg;
@ -381,4 +383,13 @@ public class WmCusCostIEntity implements java.io.Serializable {
public void setFreeDay2(String freeDay2) { public void setFreeDay2(String freeDay2) {
this.freeDay2 = freeDay2; this.freeDay2 = freeDay2;
} }
@Column(name ="data_sql",nullable=true,length=36)
public String getDataSql() {
return dataSql;
}
public void setDataSql(String dataSql) {
this.dataSql = dataSql;
}
} }

34
src/main/java/org/jeecgframework/web/system/sms/util/task/CostTask.java
View File

@ -63,6 +63,40 @@ public class CostTask {
org.jeecgframework.core.util.LogUtil.info("总耗时" + times + "毫秒"); org.jeecgframework.core.util.LogUtil.info("总耗时" + times + "毫秒");
} }
public void costcountv2(String datestr, String chongsuan, WmDayCostConfEntity t){
String tsql = "select COST_SF from wm_day_cost_conf where to_days(cost_date) = to_days(?)";
if (chongsuan.equals("N")) {//非重算
List<Map<String, Object>> resultconf = systemService.findForJdbc(tsql, datestr);
if (resultconf.size() > 0) {
return;
} else {
Date costdate = DateUtils.str2Date(datestr, DateUtils.date_sdf);
t.setCostDate(costdate);
t.setCostSf("Y");
t.setCreateBy("system");
t.setCreateDate(costdate);
systemService.save(t);
}
}
tsql = "call update_wm_his_stock('" + datestr + "')";
try {
systemService.executeSql(tsql);
} catch (Exception e) {
// TODO: handle exception
}
org.jeecgframework.core.util.LogUtil
.info("===================1库存更新成功===================");
//先删除
tsql = "delete from wm_day_cost where cost_sta ='已生成' and to_days(cost_data) = to_days(?)";
systemService.executeSql(tsql, t.getCostDate());
org.jeecgframework.core.util.LogUtil
.info("===================V2数据删除成功===================");
}
public void costcount(String datestr, String chongsuan, WmDayCostConfEntity t) { public void costcount(String datestr, String chongsuan, WmDayCostConfEntity t) {
// WmDayCostConfEntity t = new WmDayCostConfEntity(); // WmDayCostConfEntity t = new WmDayCostConfEntity();
String tsql = "select COST_SF from wm_day_cost_conf where to_days(cost_date) = to_days(?)"; String tsql = "select COST_SF from wm_day_cost_conf where to_days(cost_date) = to_days(?)";

90
src/main/webapp/webpage/com/zzjee/ba/baCostConf-add.jsp
View File

@ -12,10 +12,10 @@
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css"> <link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css">
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css"> <link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css">
<link rel="stylesheet" href="online/template/ledefault/css/app.css"> <link rel="stylesheet" href="online/template/ledefault/css/app.css">
<link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/> <link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/>
<link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/> <link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/>
<script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script> <script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script>
<script type="text/javascript" src="plug-in/tools/dataformat.js"></script> <script type="text/javascript" src="plug-in/tools/dataformat.js"></script>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script> <script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
@ -31,7 +31,7 @@
<script type="text/javascript" src="plug-in/Validform/plugin/passwordStrength/passwordStrength-min.js"></script> <script type="text/javascript" src="plug-in/Validform/plugin/passwordStrength/passwordStrength-min.js"></script>
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.config.js"></script> <script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.config.js"></script>
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.all.min.js"></script> <script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.all.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//编写自定义JS代码 //编写自定义JS代码
</script> </script>
@ -56,85 +56,121 @@
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t:dictSelect field="costCode" type="list" extendJson="{class:'form-control'}" <t:dictSelect field="costCode" type="list" extendJson="{class:'form-control'}"
dictTable="ba_cost" dictField="cost_code" dictText="cost_name" hasLabel="false" title="费用名称"></t:dictSelect> dictTable="ba_cost" dictField="cost_code" dictText="cost_name" hasLabel="false" title="费用名称"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">费用名称</label> <label class="Validform_label" style="display: none">费用名称</label>
</div> </div>
</div> </div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数：</b>
</div>
<div class="col-xs-3">
<input id="freeDay" name="freeDay" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数2：</b>
</div>
<div class="col-xs-3">
<input id="freeDay2" name="freeDay2" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数2</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>数据SQL：</b>
</div>
<div class="col-xs-3">
<input id="dataSql" name="dataSql" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">数据SQL</label>
</div>
</div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>价格RMB：</b> <b>价格RMB：</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<input id="costJg" name="costJg" type="text" class="form-control" <input id="costJg" name="costJg" type="text" class="form-control"
ignore="ignore" ignore="ignore"
/> />
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">价格RMB</label> <label class="Validform_label" style="display: none">价格RMB</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>税率：</b> <b>税率：</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<input id="costSl" name="costSl" type="text" class="form-control" <input id="costSl" name="costSl" type="text" class="form-control"
ignore="ignore" ignore="ignore"
/> />
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">税率</label> <label class="Validform_label" style="display: none">税率</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>折扣：</b> <b>折扣：</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<input id="costZk" name="costZk" type="text" class="form-control" <input id="costZk" name="costZk" type="text" class="form-control"
ignore="ignore" ignore="ignore"
/> />
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">折扣</label> <label class="Validform_label" style="display: none">折扣</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>不含税价RMB：</b> <b>不含税价RMB：</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<input id="costBhs" name="costBhs" type="text" class="form-control" <input id="costBhs" name="costBhs" type="text" class="form-control"
ignore="ignore" ignore="ignore"
/> />
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">不含税价RMB</label> <label class="Validform_label" style="display: none">不含税价RMB</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>含税价RMB：</b> <b>含税价RMB：</b>
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<input id="costHs" name="costHs" type="text" class="form-control" <input id="costHs" name="costHs" type="text" class="form-control"
ignore="ignore" ignore="ignore"
/> />
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">含税价RMB</label> <label class="Validform_label" style="display: none">含税价RMB</label>
</div> </div>
</div> </div>
<div class="row" id = "sub_tr" style="display: none;"> <div class="row" id = "sub_tr" style="display: none;">
<div class="col-xs-12 layout-header"> <div class="col-xs-12 layout-header">
<div class="col-xs-6"></div> <div class="col-xs-6"></div>
@ -143,7 +179,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="con-wrapper" id="con-wrapper2" style="display: block;"></div> <div class="con-wrapper" id="con-wrapper2" style="display: block;"></div>
</div> </div>
</t:formvalid> </t:formvalid>
@ -154,7 +190,7 @@
if(location.href.indexOf("load=detail")!=-1){ if(location.href.indexOf("load=detail")!=-1){
$(".jeecgDetail").hide(); $(".jeecgDetail").hide();
} }
if(location.href.indexOf("mode=read")!=-1){ if(location.href.indexOf("mode=read")!=-1){
//查看模式控件禁用 //查看模式控件禁用
$("#formobj").find(":input").attr("disabled","disabled"); $("#formobj").find(":input").attr("disabled","disabled");
@ -167,11 +203,11 @@
var neibuClickFlag = false; var neibuClickFlag = false;
function neibuClick() { function neibuClick() {
neibuClickFlag = true; neibuClickFlag = true;
$('#btn_sub').trigger('click'); $('#btn_sub').trigger('click');
} }
</script> </script>
</body> </body>
<script src = "webpage/com/zzjee/ba/baCostConf.js"></script> <script src = "webpage/com/zzjee/ba/baCostConf.js"></script>
</html> </html>

84
src/main/webapp/webpage/com/zzjee/ba/baCostConf-update.jsp
View File

@ -12,10 +12,10 @@
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css"> <link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css">
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css"> <link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css">
<link rel="stylesheet" href="online/template/ledefault/css/app.css"> <link rel="stylesheet" href="online/template/ledefault/css/app.css">
<link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/> <link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/>
<link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/> <link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/>
<script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script> <script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script>
<script type="text/javascript" src="plug-in/tools/dataformat.js"></script> <script type="text/javascript" src="plug-in/tools/dataformat.js"></script>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script> <script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
@ -40,8 +40,8 @@
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="baCostConfController.do?doUpdate" tiptype="1" > <t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="baCostConfController.do?doUpdate" tiptype="1" >
<input type="hidden" id="btn_sub" class="btn_sub"/> <input type="hidden" id="btn_sub" class="btn_sub"/>
<input type="hidden" name="id" value='${baCostConfPage.id}' > <input type="hidden" name="id" value='${baCostConfPage.id}' >
<div class="tab-wrapper"> <div class="tab-wrapper">
<!-- tab --> <!-- tab -->
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
@ -56,13 +56,51 @@
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<t:dictSelect field="costCode" type="list" extendJson="{class:'form-control'}" <t:dictSelect field="costCode" type="list" extendJson="{class:'form-control'}"
dictTable="ba_cost" dictField="cost_code" dictText="cost_name" defaultVal="${baCostConfPage.costCode}" hasLabel="false" title="费用名称"></t:dictSelect> dictTable="ba_cost" dictField="cost_code" dictText="cost_name" defaultVal="${baCostConfPage.costCode}" hasLabel="false" title="费用名称"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span> <span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">费用名称</label> <label class="Validform_label" style="display: none">费用名称</label>
</div> </div>
</div> </div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数：</b>
</div>
<div class="col-xs-3">
<input id="freeDay" name="freeDay" type="text" class="form-control"
ignore="ignore"
value='${baCostConfPage.freeDay}' />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数2：</b>
</div>
<div class="col-xs-3">
<input id="freeDay2" name="freeDay2" type="text" class="form-control"
ignore="ignore"
value='${baCostConfPage.freeDay2}' />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数2</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>数据SQL：</b>
</div>
<div class="col-xs-3">
<input id="dataSql" name="dataSql" type="text" class="form-control"
ignore="ignore"
value='${baCostConfPage.dataSql}' />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">数据SQL</label>
</div>
</div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>价格RMB：</b> <b>价格RMB：</b>
@ -75,8 +113,8 @@
<label class="Validform_label" style="display: none">价格RMB</label> <label class="Validform_label" style="display: none">价格RMB</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>税率：</b> <b>税率：</b>
@ -89,8 +127,8 @@
<label class="Validform_label" style="display: none">税率</label> <label class="Validform_label" style="display: none">税率</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>折扣：</b> <b>折扣：</b>
@ -103,8 +141,8 @@
<label class="Validform_label" style="display: none">折扣</label> <label class="Validform_label" style="display: none">折扣</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>不含税价RMB：</b> <b>不含税价RMB：</b>
@ -117,8 +155,8 @@
<label class="Validform_label" style="display: none">不含税价RMB</label> <label class="Validform_label" style="display: none">不含税价RMB</label>
</div> </div>
</div> </div>
<div class="row show-grid"> <div class="row show-grid">
<div class="col-xs-3 text-center"> <div class="col-xs-3 text-center">
<b>含税价RMB：</b> <b>含税价RMB：</b>
@ -131,10 +169,10 @@
<label class="Validform_label" style="display: none">含税价RMB</label> <label class="Validform_label" style="display: none">含税价RMB</label>
</div> </div>
</div> </div>
<div class="row" id = "sub_tr" style="display: none;"> <div class="row" id = "sub_tr" style="display: none;">
<div class="col-xs-12 layout-header"> <div class="col-xs-12 layout-header">
<div class="col-xs-6"></div> <div class="col-xs-6"></div>
@ -143,7 +181,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="con-wrapper" id="con-wrapper2" style="display: block;"></div> <div class="con-wrapper" id="con-wrapper2" style="display: block;"></div>
</div> </div>
</t:formvalid> </t:formvalid>
@ -154,7 +192,7 @@
if(location.href.indexOf("load=detail")!=-1){ if(location.href.indexOf("load=detail")!=-1){
$(".jeecgDetail").hide(); $(".jeecgDetail").hide();
} }
if(location.href.indexOf("mode=read")!=-1){ if(location.href.indexOf("mode=read")!=-1){
//查看模式控件禁用 //查看模式控件禁用
$("#formobj").find(":input").attr("disabled","disabled"); $("#formobj").find(":input").attr("disabled","disabled");
@ -167,11 +205,11 @@
var neibuClickFlag = false; var neibuClickFlag = false;
function neibuClick() { function neibuClick() {
neibuClickFlag = true; neibuClickFlag = true;
$('#btn_sub').trigger('click'); $('#btn_sub').trigger('click');
} }
</script> </script>
</body> </body>
<script src = "webpage/com/zzjee/ba/baCostConf.js"></script> <script src = "webpage/com/zzjee/ba/baCostConf.js"></script>
</html> </html>

3
src/main/webapp/webpage/com/zzjee/ba/baCostConfList.jsp
View File

@ -14,6 +14,9 @@
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol> <t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="费用名称" field="costCode" query="true" queryMode="single" dictionary="ba_cost,cost_code,cost_name" width="120"></t:dgCol> <t:dgCol title="费用名称" field="costCode" query="true" queryMode="single" dictionary="ba_cost,cost_code,cost_name" width="120"></t:dgCol>
<t:dgCol title="免费天数" field="freeDay" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="免费天数2" field="freeDay2" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="数据SQL" field="dataSql" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="价格RMB" field="costJg" queryMode="single" width="120"></t:dgCol> <t:dgCol title="价格RMB" field="costJg" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="税率" field="costSl" queryMode="single" width="120"></t:dgCol> <t:dgCol title="税率" field="costSl" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="折扣" field="costZk" queryMode="single" width="120"></t:dgCol> <t:dgCol title="折扣" field="costZk" queryMode="single" width="120"></t:dgCol>

4
src/main/webapp/webpage/com/zzjee/wm/wmCusCostH-add.jsp
View File

@ -333,10 +333,10 @@
<label class="Validform_label" style="display: none;">免费天数</label> <label class="Validform_label" style="display: none;">免费天数</label>
</td> </td>
<td align="left"> <td align="left">
<input name="wmCusCostIList[#index#].freeDay2" maxlength="32" <input name="wmCusCostIList[#index#].dataSql" maxlength="32"
ignore="checked" ignore="checked"
type="text" class="form-control" style="width:120px;" datatype="*"> type="text" class="form-control" style="width:120px;" datatype="*">
<label class="Validform_label" style="display: none;">免费天数2</label> <label class="Validform_label" style="display: none;">数据SQL</label>
</td> </td>
<td align="left"> <td align="left">
<input name="wmCusCostIList[#index#].costSl" maxlength="32" <input name="wmCusCostIList[#index#].costSl" maxlength="32"

4
src/main/webapp/webpage/com/zzjee/wm/wmCusCostH-update.jsp
View File

@ -332,10 +332,10 @@
<label class="Validform_label" style="display: none;">免费天数</label> <label class="Validform_label" style="display: none;">免费天数</label>
</td> </td>
<td align="left"> <td align="left">
<input name="wmCusCostIList[#index#].freeDay2" maxlength="32" <input name="wmCusCostIList[#index#].dataSql" maxlength="32"
ignore="checked" ignore="checked"
type="text" class="form-control" style="width:120px;" datatype="*"> type="text" class="form-control" style="width:120px;" datatype="*">
<label class="Validform_label" style="display: none;">免费天数2</label> <label class="Validform_label" style="display: none;">数据SQL</label>
</td> </td>
<td align="left"> <td align="left">
<input name="wmCusCostIList[#index#].costSl" maxlength="32" <input name="wmCusCostIList[#index#].costSl" maxlength="32"

12
src/main/webapp/webpage/com/zzjee/wm/wmCusCostIList.jsp
View File

@ -44,7 +44,7 @@
免费天数 免费天数
</th> </th>
<th> <th>
免费天数2 数据SQL
</th> </th>
<th> <th>
价格RMB 价格RMB
@ -90,9 +90,9 @@
<label class="Validform_label" style="display: none;">免费天数</label> <label class="Validform_label" style="display: none;">免费天数</label>
</td> </td>
<td> <td>
<input name="wmCusCostIList[0].freeDay2" maxlength="32" <input name="wmCusCostIList[0].dataSql" maxlength="32"
type="text" class="form-control" style="width:120px;" datatype="*"> type="text" class="form-control" style="width:120px;" datatype="*">
<label class="Validform_label" style="display: none;">免费天数2</label> <label class="Validform_label" style="display: none;">数据SQL</label>
</td> </td>
<td> <td>
<input name="wmCusCostIList[0].costJg" maxlength="32" <input name="wmCusCostIList[0].costJg" maxlength="32"
@ -147,9 +147,9 @@
<label class="Validform_label" style="display: none;">免费天数</label> <label class="Validform_label" style="display: none;">免费天数</label>
</td> </td>
<td align="left"> <td align="left">
<input name="wmCusCostIList[${stuts.index }].freeDay2" maxlength="32" <input name="wmCusCostIList[${stuts.index }].dataSql" maxlength="32"
type="text" class="form-control" style="width:120px;" datatype="*" value="${poVal.freeDay2 }"> type="text" class="form-control" style="width:120px;" datatype="*" value="${poVal.dataSql }">
<label class="Validform_label" style="display: none;">免费天数2</label> <label class="Validform_label" style="display: none;">数据SQL</label>
</td> </td>
<td align="left"> <td align="left">
<input name="wmCusCostIList[${stuts.index }].costJg" maxlength="32" <input name="wmCusCostIList[${stuts.index }].costJg" maxlength="32"