[fix]销售管理:

客户资料
解决客户资料审核流程问题

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

@@ -409,8 +409,9 @@ public class SysCustomerController extends BaseController
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String processInstanceId = task.getProcessInstanceId();
         ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-        SysCustomerVo erpMaterialVo = sysCustomerService.selectSysCustomerById(new Long(processInstance.getBusinessKey()));
+        SysCustomerVo sysCustomerVo = sysCustomerService.selectSysCustomerById(new Long(processInstance.getBusinessKey()));
-        mmap.put("formData", erpMaterialVo);
+        sysCustomerVo.setTaskId(taskId);
+        mmap.put("formData", sysCustomerVo);
         mmap.put("taskId", taskId);
         String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1);
         return prefix + "/task" + verifyName;

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

@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                delivery_address_id,delivery_customer_person,delivery_customer_phone,
                delivery_address,delivery_customer_postal,delivery_customer_fax,business_members,
                identifying_people,first_add_time,update_info_time, create_time ,audit_status,use_status,update_by,
-               apply_user,apply_time from sys_customer
+               apply_user,apply_time , instance_id , instance_type from sys_customer
 
     </sql>
     <select id="selectSysCustomerToList" parameterType="SysCustomer" resultMap="SysCustomerResult">

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

@@ -38,9 +38,6 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:makeorderpick:add">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:makeorderpick:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>