Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
+
+import com.ruoyi.ck.utils.Result;
+import com.ruoyi.common.core.redis.RedisCache;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -29,7 +32,6 @@ public class ErpTechniqueMeritsController extends BaseController
 
     @Autowired
     private IErpTechniqueMeritsService erpTechniqueMeritsService;
-
     @RequiresPermissions("system:technicalMerits:view")
     @GetMapping()
     public String technicalMerits()
@@ -154,4 +156,10 @@ public class ErpTechniqueMeritsController extends BaseController
     {
         return AjaxResult.success(erpTechniqueMeritsService.selectErpTechniqueMeritsById(id));
     }
+
+    @GetMapping("/getId")
+    @ResponseBody
+    public Result getId() throws Exception {
+        return Result.getSuccessResult(erpTechniqueMeritsService.getId());
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java

@@ -103,11 +103,12 @@ public class SysCustomerController extends BaseController
     {
         SysUser curUser = ShiroUtils.getSysUser();
         Long userId = curUser.getUserId();
+        Set<String> roleKeys = roleService.selectRoleKeys(userId);
         // 业务员角色只能看到自己创建的数据
-        SysRole role = roleService.selectRoleById(curUser.getRoleId());
-        if (role.getRoleKey().equals("ywyRole")){
-            sysCustomerVo.setCreateBy(curUser.getUserName());
+        if (roleKeys.contains("ywyRole")) {
+            sysCustomerVo.setApplyUser(curUser.getLoginName());
         }
+
         startPage();
         List<SysCustomerVo> list = sysCustomerService.selectSysCustomerList(sysCustomerVo);
         return getDataTable(list);
@@ -148,9 +149,11 @@ public class SysCustomerController extends BaseController
     public AjaxResult addSave(SysCustomer sysCustomer)
     {
         //判断是否客户对象增加重复
+        SysUser sysUser = ShiroUtils.getSysUser();
         SysCustomerVo sysCustomer1 = new SysCustomerVo();
         sysCustomer1.setEnterpriseName(sysCustomer.getEnterpriseName());
         sysCustomer1.setCustomerPurser(sysCustomer.getCustomerPurser());
+        List<SysPost> sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId());
         SysCustomerVo sysCustomerVo2 = sysCustomerService.selectSysCustomerByCustomer(sysCustomer1);
         if(ObjectUtil.isNotNull(sysCustomerVo2)){
             return AjaxResult.error("该客户已被其他业务员添加,"+" 客户名称 :" +
@@ -158,9 +161,8 @@ public class SysCustomerController extends BaseController
                     "事业部 :  "+ sysCustomerVo2.getCustomerPurser() +
                     "  业务员 : " + sysCustomerVo2.getBusinessMembers());
         }
-        SysUser sysUser = ShiroUtils.getSysUser();
-        List<SysPost> sysPostsList = sysPostService.selectPostsByUserId(sysUser.getUserId());
-        sysPostsList.get(0).getPostName();
+
+
         String operPeople = sysUser.getDept().getDeptName() + "/" + sysPostsList.get(0).getPostName()+"/" + sysUser.getUserName();
         //通过用户获取部门信息
         // 使用状态-否
@@ -233,7 +235,7 @@ public class SysCustomerController extends BaseController
         sysCustomerOper.setOperPeople(operPeople);
         sysCustomerOper.setOperStatus(sysCustomer.getAuditStatus());
         ProcessInstance processInstance = sysCustomerService.updateSysCustomerVo(sysCustomer);
-        if(processInstance != null){
+        if(processInstance.getId() != null){
             sysCustomerOper.setOperStatus("0");
         }else{
             sysCustomerOper.setOperStatus("1");
@@ -479,7 +481,7 @@ public class SysCustomerController extends BaseController
     }
     @RequestMapping("/getCustomerSelList")
     @ResponseBody
-    public AjaxResult ggetCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){
+    public AjaxResult getCustomerQuoteSelList(@RequestParam(required = false,value = "keyword")String keyword){
         SysCustomerVo sysCustomerVo = new SysCustomerVo();
         sysCustomerVo.setKeyword(keyword);
         return success(sysCustomerService.selectSysCustomerList(sysCustomerVo));

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

@@ -101,64 +101,33 @@ public class SysSalesOrderController extends BaseController
     @ResponseBody
     public TableDataInfo list(SysSalesOrderVo sysSalesOrderVo)
     {
-        startPage();
-        List<SysSalesOrderVo> list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
         try {
+            startPage();
+            List<SysSalesOrderVo> list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
             SysUser curUser = ShiroUtils.getSysUser();
+            String loginName = ShiroUtils.getLoginName();
             Long userId = curUser.getUserId();
             Set<String> roleKeys = roleService.selectRoleKeys(userId);
-            List<SysUser> sysUserlist = sysUserService.selectRoleToUserList("ywy");
-            if(roleKeys.contains("ywjlRole")){
-                sysUserlist = sysUserlist.stream().filter(item -> {
-                    return item.getDept().getDeptId() == curUser.getDeptId();
-                }).collect(Collectors.toList());
-                List<SysUser> finalSysUserlist = sysUserlist;
-                finalSysUserlist.add(curUser);
+            List<SysUser> sysUserlist = sysUserService.selectRoleToUserList("ywyRole");
+            sysUserlist.add(curUser);
+            if (roleKeys.contains("ywjlRole")) {
+                List<SysUser> findUser = sysUserlist.stream().filter(item -> (item.getDeptId().equals(curUser.getDeptId()))).collect(Collectors.toList());
+                Set<String> user = findUser.stream().map(SysUser::getLoginName).collect(Collectors.toSet());
                 startPage();
-                list = list.stream().filter(item -> {
-                    for (SysUser sysUser : finalSysUserlist) {
-                        if (sysUser.getLoginName().equals(item.getApplyUser())) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }).collect(Collectors.toList());
-
-                return getDataTable(list);
+                List<SysSalesOrderVo> list2 = list.stream().filter(item -> user.contains(item.getApplyUser())).collect(Collectors.toList());
+                return getDataTable(list2);
             }
-            if(roleKeys.contains("ywzgRole")){
-                sysUserlist = sysUserlist.stream().filter(item -> {
-                    return item.getDept().getDeptId() == curUser.getDeptId();
-                }).collect(Collectors.toList());
-                List<SysUser> finalSysUserlist = sysUserlist;
-                finalSysUserlist.add(curUser);
-                startPage();
-                list = list.stream().filter(item -> {
-                    for (SysUser sysUser : finalSysUserlist) {
-                        if (sysUser.getLoginName().equals(item.getApplyUser())) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }).collect(Collectors.toList());
-                return getDataTable(list);
-            }
-            // 业务员角色只能看到自己创建的数据
-            if(roleKeys.contains("ywyRole")){
-                sysSalesOrderVo.setApplyUser(curUser.getLoginName());
+                    // 业务员角色只能看到自己创建的数据
+            if (roleKeys.contains("ywyRole")) {
+                sysSalesOrderVo.setApplyUser(curUser.getUserName());
                 startPage();
                 list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
                 return getDataTable(list);
             }
-           if(!roleKeys.contains("ywzjRole") && !roleKeys.contains("ywzjRole") && !roleKeys.contains("ywzjRole")){
-               sysSalesOrderVo.setApplyUser(curUser.getLoginName());
-               startPage();
-               list = sysSalesOrderService.selectSysSalesOrderList(sysSalesOrderVo);
-           }
-        }catch (NullPointerException e){
+            return getDataTable(list);
+        }catch(NullPointerException e){
             throw new NullPointerException("当前用户没有申请客户资料");
         }
-        return getDataTable(list);
     }
 
     /**
@@ -466,8 +435,10 @@ public class SysSalesOrderController extends BaseController
         if (processIsFinish) {
             // 审核通过
             sysSalesOrderVo.setAuditStatus("1");
+            //查通过的审核订单
+            SysSalesOrderVo sysSalesOrderVo1 = sysSalesOrderService.selectSysSalesOrderById(sysSalesOrderVo.getSalesOrderId());
             //生产订单生成
-            sysMakeOrderService.generateMakeOrderBySalesOrderCode(sysSalesOrderVo.getSalesOrderCode());
+            sysMakeOrderService.generateMakeOrderBySalesOrderCode(sysSalesOrderVo1.getSalesOrderCode());
             // 提交
             if("submit".equals(instanceType)){
                 // 使用状态-是
@@ -525,7 +496,7 @@ public class SysSalesOrderController extends BaseController
     @ResponseBody
     public TableDataInfo getBinessMembers(){
         startPage();
-        List<SysUser> list = sysUserService.selectRoleToUserList("ywyRole");
+        List<SysUser> list = sysUserService.selectRoleToUserList("ywyRole,ywjlRole,ywzgRole");
         return getDataTable(list);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java

@@ -22,7 +22,7 @@ public class ErpTechniqueMerits extends BaseEntity
 
     /** 技术绩效ID */
     @Excel(name = "技术绩效ID")
-    private Long techniqueId;
+    private String techniqueId;
 
     /** 员工ID */
     @Excel(name = "员工ID")
@@ -68,12 +68,12 @@ public class ErpTechniqueMerits extends BaseEntity
     {
         return id;
     }
-    public void setTechniqueId(Long techniqueId) 
+    public void setTechniqueId(String techniqueId)
     {
         this.techniqueId = techniqueId;
     }
 
-    public Long getTechniqueId() 
+    public String getTechniqueId()
     {
         return techniqueId;
     }

ruoyi-admin/src/main/java/com/ruoyi/system/service/IErpTechniqueMeritsService.java

@@ -72,4 +72,6 @@ public interface IErpTechniqueMeritsService
      * @return
      */
     int restoreErpTechniqueMeritsById(Long id);
+
+   public Object getId();
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/ErpTechniqueMeritsServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.system.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 ErpTechniqueMeritsServiceImpl implements IErpTechniqueMeritsService
 {
     @Autowired
     private ErpTechniqueMeritsMapper erpTechniqueMeritsMapper;
-
+   @Autowired
+   private RedisCache redisCache;
     /**
      * 查询技术绩效列表
      * 
@@ -123,4 +126,8 @@ public class ErpTechniqueMeritsServiceImpl implements IErpTechniqueMeritsService
     {
         return erpTechniqueMeritsMapper.restoreErpTechniqueMeritsById(id);
     }
+    @Override
+    public Object getId(){
+        return redisCache.generateNo("JSJX");
+    }
 }

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

@@ -83,28 +83,28 @@ public class SysCustomerServiceImpl implements ISysCustomerService
     /**
      * 查询客户基本信息列表
      *
-     * @param  sysCustomerVo1
+     * @param  sysCustomer
      * @return 客户基本信息
      */
     @Override
-    public List<SysCustomerVo> selectSysCustomerList(SysCustomerVo sysCustomerVo1)
+    public List<SysCustomerVo> selectSysCustomerList(SysCustomerVo sysCustomer)
     {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        Page<SysCustomerVo> list = (Page<SysCustomerVo>) sysCustomerMapper.selectSysCustomerList(sysCustomerVo1);
+        Page<SysCustomerVo> list = (Page<SysCustomerVo>) sysCustomerMapper.selectSysCustomerList(sysCustomer);
         Page<SysCustomerVo>  returnList = new Page<>();
         //PageHelper 仅对第一List分页有效
-        for(SysCustomerVo sysCustomer : list){
-            SysUser sysUser = userMapper.selectUserByLoginName(sysCustomer.getCreateBy());
+        for(SysCustomerVo sysCustomerVo : list){
+            SysUser sysUser = userMapper.selectUserByLoginName(sysCustomerVo.getCreateBy());
             if (sysUser != null) {
-                sysCustomer.setCreateBy(sysUser.getUserName());
+                sysCustomerVo.setCreateBy(sysUser.getUserName());
             }
-            SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomer.getApplyUser());
+            SysUser sysUser2 = userMapper.selectUserByLoginName(sysCustomerVo.getApplyUser());
             if (sysUser2!=null){
-                sysCustomer.setApplyUserName(sysUser2.getUserName());
+                sysCustomerVo.setApplyUserName(sysUser2.getUserName());
             }
-            String instanceId = sysCustomer.getInstanceId();
+            String instanceId = sysCustomerVo.getInstanceId();
             // 当前环节
             if (StringUtils.isNotBlank(instanceId)) {
                 List<Task> taskList = taskService.createTaskQuery()
@@ -114,27 +114,27 @@ public class SysCustomerServiceImpl implements ISysCustomerService
                 if (!CollectionUtils.isEmpty(taskList)) {
                     TaskEntityImpl task = (TaskEntityImpl) taskList.get(0);
                     String taskId = task.getId();
-                    sysCustomer.setTaskId(taskId);
+                    sysCustomerVo.setTaskId(taskId);
                     // 设置待办用户
                     List<String> todoUserList = todoItemMapper.selectUndealTodoUserList(taskId);
                     if(!CollectionUtils.isEmpty(taskList)){
-                        sysCustomer.setTodoUserId(String.join(",",todoUserList));
+                        sysCustomerVo.setTodoUserId(String.join(",",todoUserList));
                     }
                     if (task.getSuspensionState() == 2) {
-                        sysCustomer.setTaskName("已挂起");
-                        sysCustomer.setSuspendState("2");
+                        sysCustomerVo.setTaskName("已挂起");
+                        sysCustomerVo.setSuspendState("2");
                     } else {
-                        sysCustomer.setTaskName(task.getName());
-                        sysCustomer.setSuspendState("1");
+                        sysCustomerVo.setTaskName(task.getName());
+                        sysCustomerVo.setSuspendState("1");
                     }
                 } else {
                     // 已办结或者已撤销
-                    sysCustomer.setTaskName("已结束");
+                    sysCustomerVo.setTaskName("已结束");
                 }
             } else {
-                sysCustomer.setTaskName("未启动");
+                sysCustomerVo.setTaskName("未启动");
             }
-            returnList.add(sysCustomer);
+            returnList.add(sysCustomerVo);
         }
         returnList.setTotal(CollectionUtils.isEmpty(list) ? 0 : list.getTotal());
         returnList.setPageNum(pageNum);
@@ -281,7 +281,6 @@ public class SysCustomerServiceImpl implements ISysCustomerService
 
     @Override
     public int add(SysCustomer sysCustomer) {
-
         return sysCustomerMapper.insertSysCustomer(sysCustomer);
     }
 
@@ -387,8 +386,8 @@ public class SysCustomerServiceImpl implements ISysCustomerService
 
 
     private ProcessInstance startProcessInstance(String applyTitle, String instanceType, SysCustomer sysCustomer, SysUser user) {
-        Long materialId = sysCustomer.getId();
-        String businessKey = materialId.toString(); // 实体类 ID，作为流程的业务 key
+        Long customerId = sysCustomer.getId();
+        String businessKey = customerId.toString(); // 实体类 ID，作为流程的业务 key
         String key = "customer";
         Map<String,Object> variables = new HashMap<>();
         // 构造authority传参

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

@@ -170,7 +170,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService
     public int insertSysSalesOrder(SysSalesOrder sysSalesOrder){
         String loginName = ShiroUtils.getLoginName();
         sysSalesOrder.setCreateBy(loginName);
-        sysSalesOrder.setCreateTime(new Date());
+        sysSalesOrder.setCreateTime(DateUtils.getNowDate());
         int result = sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder);
         sysSalesOrder.getSalesOrderId();
         int s = sysSalesOrder.getSysSalesOrderChildList().size();

ruoyi-admin/src/main/resources/mapper/system/ErpTechniqueMeritsMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.system.mapper.ErpTechniqueMeritsMapper">
     
     <resultMap type="ErpTechniqueMerits" id="ErpTechniqueMeritsResult">
-        <result property="id"    column="id"    />
+        <result property="id"   column="id"    />
         <result property="techniqueId"    column="technique_id"    />
         <result property="staffNo"    column="staff_no"    />
         <result property="makeName"    column="make_name"    />

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

@@ -76,7 +76,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-6 control-label" is-required>法人代表：</label>
+                <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>
@@ -91,7 +91,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-6 control-label" is-required>开票公司名称：</label>
+                <label class="col-sm-6 control-label is-required">开票公司名称：</label>
                 <div class="col-sm-6">
                     <input required name="invoicingCompanyName" class="form-control" type="text">
                 </div>
@@ -242,7 +242,7 @@
             <div class="form-group">
                 <label class="col-sm-6 control-label">业务员：</label>
                 <div class="col-sm-6">
-                    <select name="businessMembers" class="form-control" shiro:partial="customer:selectBusinessMembers">
+                    <select name="businessMembers" class="form-control"  disabled>
                         <option value="">无</option>
                     </select>
                 </div>
@@ -261,6 +261,7 @@
     <script th:inline="javascript">
         var prefix = ctx + "system/customer"
         var userName = [[${@permission.getPrincipalProperty('userName')}]];
+        var loginName = [[${@permission.getPrincipalProperty('loginName')}]];
         $(function() {
             //获取单号
             $.ajax({
@@ -289,7 +290,7 @@
                         for (let i in usertData) {
                             $("select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                         }
-
+                        $("select[name='businessMembers']").val(loginName);
                     } else {
                         $.modal.msgError(res.msg);
                     }

ruoyi-admin/src/main/resources/templates/system/customer/detail.html

@@ -307,7 +307,7 @@
             $("#form-customer-detail select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
           }
           let userName = [[${@permission.getPrincipalProperty('userName')}]];
-          $("#form-customer-detail select[name='businessMembers']").val(userName).trigger("change")
+          $("#form-customer-detail select[name='businessMembers']").val(customer.businessMembers);
         } else {
           $.modal.msgError(res.msg);
         }

ruoyi-admin/src/main/resources/templates/system/customer/edit.html

@@ -268,8 +268,8 @@
     <script th:src="@{/ajax/libs/vue/vue.js}"></script>
     <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
     <script th:inline="javascript">
-
         var prefix = ctx + "system/customer";
+        var customer = [[${sysCustomer}]];
         $("#form-customer-edit").validate({focusCleanup: true});
 
         function submitHandler() {
@@ -289,6 +289,7 @@
                             $("select[name='businessMembers']").append("<option value='"
                                 + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                         }
+                        $("select[name='businessMembers']").val(customer.businessMembers);
                     } else {
                         $.modal.msgError(res.msg);
                     }

ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html

@@ -307,6 +307,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:src="javascript">
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({onkeyup: false, rules:{}, messages: {},focusCleanup: true});
     $(function(){
         $.ajax({
@@ -320,6 +321,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }

ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html

@@ -308,6 +308,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({focusCleanup: true});
     $(function(){
         $.ajax({
@@ -321,6 +322,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }

ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html

@@ -309,6 +309,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({focusCleanup: true });
     $(function(){
         $.ajax({
@@ -322,6 +323,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }

ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html

@@ -307,8 +307,8 @@
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
-
     var prefix = ctx + "system/customer";
+    var customer = [[${formData}]];
     $("#form-edit").validate({focusCleanup: true});
     $(function(){
         $.ajax({
@@ -322,6 +322,7 @@
                         $("select[name='businessMembers']").append("<option value='"
                             + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                     }
+                    $("select[name='businessMembers']").val(customer.businessMembers);
                 } else {
                     $.modal.msgError(res.msg);
                 }

ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html

@@ -23,7 +23,7 @@
         <div class="form-group" shiro:hasPermission="system:customerQuote:edit">
             <label class="col-sm-4 control-label">业务员：</label>
             <div class="col-sm-8">
-                <select readonly class="form-control" name="businessMembers" required th:field="*{businessMembers}">
+                <select class="form-control" name="businessMembers"  th:field="*{businessMembers}" readonly required>
                     <option value="">请选择</option>
                 </select>
             </div>
@@ -43,7 +43,7 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">报价币种：</label>
             <div class="col-sm-8">
-                <select class="form-control" id="commonCurrency_edit" th:with="dictList=${@dict.getType('sys_common_currency')}" name="commonCurrency"  required>
+                <select class="form-control" id="commonCurrency_edit" th:field="*{commonCurrency}" th:with="dictList=${@dict.getType('sys_common_currency')}" name="commonCurrency"  required>
                     <option value="">请选择</option>
                     <option th:each="dict : ${dictList}" th:value="${dict.dictValue}" th:text="${dict.dictLabel}" ></option>
                 </select>
@@ -68,7 +68,10 @@
         <div class="form-group">
             <label class="col-sm-4 control-label">国内税率：</label>
             <div class="col-sm-8">
-                <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}"  class="form-control" type="number" placeholder="13%" />
+                <div class="input-group">
+                    <input name="rmbTax" id="rmbTax_edit" th:field="*{rmbTax}" class="form-control"  placeholder="13" />
+                    <span class="input-group-addon">%</span>
+                </div>
             </div>
         </div>
         <div class="form-group">

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

@@ -291,7 +291,9 @@
                 <input placeholder="美元" class="col-sm-4" name="usdTaxSum" th:field="*{usdTaxSum}" id="usdSum_edit" type="number" disabled />
             </div>
         </div>
-
+        <div class="container">
+            <input type="hidden" name="salesOrderChildList" >
+        </div>
     </form>
     <div class="other-container">
         <div class="form-row">

ruoyi-admin/src/main/resources/templates/system/technicalMerits/add.html

@@ -9,7 +9,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">技术绩效ID：</label>
                 <div class="col-sm-8">
-                    <input name="techniqueId" class="form-control" type="text">
+                    <input name="techniqueId" class="form-control" type="text" disabled>
                 </div>
             </div>
             <div class="form-group">    
@@ -33,7 +33,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">币种：</label>
                 <div class="col-sm-8">
-                    <input name="currency" class="form-control" type="text">
+                    <select name="currency" class="form-control" th:with="currency=${@dict.getType('sys_common_currency')}">
+                        <option th:each="dict : ${currency}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
@@ -71,10 +73,24 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var prefix = ctx + "system/technicalMerits"
-        $("#form-technicalMerits-add").validate({
-            focusCleanup: true
-        });
-
+        $("#form-technicalMerits-add").validate({focusCleanup: true});
+        $(function (){
+            $.ajax({
+                url: prefix + "/getId",
+                type: "get",
+                dateType: "json",
+                success: function (resp) {
+                    if (resp.code === 0) {
+                        $("#form-technicalMerits-add input[name='techniqueId']").val(resp.data);
+                    } else {
+                        $.modal.msgError("失败啦");
+                    }
+                },
+                error: function () {
+                    $.modal.msgError("后台出错啦！");
+                }
+            });
+        })
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-technicalMerits-add').serialize());

ruoyi-admin/src/main/resources/templates/system/technicalMerits/detail.html

@@ -34,7 +34,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">币种：</label>
                 <div class="col-sm-8">
-                    <input name="currency" th:field="*{currency}" class="form-control" type="text">
+                    <select name="currency" class="form-control" th:with="currency=${@dict.getType('sys_common_currency')}" th:field="*{currency}">
+                        <option th:each="dict : ${currency}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    

ruoyi-admin/src/main/resources/templates/system/technicalMerits/edit.html

@@ -34,7 +34,9 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">币种：</label>
                 <div class="col-sm-8">
-                    <input name="currency" th:field="*{currency}" class="form-control" type="text">
+                    <select name="currency" class="form-control" th:with="currency=${@dict.getType('sys_common_currency')}" th:field="*{currency}">
+                        <option th:each="dict : ${currency}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    

ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html

@@ -37,7 +37,9 @@
                 </form>
             </div>
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:technicalMerits:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
                 <a class="btn btn-warning">
                     <i class="fa fa-download"></i> 导入已发放绩效
                 </a>