From 1ca7b0411ab10ff36d7184d6a71c39be886d7af5 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 17 八月 2023 17:01:50 +0800
Subject: [PATCH] #报销申请第二版
---
src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java | 23
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineDetlController.java | 125 ++++
src/main/java/com/zy/crm/manager/controller/ReimburseCostTypesController.java | 153 +++++
src/main/webapp/views/reimburseCostTypes/reimburseCostTypes.html | 92 +++
src/main/webapp/views/reimburseOnline/reimburseOnline.html | 125 +++-
src/main/java/com/zy/crm/manager/entity/ReimburseCostTypes.java | 38 +
src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java | 277 +++++++++
src/main/java/com/zy/crm/manager/mapper/ReimburseCostTypesMapper.java | 13
src/main/java/com/zy/crm/manager/service/impl/ReimburseCostTypesServiceImpl.java | 12
src/main/webapp/static/js/reimburseCostTypes/reimburseCostTypes.js | 246 ++++++++
src/main/java/com/zy/crm/manager/mapper/ReimburseOnlineDetlMapper.java | 13
src/main/java/com/zy/crm/manager/service/ReimburseCostTypesService.java | 9
src/main/java/com/zy/crm/manager/service/impl/ReimburseOnlineDetlServiceImpl.java | 12
src/main/resources/mapper/ReimburseCostTypesMapper.xml | 12
src/main/java/com/zy/crm/manager/service/ReimburseOnlineDetlService.java | 9
src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java | 9
src/main/resources/mapper/ReimburseOnlineDetlMapper.xml | 36 +
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 368 ++++++++++++
src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java | 16
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 25
src/main/resources/application.yml | 10
21 files changed, 1,555 insertions(+), 68 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseCostTypesController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseCostTypesController.java
new file mode 100644
index 0000000..95686f4
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseCostTypesController.java
@@ -0,0 +1,153 @@
+package com.zy.crm.manager.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.crm.common.web.BaseController;
+import com.zy.crm.manager.entity.ReimburseCostTypes;
+import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+import com.zy.crm.manager.entity.result.KeyValueVo;
+import com.zy.crm.manager.service.ReimburseCostTypesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class ReimburseCostTypesController extends BaseController {
+
+ @Autowired
+ private ReimburseCostTypesService reimburseCostTypesService;
+
+ @RequestMapping(value = "/reimburseCostTypes/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(reimburseCostTypesService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/reimburseCostTypes/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<ReimburseCostTypes> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(ReimburseCostTypes.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(reimburseCostTypesService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/reimburseCostTypes/add/auth")
+ @ManagerAuth
+ public R add(ReimburseCostTypes reimburseCostTypes) {
+ reimburseCostTypesService.insert(reimburseCostTypes);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseCostTypes/update/auth")
+ @ManagerAuth
+ public R update(ReimburseCostTypes reimburseCostTypes){
+ if (Cools.isEmpty(reimburseCostTypes) || null==reimburseCostTypes.getId()){
+ return R.error();
+ }
+ reimburseCostTypesService.updateById(reimburseCostTypes);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseCostTypes/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ reimburseCostTypesService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseCostTypes/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<ReimburseCostTypes> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("reimburseCostTypes"));
+ convert(map, wrapper);
+ List<ReimburseCostTypes> list = reimburseCostTypesService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/reimburseCostTypesQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<ReimburseCostTypes> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<ReimburseCostTypes> page = reimburseCostTypesService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ReimburseCostTypes reimburseCostTypes : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", reimburseCostTypes.getId());
+ map.put("value", reimburseCostTypes.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/reimburseCostTypes/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<ReimburseCostTypes> wrapper = new EntityWrapper<ReimburseCostTypes>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != reimburseCostTypesService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(ReimburseCostTypes.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseCostTypes/covert/{id}/auth")
+ @ManagerAuth
+ public R covert(@PathVariable("id") Integer id) {
+ ReimburseOnlineDetl reimburseOnlineDetl = new ReimburseOnlineDetl(id);
+ return R.ok().add(reimburseOnlineDetl);
+ }
+
+ // xm-select 鎼滅储鍟嗗搧鍒楄〃
+ @RequestMapping("/reimburseCostTypes/all/get/kv")
+ @ManagerAuth
+ public R getReimburseCostTypesDataKV(@RequestParam(required = false) String condition) {
+ Wrapper<ReimburseCostTypes> wrapper = new EntityWrapper<ReimburseCostTypes>()
+ .andNew().like("type_name", condition);
+ List<ReimburseCostTypes> reimburseCostTypesList = reimburseCostTypesService.selectPage(new Page<>(1, 30), wrapper).getRecords();
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (ReimburseCostTypes reimburseCostTypes : reimburseCostTypesList) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(reimburseCostTypes.getTypeName());
+ vo.setValue(reimburseCostTypes.getId());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
index 7432cfb..fff418d 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -14,9 +14,12 @@
import com.zy.crm.manager.entity.Plan;
import com.zy.crm.manager.entity.Reimburse;
import com.zy.crm.manager.entity.ReimburseOnline;
+import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+import com.zy.crm.manager.entity.param.ReimburseOnlineDomainParam;
import com.zy.crm.manager.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ClassPathResource;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ClassUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -37,6 +40,8 @@
@Autowired
private PlanService planService;
+ @Autowired
+ private ReimburseOnlineDetlService reimburseOnlineDetlService;
@RequestMapping(value = "/reimburseOnline/{id}/auth")
@ManagerAuth
@@ -102,6 +107,26 @@
wrapper.eq("user_id", getUserId());
}
}
+ @RequestMapping(value = "/reimburseOnline/from/add/auth")
+ @Transactional
+ public R formAdd(@RequestBody ReimburseOnlineDomainParam param){
+ System.out.println(param);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseOnline/from/modify/auth")
+ @Transactional
+ public R formModify(@RequestBody ReimburseOnlineDomainParam param){
+ System.out.println(param);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseOnline/detl/all/auth")
+ @Transactional
+ public R head(@RequestParam Integer reimburseId){
+ List<ReimburseOnlineDetl> reimburseOnlineDetls = reimburseOnlineDetlService.selectList(new EntityWrapper<ReimburseOnlineDetl>().eq("reimburse_id", reimburseId));
+ return R.ok().add(reimburseOnlineDetls);
+ }
@RequestMapping(value = "/reimburseOnline/add/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineDetlController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineDetlController.java
new file mode 100644
index 0000000..5cfa5ed
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineDetlController.java
@@ -0,0 +1,125 @@
+package com.zy.crm.manager.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.crm.common.web.BaseController;
+import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+import com.zy.crm.manager.service.ReimburseOnlineDetlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class ReimburseOnlineDetlController extends BaseController {
+
+ @Autowired
+ private ReimburseOnlineDetlService reimburseOnlineDetlService;
+
+ @RequestMapping(value = "/reimburseOnlineDetl/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(reimburseOnlineDetlService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/reimburseOnlineDetl/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(reimburseOnlineDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/reimburseOnlineDetl/add/auth")
+ @ManagerAuth
+ public R add(ReimburseOnlineDetl reimburseOnlineDetl) {
+ reimburseOnlineDetlService.insert(reimburseOnlineDetl);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseOnlineDetl/update/auth")
+ @ManagerAuth
+ public R update(ReimburseOnlineDetl reimburseOnlineDetl){
+ if (Cools.isEmpty(reimburseOnlineDetl) || null==reimburseOnlineDetl.getId()){
+ return R.error();
+ }
+ reimburseOnlineDetlService.updateById(reimburseOnlineDetl);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseOnlineDetl/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ reimburseOnlineDetlService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/reimburseOnlineDetl/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("reimburseOnlineDetl"));
+ convert(map, wrapper);
+ List<ReimburseOnlineDetl> list = reimburseOnlineDetlService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/reimburseOnlineDetlQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<ReimburseOnlineDetl> page = reimburseOnlineDetlService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ReimburseOnlineDetl reimburseOnlineDetl : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", reimburseOnlineDetl.getId());
+ map.put("value", reimburseOnlineDetl.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/reimburseOnlineDetl/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<ReimburseOnlineDetl> wrapper = new EntityWrapper<ReimburseOnlineDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != reimburseOnlineDetlService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(ReimburseOnlineDetl.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/entity/ReimburseCostTypes.java b/src/main/java/com/zy/crm/manager/entity/ReimburseCostTypes.java
new file mode 100644
index 0000000..3a420e8
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseCostTypes.java
@@ -0,0 +1,38 @@
+package com.zy.crm.manager.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("man_reimburse_cost_types")
+public class ReimburseCostTypes implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍚嶇О
+ */
+ @ApiModelProperty(value= "鍚嶇О")
+ @TableField("type_name")
+ private String typeName;
+
+ public ReimburseCostTypes() {}
+
+ public ReimburseCostTypes(String typeName) {
+ this.typeName = typeName;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
index f8ae8e9..5ca5422 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnline.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.service.PlanService;
import com.zy.crm.system.entity.User;
import com.zy.crm.system.service.UserService;
@@ -138,10 +139,10 @@
// }
public String getPlanId$() {
- PlanService planService = SpringUtils.getBean(PlanService.class);
- Plan plan = planService.selectById(this.itemId);
- if (!Cools.isEmpty(plan)){
- return String.valueOf(plan.getUuid());
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ Order order = orderService.selectById(this.itemId);
+ if (!Cools.isEmpty(order)){
+ return String.valueOf(order.getUuid());
}
return null;
}
diff --git a/src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java b/src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java
new file mode 100644
index 0000000..cbc7803
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java
@@ -0,0 +1,277 @@
+package com.zy.crm.manager.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import com.core.common.SpringUtils;
+import com.zy.crm.manager.service.ReimburseCostTypesService;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("man_reimburse_online_detl")
+public class ReimburseOnlineDetl implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value= "浜嬬敱")
+ private String occupation;
+
+ /**
+ * 璐圭敤绫诲瀷
+ */
+ @ApiModelProperty(value= "璐圭敤绫诲瀷")
+ @TableField("expense_type")
+ private Integer expenseType;
+
+ /**
+ * 鍒楁敮浜哄憳
+ */
+ @ApiModelProperty(value= "鍒楁敮浜哄憳")
+ @TableField("user_id")
+ private Integer userId;
+
+ /**
+ * 鍒楁敮閮ㄩ棬
+ */
+ @ApiModelProperty(value= "鍒楁敮閮ㄩ棬")
+ @TableField("dept_id")
+ private Integer deptId;
+
+ @ApiModelProperty(value= "")
+ @TableField("host_id")
+ private Integer hostId;
+
+ /**
+ * 椤圭洰ID锛屽叧鑱攎an_order琛ㄤ富閿�
+ */
+ @ApiModelProperty(value= "椤圭洰ID锛屽叧鑱攎an_order琛ㄤ富閿�")
+ @TableField("order_id")
+ private Integer orderId;
+
+ /**
+ * 绋庣巼
+ */
+ @ApiModelProperty(value= "绋庣巼")
+ @TableField("tax_rate")
+ private Long taxRate;
+
+ /**
+ * 鏈◣鏈竵閲戦
+ */
+ @ApiModelProperty(value= "鏈◣鏈竵閲戦")
+ @TableField("untaxed_amount_in_local_currency")
+ private Long untaxedAmountInLocalCurrency;
+
+ /**
+ * 鏈◣閲戦
+ */
+ @ApiModelProperty(value= "鏈◣閲戦")
+ @TableField("untaxed_amount")
+ private Long untaxedAmount;
+
+ /**
+ * 绋庨
+ */
+ @ApiModelProperty(value= "绋庨")
+ @TableField("tax_amount")
+ private Long taxAmount;
+
+ /**
+ * 鍙戠エ閲戦
+ */
+ @ApiModelProperty(value= "鍙戠エ閲戦")
+ @TableField("invoice_value")
+ private Long invoiceValue;
+
+ /**
+ * 鍙戠エ鏈竵閲戦
+ */
+ @ApiModelProperty(value= "鍙戠エ鏈竵閲戦")
+ @TableField("invoice_amount_in_local_currency")
+ private Long invoiceAmountInLocalCurrency;
+
+ /**
+ * 鎶ラ攢姣斾緥
+ */
+ @ApiModelProperty(value= "鎶ラ攢姣斾緥")
+ @TableField("reimbursement_ratio")
+ private Long reimbursementRatio;
+
+ /**
+ * 鎶ラ攢閲戦
+ */
+ @ApiModelProperty(value= "鎶ラ攢閲戦")
+ @TableField("reimbursement_amount")
+ private Long reimbursementAmount;
+
+ /**
+ * 鎶ラ攢鏈竵閲戦
+ */
+ @ApiModelProperty(value= "鎶ラ攢鏈竵閲戦")
+ @TableField("reimbursement_amount_in_local_currency")
+ private Long reimbursementAmountInLocalCurrency;
+
+ /**
+ * 鍑虹撼纭閲戦
+ */
+ @ApiModelProperty(value= "鍑虹撼纭閲戦")
+ @TableField("cashier_confirmation_amount")
+ private Long cashierConfirmationAmount;
+
+ /**
+ * 鍑虹撼甯佺
+ */
+ @ApiModelProperty(value= "鍑虹撼甯佺")
+ @TableField("cashier_currency")
+ private Integer cashierCurrency;
+
+ /**
+ * 鍑哄彂鏃ユ湡
+ */
+ @ApiModelProperty(value= "鍑哄彂鏃ユ湡")
+ @TableField("departure_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date departureTime;
+
+ /**
+ * 鏇存柊鏃ユ湡
+ */
+ @ApiModelProperty(value= "鏇存柊鏃ユ湡")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 鏇存柊浜哄憳ID
+ */
+ @ApiModelProperty(value= "鏇存柊浜哄憳ID")
+ @TableField("update_user_id")
+ private Integer updateUserId;
+
+ /**
+ * 鏇存柊浜哄憳鍚嶅瓧
+ */
+ @ApiModelProperty(value= "鏇存柊浜哄憳鍚嶅瓧")
+ @TableField("update_user_name")
+ private String updateUserName;
+
+ /**
+ * 鍒涘缓鏃ユ湡
+ */
+ @ApiModelProperty(value= "鍒涘缓鏃ユ湡")
+ @TableField("creation_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date creationTime;
+
+ /**
+ * 鍒涘缓浜哄憳id
+ */
+ @ApiModelProperty(value= "鍒涘缓浜哄憳id")
+ @TableField("creation_user_id")
+ private Integer creationUserId;
+
+ /**
+ * 鍒涘缓浜哄憳鍚嶅瓧
+ */
+ @ApiModelProperty(value= "鍒涘缓浜哄憳鍚嶅瓧")
+ @TableField("creation_user_name")
+ private String creationUserName;
+
+ /**
+ * 鎶ラ攢涓昏〃ID
+ */
+ @ApiModelProperty(value= "鎶ラ攢涓昏〃ID")
+ @TableField("reimburse_id")
+ private Integer reimburseId;
+
+ public ReimburseOnlineDetl() {}
+
+ public ReimburseOnlineDetl(String occupation,Integer expenseType,Integer userId,Integer deptId,Integer hostId,Integer orderId,Long taxRate,Long untaxedAmountInLocalCurrency,Long untaxedAmount,Long taxAmount,Long invoiceValue,Long invoiceAmountInLocalCurrency,Long reimbursementRatio,Long reimbursementAmount,Long reimbursementAmountInLocalCurrency,Long cashierConfirmationAmount,Integer cashierCurrency,Date departureTime,Date updateTime,Integer updateUserId,String updateUserName,Date creationTime,Integer creationUserId,String creationUserName,Integer reimburseId) {
+ this.occupation = occupation;
+ this.expenseType = expenseType;
+ this.userId = userId;
+ this.deptId = deptId;
+ this.hostId = hostId;
+ this.orderId = orderId;
+ this.taxRate = taxRate;
+ this.untaxedAmountInLocalCurrency = untaxedAmountInLocalCurrency;
+ this.untaxedAmount = untaxedAmount;
+ this.taxAmount = taxAmount;
+ this.invoiceValue = invoiceValue;
+ this.invoiceAmountInLocalCurrency = invoiceAmountInLocalCurrency;
+ this.reimbursementRatio = reimbursementRatio;
+ this.reimbursementAmount = reimbursementAmount;
+ this.reimbursementAmountInLocalCurrency = reimbursementAmountInLocalCurrency;
+ this.cashierConfirmationAmount = cashierConfirmationAmount;
+ this.cashierCurrency = cashierCurrency;
+ this.departureTime = departureTime;
+ this.updateTime = updateTime;
+ this.updateUserId = updateUserId;
+ this.updateUserName = updateUserName;
+ this.creationTime = creationTime;
+ this.creationUserId = creationUserId;
+ this.creationUserName = creationUserName;
+ this.reimburseId = reimburseId;
+ }
+ public ReimburseOnlineDetl(Integer reminburseCostTypeId) {
+ this.occupation = "";
+ this.expenseType = reminburseCostTypeId;
+ this.taxRate = (long)0.0;
+ this.untaxedAmountInLocalCurrency = (long)0.0;
+ this.untaxedAmount = (long)0.0;
+ this.taxAmount = (long)0.0;
+ this.invoiceValue = (long)0.0;
+ this.invoiceAmountInLocalCurrency = (long)0.0;
+ this.reimbursementRatio = (long)0.0;
+ this.reimbursementAmount = (long)0.0;
+ this.reimbursementAmountInLocalCurrency = (long)0.0;
+ this.cashierConfirmationAmount = (long)0.0;
+ }
+
+
+ public String getDepartureTime$(){
+ if (Cools.isEmpty(this.departureTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.departureTime);
+ }
+
+ public String getExpenseType$(){
+ ReimburseCostTypesService reimburseCostTypesService = SpringUtils.getBean(ReimburseCostTypesService.class);
+ ReimburseCostTypes reimburseCostTypes = reimburseCostTypesService.selectById(this.expenseType);
+ if (!Cools.isEmpty(reimburseCostTypes)){
+ return String.valueOf(reimburseCostTypes.getTypeName());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getCreationTime$(){
+ if (Cools.isEmpty(this.creationTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.creationTime);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java b/src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java
new file mode 100644
index 0000000..8b9e8f6
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/param/ReimburseOnlineDomainParam.java
@@ -0,0 +1,16 @@
+package com.zy.crm.manager.entity.param;
+
+import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+
+import java.util.List;
+
+public class ReimburseOnlineDomainParam {
+
+ private Integer reimburseId;
+
+ private Long docType;
+
+ private String orderNo;
+
+ private List<ReimburseOnlineDetl> reimburseOnlineDetls;
+}
diff --git a/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java b/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
new file mode 100644
index 0000000..14b7809
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/entity/result/KeyValueVo.java
@@ -0,0 +1,23 @@
+package com.zy.crm.manager.entity.result;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/4/13
+ */
+@Data
+public class KeyValueVo {
+
+ private String name;
+
+ private Object value;
+
+ public KeyValueVo() {
+ }
+
+ public KeyValueVo(String name, Object value) {
+ this.name = name;
+ this.value = value;
+ }
+
+}
diff --git a/src/main/java/com/zy/crm/manager/mapper/ReimburseCostTypesMapper.java b/src/main/java/com/zy/crm/manager/mapper/ReimburseCostTypesMapper.java
new file mode 100644
index 0000000..d4b2ee4
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/ReimburseCostTypesMapper.java
@@ -0,0 +1,13 @@
+package com.zy.crm.manager.mapper;
+
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.crm.manager.entity.ReimburseCostTypes;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ReimburseCostTypesMapper extends BaseMapper<ReimburseCostTypes> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/mapper/ReimburseOnlineDetlMapper.java b/src/main/java/com/zy/crm/manager/mapper/ReimburseOnlineDetlMapper.java
new file mode 100644
index 0000000..c1a8c00
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/mapper/ReimburseOnlineDetlMapper.java
@@ -0,0 +1,13 @@
+package com.zy.crm.manager.mapper;
+
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface ReimburseOnlineDetlMapper extends BaseMapper<ReimburseOnlineDetl> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/ReimburseCostTypesService.java b/src/main/java/com/zy/crm/manager/service/ReimburseCostTypesService.java
new file mode 100644
index 0000000..cad2779
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/ReimburseCostTypesService.java
@@ -0,0 +1,9 @@
+package com.zy.crm.manager.service;
+
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.crm.manager.entity.ReimburseCostTypes;
+
+public interface ReimburseCostTypesService extends IService<ReimburseCostTypes> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/ReimburseOnlineDetlService.java b/src/main/java/com/zy/crm/manager/service/ReimburseOnlineDetlService.java
new file mode 100644
index 0000000..30fd271
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/ReimburseOnlineDetlService.java
@@ -0,0 +1,9 @@
+package com.zy.crm.manager.service;
+
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+
+public interface ReimburseOnlineDetlService extends IService<ReimburseOnlineDetl> {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/ReimburseCostTypesServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/ReimburseCostTypesServiceImpl.java
new file mode 100644
index 0000000..0a41584
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/ReimburseCostTypesServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.crm.manager.entity.ReimburseCostTypes;
+import com.zy.crm.manager.mapper.ReimburseCostTypesMapper;
+import com.zy.crm.manager.service.ReimburseCostTypesService;
+import org.springframework.stereotype.Service;
+
+@Service("reimburseCostTypesService")
+public class ReimburseCostTypesServiceImpl extends ServiceImpl<ReimburseCostTypesMapper, ReimburseCostTypes> implements ReimburseCostTypesService {
+
+}
diff --git a/src/main/java/com/zy/crm/manager/service/impl/ReimburseOnlineDetlServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/ReimburseOnlineDetlServiceImpl.java
new file mode 100644
index 0000000..35fc5c5
--- /dev/null
+++ b/src/main/java/com/zy/crm/manager/service/impl/ReimburseOnlineDetlServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.crm.manager.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.crm.manager.entity.ReimburseOnlineDetl;
+import com.zy.crm.manager.mapper.ReimburseOnlineDetlMapper;
+import com.zy.crm.manager.service.ReimburseOnlineDetlService;
+import org.springframework.stereotype.Service;
+
+@Service("reimburseOnlineDetlService")
+public class ReimburseOnlineDetlServiceImpl extends ServiceImpl<ReimburseOnlineDetlMapper, ReimburseOnlineDetl> implements ReimburseOnlineDetlService {
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index adb0c34..88bc5ac 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -17,12 +17,12 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
-# username: sa
-# password: sa@123
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
+ url: jdbc:sqlserver://localhost:1433;databasename=zy_crm
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
+# url: jdbc:sqlserver://47.97.1.152:51433;databasename=zy_crm
+# username: sa
+# password: Zoneyung@zy56$
mvc:
static-path-pattern: /**
redis:
diff --git a/src/main/resources/mapper/ReimburseCostTypesMapper.xml b/src/main/resources/mapper/ReimburseCostTypesMapper.xml
new file mode 100644
index 0000000..1c94530
--- /dev/null
+++ b/src/main/resources/mapper/ReimburseCostTypesMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.ReimburseCostTypesMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.ReimburseCostTypes">
+ <id column="id" property="id" />
+ <result column="type_name" property="typeName" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/ReimburseOnlineDetlMapper.xml b/src/main/resources/mapper/ReimburseOnlineDetlMapper.xml
new file mode 100644
index 0000000..7f20254
--- /dev/null
+++ b/src/main/resources/mapper/ReimburseOnlineDetlMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.crm.manager.mapper.ReimburseOnlineDetlMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.crm.manager.entity.ReimburseOnlineDetl">
+ <id column="id" property="id" />
+ <result column="occupation" property="occupation" />
+ <result column="expense_type" property="expenseType" />
+ <result column="user_id" property="userId" />
+ <result column="dept_id" property="deptId" />
+ <result column="host_id" property="hostId" />
+ <result column="order_id" property="orderId" />
+ <result column="tax_rate" property="taxRate" />
+ <result column="untaxed_amount_in_local_currency" property="untaxedAmountInLocalCurrency" />
+ <result column="untaxed_amount" property="untaxedAmount" />
+ <result column="tax_amount" property="taxAmount" />
+ <result column="invoice_value" property="invoiceValue" />
+ <result column="invoice_amount_in_local_currency" property="invoiceAmountInLocalCurrency" />
+ <result column="reimbursement_ratio" property="reimbursementRatio" />
+ <result column="reimbursement_amount" property="reimbursementAmount" />
+ <result column="reimbursement_amount_in_local_currency" property="reimbursementAmountInLocalCurrency" />
+ <result column="cashier_confirmation_amount" property="cashierConfirmationAmount" />
+ <result column="cashier_currency" property="cashierCurrency" />
+ <result column="departure_time" property="departureTime" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_user_id" property="updateUserId" />
+ <result column="update_user_name" property="updateUserName" />
+ <result column="creation_time" property="creationTime" />
+ <result column="creation_user_id" property="creationUserId" />
+ <result column="creation_user_name" property="creationUserName" />
+ <result column="reimburse_id" property="reimburseId" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/reimburseCostTypes/reimburseCostTypes.js b/src/main/webapp/static/js/reimburseCostTypes/reimburseCostTypes.js
new file mode 100644
index 0000000..339487b
--- /dev/null
+++ b/src/main/webapp/static/js/reimburseCostTypes/reimburseCostTypes.js
@@ -0,0 +1,246 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#reimburseCostTypes',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/reimburseCostTypes/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID'}
+ ,{field: 'typeName', align: 'center',title: '鍚嶇О'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(reimburseCostTypes)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(reimburseCostTypes)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'reimburseCostTypes': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/reimburseCostTypes/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(reimburseCostTypes)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/reimburseCostTypes/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/reimburseCostTypes/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 90f1f1b..6cd9c1c 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -84,16 +84,17 @@
cols: [[
{type: 'checkbox', fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide: true}
- ,{field: 'templateName', align: 'center',title: '鎶ラ攢鍚�',hide: false}
+ ,{field: 'templateName', align: 'center',title: '鎶ラ攢绫诲瀷',hide: false}
,{field: 'orderNum', align: 'center',title: '鎶ラ攢鍗曞彿'}
- ,{field: 'planId$', align: 'center',title: '瑙勫垝鍗曞彿'}
+ ,{field: 'orderId$', align: 'center',title: '椤圭洰鍙�'}
,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�'}
,{field: 'user$', align: 'center',title: '鍒涘缓浜哄憳'}
,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳'}
- ,{field: 'checkDataStatus$', align: 'center',title: '鎶ヤ环鏁版嵁'}
+ // // ,{field: 'checkDataStatus$', align: 'center',title: '鎶ヤ环鏁版嵁'}
+ ,{align: 'center', title: '鎶ラ攢鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:350}
]],
request: {
@@ -365,6 +366,78 @@
}
});
break;
+ case "look":
+ var $a = $(obj.tr).find('a[lay-event="look"]');
+ var offset = $a.offset();
+ var top = offset.top;
+ var left = offset.left;
+ layer.open({
+ type: 1,
+ title: false,
+ area: '2100px',
+ offset: [top + 'px', (left - 1730 + $a.outerWidth()) + 'px'],
+ shade: .01,
+ shadeClose: true,
+ fixed: false,
+ content: '<table id="lookSSXMTable" lay-filter="lookSSXMTable"></table>',
+ success: function (layero) {
+ table.render({
+ elem: '#lookSSXMTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/reimburseOnlineDetl/list/auth',
+ where: {
+ order_id: data.id
+ },
+ page: true,
+ cellMinWidth: 100,
+ cols: [[
+ // {type: 'numbers'},
+ {field: 'occupation', title: '浜嬬敱', width: 100},
+ // {field: 'expenseType', title: '璐圭敤绫诲瀷', width: 100},
+ {field: 'expenseType$', title: '璐圭敤绫诲瀷', width: 100},
+ {field: 'taxRate', title: '绋庣巼', width: 60},
+ {field: 'untaxedAmountInLocalCurrency', title: '鏈◣鏈竵閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'untaxedAmount', title: '鏈◣閲戦', width: 100},
+ {field: 'taxAmount', title: '绋庨', width: 60},
+ {field: 'invoiceValue', title: '鍙戠エ閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'invoiceAmountInLocalCurrency', title: '鍙戠エ鏈竵閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'reimbursementRatio', title: '鎶ラ攢姣斾緥', width: 100},
+ {field: 'reimbursementAmount', title: '鎶ラ攢閲戦', width: 100},
+ {field: 'reimbursementAmountInLocalCurrency', title: '鎶ラ攢鏈竵閲戦', width: 120},
+ {field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
+ {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100},
+ {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
+ {field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
+ {field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
+ {field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
+ {field: 'updateTime', title: '鏇存柊鏃ユ湡', width: 100},
+ // {field: 'updateUserId', title: '鏇存柊浜哄憳ID', width: 160},
+ {field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧'},
+ // {field: 'creationTime', title: '鍒涘缓鏃ユ湡', width: 160}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function () {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ });
+ }
+ });
+ break;
}
});
@@ -375,39 +448,284 @@
tableReload();
});
- /* 寮圭獥 - 鏂板銆佷慨鏀� */
- function showEditModel(mData) {
+ // 鏄剧ず琛ㄥ崟寮圭獥
+ function showEditModel(expTpe) {
admin.open({
type: 1,
- area: '800px',
- title: (mData ? '淇敼' : '娣诲姞') + '鏍镐环',
+ title: (expTpe ? '淇敼' : '娣诲姞') + '鎶ラ攢瀹℃壒',
content: $('#editDialog').html(),
+ area: '2200px',
success: function (layero, dIndex) {
- form.val('detail', mData);
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- layer.close(loadIndex);
- layer.close(dIndex);
- layer.open({
- type: 2,
- title: '鏂板',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: false,
- content: 'reimburseOnline_detail.html?item_id=' + data.field.planId + "&pri_id=" + data.field.priId,
- success: function(layero, index){
- clearFormVal(layer.getChildFrame('#detail', index));
- // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ var isExpAdd = !expTpe;
+ // 鍥炴樉鏁版嵁
+ form.val('editForm', expTpe);
+ if (expTpe) {
+ // $('#orderNo').attr("disabled", "disabled");
+ }
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(orderEditSubmit)', function (data) {
+ // 缁勮鏁版嵁
+ if (xxDataList.length <= 0) {
+ layer.tips('璇锋坊鍔犳姤閿�鏄庣粏', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
+ return false;
+ }
+ let nList = admin.util.deepClone(xxDataList);
+ for (let xi = 0; xi < nList.length; xi++) {
+ // if (nList[xi].anfme <= 0){
+ // layer.msg('鏄庣粏淇敼鏁伴噺涓嶅悎娉�', {icon: 2});
+ // return false;
+ // }
+ }
+ layer.load(2);
+ $.ajax({
+ url: baseUrl+"/reimburseOnline/from/" + (isExpAdd?"add":"modify") + "/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ orderId: Number(data.field.id),
+ docType: Number(data.field.docType),
+ orderNo: data.field.orderNo,
+ orderDetlList: nList
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ layer.close(dIndex);
+ $(".layui-laypage-btn")[0].click();
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
}
- });
+ })
return false;
});
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
+ // 鏄庣粏琛ㄦ牸
+ var xxDataList = [];
+ var tbOptions = {
+ elem: '#formSSXMTable',
+ headers: {token: localStorage.getItem('token')},
+ data: xxDataList,
+ page: true,
+ height: '350px;',
+ cellMinWidth: 100,
+ cols: [[
+ {type: 'numbers', title: '#'},
+ {field: 'occupation', title: '浜嬬敱', width: 100},
+ // {field: 'expenseType', title: '璐圭敤绫诲瀷', width: 100},
+ {field: 'expenseType$', title: '璐圭敤绫诲瀷', width: 100},
+ {field: 'taxRate', title: '绋庣巼', width: 60},
+ {field: 'untaxedAmountInLocalCurrency', title: '鏈◣鏈竵閲戦', width: 120},
+ {field: 'untaxedAmount', title: '鏈◣閲戦', width: 100},
+ {field: 'taxAmount', title: '绋庨', width: 60},
+ {field: 'invoiceValue', title: '鍙戠エ閲戦', width: 100},
+ {field: 'invoiceAmountInLocalCurrency', title: '鍙戠エ鏈竵閲戦', width: 120},
+ {field: 'reimbursementRatio', title: '鎶ラ攢姣斾緥', width: 100},
+ {field: 'reimbursementAmount', title: '鎶ラ攢閲戦', width: 100},
+ {field: 'reimbursementAmountInLocalCurrency', title: '鎶ラ攢鏈竵閲戦', width: 120},
+ {field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
+ {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100},
+ {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
+ {field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
+ {field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
+ {field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
+ {field: 'updateTime', title: '鏇存柊鏃ユ湡', width: 100},
+ // {field: 'updateUserId', title: '鏇存柊浜哄憳ID', width: 160},
+ {field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧'},
+ // {field: 'creationTime', title: '鍒涘缓鏃ユ湡', width: 160}
+ ]],
+ done: function (res) {
+ $(layero).find('.layui-table-view').css('margin', '0');
+ },
+ size: ''
+ };
+ if (!isExpAdd) {
+ $.ajax({
+ url: baseUrl+"/reimburseOnline/detl/all/auth?reimburseId=" + expTpe.id,
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ xxDataList = res.data;
+ tbOptions.data = xxDataList;
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+ var insTbSSXM = table.render(tbOptions);
+ // 宸ュ叿鏉＄偣鍑讳簨浠�
+ table.on('tool(formSSXMTable)', function (obj) {
+ var data = obj.data;
+ var layEvent = obj.event;
+ if (layEvent === 'edit') {
+ showEditModel2(data);
+ } else if (layEvent === 'del') {
+ layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].matnr === data.matnr && xxDataList[j].batch === data.batch) {
+ xxDataList.splice(j, 1);
+ break;
+ }
+ }
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ });
+ }
+ });
+ // 鏄庣粏鏁版嵁淇敼
+ table.on('edit(formSSXMTable)', function (obj) {
+ let index = obj.tr.attr("data-index");
+ let data = xxDataList[index];
+ if (obj.field === 'anfme'){
+ let vle = Number(obj.value);
+ if (isNaN(vle)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+ return false;
+ } else {
+ if (vle <= 0) {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ return false;
+ }
+ }
+ }
+ data[obj.field] = obj.value;
+ insTbSSXM.reload({data: xxDataList});
+ });
+
+ $('#matAddBtnComment').click(function () {
+ showEditModel2();
+ });
+
+ // 鏄剧ず娣诲姞鏄庣粏琛ㄥ崟寮圭獥
+ function showEditModel2(exp) {
+ admin.open({
+ type: 1,
+ offset: '150px',
+ area: '680px',
+ title: (exp ? '淇敼' : '娣诲姞') + '鏄庣粏',
+ content: $('#matEditDialog').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉鏁版嵁
+ form.val('matEditForm', exp);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(matEditSubmit)', function (data) {
+ let selectList = matXmSelect.getValue();
+ for (let i = 0; i<selectList.length; i++) {
+ let item = selectList[i];
+ // 鏌ヨ鐗╂枡璇︽儏
+ $.ajax({
+ url: baseUrl+"/reimburseCostTypes/covert/"+item.value+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ var bige=true;
+ for (var j = 0; j < xxDataList.length; j++) {
+ if (xxDataList[j].matnr === res.data.matnr && xxDataList[j].batch === res.data.batch) {
+ bige=false;
+ break;
+ }
+ }
+ if (bige){
+ xxDataList.push(res.data);
+ insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
+ }
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+ layer.close(dIndex);
+ return false;
+ });
+ // 娓叉煋鐗╂枡閫夋嫨
+ var matXmSelect = xmSelect.render({
+ el: '#reimburseCostTypes',
+ style: {
+ width: '340px',
+ },
+ autoRow: true,
+ toolbar: { show: true },
+ filterable: true,
+ remoteSearch: true,
+ remoteMethod: function(val, cb, show){
+ $.ajax({
+ url: baseUrl+"/reimburseCostTypes/all/get/kv",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ condition: val
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ cb(res.data)
+ } else {
+ cb([]);
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ }
+ })
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
}
});
}
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ // function showEditModel(mData) {
+ // admin.open({
+ // type: 1,
+ // area: '800px',
+ // title: (mData ? '淇敼' : '娣诲姞') + '鏍镐环',
+ // content: $('#editDialog').html(),
+ // success: function (layero, dIndex) {
+ // form.val('detail', mData);
+ // form.on('submit(editSubmit)', function (data) {
+ // var loadIndex = layer.load(2);
+ // layer.close(loadIndex);
+ // layer.close(dIndex);
+ // layer.open({
+ // type: 2,
+ // title: '鏂板',
+ // maxmin: true,
+ // area: [top.detailWidth, top.detailHeight],
+ // shadeClose: false,
+ // content: 'reimburseOnline_detail.html?item_id=' + data.field.planId + "&pri_id=" + data.field.priId,
+ // success: function(layero, index){
+ // clearFormVal(layer.getChildFrame('#detail', index));
+ // // layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ // }
+ // });
+ // return false;
+ // });
+ // $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ // layui.form.render('select');
+ // }
+ // });
+ // }
+
//鏇存柊form
function showEditForm(mData) {
admin.open({
diff --git a/src/main/webapp/views/reimburseCostTypes/reimburseCostTypes.html b/src/main/webapp/views/reimburseCostTypes/reimburseCostTypes.html
new file mode 100644
index 0000000..841c63e
--- /dev/null
+++ b/src/main/webapp/views/reimburseCostTypes/reimburseCostTypes.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="reimburseCostTypes" lay-filter="reimburseCostTypes"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/reimburseCostTypes/reimburseCostTypes.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="typeName" placeholder="璇疯緭鍏ュ悕绉�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/reimburseOnline/reimburseOnline.html b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
index 5ba5407..c2b407a 100644
--- a/src/main/webapp/views/reimburseOnline/reimburseOnline.html
+++ b/src/main/webapp/views/reimburseOnline/reimburseOnline.html
@@ -59,9 +59,18 @@
</div>
</div>
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
+<script type="text/html" id="tbLook">
+ <span class="layui-text">
+ <a href="javascript:;" lay-event="look">
+ <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鎶ラ攢鏄庣粏
+ </a>
+ </span>
+</script>
+
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" lay-event="addBlank">鏂板鎶ラ攢</button>
+ <button class="layui-btn layui-btn-sm" lay-event="addBlank">鐢宠鎶ラ攢</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">鍒犻櫎</button>
</div>
</script>
@@ -89,45 +98,92 @@
<script type="text/javascript" src="../../static/js/luckysheet_js/pako.es5.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/luckysheet_js/base64.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/reimburseOnline/reimburseOnline.js" charset="utf-8"></script>
+<!--<!– 琛ㄥ崟寮圭獥 –>-->
+<!--<script type="text/html" id="editDialog">-->
+<!-- <div id="detail" lay-filter="detail" class="layui-form admin-form model-form">-->
+<!-- <input name="id" type="hidden">-->
+<!-- <div class="layui-row">-->
+<!-- <div class="layui-col-md12">-->
+
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鎶ラ攢妯℃澘鍚�: </label>-->
+<!-- <div class="layui-input-block cool-auto-complete">-->
+<!-- <input class="layui-input" name="priId" placeholder="璇疯緭鍏ユā鏉垮悕" style="display: none" lay-verify="required">-->
+<!-- <input id="priId$" name="priId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユā鏉垮悕" onfocus=this.blur()>-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="reimburseQueryBypri" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="reimburseQueryBypriSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <hr class="layui-bg-gray">-->
+<!-- <div class="layui-form-item text-right">-->
+<!-- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>-->
+<!-- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>-->
+<!-- </div>-->
+<!-- </div>-->
+<!--</script>-->
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
- <div id="detail" lay-filter="detail" class="layui-form admin-form model-form">
- <input name="id" type="hidden">
- <div class="layui-row">
- <div class="layui-col-md12">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰鍚�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none" lay-verify="required">
- <input id="planId$" name="planId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩悕" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="planQueryNameBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="planQueryNameBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
-
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鎶ラ攢妯℃澘鍚�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="priId" placeholder="璇疯緭鍏ユā鏉垮悕" style="display: none" lay-verify="required">
- <input id="priId$" name="priId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユā鏉垮悕" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="reimburseQueryBypri" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="reimburseQueryBypriSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
+ <form id="editForm" lay-filter="editForm" class="layui-form model-form">
+ <input name="id" type="hidden"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰鍚�: </label>
+ <div class="layui-input-block cool-auto-complete">
+ <input class="layui-input" name="planId" placeholder="璇疯緭鍏ラ」鐩悕" style="display: none" lay-verify="required">
+ <input id="planId$" name="planId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ラ」鐩悕" onfocus=this.blur()>
+ <div class="cool-auto-complete-window">
+ <input class="cool-auto-complete-window-input" data-key="planQueryNameBydirector" onkeyup="autoLoad(this.getAttribute('data-key'))">
+ <select class="cool-auto-complete-window-select" data-key="planQueryNameBydirectorSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ </select>
</div>
</div>
</div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <div class="layui-form-item" style="position: relative;">
+ <label class="layui-form-label">鎶ラ攢鏄庣粏锛�</label>
+ <div class="layui-input-block">
+ <table id="formSSXMTable" lay-filter="formSSXMTable"></table>
+ </div>
+ <button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
+ style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
+ <i class="layui-icon"></i>娣诲姞鏄庣粏
+ </button>
</div>
- </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+ </form>
+</script>
+
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
+<script type="text/html" id="formSSXMTableBar">
+ <!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+</script>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="matEditDialog">
+ <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
+ <input name="experimentId" type="hidden"/>
+
+ <div class="layui-form-item" style="float: left">
+ <label class="layui-form-label">璐圭敤绫诲瀷 - 澶氶��</label>
+ <div class="layui-input-block">
+ <div id="reimburseCostTypes" name="reimburseCostTypes">
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>
+ </div>
+
+ </form>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
@@ -136,6 +192,7 @@
<input name="id" type="hidden">
<div class="layui-row">
<div class="layui-col-md12">
+
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鐘舵��: </label>
<div class="layui-input-block">
--
Gitblit v1.9.1