root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[update]销售模块:修改客户报价添加页面样式，客户销售定单页面布局结构做修改， 

绩效模块：对技术团队表布局样式结构修改，业务团队布局样式修改，新增部分字段，字段为录入时间，录入人，更新人，上次更新时间。
全局：添加一个generateNo生产方法，采用redis，字段生产为前缀，自动增加，前缀加上001类的流水码。
dev
zhangsiqi 9 months ago
parent
5e04982638
commit
a11b8c2b82
33 changed files with 1322 additions and 1466 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java
  2. 8
      ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java
  3. 4
      ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
  4. 2
      ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpUtbItemService.java
  5. 10
      ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpUtbItemServiceImpl.java
  6. 7
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductItemController.java
  7. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
  8. 29
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java
  9. 2
      ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java
  10. 8
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
  11. 10
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java
  12. 7
      ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
  13. 10
      ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml
  14. 14
      ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml
  15. 12
      ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml
  16. 44
      ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml
  17. 123
      ruoyi-admin/src/main/resources/templates/erp/utb/add.html
  18. 9
      ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
  19. 45
      ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html
  20. 22
      ruoyi-admin/src/main/resources/templates/main.html
  21. 341
      ruoyi-admin/src/main/resources/templates/system/customer/add.html
  22. 729
      ruoyi-admin/src/main/resources/templates/system/customer/customer.html
  23. 125
      ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
  24. 108
      ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
  25. 72
      ruoyi-admin/src/main/resources/templates/system/item/add.html
  26. 48
      ruoyi-admin/src/main/resources/templates/system/item/edit.html
  27. 145
      ruoyi-admin/src/main/resources/templates/system/item/item.html
  28. 68
      ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html
  29. 35
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  30. 85
      ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
  31. 12
      ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
  32. 4
      ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
  33. 6
      ruoyi-generator/src/main/resources/vm/html/list.html.vm

2
ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpBomController.java
View File

@ -37,7 +37,7 @@ import java.util.List;
import java.util.Set;
/**
* bomController
* 物料bom信息Controller
*
* @author ruoyi
* @date 2023-11-21

8
ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpUtbItemController.java
View File

@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import com.ruoyi.ck.utils.Result;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -167,6 +169,10 @@ public class ErpUtbItemController extends BaseController
{
return toAjax(erpUtbItemService.restoreErpUtbItemById(id));
}
@PostMapping("/getId")
@ResponseBody
public Result getId() throws Exception {
return Result.getSuccessResult(erpUtbItemService.getId());
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java
View File

@ -46,6 +46,10 @@ public class ErpMaterial extends BaseEntity
private String productItem;
/**技术团队名称 */
private String itemName;
/** 技术团队绩效(%) */
private int itemCtc;
//技术团队利润率
private String itemPR;
/** 物料类型 */
private String materialType;
/** 物料类型名称 */

2
ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpUtbItemService.java
View File

@ -70,4 +70,6 @@ public interface IErpUtbItemService
* @return 结果
*/
public int restoreErpUtbItemById(Long id);
Object getId();
}

10
ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpUtbItemServiceImpl.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.erp.service.impl;
import java.util.List;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -21,7 +23,8 @@ public class ErpUtbItemServiceImpl implements IErpUtbItemService
{
@Autowired
private ErpUtbItemMapper erpUtbItemMapper;
@Autowired
private RedisCache redisCache;
/**
* 查询业务团队
*
@ -125,4 +128,9 @@ public class ErpUtbItemServiceImpl implements IErpUtbItemService
{
return erpUtbItemMapper.restoreErpUtbItemById(id);
}
@Override
public Object getId(){
return redisCache.generateNo("YWTEAM");
}
}

7
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysProductItemController.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.controller;
import com.ruoyi.ck.utils.Result;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@ -144,5 +145,9 @@ public class SysProductItemController extends BaseController
return toAjax(sysProductItemService.restoreSysProductItemById(id));
}
@PostMapping("/getId")
@ResponseBody
public Result getId() throws Exception {
return Result.getSuccessResult(sysProductItemService.getId());
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
View File

@ -304,7 +304,7 @@ public class SysSalesOrderController extends BaseController
}
/**
* 获取报价编号
* 获取客户销售订单编号
*/
@PostMapping("/getId")
@ResponseBody

29
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysProductItem.java
View File

@ -16,9 +16,10 @@ public class SysProductItem extends BaseEntity
private static final long serialVersionUID = 1L;
/** 生产团队的id */
@Excel(name = "生产团队的id")
@Excel(name = "生产团队的序号")
private Long id;
@Excel(name = "生产团队的ID")
private String productItemId;
/** 生产团队类型 */
@Excel(name = "生产团队类型")
private String types;
@ -30,10 +31,6 @@ public class SysProductItem extends BaseEntity
/** 删除标志 0正常 1删除 */
private String delFlag;
/** 职能 */
@Excel(name = "职能")
private String functions;
/** 电气技术人员 */
@Excel(name = "电气技术人员")
private String dianqi;
@ -75,6 +72,15 @@ public class SysProductItem extends BaseEntity
{
return id;
}
public String getProductItemId() {
return productItemId;
}
public void setProductItemId(String productItemId) {
this.productItemId = productItemId;
}
public void setTypes(String types)
{
this.types = types;
@ -102,15 +108,6 @@ public class SysProductItem extends BaseEntity
{
return delFlag;
}
public void setFunctions(String functions)
{
this.functions = functions;
}
public String getFunctions()
{
return functions;
}
public void setDianqi(String dianqi)
{
this.dianqi = dianqi;
@ -188,6 +185,7 @@ public class SysProductItem extends BaseEntity
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("productItemId", getProductItemId())
.append("types", getTypes())
.append("productItem", getProductItem())
.append("createBy", getCreateBy())
@ -195,7 +193,6 @@ public class SysProductItem extends BaseEntity
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("delFlag", getDelFlag())
.append("functions", getFunctions())
.append("dianqi", getDianqi())
.append("struct", getStruct())
.append("soft", getSoft())

2
ruoyi-admin/src/main/java/com/ruoyi/system/service/ISysProductItemService.java
View File

@ -75,4 +75,6 @@ public interface ISysProductItemService
int restoreSysProductItemById(Long id);
public List<SysProductItem> selectSysProductItemLists();
Object getId();
}

8
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
View File

@ -1,11 +1,13 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
import com.ruoyi.system.domain.SysCustomer;
import com.ruoyi.system.mapper.SysCustomerMapper;
import com.ruoyi.system.service.ISysCustomerService;
import io.swagger.annotations.OAuth2Definition;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -25,6 +27,9 @@ public class SysCustomerServiceImpl implements ISysCustomerService
@Autowired
private SysCustomerMapper sysCustomerMapper;
@Autowired
private RedisCache redisCache;
@Override
public SysCustomer selectSysCustomerById(Long customerId) {
return sysCustomerMapper.selectSysCustomerById(customerId);
@ -115,7 +120,6 @@ public class SysCustomerServiceImpl implements ISysCustomerService
@Override
public String getId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format("%3d");
return "KH" + time.substring(2);
return redisCache.generateNo("KH");
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductItemServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.ShiroUtils;
@ -23,6 +24,9 @@ public class SysProductItemServiceImpl implements ISysProductItemService
@Autowired
private SysProductItemMapper sysProductItemMapper;
@Autowired
private RedisCache redisCache;
/**
* 查询生产团队
*
@ -59,6 +63,7 @@ public class SysProductItemServiceImpl implements ISysProductItemService
String loginName = ShiroUtils.getLoginName();
sysProductItem.setCreateBy(loginName);
sysProductItem.setCreateTime(DateUtils.getNowDate());
redisCache.generateNo("JSTEAM");
return sysProductItemMapper.insertSysProductItem(sysProductItem);
}
@ -130,4 +135,9 @@ public class SysProductItemServiceImpl implements ISysProductItemService
SysProductItem sysProductItem = new SysProductItem();
return sysProductItemMapper.selectSysProductItemList(sysProductItem);
}
@Override
public Object getId() {
return redisCache.generateNo("JSTEAM");
}
}

7
ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.system.domain.SysSalesOrder;
import com.ruoyi.system.mapper.SysSalesOrderMapper;
@ -22,6 +23,9 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
@Autowired
private SysSalesOrderMapper sysSalesOrderMapper;
@Autowired
private RedisCache redisCache;
/**
* 查询销售订单
*
@ -96,7 +100,6 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
@Override
public String getId() {
String time = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(System.currentTimeMillis());
return "SO" + time.substring(2);
return redisCache.generateBillNo("XS");
}
}

10
ruoyi-admin/src/main/resources/mapper/erp/ErpUtbItemMapper.xml
View File

@ -29,11 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="utbId != null and utbId != ''"> and utbId = #{utbId}</if>
<if test="utbName != null and utbName != ''"> and utbName like concat('%', #{utbName}, '%')</if>
<if test="salesman1 != null and salesman1 != ''"> and salesman1 = #{salesman1}</if>
<if test="salesman2 != null and salesman2 != ''"> and salesman2 = #{salesman2}</if>
<if test="salesman3 != null and salesman3 != ''"> and salesman3 = #{salesman3}</if>
<if test="manage != null and manage != ''"> and manage = #{manage}</if>
<if test="manager != null and manager != ''"> and manager = #{manager}</if>
<if test="salesman1 != null and salesman1 != ''"> and salesman1 like concat('%', #{salesman1}, '%') </if>
<if test="salesman2 != null and salesman2 != ''"> and salesman2 like concat('%', #{salesman2}, '%') </if>
<if test="salesman3 != null and salesman3 != ''"> and salesman3 like concat('%',#{salesman3}, '%') </if>
<if test="manage != null and manage != ''"> and manage like concat('%', #{manage}, '%') </if>
<if test="manager != null and manager != ''"> and manager like concat('%', #{manager}, '%') </if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>

14
ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsDetailMapper.xml
View File

@ -25,10 +25,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="salesExplain" column="sales_explain" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectDeliveryGoodsDetailVo">
select delivery_goods_detail_id, notice_order_number, sales_order_number, enterprise_code, enterprise_name, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, version_number, sales_explain, standby_one, standby_two from delivery_goods_detail
select delivery_goods_detail_id, notice_order_number, sales_order_number, enterprise_code, enterprise_name, finish_product_code, finish_product_name, specification_model, customer_number, type_machine, inventory_unit, common_currency, process_price, product_quantity, amount_money, line, version_number, sales_explain, standby_one, standby_two,create_by, create_time, update_by, update_time, remark from delivery_goods_detail
</sql>
<select id="selectDeliveryGoodsDetailList" parameterType="DeliveryGoodsDetail" resultMap="DeliveryGoodsDetailResult">
@ -40,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="finishProductCode != null and finishProductCode != ''"> and finish_product_code like concat('%', #{finishProductCode}, '%')</if>
<if test="finishProductName != null and finishProductName != ''"> and finish_product_name like concat('%', #{finishProductName}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
@ -71,6 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="salesExplain != null">sales_explain,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
<if test="createBy != null">create_by,</if>
create_time
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="deliveryGoodsDetailId != null">#{deliveryGoodsDetailId},</if>
@ -93,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="salesExplain != null">#{salesExplain},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
<if test="createBy != null">#{createBy},</if>
now()
</trim>
</insert>
@ -118,6 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="salesExplain != null">sales_explain = #{salesExplain},</if>
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
update_time = CONCAT_WS(',',NOW(),update_time),
</trim>
where delivery_goods_detail_id = #{deliveryGoodsDetailId}
</update>

12
ruoyi-admin/src/main/resources/mapper/manufacture/DeliveryGoodsNoticeMapper.xml
View File

@ -23,10 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateInfoTime" column="update_info_time" />
<result property="standbyOne" column="standby_one" />
<result property="standbyTwo" column="standby_two" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectDeliveryGoodsNoticeVo">
select delivery_goods_notice_id, notice_order_number, delivery_date, enterprise_code, enterprise_name, customer_contact, customer_factory, delivery_address, export_sales, stock_number, stock_name, remarks, voucher_preparation, delivery_goods_flag, first_add_time, update_info_time, standby_one, standby_two from delivery_goods_notice
select delivery_goods_notice_id, notice_order_number, delivery_date, enterprise_code, enterprise_name, customer_contact, customer_factory, delivery_address, export_sales, stock_number, stock_name, remarks, voucher_preparation, delivery_goods_flag, first_add_time, update_info_time, standby_one, standby_two, create_by, create_time, update_by, update_time from delivery_goods_notice
</sql>
<select id="selectDeliveryGoodsNoticeList" parameterType="DeliveryGoodsNotice" resultMap="DeliveryGoodsNoticeResult">
@ -38,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterpriseName != null and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
<if test="exportSales != null and exportSales != ''"> and export_sales = #{exportSales}</if>
<if test="deliveryGoodsFlag != null and deliveryGoodsFlag != ''"> and delivery_goods_flag = #{deliveryGoodsFlag}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
@ -64,7 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deliveryGoodsFlag != null">delivery_goods_flag,</if>
<if test="standbyOne != null">standby_one,</if>
<if test="standbyTwo != null">standby_two,</if>
<if test="createBy != null">create_by,</if>
first_add_time,
create_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="noticeOrderNumber != null and noticeOrderNumber != ''">#{noticeOrderNumber},</if>
@ -82,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deliveryGoodsFlag != null">#{deliveryGoodsFlag},</if>
<if test="standbyOne != null">#{standbyOne},</if>
<if test="standbyTwo != null">#{standbyTwo},</if>
<if test="createBy != null">#{createBy},</if>
NOW(),
NOW(),
</trim>
</insert>
@ -105,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="standbyOne != null">standby_one = #{standbyOne},</if>
<if test="standbyTwo != null">standby_two = #{standbyTwo},</if>
update_info_time = CONCAT_WS(',',NOW(),update_info_time),
update_time = CONCAT_WS(',',NOW(),update_time),
</trim>
where delivery_goods_notice_id = #{deliveryGoodsNoticeId}
</update>

44
ruoyi-admin/src/main/resources/mapper/system/SysProductItemMapper.xml
View File

@ -6,6 +6,7 @@
<resultMap type="SysProductItem" id="SysProductItemResult">
<result property="id" column="id" />
<result property="productItemId" column="product_item_id" />
<result property="types" column="types" />
<result property="productItem" column="productItem" />
<result property="createBy" column="create_by" />
@ -13,7 +14,6 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="updateTime" />
<result property="delFlag" column="del_flag" />
<result property="functions" column="functions" />
<result property="dianqi" column="dianqi" />
<result property="struct" column="struct" />
<result property="soft" column="soft" />
@ -25,25 +25,19 @@
</resultMap>
<sql id="selectSysProductItemVo">
select id, types, productItem, create_by, create_time, update_by, updateTime, del_flag, functions, dianqi, struct, soft, test, zhuguan1, zhuguan2, manger, director from sys_product_item
select id,product_item_id, types, productItem, create_by, create_time, update_by, updateTime, del_flag, dianqi, struct, soft, test, zhuguan1, zhuguan2, manger, director from sys_product_item
</sql>
<select id="selectSysProductItemList" parameterType="SysProductItem" resultMap="SysProductItemResult">
<include refid="selectSysProductItemVo"/>
<where>
<if test="id != null "> and id = #{id}</if>
<if test="types != null and types != ''"> and types = #{types}</if>
<if test="productItem != null and productItem != ''"> and productItem = #{productItem}</if>
<if test="updateTime != null "> and updateTime = #{updateTime}</if>
<if test="functions != null and functions != ''"> and functions = #{functions}</if>
<if test="dianqi != null and dianqi != ''"> and dianqi = #{dianqi}</if>
<if test="struct != null and struct != ''"> and struct = #{struct}</if>
<if test="soft != null and soft != ''"> and soft = #{soft}</if>
<if test="test != null and test != ''"> and test = #{test}</if>
<if test="zhuguan1 != null and zhuguan1 != ''"> and zhuguan1 = #{zhuguan1}</if>
<if test="zhuguan2 != null and zhuguan2 != ''"> and zhuguan2 = #{zhuguan2}</if>
<if test="manger != null and manger != ''"> and manger = #{manger}</if>
<if test="director != null and director != ''"> and director = #{director}</if>
<if test="productItemId != null and productItemId != ''"> and product_item_id concat('%',#{productItemId}, '%') </if>
<if test="productItem != null and productItem != ''"> and productItem like concat('%',#{productItem}, '%') </if>
<if test="dianqi != null and dianqi != ''"> and dianqi concat('%',#{dianqi}, '%') </if>
<if test="struct != null and struct != ''"> and struct concat('%',#{struct}, '%')}</if>
<if test="soft != null and soft != ''"> and soft like concat('%', #{soft}, '%') </if>
<if test="test != null and test != ''"> and testlike concat('%', #{test}, '%')</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
@ -55,14 +49,12 @@
<insert id="insertSysProductItem" parameterType="SysProductItem" useGeneratedKeys="true" keyProperty="id">
insert into sys_product_item
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="types != null">types,</if>
<if test="productItemId != null">product_item_id,</if>
<if test="productItem != null">productItem,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">updateTime,</if>
<if test="delFlag != null">del_flag,</if>
<if test="functions != null">functions,</if>
<if test="dianqi != null">dianqi,</if>
<if test="struct != null">struct,</if>
<if test="soft != null">soft,</if>
@ -71,16 +63,16 @@
<if test="zhuguan2 != null">zhuguan2,</if>
<if test="manger != null">manger,</if>
<if test="director != null">director,</if>
<if test="remark != null">remark,</if>
<if test="delFlag != null">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="types != null">#{types},</if>
<if test="productItemId != null">#{productItemId},</if>
<if test="productItem != null">#{productItem},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="delFlag != null">#{delFlag},</if>
<if test="functions != null">#{functions},</if>
<if test="dianqi != null">#{dianqi},</if>
<if test="struct != null">#{struct},</if>
<if test="soft != null">#{soft},</if>
@ -89,20 +81,18 @@
<if test="zhuguan2 != null">#{zhuguan2},</if>
<if test="manger != null">#{manger},</if>
<if test="director != null">#{director},</if>
<if test="remark != null">#{remark},</if>
<if test="delFlag != null">#{delFlag},</if>
</trim>
</insert>
<update id="updateSysProductItem" parameterType="SysProductItem">
update sys_product_item
<trim prefix="SET" suffixOverrides=",">
<if test="types != null">types = #{types},</if>
<if test="productItemId != null">product_item_id = #{productItemId},</if>
<if test="productItem != null">productItem = #{productItem},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">updateTime = #{updateTime},</if>
<if test="delFlag != null">del_flag = #{delFlag},</if>
<if test="functions != null">functions = #{functions},</if>
<if test="dianqi != null">dianqi = #{dianqi},</if>
<if test="struct != null">struct = #{struct},</if>
<if test="soft != null">soft = #{soft},</if>
@ -111,6 +101,7 @@
<if test="zhuguan2 != null">zhuguan2 = #{zhuguan2},</if>
<if test="manger != null">manger = #{manger},</if>
<if test="director != null">director = #{director},</if>
updateTime = now()
</trim>
where id = #{id}
</update>
@ -133,5 +124,4 @@
<update id="restoreSysProductItemById" parameterType="Long">
update sys_product_item set del_flag = '0' where id = #{id}
</update>
</mapper>

123
ruoyi-admin/src/main/resources/templates/erp/utb/add.html
View File

@ -1,59 +1,128 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增业务团队')" />
<th:block th:include="include :: header('添加业务团队')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-utb-add">
<div class="form-group">
<label class="col-sm-3 control-label">业务团队ID：</label>
<div class="container">
<div class="form-header">
<h4>添加业务团队</h4>
</div>
<div class="form-row" hidden="hidden">
<label class="col-sm-5 control-label">业务团队ID：</label>
<div class="col-sm-8">
<input name="utbId" class="form-control" type="text">
<input readonly name="utbId" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">团队名称：</label>
<div class="form-row">
<div class="col-xs-6">
<label class="col-sm-4 control-label">团队名称：</label>
<div class="col-sm-8">
<input name="utbName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-xs-6">
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务员1：</label>
</div>
</div>
<div class="container">
<div class="form-header">
<h4>业务员</h4>
</div>
<div class="form-row">
<div class="col-xs-8">
<label class="col-sm-4 control-label">业务员1：</label>
<div class="col-sm-8">
<input name="salesman1" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务员2：</label>
<label class="col-sm-4 control-label">业务员2：</label>
<div class="col-sm-8">
<input name="salesman2" class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员3：</label>
<div class="col-sm-8">
<input name="salesman3" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务员3：</label>
<label class="col-sm-4 control-label">业务员3：</label>
<div class="col-sm-8">
<input name="salesman3" class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员4：</label>
<div class="col-sm-8">
<input name="salesman4" class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员5：</label>
<div class="col-sm-8">
<input name="salesman5" class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员6：</label>
<div class="col-sm-8">
<input name="salesman6" class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员7：</label>
<div class="col-sm-8">
<input name="salesman7" class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员8：</label>
<div class="col-sm-8">
<input name="salesman8" class="form-control" type="text">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">主管：</label>
</div>
<div class="container">
<div class="form-header">
<h4>业务服务员</h4>
</div>
<div class="form-row">
<div class="col-xs-8">
<label class="col-sm-4 control-label">业务服务员1：</label>
<div class="col-sm-8">
<input class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员服务2：</label>
<div class="col-sm-8">
<input class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员服务3：</label>
<div class="col-sm-8">
<input class="form-control" type="text">
</div>
<label class="col-sm-4 control-label">业务员服务4：</label>
<div class="col-sm-8">
<input class="form-control" type="text">
</div>
</div>
</div>
</div>
<div class="container">
<div class="form-header">
<h4>经理和主管</h4>
</div>
<div class="form-row">
<div class="col-xs-6">
<label class="col-sm-4 control-label">主管：</label>
<div class="col-sm-8">
<input name="manager" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">经理：</label>
<div class="col-xs-6">
<label class="col-sm-4 control-label">经理：</label>
<div class="col-sm-8">
<input name="manage" class="form-control" type="text">
</div>
</div>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
@ -68,6 +137,22 @@
$.operate.save(prefix + "/add", $('#form-utb-add').serialize());
}
}
//获取单号
$.ajax({
url: prefix + "/getId",
type: "post",
dateType: "json",
success: function (resp) {
if (resp.code === 0) {
$("input[name='utbId']").val(resp.data);
} else {
$.modal.msgError("失败啦");
}
},
error: function () {
$.modal.msgError("后台出错啦！");
}
});
</script>
</body>
</html>

9
ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
View File

@ -57,15 +57,6 @@
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:utb:add">
<i class="fa fa-plus"></i> 添加业务团队
</a>
<!-- <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="erp:utb:edit">-->
<!-- <i class="fa fa-edit"></i> 修改-->
<!-- </a>-->
<!-- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:utb:remove">-->
<!-- <i class="fa fa-remove"></i> 删除-->
<!-- </a>-->
<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:utb:export">-->
<!-- <i class="fa fa-download"></i> 导出-->
<!-- </a>-->
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>

45
ruoyi-admin/src/main/resources/templates/erp/utb/utbcoef.html
View File

@ -14,10 +14,18 @@
<div id="app" class="wrapper wrapper-content animated fadeInRight ibox-content" >
<h2 class="form-header">业务绩效配置</h2>
<form class="form-horizontal m" id="form-utbCoef-edit">
<div class="container-div">
<div class="container">
<div class="form-row">
<h4 class="form-header">个人绩效（业务员、业务经理、业务主管）</h4>
</div>
<div class="form-row">
<div class="col-xs-6">
<span class="text-danger">每个季度内，绩效金额区间</span>
</div>
<div class="col-xs-6">
<span class="text-danger">绩效系数</span>
</div>
</div>
<input name="id" type="text" hidden="hidden">
<div class="form-row">
<div class="col-md-12">
@ -70,12 +78,20 @@
</div>
</div>
</div>
<div class="container-div">
<div class="container">
<div class="form-row">
<h4 class="form-header">团队绩效（业务经理）</h4>
</div>
<div class="form-row">
<div class="col-md-12">
<div class="col-xs-6">
<span class="text-danger">每个季度内，绩效金额区间</span>
</div>
<div class="col-xs-6">
<span class="text-danger">绩效系数</span>
</div>
</div>
<div class="form-row">
<div class="col-xs-12">
<san class="text-danger">超过</san>
<input type="text" value="0.00" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" disabled>
<span class="text-danger">至</span>
@ -83,7 +99,7 @@
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12">
<div class="col-xs-12">
<san class="text-danger">超过</san>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" >
<span class="text-danger">至</span>
@ -123,12 +139,21 @@
<span class="text-danger">以内*</span>
<input type="text" onkeyup="value=value.match(/\d+\.?d{0,2}/,'')" />
</div>
<div class="col-md-12"></div>
</div>
</div>
<div class="container-div">
<div class="container">
<div class="form-row">
<h4 class="form-header">团队绩效（业务主管）</h4>
</div>
<div class="form-row">
<div class="col-xs-6">
<span class="text-danger">每个季度内，绩效金额区间</span>
</div>
<div class="col-xs-6">
<span class="text-danger">绩效系数</span>
</div>
</div>
<div class="form-row">
<div class="col-md-12">
<san class="text-danger">超过</san>
@ -180,10 +205,18 @@
</div>
</div>
</div>
<div class="container-div">
<div class="container">
<div class="form-row">
<h4 class="form-header">业务服务员（业务服务员）</h4>
</div>
<div class="form-row">
<div class="col-xs-6">
<span class="text-danger">每个季度内，绩效金额区间</span>
</div>
<div class="col-xs-6">
<span class="text-danger">绩效系数</span>
</div>
</div>
<div class="form-row">
<div class="col-md-12">
<san class="text-danger">超过</san>

22
ruoyi-admin/src/main/resources/templates/main.html
View File

@ -176,7 +176,7 @@
contentType:'application/json;charset=utf-8',
dataType:'json',
success:function (data){
console.log(data);
// console.log(data);
$("#oderNolist").val(data);
},
error:function (){
@ -193,7 +193,7 @@
contentType:'application/json;charset=utf-8',
dataType:'json',
success:function (data){
console.log(data);
// console.log(data);
$("#oderNolist").val(data);
},
error:function (){
@ -201,7 +201,7 @@
}
});
</script>
<!-- 产品产量分布统计-->
<!-- 产品产量分布统计-->
<script type="text/javascript">
var productYieldDom = document.getElementById('productYield');
var productYield = echarts.init(productYieldDom, 'walden', {
@ -257,7 +257,7 @@
if (productYieldOption && typeof productYieldOption === 'object') {
productYield.setOption(productYieldOption);
console.log(productYield.getOption())
// console.log(productYield.getOption())
}
window.addEventListener('resize', productYield.resize);
@ -314,13 +314,13 @@
if (productClassificationYieldOption && typeof productClassificationYieldOption === 'object') {
productClassificationYield.setOption(productClassificationYieldOption);
console.log(productClassificationYield.getOption())
// console.log(productClassificationYield.getOption())
}
window.addEventListener('resize', productClassificationYield.resize);
</script>
<!-- 产品日增长量-->
<!-- 产品日增长量-->
<script type="text/javascript">
var dailyProductGrowthDom = document.getElementById('dailyProductGrowth');
var dailyProductGrowth = echarts.init(dailyProductGrowthDom, 'walden', {
@ -477,13 +477,13 @@
if (productDefectsOption && typeof productDefectsOption === 'object') {
productDefects.setOption(productDefectsOption);
console.log(productDefects.getOption())
// console.log(productDefects.getOption())
}
window.addEventListener('resize', productDefects.resize);
</script>
<!-- 产品分类缺陷分布统计-->
<!-- 产品分类缺陷分布统计-->
<script type="text/javascript">
var productClassificationDefectsDom = document.getElementById('productClassificationDefects');
var productClassificationDefects = echarts.init(productClassificationDefectsDom, 'walden', {
@ -588,7 +588,7 @@
window.addEventListener('resize', productClassificationDefects.resize);
</script>
<!--产品分类日增长趋势-->
<!--产品分类日增长趋势-->
<script type="text/javascript">
var dailyGrowthTrendDom = document.getElementById('dailyGrowthTrend');
var dailyGrowthTrend = echarts.init(dailyGrowthTrendDom, 'walden', {
@ -647,7 +647,7 @@
window.addEventListener('resize', dailyGrowthTrend.resize);
</script>
<!--产品合格率统计-->
<!--产品合格率统计-->
<script type="text/javascript">
var passRateDom = document.getElementById('passRate');
var passRate = echarts.init(passRateDom, 'walden', {
@ -688,7 +688,7 @@
window.addEventListener('resize', passRate.resize);
</script>
<!--产品分类合格率统计-->
<!--产品分类合格率统计-->
<script type="text/javascript">
var classificationPassRateDom = document.getElementById('classificationPassRate');
var classificationPassRate = echarts.init(classificationPassRateDom, null, {

341
ruoyi-admin/src/main/resources/templates/system/customer/add.html
View File

@ -10,284 +10,311 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-customer-add">
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">客户ID：</label>
<div class="col-sm-8">
<label class="col-sm-6 control-label">客户ID：</label>
<div class="col-sm-6">
<input name="customerId" class="form-control" type="text" required >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">内外销：</label>
<div class="col-sm-8">
<select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户代码：</label>
<div class="col-sm-8">
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label is-required">客户代码：</label>
<div class="col-sm-6">
<input name="enterpriseCode" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户/企业名称：</label>
<div class="col-sm-8">
<label class="col-sm-6 control-label is-required">客户/企业名称：</label>
<div class="col-sm-6">
<input name="enterpriseName" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">英文名称：</label>
<div class="col-sm-8">
<label class="col-sm-6 control-label">英文名称：</label>
<div class="col-sm-6">
<input name="englishName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户公司简称：</label>
<div class="col-sm-8">
<input name="customerAbbreviation" class="form-control" type="text">
<label class="col-sm-6 control-label">事业部：</label>
<div class="col-sm-6">
<input name="customerPurser" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">事业部：</label>
<div class="col-sm-8">
<input name="customerPurser" class="form-control" type="text" required>
<label class="col-sm-6 control-label">客户简称：</label>
<div class="col-sm-6">
<input name="customerAbbreviation" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">地址：</label>
<div class="col-sm-8">
<input name="customerAddress" class="form-control" type="text">
<label class="col-sm-6 control-label">内外销：</label>
<div class="col-sm-6">
<select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">送货地址：</label>
<div class="col-sm-8">
<input name="deliveryAddress" class="form-control" type="text">
<label class="col-sm-6 control-label">国家地区：</label>
<div class="col-sm-6">
<select name="customerCountry" class="form-control m-b" th:with="type=${@dict.getType('sys_country')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">邮编：</label>
<div class="col-sm-8">
<label class="col-sm-6 control-label">邮编：</label>
<div class="col-sm-6">
<input name="postalCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">国家地区：</label>
<div class="col-sm-8">
<select name="customerCountry" class="form-control m-b" th:with="type=${@dict.getType('sys_country')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<label class="col-sm-6 control-label">公司地址：</label>
<div class="col-sm-6">
<input name="customerAddress" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">第一联系人：</label>
<div class="col-sm-8">
<input name="customerContact" class="form-control" type="text" required>
<label class="col-sm-6 control-label" is-required>法人代表：</label>
<div class="col-sm-6">
<input required name="legalRepresentative" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label" >职务：</label>
<div class="col-sm-8">
<input name="customerOffice" class="form-control" type="text">
<label class="col-sm-6 control-label">成立日期：</label>
<div class="col-sm-6">
<div class="input-group date">
<input name="establishedTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required" >联系电话：</label>
<div class="col-sm-8">
<input name="contactNumber" class="form-control" type="text" required>
<label class="col-sm-6 control-label" is-required>开票公司名称：</label>
<div class="col-sm-6">
<input required name="invoicingCustomerName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">传真：</label>
<div class="col-sm-8">
<input name="customerFax" class="form-control" type="text">
<label class="col-sm-6 control-label">开票公司税号：</label>
<div class="col-sm-6">
<input name="invoicingCompanyName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Email：</label>
<div class="col-sm-8">
<input name="customerEmail" class="form-control" type="text">
<label class="col-sm-6 control-label">开户银行：</label>
<div class="col-sm-6">
<input name="depositBank" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">海关代码：</label>
<div class="col-sm-8">
<input name="customsCode" class="form-control" type="text">
<label class="col-sm-6 control-label">开户银行账号：</label>
<div class="col-sm-6">
<input name="bankAccount" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款条件：</label>
<div class="col-sm-8">
<input name="paymentTerms" class="form-control" type="text">
<label class="col-sm-6 control-label is-required">报价币种：</label>
<div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_common_currency')}">
<input required type="radio" th:id="${'commonCurrency_' + dict.dictCode}" name="commonCurrency" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'commonCurrency_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">常用币种：</label>
<div class="col-sm-8">
<select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
<label class="col-sm-6 control-label">诚信评级：</label>
<div class="col-sm-6">
<select name="integrityRating" class="form-control m-b" th:with="type=${@dict.getType('sys_integrity_rating')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开户银行：</label>
<div class="col-sm-8">
<input name="depositBank" class="form-control" type="text">
<!--<div class="form-group">
<label class="col-sm-6 control-label">信用额度：</label>
<div class="col-sm-6">
<input name="creditLimit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开户银行账号：</label>
<div class="col-sm-8">
<input name="bankAccount" class="form-control" type="text">
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">发票代码：</label>
<div class="col-sm-6">
<input name="invoiceCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">法人代表：</label>
<div class="col-sm-8">
<input name="legalRepresentative" class="form-control" type="text">
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">目的港：</label>
<div class="col-sm-6">
<input name="portOfDestination" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成立日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="establishedTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">结汇银行：</label>
<div class="col-sm-6">
<input name="settlementBank" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">结汇账号：</label>
<div class="col-sm-6">
<input name="exchangeSettlementAccount" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开票客户名称：</label>
<div class="col-sm-8">
<input name="invoicingCustomerName" class="form-control" type="text">
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">目的地港代号：</label>
<div class="col-sm-6">
<input name="destinationPortCode" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开票公司税号：</label>
<div class="col-sm-8">
<input name="invoicingCompanyName" class="form-control" type="text">
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">起运潜名：</label>
<div class="col-sm-6">
<input name="departurePotentialName" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">信用额度：</label>
<div class="col-sm-8">
<input name="creditLimit" class="form-control" type="text">
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">起运潜代号：</label>
<div class="col-sm-6">
<input name="departurePotentialCode" class="form-control" type="text">
</div>
<div class="form-group">
<label class="col-sm-3 control-label">诚信评级：</label>
<div class="col-sm-8">
<select name="integrityRating" class="form-control m-b" th:with="type=${@dict.getType('sys_integrity_rating')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">统一编号：</label>
<div class="col-sm-6">
<input name="unifiedNumbering" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">发票代码：</label>
<div class="col-sm-8">
<input name="invoiceCode" class="form-control" type="text">
<label class="col-sm-6 control-label">制单人：</label>
<div class="col-sm-6">
<input name="voucherPreparation" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">目的港：</label>
<div class="col-sm-8">
<input name="portOfDestination" class="form-control" type="text">
<label class="col-sm-6 control-label">确认人：</label>
<div class="col-sm-6">
<input readonly name="identifyingPeople" class="form-control" type="text">
</div>
</div> -->
<div class="form-group">
<label class="col-sm-6 control-label is-required">是否含税：</label>
<div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
<input required type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">结汇银行：</label>
<div class="col-sm-8">
<input name="settlementBank" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">结汇账号：</label>
<div class="col-sm-8">
<input name="exchangeSettlementAccount" class="form-control" type="text">
<div class="form-group">
<label class="col-sm-6 control-label" is-required>国内税率：</label>
<div class="col-sm-6">
<input required name="taxRate" class="form-control" placeholder="%" type="text"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">RMB注册资金：</label>
<div class="col-sm-8">
<label class="col-sm-6 control-label">RMB注册资金：</label>
<div class="col-sm-6">
<input name="rmbRegisteredCapital" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">外币注册资金：</label>
<div class="col-sm-8">
<label class="col-sm-6 control-label">外币注册资金：</label>
<div class="col-sm-6">
<input name="registeredCapital" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务员：</label>
<div class="col-sm-8">
<!-- <select name="businessMembers" class="form-control m-b">
<option value="">业务员</option>
</select> -->
<input name="businessMembers" readonly th:value="${@permission.getPrincipalProperty('userName')}" required class="form-control businessMembers is-required" type="text">
<label class="col-sm-6 control-label">付款条件：</label>
<div class="col-sm-6">
<input name="paymentTerms" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">目的地港代号：</label>
<div class="col-sm-8">
<input name="destinationPortCode" class="form-control" type="text">
<div class="form-group">
<label class="col-sm-6 control-label">海关代码：</label>
<div class="col-sm-6">
<input name="customsCode" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">起运潜名：</label>
<div class="col-sm-8">
<input name="departurePotentialName" class="form-control" type="text">
<div class="form-group" >
<label class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
<div class="col-sm-6">
<input name="customerContact" class="form-control" type="text" required>
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">起运潜代号：</label>
<div class="col-sm-8">
<input name="departurePotentialCode" class="form-control" type="text">
<div class="form-group">
<label class="col-sm-6 control-label">第一联系人职务：</label>
<div class="col-sm-6">
<input name="customerOffice" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">统一编号：</label>
<div class="col-sm-8">
<input name="unifiedNumbering" class="form-control" type="text">
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" required>
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">制单人：</label>
<div class="col-sm-8">
<input name="voucherPreparation" class="form-control" type="text">
<div class="form-group">
<label class="col-sm-6 control-label">第一联系人邮箱：</label>
<div class="col-sm-6">
<input name="customerEmail" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">确认人：</label>
<div class="col-sm-8">
<input readonly name="identifyingPeople" class="form-control" type="text">
<div class="form-group">
<label class="col-sm-6 control-label">第一联系人传真：</label>
<div class="col-sm-6">
<input name="customerFax" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否含税：</label>
<div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
<input type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<div class="col-sm-6">
<input name="customerContact" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<div class="col-sm-6">
<input required name="deliveryAddress" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">第一收货人邮编：</label>
<div class="col-sm-6">
<input class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">第一收货人传真：</label>
<div class="col-sm-6">
<input class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">税率：</label>
<div class="col-sm-8">
<input name="taxRate" class="form-control" type="text="/>
<label class="col-sm-6 control-label">业务员：</label>
<div class="col-sm-6">
<select name="businessMembers" class="form-control m-b">
<option value="">业务员</option>
</select>
<!-- <input name="businessMembers" readonly
th:value="${@permission.getPrincipalProperty('userName')}"
required class="form-control businessMembers is-required" type="text">-->
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注内容：</label>
<div class="col-sm-8">
<label class="col-sm-6 control-label">备注内容：</label>
<div class="col-sm-6">
<textarea name="customerRemarks" class="form-control"></textarea>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />

729
ruoyi-admin/src/main/resources/templates/system/customer/customer.html
View File

@ -341,335 +341,331 @@
<div class="details-title">客户详情</div>
<div class="modal-body details-body">
<div class="row">
<div class="base-customer">
<form class="form-horizontal m" id="form-customer-detail">
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">客户/企业代码：</label>
<div class="col-sm-8">
<input id="enterpriseCode" name="enterpriseCode" class="form-control" type="text"
readonly>
<label class="col-sm-6 control-label">客户ID：</label>
<div class="col-sm-6">
<input name="customerId" class="form-control" type="text" required >
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">内外销：</label>
<div class="col-sm-8">
<input name="exportSales" class="form-control" type="text" readonly>
<!-- <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label is-required">客户代码：</label>
<div class="col-sm-6">
<input name="enterpriseCode" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户/企业名称：</label>
<div class="col-sm-8">
<input id="enterpriseName" name="enterpriseName" class="form-control" type="text"
readonly>
<label class="col-sm-6 control-label is-required">客户/企业名称：</label>
<div class="col-sm-6">
<input name="enterpriseName" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">英文名称：</label>
<div class="col-sm-8">
<input name="englishName" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">英文名称：</label>
<div class="col-sm-6">
<input name="englishName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">客户简称：</label>
<div class="col-sm-8">
<input name="customerAbbreviation" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">事业部：</label>
<div class="col-sm-6">
<input name="customerPurser" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">事业部：</label>
<div class="col-sm-8">
<input name="customerPurser" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">客户简称：</label>
<div class="col-sm-6">
<input name="customerAbbreviation" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">地址：</label>
<div class="col-sm-8">
<input name="customerAddress" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">内外销：</label>
<div class="col-sm-6">
<select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">送货地址：</label>
<div class="col-sm-8">
<input id="deliveryAddress" name="deliveryAddress" class="form-control" type="text"
readonly>
<label class="col-sm-6 control-label">国家地区：</label>
<div class="col-sm-6">
<select name="customerCountry" class="form-control m-b" th:with="type=${@dict.getType('sys_country')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">邮编：</label>
<div class="col-sm-8">
<input name="postalCode" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">邮编：</label>
<div class="col-sm-6">
<input name="postalCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">国家地区：</label>
<div class="col-sm-8">
<input name="customerCountry" class="form-control" type="text" readonly>
<!-- <select name="customerCountry" class="form-control m-b" th:with="type=${@dict.getType('sys_country')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<label class="col-sm-6 control-label">公司地址：</label>
<div class="col-sm-6">
<input name="customerAddress" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">常用币种：</label>
<div class="col-sm-8">
<input name="commonCurrency" class="form-control" type="text" readonly>
<!-- <select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<label class="col-sm-6 control-label" is-required>法人代表：</label>
<div class="col-sm-6">
<input required name="legalRepresentative" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注内容：</label>
<div class="col-sm-8">
<textarea name="customerRemarks" class="form-control" readonly></textarea>
</div>
<label class="col-sm-6 control-label">成立日期：</label>
<div class="col-sm-6">
<div class="input-group date">
<input name="establishedTime" class="form-control" placeholder="yyyy-MM-dd" type="text">
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">法人代表：</label>
<div class="col-sm-8">
<input name="legalRepresentative" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开票客户名称：</label>
<div class="col-sm-8">
<input name="invoicingCustomerName" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label" is-required>开票公司名称：</label>
<div class="col-sm-6">
<input required name="invoicingCustomerName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开票公司代码</label>
<div class="col-sm-8">
<input name="invoicingCompanyName" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">开票公司税号：</label>
<div class="col-sm-6">
<input name="invoicingCompanyName" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">信用额度：</label>
<div class="col-sm-8">
<input name="creditLimit" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">开户银行：</label>
<div class="col-sm-6">
<input name="depositBank" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">诚信评级：</label>
<div class="col-sm-8">
<input name="integrityRating" class="form-control" type="text" readonly>
<!-- <select name="integrityRating" class="form-control m-b" th:with="type=${@dict.getType('sys_integrity_rating')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<label class="col-sm-6 control-label">开户银行账号：</label>
<div class="col-sm-6">
<input name="bankAccount" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">职务：</label>
<div class="col-sm-8">
<input name="customerOffice" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label is-required">报价币种：</label>
<div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_common_currency')}">
<input required type="radio" th:id="${'commonCurrency_' + dict.dictCode}" name="commonCurrency" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'commonCurrency_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系人：</label>
<div class="col-sm-8">
<input name="customerContact" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">联系电话：</label>
<div class="col-sm-8">
<input name="contactNumber" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">诚信评级：</label>
<div class="col-sm-6">
<select name="integrityRating" class="form-control m-b" th:with="type=${@dict.getType('sys_integrity_rating')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">传真：</label>
<div class="col-sm-8">
<input name="customerFax" class="form-control" type="text" readonly>
<!--<div class="form-group">
<label class="col-sm-6 control-label">信用额度：</label>
<div class="col-sm-6">
<input name="creditLimit" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">Email：</label>
<div class="col-sm-8">
<input name="customerEmail" class="form-control" type="text" readonly>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">发票代码：</label>
<div class="col-sm-6">
<input name="invoiceCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">海关代码：</label>
<div class="col-sm-8">
<input name="customsCode" class="form-control" type="text" readonly>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">目的港：</label>
<div class="col-sm-6">
<input name="portOfDestination" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">付款条件：</label>
<div class="col-sm-8">
<input name="paymentTerms" class="form-control" type="text" readonly>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">结汇银行：</label>
<div class="col-sm-6">
<input name="settlementBank" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">发票代码：</label>
<div class="col-sm-8">
<input name="invoiceCode" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">结汇账号：</label>
<div class="col-sm-6">
<input name="exchangeSettlementAccount" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">目的港：</label>
<div class="col-sm-8">
<input name="portOfDestination" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">目的地港代号：</label>
<div class="col-sm-6">
<input name="destinationPortCode" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">成立日期：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="establishedTime" class="form-control" type="text" readonly>
<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">起运潜名：</label>
<div class="col-sm-6">
<input name="departurePotentialName" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">起运潜代号：</label>
<div class="col-sm-6">
<input name="departurePotentialCode" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">结汇银行：</label>
<div class="col-sm-8">
<input name="settlementBank" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">统一编号：</label>
<div class="col-sm-6">
<input name="unifiedNumbering" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">结汇账号：</label>
<div class="col-sm-8">
<input name="exchangeSettlementAccount" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">制单人：</label>
<div class="col-sm-6">
<input name="voucherPreparation" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-6 control-label">确认人：</label>
<div class="col-sm-6">
<input readonly name="identifyingPeople" class="form-control" type="text">
</div>
</div> -->
<div class="form-group">
<label class="col-sm-3 control-label">开户银行：</label>
<div class="col-sm-8">
<input name="depositBank" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label is-required">是否含税：</label>
<div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
<input required type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">开户银行账号：</label>
<div class="col-sm-8">
<input name="bankAccount" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label" is-required>国内税率：</label>
<div class="col-sm-6">
<input required name="taxRate" class="form-control" placeholder="%" type="text"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">RMB注册资金：</label>
<div class="col-sm-8">
<input name="rmbRegisteredCapital" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">RMB注册资金：</label>
<div class="col-sm-6">
<input name="rmbRegisteredCapital" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">外币注册资金：</label>
<div class="col-sm-8">
<input name="registeredCapital" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">外币注册资金：</label>
<div class="col-sm-6">
<input name="registeredCapital" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">订单号长度：</label>
<div class="col-sm-8">
<input name="orderLength" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">付款条件：</label>
<div class="col-sm-6">
<input name="paymentTerms" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">出货单格式模板名称：</label>
<div class="col-sm-8">
<input name="shippingTemplate" class="form-control" type="text" readonly>
<!-- <select name="shippingTemplate" class="form-control m-b" th:with="type=${@dict.getType('sys_shipping_template')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<label class="col-sm-6 control-label">海关代码：</label>
<div class="col-sm-6">
<input name="customsCode" class="form-control" type="text">
</div>
</div>
<div class="form-group" >
<label class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
<div class="col-sm-6">
<input name="customerContact" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">业务员：</label>
<div class="col-sm-8">
<input name="businessMembers" class="form-control" type="text" readonly>
<label class="col-sm-6 control-label">第一联系人职务：</label>
<div class="col-sm-6">
<input name="customerOffice" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">目的地港代号：</label>
<div class="col-sm-8">
<input name="destinationPortCode" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一联系人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" required>
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">起运潜名：</label>
<div class="col-sm-8">
<input name="departurePotentialName" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label">第一联系人邮箱：</label>
<div class="col-sm-6">
<input name="customerEmail" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">起运潜代号：</label>
<div class="col-sm-8">
<input name="departurePotentialCode" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label">第一联系人传真：</label>
<div class="col-sm-6">
<input name="customerFax" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">统一编号：</label>
<div class="col-sm-8">
<input name="unifiedNumbering" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label is-required">客户第一收货人：</label>
<div class="col-sm-6">
<input name="customerContact" class="form-control" type="text" required>
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">出货需录入使用量：</label>
<div class="col-sm-8">
<input name="shipmentUsage" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人电话：</label>
<div class="col-sm-6">
<input name="contactNumber" class="form-control" type="text" required>
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">制单人：</label>
<div class="col-sm-8">
<input name="voucherPreparation" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label is-required">第一收货人地址：</label>
<div class="col-sm-6">
<input required name="deliveryAddress" class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">确认人：</label>
<div class="col-sm-8">
<input name="identifyingPeople" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label">第一收货人邮编：</label>
<div class="col-sm-6">
<input class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">是否含税：</label>
<div class="col-sm-8">
<!-- <div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">-->
<!-- <input type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}">-->
<!-- <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>-->
<!-- </div>-->
<input type="text" name="confirmTax" class="form-control" readonly>
<label class="col-sm-6 control-label">第一收货人传真：</label>
<div class="col-sm-6">
<input class="form-control" type="text">
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">税率：</label>
<div class="col-sm-8">
<input name="taxRate" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label">业务员：</label>
<div class="col-sm-6">
<select name="businessMembers" class="form-control m-b">
<option value="">业务员</option>
</select>
<!-- <input name="businessMembers" readonly
th:value="${@permission.getPrincipalProperty('userName')}"
required class="form-control businessMembers is-required" type="text">-->
</div>
</div>
<div class="form-group" hidden="hidden">
<label class="col-sm-3 control-label">国家/地区编号：</label>
<div class="col-sm-8">
<!-- <select name="countryNumber" class="form-control m-b" th:with="type=${@dict.getType('sys_country_number')}">-->
<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
<!-- </select>-->
<input name="countryNumber" class="form-control" type="text" readonly>
<div class="form-group">
<label class="col-sm-6 control-label">备注内容：</label>
<div class="col-sm-6">
<textarea name="customerRemarks" class="form-control"></textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-6 control-label">是否作废客户信息：</label>
<div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_whether')}">
<input type="radio" th:id="${'delflag_' + dict.dictCode}" name="delflag" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'delflag_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
<div class="contactsList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">联系人明细</div>
<table id="contacts-table"></table>
</div>
</div>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">送货地址</div>
<table id="address-table"></table>
<div class="form-group">
<label class="col-sm-6 control-label">客户标识：</label>
<div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_customer_sign')}">
<input type="radio" th:id="${'sign_' + dict.dictCode}" name="customerSign" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'sign_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
</form>
<div class="addressList sh">
<div class="col-sm-12 select-table table-striped">
<div class="details" style="padding: 8px 0;font-size: 18px">操作历史</div>
@ -776,244 +772,76 @@
modalName: "客户基本信息",
fixedColumns:true,
fixedRightNumber:1,
columns: [{
checkbox: true
},
{
field: 'deginflag',
title: '审核状态',
formatter: function (value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value);
}
},
{
field: 'delflag',
title: '客户状态',
formatter: function (value, row, index) {
return $.table.selectDictLabel(useStatusDatas, value);
},
},
{
field: 'businessMembers',
title: '业务员',
visible: false
},
{
field: 'enterpriseCode',
title: '客户ID',
},
{
field: 'enterpriseName',
title: '客户公司名称'
},
{
field: 'customerAbbreviation',
title: '客户公司简称',
},
{
field: 'englishName',
title: '英文名称',
},
{
field: 'customerPurser',
title: '事业部',
},
{
field: 'customerAddress',
title: '公司地址',
},
{
field: 'customerOffice',
title: '职务',
visible: false
},
{
field: 'exportSales',
title: '内外销',
formatter: function (value, row, index) {
return $.table.selectDictLabel(exportSalesDatas, value);
},
visible: false
},
{
field: 'deliveryAddress',
title: '送货地址'
},
{
field: 'postalCode',
title: '邮编',
visible: false
},
{
field: 'customerCountry',
title: '国家地区',
formatter: function (value, row, index) {
return $.table.selectDictLabel(customerCountryDatas, value);
},
visible: false
},
{
field: 'commonCurrency',
title: '币种',
formatter: function (value, row, index) {
return $.table.selectDictLabel(commonCurrencyDatas, value);
},
visible: false
},
{
field: 'customerRemarks',
title: '备注内容',
visible: false
},
{
field: 'legalRepresentative',
title: '法人代表',
visible: false
},
{
field: 'invoicingCustomerName',
title: '开票客户名称',
visible: false
},
{
field: 'invoicingCompanyName',
title: '开票公司名称',
visible: false
},
{
field: 'creditLimit',
title: '信用额度',
visible: false
},
{
field: 'integrityRating',
title: '诚信评级',
formatter: function (value, row, index) {
return $.table.selectDictLabel(integrityRatingDatas, value);
},
visible: false
},
{
field: 'customerContact',
title: '联系人'
},
{
field: 'contactNumber',
title: '联系电话'
},
{
field: 'customerFax',
title: '传真'
},
{
field: 'customerEmail',
title: 'Email'
},
{
field: 'customsCode',
title: '海关代码',
visible: false
},
{
field: 'paymentTerms',
title: '付款条件'
},
{
field: 'invoiceCode',
title: '发票代码',
visible: false
},
{
field: 'portOfDestination',
title: '目的港',
visible: false
},
{
field: 'establishedTime',
title: '成立日期'
},
{
field: 'settlementBank',
title: '结汇银行',
visible: false
},
{
field: 'exchangeSettlementAccount',
title: '结汇账号',
visible: false
},
{
field: 'depositBank',
title: '开户银行',
// visible: false
},
{
field: 'bankAccount',
title: '开户银行账号',
// visible: false
},
{
field: 'rmbRegisteredCapital',
title: 'RMB注册资金',
visible: false
},
{
field: 'registeredCapital',
title: '外币注册资金',
visible: false
},
{
field: 'confirmTax',
title: '是否含税',
columns: [
{checkbox: true},
{ title: '审核状态',field: 'deginflag',
formatter: function (value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
},
{title: '客户状态',field: 'delflag',
formatter: function (value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);},
},
{title: '业务员',field: 'businessMembers',visible: false},
{title: '客户ID',field: 'enterpriseCode' },
{title: '客户公司名称',field: 'enterpriseName'},
{title: '客户公司简称',field: 'customerAbbreviation'},
{title: '英文名称',field: 'englishName'},
{title: '事业部',field: 'customerPurser'},
{title: '公司地址',field: 'customerAddress'},
{title: '职务',field: 'customerOffice',visible: false},
{title: '内外销',field: 'exportSales',visible: false,
formatter: function (value, row, index) {return $.table.selectDictLabel(exportSalesDatas, value);},
},
{title: '送货地址',field: 'deliveryAddress'},
{title: '邮编',field: 'postalCode',visible: false},
{title: '国家地区',field: 'customerCountry',visible: false,
formatter: function (value, row, index) {return $.table.selectDictLabel(customerCountryDatas, value);},
},
{title: '国家/地区编号',field: 'countryNumber',visible: false,
formatter: function (value, row, index) {return $.table.selectDictLabel(countryNumberDatas, value); },
},
{title: '币种',field: 'commonCurrency',visible: false,
formatter: function (value, row, index) {return $.table.selectDictLabel(commonCurrencyDatas, value);},
},
{title: '备注内容',field: 'customerRemarks',visible: false},
{title: '法人代表',field: 'legalRepresentative',visible: false},
{title: '开票客户名称',field: 'invoicingCustomerName',visible: false},
{title: '开票公司名称',field: 'invoicingCompanyName',visible: false},
{ title: '信用额度',field: 'creditLimit',visible: false},
{title: '诚信评级',field: 'integrityRating',visible: false,
formatter: function (value, row, index) {return $.table.selectDictLabel(integrityRatingDatas, value);},
},
{title: '联系人',field: 'customerContact'},
{title: '联系电话',field: 'contactNumber'},
{title: '传真',field: 'customerFax'},
{title: 'Email',field: 'customerEmail'},
{title: '海关代码',field: 'customsCode',visible: false},
{title: '付款条件',field: 'paymentTerms'},
{title: '发票代码',field: 'invoiceCode',visible: false},
{title: '目的港',field: 'portOfDestination',visible: false},
{title: '成立日期',field: 'establishedTime'},
{title: '结汇银行',field: 'settlementBank',visible: false},
{title: '结汇账号',field: 'exchangeSettlementAccount',visible: false},
{title: '开户银行',field: 'depositBank'},
{title: '开户银行账号',field: 'bankAccount'},
{title: 'RMB注册资金',field: 'rmbRegisteredCapital',visible: false},
{title: '外币注册资金',field: 'registeredCapital',visible: false},
{title: '是否含税',field: 'confirmTax',
formatter: function (value, row, index) {
return $.table.selectDictLabel(confirmTaxDatas, value);
},
// visible: false
},
{
field: 'taxRate',
title: '税率',
// visible: false
},
{
field: 'countryNumber',
title: '国家/地区编号',
formatter: function (value, row, index) {
return $.table.selectDictLabel(countryNumberDatas, value);
},
visible: false
},
{
field: 'firstAddTime',
title: '录入时间',
{title: '税率',field: 'taxRate'},
{title: '录入时间',field: 'firstAddTime',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
return value;
}
if (value == null) {return " ";} else { return value;}
}
},
{
field: 'updateInfoTime',
title: '上次修改时间',
{title: '上次修改时间',field: 'updateInfoTime',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
}
if (value == null) {return " ";} else {var vArr = value.split(',');return vArr[0];}
}
},
{
title: '操作',
align: 'center',
{title: '操作',align: 'center',
formatter: function(value, row, index) {
var actions = [];
// 审核状态-审核通过 使用状态-是 未发起作废流程
@ -1045,18 +873,10 @@
}
// 详情
actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-eye"></i> 详情</a> ');
/*actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="showdetails(\'' + index + '\')"><i class="fa fa-eye"></i>详情</a> ');
actions.push('<a class="btn btn-success btn-xs ' + auditFlag + '" href="javascript:void(0)" onclick="showMaterial(\'' + index + '\')"><i class="fa fa-file-o"></i>审核</a> ');
if(row.delFlag == '0'){
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a>');
}else{
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a>');
}*/
return actions.join('');
}
}]
}
]
};
$.table.init(options);
});
@ -1071,8 +891,6 @@
$.operate.save(prefix1 + "/add", $('#form-contacts-add').serialize());
$('#infoModal').modal("hide")
}
}
// 列表联系人明细
@ -1133,19 +951,17 @@
focusCleanup: true
});
function showdetails(index) {
var data = $("#bootstrap-table").bootstrapTable("getSelections");
// var enterpriseCode=data[0].enterpriseCode;
// console.log(data.length,enterpriseCode)
if (data.length == 1) {
$("#enterpriseCode").val(data[0].enterpriseCode)
$("input[name='enterpriseCode']").val(data[0].enterpriseCode)
$("input[name='exportSales']").val(data[0].exportSales)
$("#enterpriseName").val(data[0].enterpriseName)
$("input[name='enterpriseName']").val(data[0].enterpriseName)
$("input[name='englishName']").val(data[0].englishName)
$("input[name='customerAddress']").val(data[0].customerAddress)
$("#deliveryAddress").val(data[0].deliveryAddress)
$("input[name='deliveryAddress']").val(data[0].deliveryAddress)
$("input[name='postalCode']").val(data[0].postalCode)
$("input[name='customerCountry']").val(data[0].customerCountry)
$("input[name='commonCurrency']").val(data[0].commonCurrency)
@ -1173,7 +989,6 @@
$("input[name='registeredCapital']").val(data[0].registeredCapital)
$("input[name='orderLength']").val(data[0].orderLength)
$("input[name='shippingTemplate']").val(data[0].shippingTemplate)
$("input[name='businessMembers']").val(data[0].businessMembers)
$("input[name='destinationPortCode']").val(data[0].destinationPortCode)
$("input[name='departurePotentialName']").val(data[0].departurePotentialName)
@ -1185,21 +1000,16 @@
// $("input[name='confirmTax']").val(data[0].confirmTax)
$("input[name='taxRate']").val(data[0].taxRate)
$("input[name='countryNumber']").val(data[0].countryNumber)
console.log(data[0].shipmentUsage)
console.log(data[0].confirmTax)
if (data[0].confirmTax == 1) {
$("input[name='confirmTax']").val("是")
} else {
$("input[name='confirmTax']").val("否")
}
if (data[0].shipmentUsage == 1) {
$("input[name='shipmentUsage']").val("是")
} else {
$("input[name='shipmentUsage']").val("否")
}
// 联系人
$('#contacts-table').bootstrapTable('destroy');
@ -1299,7 +1109,6 @@
},
]
});
// 送货地址
$('#address-table').bootstrapTable('destroy');
$('#address-table').bootstrapTable({
@ -1382,7 +1191,7 @@
]
});
// 客户表操作历史
$('#oper-table').bootstrapTable('destroy');
$('#oper-table').bootstrapTable({
url: '/system/customer/operList',
@ -1465,8 +1274,6 @@
else {
$.modal.alert("请选择一条数据");
}
}
function close() {
@ -1538,7 +1345,7 @@
}
// 联系人
// 联系人列表
$('#contacts-table').bootstrapTable('destroy');
$('#contacts-table').bootstrapTable({
url: '/system/contacts/list',
@ -1637,7 +1444,7 @@
]
});
// 送货地址
// 送货地址列表
$('#address-table').bootstrapTable('destroy');
$('#address-table').bootstrapTable({
url: '/system/shippingaddress/addresslist',
@ -1719,7 +1526,7 @@
]
});
// 客户表操作历史
$('#oper-table').bootstrapTable('destroy');
$('#oper-table').bootstrapTable({
url: '/system/customer/operList',

125
ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
View File

@ -14,10 +14,12 @@
<input name="supplierCode" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group" hidden="hidden">
<div class="col-xs-12">
<label class="col-sm-4 control-label">业务员：</label>
<div class="col-sm-8">
<input name="createBy" class="form-control" type="text" th:value="${@permission.getPrincipalProperty('userName')}" readonly>
<select class="form-control" name="salesman" required>
<option value="">请选择</option>
</select>
</div>
</div>
<div class="form-group">
@ -36,23 +38,26 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">物料合计：</label>
<label class="col-sm-4 control-label">报价币种：</label>
<div class="col-sm-8">
<input name="enterprise" class="form-control" type="text">
<select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">数量合计：</label>
<label class="col-sm-4 control-label">美元汇率：</label>
<div class="col-sm-8">
<input name="enterpriseSum" class="form-control" type="text">
<input name="usdTax" class="form-control" type="text" placeholder="美元对人民币汇率">
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">报价币种：</label>
<div class="col-sm-8">
<select name="commonCurrency" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<label class="col-sm-6 control-label is-required">是否含税：</label>
<div class="col-sm-6">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_confirm_tax')}">
<input required type="radio" th:id="${'confirmTax_' + dict.dictCode}" name="confirmTax" th:value="${dict.dictValue}" th:checked="${dict.default}">
<label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
</div>
</div>
</div>
<div class="form-group">
@ -62,50 +67,95 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">美元汇率：</label>
<label class="col-sm-4 control-label">订价日期：</label>
<div class="col-sm-8">
<input name="createTime" class="form-control" type="datetime-local">
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">备注说明：</label>
<div class="col-sm-8">
<textarea readonly name="remark" class="form-control"></textarea>
</div>
</div>
<div class="container">
<h4 class="form-header h4">计算</h4>
<div class="form-row">
<div class="col-xs-6">
<div class="form-group">
<label class="col-sm-4 control-label">物料合计：</label>
<div class="col-sm-8">
<input name="enterprise" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">数量合计：</label>
<div class="col-sm-8">
<input name="usdTax" class="form-control" type="text">
<input name="enterpriseSum" class="form-control" type="text">
</div>
</div>
</div>
<!-- <div class="form-group">
</div>
<div class="form-row">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">不含税单价(RMB)：</label>
<div class="col-sm-8">
<input class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">不含税总价(RMB)：</label>
<div class="col-sm-8">
<input name="noRmbSum" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">含税单价(RMB)：</label>
<div class="col-sm-8">
<input class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">含税总价(RMB)：</label>
<div class="col-sm-8">
<input name="rmbSum" class="form-control" type="text" readonly>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="col-xs-12">
<div class="form-group">
<label class="col-sm-3 control-label">不含税总价(美元)：</label >
<label class="col-sm-3 control-label">不含税单价(美元)：</label >
<div class="col-sm-8">
<input name="noUsdSum" class="form-control" type="text" readonly>
<input class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">含税总价(美元)：</label>
<label class="col-sm-3 control-label">不含税总价(美元)：</label >
<div class="col-sm-8">
<input name="usdSum" class="form-control" type="text" readonly>
<input name="noUsdSum" class="form-control" type="text" readonly>
</div>
</div>
-->
<div class="form-group" hidden="hidden">
<label class="col-sm-4 control-label">审核标志: </label>
<div class="form-group">
<label class="col-sm-3 control-label">含税单价(美元)：</label>
<div class="col-sm-8">
<input name="deginFlag" class="form-control" type="text">
<input class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-4 control-label">备注：</label>
<label class="col-sm-3 control-label">含税总价(美元)：</label>
<div class="col-sm-8">
<textarea name="remark" class="form-control"></textarea>
<input name="usdSum" class="form-control" type="text" readonly>
</div>
</div>
<div>
<h4 class="form-header h4">客户报价子信息</h4>
</div>
</div>
</div>
<div class="container">
<h4 class="form-header">客户报价子信息</h4>
</div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="insertRow()">
@ -151,6 +201,7 @@
}
}
//获取客户信息
$(function(){
$("#customerCode").select2({
theme: "bootstrap",
allowClear: true,
@ -192,15 +243,13 @@
// minimumInputLength: 1
}
});
})
$('#customerCode').on('select2:select', function (e) {
var data = e.params.data;
$("input[name='customerName']").val(data.enterpriseName)
$("input[name='contactNumber']").val(data.contactNumber)
$("input[name='businessMembers']").val(data.businessMembers)
$("input[name='customerFax']").val(data.customerFax)
$("input[name='deliveryAddress']").val(data.deliveryAddress)
$("input[name='customerContact']").val(data.customerContact)
$("input[name='paymentTerms']").val(data.paymentTerms)
$("input[name='customerName']").val(data.enterpriseName);
$("select[name='commonCurrency']").val(data.currency).trigger('change');
$("input[name='businessMembers']").val(data.businessMembers);
$("input[name='customerFax']").val(data.customerFax);
});
$(function() {
var options = {
@ -395,7 +444,7 @@
$.modal.msgError("后台出错啦！");
}
});
/*用户列表*/
/*业务员列表*/
$.ajax({
url: ctx + 'system/user/list',
type: 'post',
@ -406,17 +455,16 @@
//alert(JSON.stringify(data));
for (let i in usertData) {
// console.log(finishProductData[i].finishProductCode)
$("#form-salesOrder-add select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
$("#form-customerQuote-add select[name='salesman']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
}
let userName = [[${@permission.getPrincipalProperty('userName')}]];
$("#form-salesOrder-add select[name='businessMembers']").val(userName).trigger("change")
$("#form-customerQuote-add select[name='salesman']").val(userName).trigger("change")
} else {
$.modal.msgError(res.msg);
}
}
})
});
function doSubmit(index, layero,uniqueId){
console.log(uniqueId);
var iframeWin = window[layero.find('iframe')[0]['name']];
@ -465,7 +513,6 @@
};
$.modal.openOptions(options);
}
/* 删除指定表格行 */
function removeRow(){
var ids = $.table.selectColumns("id");

108
ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('customerQuote列表')" />
<th:block th:include="include :: header('客户报价列表')" />
</head>
<body class="gray-bg">
<div class="container-div">
@ -90,84 +90,32 @@
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export",
modalName: "customerQuote",
modalName: "客户报价表",
fixedColumns:true,
fixedRightNumber:1,
columns: [{
checkbox: true
},
{
field: 'deginFlag',
title: '审核状态',
formatter:function (value){
$.table.selectDictLabel(auditStatusData,value);
}
},
{
field: 'businessMembers',
title: '业务员',
},
{
field: 'id',
title: '客户报价表编号',
visible: false
},
{
field: 'supplierCode',
title: '客户报价编号'
},
{
field: 'customerCode',
title: '客户编号'
},
{
field: 'customerName',
title: '客户名称'
},
{
field: 'enterprise',
title: '物料合计'
},
{
field: 'enterpriseSum',
title: '数量合计'
},
{
field: 'commonCurrency',
title: '报价币种',
},
columns: [
{checkbox: true},
{title: '审核状态',field: 'deginFlag',
formatter:function (value){$.table.selectDictLabel(auditStatusData,value);}
},
{title: '业务员',field: 'businessMembers'},
{title: '客户报价表编号',field: 'id',visible: false},
{title: '客户报价编号',field: 'supplierCode'},
{title: '客户编号',field: 'customerCode'},
{title: '客户名称',field: 'customerName'},
{title: '物料合计',field: 'enterprise'},
{title: '数量合计',field: 'enterpriseSum'},
{ title: '报价币种',field: 'commonCurrency'},
{title: '国内汇率',field: 'rmbTax'},
{title: '美元汇率',field: 'usdTax'},
{title: '不含税总价(RMB)',field: 'noRmbSum'},
{title: '含税总价(RMB)',field: 'rmbSum'},
{title: '不含税总价(美元)',field: 'noUsdSum'},
{title: '含税总价(美元)',field: 'usdSum'},
{title: '录入人',field: 'createBy'},
{
field: 'rmbTax',
title: '国内汇率'
},
{
field: 'usdTax',
title: '美元汇率'
},
{
field: 'noRmbSum',
title: '不含税总价(RMB)'
},
{
field: 'rmbSum',
title: '含税总价(RMB)'
},
{
field: 'noUsdSum',
title: '不含税总价(美元)'
},
{
field: 'usdSum',
title: '含税总价(美元)'
},
{
field: 'createBy',
title: '录入人'
},
{
field: 'createTime',
title: '定价时间',
field: 'createTime',
formatter: function(value, row, index) {
if (value == null) {
return " ";
@ -176,10 +124,7 @@
}
}
},
{
field: 'updateBy',
title: '更新人'
},
{title: '更新人',field: 'updateBy'},
{
field: 'updateInfoTime',
title: '上次修改时间',
@ -191,10 +136,7 @@
}
}
},
{
field: 'remark',
title: '备注'
},
{title: '备注',field: 'remark'},
{
title: '操作',
align: 'center',

72
ruoyi-admin/src/main/resources/templates/system/item/add.html
View File

@ -6,70 +6,65 @@
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-item-add">
<input name="productItemId" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">生产团队类型：</label>
<label class="col-sm-3 control-label is-required">团队名称：</label>
<div class="col-sm-8">
<input name="types" class="form-control" type="text">
<input name="productItem" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生产团队名称：</label>
<label class="col-sm-3 control-label is-required">电气：</label>
<div class="col-sm-8">
<input name="productItem" class="form-control" type="text">
<input name="dianqi" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">职能：</label>
<label class="col-sm-3 control-label is-required">结构：</label>
<div class="col-sm-8">
<input name="functions" class="form-control" type="text">
<input name="struct" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">电气技术人员：</label>
<label class="col-sm-3 control-label is-required">软件：</label>
<div class="col-sm-8">
<input name="dianqi" class="form-control" type="text">
<input name="soft" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">结构技术人员：</label>
<label class="col-sm-3 control-label is-required">测试：</label>
<div class="col-sm-8">
<input name="struct" class="form-control" type="text">
<input name="test" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">软件技术人员：</label>
<label class="col-sm-3 control-label is-required">主管1：</label>
<div class="col-sm-8">
<input name="soft" class="form-control" type="text">
<input name="zhuguan1" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">测试技术人员：</label>
<label class="col-sm-3 control-label is-required">主管2：</label>
<div class="col-sm-8">
<input name="test" class="form-control" type="text">
<input name="zhuguan2" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">主管1：</label>
<label class="col-sm-3 control-label is-required">经理：</label>
<div class="col-sm-8">
<input name="zhuguan1" class="form-control" type="text">
<input name="manger" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">主管2：</label>
<label class="col-sm-3 control-label is-required">总监：</label>
<div class="col-sm-8">
<input name="zhuguan2" class="form-control" type="text">
<input name="director" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">经理：</label>
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="manger" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">总监：</label>
<div class="col-sm-8">
<input name="director" class="form-control" type="text">
<textarea name="director" class="form-control" type="text"></textarea>
</div>
</div>
</form>
@ -77,15 +72,28 @@
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "system/item"
$("#form-item-add").validate({
focusCleanup: true
});
$("#form-item-add").validate({focusCleanup: true});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-item-add').serialize());
if ($.validate.form()) {$.operate.save(prefix + "/add", $('#form-item-add').serialize());}
}
$(function(){
$.ajax({
url: prefix + "/getId",
type: "post",
dataType: "json",
success: function (result) {
if (result.code == 0) {
$("input[name='productItemId']").val(result.data);
}
else {
$.modal.msgError("失败啦");
}
},
error: function () {
$.modal.msgError("后台出错啦！");
}
});
});
</script>
</body>
</html>

48
ruoyi-admin/src/main/resources/templates/system/item/edit.html
View File

@ -1,76 +1,70 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改生产团队')" />
<th:block th:include="include :: header('编辑技术团队')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-item-edit" th:object="${sysProductItem}">
<input name="id" th:field="*{id}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label">生产团队类型：</label>
<label class="col-sm-3 control-label is-required">团队名称：</label>
<div class="col-sm-8">
<input name="types" th:field="*{types}" class="form-control" type="text">
<input name="productItem" th:field="*{productItem}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">生产团队名称：</label>
<label class="col-sm-3 control-label is-required">电气：</label>
<div class="col-sm-8">
<input name="productItem" th:field="*{productItem}" class="form-control" type="text">
<input name="dianqi" th:field="*{dianqi}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">职能：</label>
<label class="col-sm-3 control-label is-required">结构：</label>
<div class="col-sm-8">
<input name="functions" th:field="*{functions}" class="form-control" type="text">
<input name="struct" th:field="*{struct}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">电气技术人员：</label>
<label class="col-sm-3 control-label is-required">软件：</label>
<div class="col-sm-8">
<input name="dianqi" th:field="*{dianqi}" class="form-control" type="text">
<input name="soft" th:field="*{soft}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">结构技术人员：</label>
<label class="col-sm-3 control-label is-required">测试：</label>
<div class="col-sm-8">
<input name="struct" th:field="*{struct}" class="form-control" type="text">
<input name="test" th:field="*{test}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">软件技术人员：</label>
<label class="col-sm-3 control-label is-required">主管1：</label>
<div class="col-sm-8">
<input name="soft" th:field="*{soft}" class="form-control" type="text">
<input name="zhuguan1" th:field="*{zhuguan1}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">测试技术人员：</label>
<label class="col-sm-3 control-label is-required">主管2：</label>
<div class="col-sm-8">
<input name="test" th:field="*{test}" class="form-control" type="text">
<input name="zhuguan2" th:field="*{zhuguan2}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">主管1：</label>
<label class="col-sm-3 control-label is-required">经理：</label>
<div class="col-sm-8">
<input name="zhuguan1" th:field="*{zhuguan1}" class="form-control" type="text">
<input name="manger" th:field="*{manger}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">主管2：</label>
<label class="col-sm-3 control-label is-required">总监：</label>
<div class="col-sm-8">
<input name="zhuguan2" th:field="*{zhuguan2}" class="form-control" type="text">
<input name="director" th:field="*{director}" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">经理：</label>
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="manger" th:field="*{manger}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">总监：</label>
<div class="col-sm-8">
<input name="director" th:field="*{director}" class="form-control" type="text">
<textarea name="director" th:field="*{remark}" class="form-control" type="text"></textarea>
</div>
</div>
</form>

145
ruoyi-admin/src/main/resources/templates/system/item/item.html
View File

@ -11,56 +11,34 @@
<div class="select-list">
<ul>
<li>
<label>生产团队的id：</label>
<input type="text" name="id"/>
<label>技术团队ID：</label>
<input type="text" name="productItemId"/>
</li>
<li>
<label>生产团队类型：</label>
<input type="text" name="types"/>
</li>
<li>
<label>生产团队名称：</label>
<label>团队名称：</label>
<input type="text" name="productItem"/>
</li>
<li>
<label>修改时间：</label>
<input type="text" class="time-input" placeholder="请选择修改时间" name="updateTime"/>
</li>
<li>
<label>职能：</label>
<input type="text" name="functions"/>
</li>
<li>
<label>电气技术人员：</label>
<label>电气：</label>
<input type="text" name="dianqi"/>
</li>
<li>
<label>结构技术人员：</label>
<label>结构：</label>
<input type="text" name="struct"/>
</li>
<li>
<label>软件技术人员：</label>
<label>软件：</label>
<input type="text" name="soft"/>
</li>
<li>
<label>测试技术人员：</label>
<label>测试：</label>
<input type="text" name="test"/>
</li>
<li>
<label>主管1：</label>
<input type="text" name="zhuguan1"/>
</li>
<li>
<label>主管2：</label>
<input type="text" name="zhuguan2"/>
</li>
<li>
<label>经理：</label>
<input type="text" name="manger"/>
</li>
<li>
<label>总监：</label>
<input type="text" name="director"/>
<li class="select-time">
<label>录入时间：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@ -73,16 +51,7 @@
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="item:item:add">
<i class="fa fa-plus"></i> 添加
</a>
<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="item:item:edit">
<i class="fa fa-edit"></i> 修改
</a>
<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="item:item:remove">
<i class="fa fa-remove"></i> 删除
</a>
<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="item:item:export">
<i class="fa fa-download"></i> 导出
<i class="fa fa-plus"></i> 添加业务团队
</a>
</div>
<div class="col-sm-12 select-table table-striped">
@ -108,61 +77,37 @@
restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export",
modalName: "生产团队",
columns: [{
checkbox: true
},
columns: [
{checkbox: true},
{title: '生产团队序号',field: 'id',visible: false},
{title: '生产团队的id',field: 'productItemId'},
{title: '生产团队名称', field: 'productItem',},
{title: '电气', field: 'dianqi',},
{title: '结构',field: 'struct',},
{title: '软件',field: 'soft',},
{title: '测试',field: 'test',},
{title: '主管1',field: 'zhuguan1',},
{title: '主管2',field: 'zhuguan2',},
{title: '经理',field: 'manger',},
{title: '总监',field: 'director',},
{title: '备注',field: 'remark',},
{title: '录入人',field: 'createBy',},
{title: '录入时间',field: 'createTime',},
{
field: 'id',
title: '生产团队的id',
visible: false
},
{
field: 'types',
title: '生产团队类型'
},
{
field: 'productItem',
title: '生产团队名称'
field: 'updateBy',
title: '更新人',
},
{
field: 'updateTime',
title: '修改时间'
},
{
field: 'functions',
title: '职能'
},
{
field: 'dianqi',
title: '电气技术人员'
},
{
field: 'struct',
title: '结构技术人员'
},
{
field: 'soft',
title: '软件技术人员'
},
{
field: 'test',
title: '测试技术人员'
},
{
field: 'zhuguan1',
title: '主管1'
},
{
field: 'zhuguan2',
title: '主管2'
},
{
field: 'manger',
title: '经理'
},
{
field: 'director',
title: '总监'
title: '上次修改时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
}
}
},
{
title: '操作',
@ -170,15 +115,11 @@
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
if(row.delFlag == '0'){
actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
}else{
actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
}
actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></i>详情</a> ');
return actions.join('');
}
}]
}
]
};
$.table.init(options);
});

68
ruoyi-admin/src/main/resources/templates/system/qutsourcingquotation/qutsourcingquotation.html
View File

@ -315,19 +315,13 @@
field: 'auditNo',
title: '审核否',
formatter: function (value, row, index) {
// return $.table.selectDictLabel(auditNoDatas, value);
var actions = [];
if ($.table.selectDictLabel(auditNoDatas, value) == "<span class=''>是</span>") {
actions.push('<a class="btn btn-primary btn-xs disabled">已审核</a> ');
} else {
actions.push('<a class="btn btn-danger btn-xs disabled">未审核</a> ');
}
return actions.join('');
return $.table.selectDictLabel(auditNoDatas, value);
}
},
{
field: 'confirmNo',
title: '确认否',
visible: false,
formatter: function (value, row, index) {
// return $.table.selectDictLabel(confirmNoDatas, value);
@ -367,14 +361,6 @@
field: 'materialName',
title: '物料名称'
},
{
field: 'specificationModel',
title: '规格型号'
},
{
field: 'typeMachine',
title: '成品机种'
},
{
field: 'measurementUnit',
title: '计量单位',
@ -422,11 +408,12 @@
},
{
field: 'taxRate',
title: '交税税率'
title: '国内税率',
},
{
field: 'relationalFormula',
title: '每采购单位对应多少库存单位'
title: '每采购单位对应多少库存单位',
visible: false
},
{
field: 'quotationExplain',
@ -455,25 +442,28 @@
{
field: 'auditName',
title: '审核人'
title: '审核人',
visible: false
},
{
field: 'auditTime',
title: '审核时间'
title: '审核时间',
visible: false
},
{
field: 'approveName',
title: '核准人'
title: '核准人',
visible: false
},
{
field: 'approveTime',
title: '核准时间'
title: '核准时间',
visible: false
},
{
field: 'standbyOne',
title: '备用一',
visible: false
},
{
field: 'standbyTwo',
@ -492,9 +482,17 @@
}
}
},
{
field: 'createBy',
title: '录入时间',
},
{
field: 'updateBy',
title: '更新人'
},
{
field: 'updateInfoTime',
title: '上次修改时间',
title: '上次更新时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
@ -503,19 +501,17 @@
return vArr[0];
}
}
},
{
title: '操作',
align: 'center',
formatter: function (value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.qutsourcingQuotationId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.qutsourcingQuotationId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}
// {
// title: '操作',
// align: 'center',
// formatter: function (value, row, index) {
// var actions = [];
// actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.qutsourcingQuotationId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
// actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.qutsourcingQuotationId + '\')"><i class="fa fa-remove"></i>删除</a>');
// return actions.join('');
// }
// }
]
}]
};
$.table.init(options);
});

35
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
View File

@ -86,7 +86,7 @@
<input required name="enterpriseName" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">-->
<div class="form-group">
<label class="col-sm-3 control-label">事业部：</label>
<div class="col-sm-8">
<input readonly name="customerPurser" class="form-control" type="text">
@ -114,13 +114,13 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">联系人邮箱：</label>
<div class="col-sm-8">
<input readonly name="salesOrderNumber" class="form-control" type="text" required>
<input readonly name="" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户收货人：</label>
<div class="col-sm-8">
<select id="customerContact" name="customerContact" class="form-control m-b" required>
<select name="customerContact" class="form-control m-b" required>
</select>
</div>
</div>
@ -133,21 +133,13 @@
<div class="form-group">
<label class="col-sm-3 control-label is-required">收货地址：</label>
<div class="col-sm-8">
<input readonly name="salesOrderNumber" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户订单号：</label>
<div class="col-sm-8">
<input name="salesOrderNumber" class="form-control" type="text" required>
<input readonly name="salesOrderAddress" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">客户订单号：</label>
<div class="col-sm-8">
<select id="selectOderType" name="customerOrderType" class="form-control m-b" required>
</select>
<input name="salesOrderNo" class="form-control" type="text" required>
</div>
</div>
<!--
@ -250,15 +242,6 @@
</div>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">修改日期：</label>-->
<!-- <div class="col-sm-8">-->
<!-- <div class="input-group date">-->
<!-- <input name="modificationTime" class="form-control" placeholder="yyyy-MM-dd" type="text">-->
<!-- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="form-group hidden">
<label class="col-sm-3 control-label">结案否：</label>
@ -341,9 +324,9 @@
<a class="btn btn-primary" onclick="addFinish()">
<i class="fa fa-plus"></i> 添加成品
</a>
<!-- <a class="btn btn-success" onclick="confirmraw()">-->
<!-- <i class="fa fa-plus"></i> 确认添加-->
<!-- </a>-->
<a class="btn btn-success" onclick="confirmraw()">
<i class="fa fa-plus"></i> 确认添加
</a>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="addFinishbomTable" style="white-space:nowrap"></table>
@ -595,7 +578,7 @@
$.modal.msgError(res.msg);
}
}
})
});
// 添加成品
function addFinish() {

85
ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
View File

@ -74,75 +74,24 @@
exportUrl: prefix + "/export",
clickToSelect: true,
modalName: "送货地址",
columns: [{
checkbox: true
columns: [
{checkbox: true},
{title: '送货id',field: 'deliveryId'},
{title: '客户/企业代码',field: 'enterpriseCode'},
{title: '客户/企业名称',field: 'enterpriseName'},
{title: '联系人电话',field: 'customerPhone'},
{title: '联系人',field: 'customerName'},
{title: '送货地址',field: 'deliveryAddress'},
{title: '联系人2',field: 'customerNameTwo'},
{title: '详细描述',field: 'detailedDescription'},
{title: '厂区',field: 'plantArea'},
{title: '邮编',field: 'postalCode'},
{title: '传真',field: 'customerFax'},
{title: '录入时间',field: 'firstAddTime',
formatter: function (value, row, index) {if (value == null) {return " ";}else {return value;}}
},
{
field: 'deliveryId',
title: '送货id',
},
{
field: 'enterpriseCode',
title: '客户/企业代码'
},
{
field: 'enterpriseName',
title: '客户/企业名称'
},
{
field: 'customerPhone',
title: '联系人电话'
},
{
field: 'customerName',
title: '联系人'
},
{
field: 'deliveryAddress',
title: '送货地址'
},
{
field: 'customerNameTwo',
title: '联系人2'
},
{
field: 'detailedDescription',
title: '详细描述'
},
{
field: 'plantArea',
title: '厂区'
},
{
field: 'postalCode',
title: '邮编'
},
{
field: 'customerFax',
title: '传真'
},
{
field: 'firstAddTime',
title: '录入时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
return value;
}
}
},
{
field: 'updateInfoTime',
title: '上次修改时间',
formatter: function (value, row, index) {
if (value == null) {
return " ";
} else {
var vArr = value.split(',')
return vArr[0];
}
}
{title: '上次修改时间',field: 'updateInfoTime',
formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(','); return vArr[0];}}
}
// {
// title: '操作',

12
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
View File

@ -323,12 +323,12 @@ public class RedisCache
no = Long.valueOf(get(codeKey).toString());
}
//新增每日流水
else{
//每日流水设置3天过期,避免生成过多
if(!set(codeKey,0,60*60*24*3)){
throw new RuntimeException("Redis新增单据编号流水失败");
}
}
// else{
// //每日流水设置3天过期,避免生成过多
// if(!set(codeKey,0,60*60*24*3)){
// throw new RuntimeException("Redis新增单据编号流水失败");
// }
// }
no = incr(codeKey, 1);
if (no == null) {
throw new RuntimeException("Redis单据编号流水递增失败");

4
ruoyi-generator/src/main/resources/vm/html/list-tree.html.vm
View File

@ -121,8 +121,8 @@
#if($column.pk)
#elseif($column.list && "" != $dictType)
{
field: '${javaField}',
title: '${comment}',
field: '${javaField}',
align: 'left',
formatter: function(value, row, index) {
return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value);
@ -130,8 +130,8 @@
},
#elseif($column.list && "" != $javaField)
{
field: '${javaField}',
title: '${comment}',
field: '${javaField}',
align: 'left'
},
#end

6
ruoyi-generator/src/main/resources/vm/html/list.html.vm
View File

@ -121,22 +121,22 @@
#end
#if($column.pk)
{
field: '${javaField}',
title: '${comment}',
field: '${javaField}',
visible: false
},
#elseif($column.list && "" != $dictType)
{
field: '${javaField}',
title: '${comment}',
field: '${javaField}',
formatter: function(value, row, index) {
return $.table.selectDictLabel#if($column.htmlType == "checkbox")s#end(${javaField}Datas, value);
}
},
#elseif($column.list && "" != $javaField)
{
title: '${comment}',
field: '${javaField}',
title: '${comment}'
},
#end
#end

Write Preview
Loading…
Cancel
Save