diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
index 8a530826..5661dd6b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerController.java
@@ -141,7 +141,7 @@ public class SysCustomerController extends BaseController
         sysCustomer1.setEnterpriseName(sysCustomer.getEnterpriseName());
         sysCustomer1.setCustomerPurser(sysCustomer.getCustomerPurser());
         SysCustomerVo sysCustomerVo2 = sysCustomerService.selectSysCustomerByCustomer(sysCustomer1);
-        if(ObjectUtil.isNotEmpty(sysCustomerVo2)){
+        if(ObjectUtil.isNotNull(sysCustomerVo2)){
             return AjaxResult.error("该客户已被其他业务员添加,"+" 客户名称 :" +
                     sysCustomerVo2.getEnterpriseName() +
                     "事业部 :  "+ sysCustomerVo2.getCustomerPurser() +
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
index db457f1c..5d99c7d2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java
@@ -351,6 +351,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService
         String businessKey = materialId.toString(); // 实体类 ID，作为流程的业务 key
         String key = "customer";
         Map<String,Object> variables = new HashMap<>();
+        insertSysCustomer(sysCustomer);
         // 构造authority传参
         buildAuthority(user, variables);
         sysCustomer.setApplyTitle(applyTitle);
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
index 7bd68bfd..fbbe249b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -143,7 +143,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 name="taxRate" class="form-control" placeholder="%" type="text" required/>
                 </div>
@@ -212,8 +212,7 @@
             <div class="form-group">
                 <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
                 <div class="col-sm-6">
-                    <input name="deliveryAddress" class="form-control" type="text" />
-<!--                    <select id="selectAddress" name="deliveryAddress" class="form-control" type="text" required></select>-->
+                    <input name="deliveryCustomerPerson" class="form-control" type="text" />
                 </div>
             </div>
             <div class="form-group">
@@ -243,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 m-b" shiro:partial="customer:selectBusinessMembers">
+                    <select name="businessMembers" class="form-control" shiro:partial="customer:selectBusinessMembers">
                         <option value="">无</option>
                     </select>
                 </div>
@@ -261,9 +260,7 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/customer"
-        var prefixShippingaddress = ctx + "system/shippingaddress";
-        var prefixinvoice = ctx + "system/invoice";
-        var prefixContacts = ctx + "system/contacts";
+        var userName = [[${@permission.getPrincipalProperty('userName')}]];
         $(function() {
             //获取单号
             $.ajax({
@@ -283,17 +280,16 @@
             });
             /*业务员列表*/
             $.ajax({
-                url: ctx + 'system/user/list',
-                type: 'post',
+                url: ctx + 'system/salesOrder/getBinessMembers',
+                type: 'get',
                 success: function (res) {
                     console.log(res)
                     if (res.rows.length > 0) {
                         var usertData = res.rows;
                         for (let i in usertData) {
-                            $("#form-customer-add select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                            $("select[name='businessMembers']").append("<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                         }
-                        let userName = [[${@permission.getPrincipalProperty('userName')}]];
-                        $("#form-customer-add select[name='businessMembers']").val(userName).trigger("change")
+
                     } else {
                         $.modal.msgError(res.msg);
                     }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
index 64622e1a..d75a44c3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
@@ -632,7 +632,7 @@
             }
         });
         $.ajax({
-            url: ctx + 'system/user/list',
+            url: ctx + 'system/salesOrder/getBinessMembers',
             type: 'post',
             success: function (res) {
                 console.log(res)
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
index e99e5d19..ea84935d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
@@ -9,278 +9,270 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
   <form class="form-horizontal m" id="form-customer-detail" th:object="${sysCustomer}">
-    <div class="form-group" hidden="hidden">
-      <label class="col-sm-6 control-label is-required">客户ID：</label>
-      <div class="col-sm-6">
-        <input name="customerId" th:field="*{id}" class="form-control" type="number"  >
-      </div>
-    </div>
-    <div class="form-group" hidden="hidden">
-      <label class="col-sm-6 control-label is-required">客户代码：</label>
-      <div class="col-sm-6">
-        <input readonly name="enterpriseCode" th:field="*{enterpriseCode}" 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 readonly name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" required>
+      <div class="form-group" hidden="hidden">
+        <label class="col-sm-6 control-label is-required">客户ID：</label>
+        <div class="col-sm-6">
+          <input name="customerId" th:field="*{id}" class="form-control" type="number"  >
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">英文名称：</label>
-      <div class="col-sm-6">
-        <input readonly name="englishName" th:field="*{englishName}" class="form-control" type="text">
+      <div class="form-group" hidden="hidden">
+        <label class="col-sm-6 control-label is-required">客户代码：</label>
+        <div class="col-sm-6">
+          <input readonly name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" required>
+        </div>
       </div>
-    </div>
-
-    <div class="form-group">
-      <label class="col-sm-6 control-label">事业部：</label>
-      <div class="col-sm-6">
-        <input readonly name="customerPurser" th:field="*{customerPurser}" 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 readonly name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" required>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">客户简称：</label>
-      <div class="col-sm-6">
-        <input readonly name="customerAbbreviation" th:field="*{customerAbbreviation}" class="form-control" type="text">
+      <div class="form-group">
+        <label class="col-sm-6 control-label">英文名称：</label>
+        <div class="col-sm-6">
+          <input readonly name="englishName" th:field="*{englishName}" class="form-control" type="text">
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">内外销：</label>
-      <div class="col-sm-6">
-        <select readonly name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}" th:field="*{exportSales}">
-          <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  ></option>
-        </select>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">事业部：</label>
+        <div class="col-sm-6">
+          <input readonly name="customerPurser" th:field="*{customerPurser}" class="form-control" type="text">
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">邮编：</label>
-      <div class="col-sm-6">
-        <input readonly name="postalCode" th:field="*{postalCode}" class="form-control" type="text">
+      <div class="form-group">
+        <label class="col-sm-6 control-label">客户简称：</label>
+        <div class="col-sm-6">
+          <input readonly name="customerAbbreviation" th:field="*{customerAbbreviation}" class="form-control" type="text">
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">公司地址：</label>
-      <div class="col-sm-6">
-        <input readonly name="customerAddress" th:field="*{customerAddress}" class="form-control" type="text">
+      <div class="form-group">
+        <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')}" th:field="*{exportSales}" disabled>
+            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  ></option>
+          </select>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label" is-required>法人代表：</label>
-      <div class="col-sm-6">
-        <input readonly name="legalRepresentative" class="form-control"
-               type="text" th:field="*{legalRepresentative}">
+      <div class="form-group">
+        <label class="col-sm-6 control-label">邮编：</label>
+        <div class="col-sm-6">
+          <input readonly name="postalCode" th:field="*{postalCode}" class="form-control" type="text">
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">成立日期：</label>
-      <div class="col-sm-6">
-        <div class="input-group date">
-          <input name="establishedTime" th:field="*{establishedTime}"
-                 class="form-control" placeholder="yyyy-MM-dd" type="text" readonly >
-          <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">公司地址：</label>
+        <div class="col-sm-6">
+          <input readonly name="customerAddress" th:field="*{customerAddress}" class="form-control" type="text" disabled>
         </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label" is-required>开票公司名称：</label>
-      <div class="col-sm-6">
-        <input  name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
-                type="text" readonly required>
+      <div class="form-group">
+        <label class="col-sm-6 control-label" is-required>法人代表：</label>
+        <div class="col-sm-6">
+          <input disabled name="legalRepresentative" class="form-control"
+                 type="text" th:field="*{legalRepresentative}">
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">开票公司税号：</label>
-      <div class="col-sm-6">
-        <input  name="invoiceCode" th:field="*{invoiceCode}" class="form-control" type="text" readonly/>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">成立日期：</label>
+        <div class="col-sm-6">
+          <div class="input-group date">
+            <input name="establishedTime" th:field="*{establishedTime}"
+                   class="form-control" placeholder="yyyy-MM-dd" type="text" disabled>
+            <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>
+          </div>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">开户银行：</label>
-      <div class="col-sm-6">
-        <input  name="depositBank" th:field="*{depositBank}" 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="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
+                  type="text" disabled required>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">开户银行账号：</label>
-      <div class="col-sm-6">
-        <input  name="bankAccount" th:field="*{bankAccount}" 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="invoiceCode" th:field="*{invoiceCode}" class="form-control" type="text" disabled/>
+        </div>
       </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_common_currency')}">
-          <input  type="radio" th:id="${'commonCurrency_' + dict.dictCode}"
-                  name="commonCurrency" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{commonCurrency}" required  disabled>
-          <label th:for="${'commonCurrency_' + dict.dictCode}" th:text="${dict.dictLabel}" ></label>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">开户银行：</label>
+        <div class="col-sm-6">
+          <input  name="depositBank" th:field="*{depositBank}" class="form-control" type="text" disabled />
         </div>
       </div>
-    </div>
-    <div class="form-group">
-      <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')}" th:field="*{integrityRating}" readonly>
-          <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
-        </select>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">开户银行账号：</label>
+        <div class="col-sm-6">
+          <input  name="bankAccount" th:field="*{bankAccount}" class="form-control" type="text" disabled/>
+        </div>
       </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  type="radio" th:id="${'confirmTax_' + dict.dictCode}"  name="confirmTax" th:value="${dict.dictValue}" disabled
-                 th:checked="${dict.default}" th:field="*{confirmTax}">
-          <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}" ></label>
+      <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_common_currency')}">
+            <input  type="radio" th:id="${'commonCurrency_' + dict.dictCode}"
+                    name="commonCurrency" th:value="${dict.dictValue}" th:checked="${dict.default}" th:field="*{commonCurrency}" required disabled>
+            <label th:for="${'commonCurrency_' + dict.dictCode}" th:text="${dict.dictLabel}" ></label>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label" is-required>国内税率：</label>
-      <div class="col-sm-6">
-        <input name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly />
+      <div class="form-group">
+        <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')}" th:field="*{integrityRating}" disabled>
+            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
+          </select>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">RMB注册资金：</label>
-      <div class="col-sm-6">
-        <input name="rmbRegisteredCapital" th:field="*{rmbRegisteredCapital}" 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">
+          <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}" disabled
+                   th:checked="${dict.default}" th:field="*{confirmTax}">
+            <label th:for="${'confirmTax_' + dict.dictCode}" th:text="${dict.dictLabel}" ></label>
+          </div>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">外币注册资金：</label>
-      <div class="col-sm-6">
-        <input  name="registeredCapital" th:field="*{registeredCapital}" 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="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly required/>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">付款条件：</label>
-      <div class="col-sm-6">
-        <input name="paymentTerms" th:field="*{paymentTerms}" class="form-control" type="text" readonly />
+      <div class="form-group">
+        <label class="col-sm-6 control-label">RMB注册资金：</label>
+        <div class="col-sm-6">
+          <input name="rmbRegisteredCapital" th:field="*{rmbRegisteredCapital}" class="form-control" type="text" readonly />
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">海关代码：</label>
-      <div class="col-sm-6">
-        <input  name="customsCode" th:field="*{customsCode}" 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="registeredCapital" th:field="*{registeredCapital}" class="form-control" type="text" readonly />
+        </div>
       </div>
-    </div>
-    <div class="form-group" hidden="hidden">
-      <label class="col-sm-6 control-label">客户联系人id：</label>
-      <div class="col-sm-6">
-        <input name="customerContactId" class="form-control" th:field="*{customerContactId}" type="number" readonly/>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">付款条件：</label>
+        <div class="col-sm-6">
+          <input name="paymentTerms" th:field="*{paymentTerms}" class="form-control" type="text" readonly />
+        </div>
       </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" th:field="*{customerContact}" readonly/>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">海关代码：</label>
+        <div class="col-sm-6">
+          <input  name="customsCode" th:field="*{customsCode}" class="form-control" type="text" readonly  />
+        </div>
       </div>
-    </div>
-    <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" th:field="*{customerOffice}" readonly/>
+      <div class="form-group" hidden="hidden">
+        <label class="col-sm-6 control-label">客户联系人id：</label>
+        <div class="col-sm-6">
+          <input name="customerContactId" class="form-control" th:field="*{customerContactId}" type="number" readonly/>
+        </div>
       </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" th:field="*{contactNumber}" required>
+      <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" th:field="*{customerContact}" readonly/>
+        </div>
       </div>
-    </div>
-    <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" th:field="*{customerEmail}" readonly>
+      <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" th:field="*{customerOffice}" readonly/>
+        </div>
       </div>
-    </div>
-    <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" th:field="*{customerFax}" 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" th:field="*{contactNumber}" disabled required>
+        </div>
       </div>
-    </div>
-    <div class="form-group" hidden="hidden">
-      <label class="col-sm-6 control-label">第一收货人：</label>
-      <div class="col-sm-6">
-        <input name="deliveryAddressId" class="form-control" type="text" th:field="*{deliveryAddressId}" 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" th:field="*{customerEmail}" readonly>
+        </div>
       </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
-      <div class="col-sm-6">
-        <input name="deliveryAddress" class="form-control" type="text" th:field="*{deliveryAddress}" />
+      <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" th:field="*{customerFax}" readonly>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
-      <div class="col-sm-6">
-        <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
+      <div class="form-group">
+        <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
+        <div class="col-sm-6">
+          <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled required/>
+        </div>
       </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" th:field="*{deliveryAddress}" readonly>
+      <div class="form-group">
+        <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
+        <div class="col-sm-6">
+          <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" disabled required>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">第一收货人邮编：</label>
-      <div class="col-sm-6">
-        <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" 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" th:field="*{deliveryAddress}" readonly>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">第一收货人传真：</label>
-      <div class="col-sm-6">
-        <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">第一收货人邮编：</label>
+        <div class="col-sm-6">
+          <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">业务员：</label>
-      <div class="col-sm-6">
-        <input name="businessMembers" th:field="*{businessMembers}" class="form-control m-b" shiro:partial="customer:selectBusinessMembers" />
+      <div class="form-group">
+        <label class="col-sm-6 control-label">第一收货人传真：</label>
+        <div class="col-sm-6">
+          <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" disabled>
+        </div>
       </div>
-    </div>
-    <div class="form-group">
-      <label class="col-sm-6 control-label">备注内容：</label>
-      <div class="col-sm-6">
-        <textarea name="customerRemarks" th:field="*{customerRemarks}" class="form-control"></textarea>
+      <div class="form-group">
+        <label class="col-sm-6 control-label">业务员：</label>
+        <div class="col-sm-6">
+          <input name="businessMembers" disabled type="text" th:field="*{businessMembers}" class="form-control m-b" shiro:partial="customer:selectBusinessMembers" />
+        </div>
       </div>
-    </div>
       <div class="form-group">
-        <label class="col-sm-2 control-label">是否作废：</label>
-        <div class="radio-box" th:each="dict : ${@dict.getType('sys_whether')}">
-          <label th:for="${'useStatus_' + dict.dictCode}" th:text="${dict.dictLabel}" th:field="*{useStatus}"></label>
-          <input type="radio"  name="useStatus" th:value="${dict.dictValue}" th:checked="${dict.default}">
+        <label class="col-sm-6 control-label">备注内容：</label>
+        <div class="col-sm-6">
+          <textarea name="customerRemarks" th:field="*{customerRemarks}" class="form-control" disabled></textarea>
         </div>
       </div>
-    <div class="form-group">
-      <label class="col-sm-2 control-label">客户标识：</label>
-      <div class="radio-box" th:each="dict : ${@dict.getType('sys_customer_sign')}">
-        <label th:for="${'customerSign_' + dict.dictCode}" th:text="${dict.dictLabel}" th:field="*{customerSign}"></label>
-        <input type="radio"  name="customerSign" th:value="${dict.dictValue}" th:checked="${dict.default}">
+      <div class="form-group">
+          <label class="col-sm-6 control-label">是否作废：</label>
+          <div class="radio-box" th:each="dict : ${@dict.getType('sys_whether')}">
+            <label th:for="${'useStatus_' + dict.dictCode}" th:text="${dict.dictLabel}" th:field="*{useStatus}"></label>
+            <input type="radio"  name="useStatus" th:value="${dict.dictValue}" th:checked="${dict.default}" disabled>
+          </div>
+        </div>
+      <div class="col-xs-12">
+        <label class="col-sm-4 control-label">客户标识：</label>
+        <div class="radio-box" th:each="dict : ${@dict.getType('sys_customer_sign')}">
+          <label th:for="${'customerSign_' + dict.dictCode}" th:text="${dict.dictLabel}" th:field="*{customerSign}"></label>
+          <input type="radio"  name="customerSign" th:value="${dict.dictValue}" th:checked="${dict.default}" disabled />
+        </div>
       </div>
-    </div>
     <div class="container">
-      <label class="col-sm-6 control-label">联系人</label>
-      <div class="col-sm-6">
+      <label class="control-label">联系人</label>
+      <div class="col-sm-12 select-table table-striped">
         <table id="contacts-table"></table>
       </div>
     </div>
     <div class="container">
-      <label class="col-sm-6 control-label">送货地址</label>
-      <div class="col-sm-6">
+      <label class="control-label">送货地址</label>
+      <div class="col-sm-12 select-table table-striped">
         <table id="address-table"></table>
       </div>
     </div>
     <div class="container">
-      <label class="col-sm-6 control-label">操作记录</label>
-      <div class="col-sm-6">
+      <label class=" control-label">操作记录</label>
+      <div class="col-sm-12 select-table table-striped">
         <table id="oper-table"></table>
       </div>
     </div>
@@ -317,7 +309,7 @@
     });
     /*业务员列表*/
     $.ajax({
-      url: ctx + 'system/user/list',
+      url: ctx + 'system/salesOrder/getBinessMembers',
       type: 'post',
       success: function (res) {
         console.log(res)
@@ -407,12 +399,12 @@
     pageSize: 10,
     pageList: [10, 25, 50, 100],
     showRefresh: false,
+    maxHeight: 70,
     method: "post",
     contentType: "application/x-www-form-urlencoded",
     striped: true, // 是否显示行间隔色
     cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
     sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
-    height: 150,
     queryParams: function (params) {
       //console.log("123");
       var curParams = {
@@ -503,6 +495,7 @@
     cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
     sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
     singleSelect: true,
+    maxHeight: 70,
     queryParams: function (params) {
       //console.log("123");
       var curParams = {
@@ -572,6 +565,7 @@
     striped: true, // 是否显示行间隔色
     cache: false, // 是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
     sidePagination: "server", // 分页方式：client客户端分页，server服务端分页（*）
+    maxHeight: 70,
     queryParams: function (params) {
       //console.log("123");
       var curParams = {
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
index df430dfc..debef887 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
@@ -50,7 +50,7 @@
             <div class="form-group">
                 <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')}">
+                    <select name="exportSales" class="form-control m-b" th:with="type=${@dict.getType('sys_export_sales')}" disabled>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  th:field="*{exportSales}"></option>
                     </select>
                 </div>
@@ -126,7 +126,7 @@
             <div class="form-group">
                 <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')}">
+                    <select name="integrityRating" class="form-control m-b" th:with="type=${@dict.getType('sys_integrity_rating')}" disabled>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{integrityRating}"></option>
                     </select>
                 </div>
@@ -143,7 +143,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="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text"/>
                 </div>
@@ -187,7 +187,7 @@
             <div class="form-group">
                 <label class="col-sm-6 control-label is-required">第一联系人电话：</label>
                 <div class="col-sm-6">
-                    <input name="contactNumber" th:field="*{contactNumber}" class="form-control" type="text" required>
+                    <input name="contactNumber" th:field="*{contactNumber}"  class="form-control" type="text" required disabled />
                 </div>
             </div>
             <div class="form-group">
@@ -205,13 +205,13 @@
             <div class="form-group">
                 <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
                 <div class="col-sm-6">
-                    <input name="deliveryCustomerPerson" th:field="*{deliveryCustomerPerson}" class="form-control" type="text" required>
+                    <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled required/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
                 <div class="col-sm-6">
-                    <input name="客户第一收货人联系电话" th:field="*{deliveryCustomerPhone}" class="form-control" type="text" required>
+                    <input name="客户第一收货人联系电话" th:field="*{deliveryCustomerPhone}" class="form-control" type="text" disabled required>
                 </div>
             </div>
             <div class="form-group">
@@ -235,14 +235,13 @@
             <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" thfield="*{businessMembers}" th:with="list=${@customerService.selectCustomerListByCompanyId()}">
-                    </select>
+                    <input name="businessMembers" th:field="*{businessMembers}" class="form-control m-b" th:field="*{businessMembers}" disabled/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-6 control-label">备注内容：</label>
                 <div class="col-sm-6">
-                    <textarea th:field="*{customerRemarks}" name="customerRemarks" class="form-control"></textarea>
+                    <textarea th:field="*{customerRemarks}" name="customerRemarks" class="form-control" disabled></textarea>
                 </div>
             </div>
         </form>
@@ -256,16 +255,31 @@
     <script th:inline="javascript">
 
         var prefix = ctx + "system/customer";
-        $("#form-customer-edit").validate({
-            focusCleanup: true
-        });
+        $("#form-customer-edit").validate({focusCleanup: true});
 
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/edit", $('#form-customer-edit').serialize());
             }
         }
-
+        $(function(){
+            $.ajax({
+                url: ctx + 'system/salesOrder/getBinessMembers',
+                type: 'get',
+                success: function (res) {
+                    console.log(res)
+                    if (res.rows.length > 0) {
+                        var usertData = res.rows;
+                        for (let i in usertData) {
+                            $("select[name='businessMembers']").append("<option value='"
+                                + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                        }
+                    } else {
+                        $.modal.msgError(res.msg);
+                    }
+                }
+            });
+        })
         $("input[name='establishedTime']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
index 64259703..231863bd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
@@ -13,12 +13,11 @@
         <input name="taskName" th:field="*{taskName}" type="hidden">
         <input name="instanceId" th:field="*{instanceId}" type="hidden">
         <input name="instanceType" th:field="*{instanceType}" type="hidden">
-        <!--驳回调整允许更新内容-->
-        <input type="hidden" name="saveEntity" value="true" />
+        <input type="hidden" name="p_COM_comment" />
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
             <div class="col-sm-8">
-                <input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
+                <input name="applyUser" th:field="*{applyUser}" class="form-control" type="text" readonly>
             </div>
         </div>
         <div class="form-group">
@@ -94,7 +93,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 readonly name="legalRepresentative" class="form-control"
                        type="text" th:field="*{legalRepresentative}">
@@ -111,7 +110,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  name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
                         type="text" readonly required>
@@ -167,9 +166,9 @@
             </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 name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly />
+                <input name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly required />
             </div>
         </div>
         <div class="form-group">
@@ -202,10 +201,10 @@
                 <input name="customerContactId" class="form-control" th:field="*{customerContactId}" type="number" readonly/>
             </div>
         </div>
-        <div class="form-group" >
-            <label  class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
+        <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" th:field="*{customerContact}" readonly/>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled required/>
             </div>
         </div>
         <div class="form-group">
@@ -232,53 +231,48 @@
                 <input name="customerFax" class="form-control" type="text" th:field="*{customerFax}" readonly>
             </div>
         </div>
-        <div class="form-group" hidden="hidden">
-            <label class="col-sm-6 control-label">第一收货人：</label>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
             <div class="col-sm-6">
-                <input name="deliveryAddressId" class="form-control" type="text" th:field="*{deliveryAddressId}" readonly>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryAddress" class="form-control" type="text" th:field="*{deliveryAddress}" />
-                </div>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" />
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
             </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" th:field="*{deliveryAddress}" readonly>
-                </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" th:field="*{deliveryAddress}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人邮编：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人邮编：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人传真：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人传真：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">业务员：</label>
-                <div class="col-sm-6">
-                    <input name="businessMembers" class="form-control m-b" shiro:partial="customer:selectBusinessMembers" />
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">业务员：</label>
+            <div class="col-sm-6">
+                <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" shiro:partial="customer:selectBusinessMembers" />
             </div>
-            <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">
+                <textarea name="customerRemarks" class="form-control"></textarea>
             </div>
+        </div>
         <hr />
         <div class="form-group">
             <label class="col-sm-3 control-label" for="reApply">是否继续申请：</label>
@@ -289,6 +283,11 @@
                 </select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">批注：</label>
+            <div class="col-sm-8">
+                <textarea name="comment" class="form-control"></textarea>
+            </div>
         </div>
     </form>
 </div>
@@ -299,15 +298,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:src="javascript">
     var prefix = ctx + "system/customer";
-    $("#form-edit").validate({
-        onkeyup: false,
-        rules:{
-        },
-        messages: {
-        },
-        focusCleanup: true
-    });
-
+    $("#form-edit").validate({onkeyup: false, rules:{}, messages: {},focusCleanup: true});
     function submitHandler() {
         if ($.validate.form()) {
             var taskId = [[${taskId}]];
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
index 1cd3bd7d..f1e54bc3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
@@ -15,23 +15,24 @@
         <input name="instanceType" th:field="*{instanceType}" type="hidden">
         <input type="hidden" name="p_COM_comment" />
         <div class="form-group">
-            <label class="col-sm-3 control-label">申请人：</label>
-            <div class="col-sm-8">
-                <input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
+            <label class="col-sm-6 control-label">申请人：</label>
+            <div class="col-sm-6">
+                <input name="applyUser" th:field="*{applyUser}" 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">
+            <label class="col-sm-6 control-label">申请时间：</label>
+            <div class="col-sm-6">
                 <div class="input-group date">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
+                    <span class="input-group-addon" disabled><i class="fa fa-calendar"></i></span>
+
                 </div>
             </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="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
             </div>
         </div>
@@ -93,7 +94,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 readonly name="legalRepresentative" class="form-control"
                        type="text" th:field="*{legalRepresentative}">
@@ -110,7 +111,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  name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
                         type="text" readonly required>
@@ -166,9 +167,9 @@
             </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 name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly />
+                <input name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly required />
             </div>
         </div>
         <div class="form-group">
@@ -201,10 +202,10 @@
                 <input name="customerContactId" class="form-control" th:field="*{customerContactId}" type="number" readonly/>
             </div>
         </div>
-        <div class="form-group" >
-            <label  class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
+        <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" th:field="*{customerContact}" readonly/>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled required/>
             </div>
         </div>
         <div class="form-group">
@@ -231,53 +232,48 @@
                 <input name="customerFax" class="form-control" type="text" th:field="*{customerFax}" readonly>
             </div>
         </div>
-        <div class="form-group" hidden="hidden">
-            <label class="col-sm-6 control-label">第一收货人：</label>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
             <div class="col-sm-6">
-                <input name="deliveryAddressId" class="form-control" type="text" th:field="*{deliveryAddressId}" readonly>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryAddress" class="form-control" type="text" th:field="*{deliveryAddress}" />
-                </div>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" />
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
             </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" th:field="*{deliveryAddress}" readonly>
-                </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" th:field="*{deliveryAddress}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人邮编：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人邮编：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人传真：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人传真：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">业务员：</label>
-                <div class="col-sm-6">
-                    <input name="businessMembers" class="form-control m-b"/>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">业务员：</label>
+            <div class="col-sm-6">
+                <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" shiro:partial="customer:selectBusinessMembers" />
             </div>
-            <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">
+                <textarea name="customerRemarks" class="form-control"></textarea>
             </div>
+        </div>
         <hr />
         <div class="form-group">
             <label class="col-sm-3 control-label" for="ywjlVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
@@ -295,7 +291,6 @@
                 <textarea name="comment" class="form-control"></textarea>
             </div>
         </div>
-        </div>
     </form>
 </div>
 <th:block th:include="include :: footer" />
@@ -305,10 +300,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "system/customer";
-    $("#form-edit").validate({
-        focusCleanup: true
-    });
-
+    $("#form-edit").validate({focusCleanup: true});
     function submitHandler() {
         if ($.validate.form()) {
             if ($('textarea[name="comment"]').val()) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
index d49f76be..0c6c6186 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
@@ -15,14 +15,14 @@
         <input name="instanceType" th:field="*{instanceType}" type="hidden">
         <input type="hidden" name="p_COM_comment" />
         <div class="form-group">
-            <label class="col-sm-3 control-label">申请人：</label>
-            <div class="col-sm-8">
-                <input name="applyUserName" th:field="*{applyUserName}" class="form-control" type="text" readonly>
+            <label class="col-sm-6 control-label">申请人：</label>
+            <div class="col-sm-6">
+                <input name="applyUser" th:field="*{applyUser}" 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">
+            <label class="col-sm-6 control-label">申请时间：</label>
+            <div class="col-sm-6">
                 <div class="input-group date">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
@@ -30,8 +30,8 @@
             </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="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
             </div>
         </div>
@@ -93,7 +93,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 readonly name="legalRepresentative" class="form-control"
                        type="text" th:field="*{legalRepresentative}">
@@ -110,7 +110,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  name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
                         type="text" readonly required>
@@ -166,9 +166,9 @@
             </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 name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly />
+                <input name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly required />
             </div>
         </div>
         <div class="form-group">
@@ -201,10 +201,10 @@
                 <input name="customerContactId" class="form-control" th:field="*{customerContactId}" type="number" readonly/>
             </div>
         </div>
-        <div class="form-group" >
-            <label  class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
+        <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" th:field="*{customerContact}" readonly/>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled required/>
             </div>
         </div>
         <div class="form-group">
@@ -231,56 +231,51 @@
                 <input name="customerFax" class="form-control" type="text" th:field="*{customerFax}" readonly>
             </div>
         </div>
-        <div class="form-group" hidden="hidden">
-            <label class="col-sm-6 control-label">第一收货人：</label>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
             <div class="col-sm-6">
-                <input name="deliveryAddressId" class="form-control" type="text" th:field="*{deliveryAddressId}" readonly>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryAddress" class="form-control" type="text" th:field="*{deliveryAddress}" />
-                </div>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" />
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
             </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" th:field="*{deliveryAddress}" readonly>
-                </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" th:field="*{deliveryAddress}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人邮编：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人邮编：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人传真：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人传真：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">业务员：</label>
-                <div class="col-sm-6">
-                    <input name="businessMembers" class="form-control m-b"/>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">业务员：</label>
+            <div class="col-sm-6">
+                <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" shiro:partial="customer:selectBusinessMembers" />
             </div>
-            <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">
+                <textarea name="customerRemarks" class="form-control"></textarea>
             </div>
+        </div>
         <hr />
         <div class="form-group">
-            <label class="col-sm-3 control-label" for="ywzgVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
+            <label class="col-sm-6 control-label" for="ywzgVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
             <div class="col-sm-8">
                 <select name="p_B_ywzgVerifyApproved" id="ywzgVerifyApproved" class="form-control m-b" required>
                     <option value=""></option>
@@ -290,12 +285,11 @@
             </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="comment" class="form-control"></textarea>
             </div>
         </div>
-        </div>
     </form>
 </div>
 <th:block th:include="include :: footer" />
@@ -305,10 +299,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
     var prefix = ctx + "system/customer";
-    $("#form-edit").validate({
-        focusCleanup: true
-    });
-
+    $("#form-edit").validate({focusCleanup: true });
     function submitHandler() {
         if ($.validate.form()) {
             if ($('textarea[name="comment"]').val()) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
index f2c40d60..dd7d33ab 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
@@ -15,14 +15,14 @@
         <input name="instanceType" th:field="*{instanceType}" type="hidden">
         <input type="hidden" name="p_COM_comment" />
         <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="applyUser" th:field="*{applyUser}" 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">
+            <label class="col-sm-6 control-label">申请时间：</label>
+            <div class="col-sm-6">
                 <div class="input-group date">
                     <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                     <input name="applyTime" th:value="${#dates.format(formData.applyTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="text" disabled>
@@ -30,8 +30,8 @@
             </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="title" th:field="*{applyTitle}" class="form-control" type="text" readonly>
             </div>
         </div>
@@ -93,7 +93,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 readonly name="legalRepresentative" class="form-control"
                        type="text" th:field="*{legalRepresentative}">
@@ -110,7 +110,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  name="invoicingCompanyName" th:field="*{invoicingCompanyName}" class="form-control"
                         type="text" readonly required>
@@ -166,9 +166,9 @@
             </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 name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly />
+                <input name="taxRate" th:field="*{taxRate}" class="form-control" placeholder="%" type="text" readonly required />
             </div>
         </div>
         <div class="form-group">
@@ -201,10 +201,10 @@
                 <input name="customerContactId" class="form-control" th:field="*{customerContactId}" type="number" readonly/>
             </div>
         </div>
-        <div class="form-group" >
-            <label  class="col-sm-6 control-label is-required is-required" >客户第一联系人：</label>
+        <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" th:field="*{customerContact}" readonly/>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" disabled required/>
             </div>
         </div>
         <div class="form-group">
@@ -231,56 +231,51 @@
                 <input name="customerFax" class="form-control" type="text" th:field="*{customerFax}" readonly>
             </div>
         </div>
-        <div class="form-group" hidden="hidden">
-            <label class="col-sm-6 control-label">第一收货人：</label>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
             <div class="col-sm-6">
-                <input name="deliveryAddressId" class="form-control" type="text" th:field="*{deliveryAddressId}" readonly>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">客户第一收货人：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryAddress" class="form-control" type="text" th:field="*{deliveryAddress}" />
-                </div>
+                <input name="deliveryCustomerPerson" class="form-control" type="text" th:field="*{deliveryCustomerPerson}" />
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label is-required">第一收货人电话：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPhone" class="form-control" type="text" th:field="*{deliveryCustomerPhone}" required>
             </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" th:field="*{deliveryAddress}" readonly>
-                </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" th:field="*{deliveryAddress}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人邮编：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人邮编：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerPostal" class="form-control" type="text" th:field="*{deliveryCustomerPostal}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">第一收货人传真：</label>
-                <div class="col-sm-6">
-                    <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">第一收货人传真：</label>
+            <div class="col-sm-6">
+                <input name="deliveryCustomerFax" class="form-control" type="text" th:field="*{deliveryCustomerFax}" readonly>
             </div>
-            <div class="form-group">
-                <label class="col-sm-6 control-label">业务员：</label>
-                <div class="col-sm-6">
-                    <input name="businessMembers" class="form-control m-b" shiro:partial="customer:selectBusinessMembers" />
-                </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-6 control-label">业务员：</label>
+            <div class="col-sm-6">
+                <input name="businessMembers" class="form-control m-b" th:field="*{businessMembers}" shiro:partial="customer:selectBusinessMembers" />
             </div>
-            <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">
+                <textarea name="customerRemarks" class="form-control"></textarea>
             </div>
+        </div>
         <hr />
         <div class="form-group">
-            <label class="col-sm-3 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
+            <label class="col-sm-6 control-label" for="zozjVerifyApproved"><span style="color: red; ">*</span>审批意见：</label>
             <div class="col-sm-8">
                 <select name="p_B_zozjVerifyApproved" id="zozjVerifyApproved" class="form-control m-b" required>
                     <option value=""></option>
@@ -290,12 +285,11 @@
             </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="comment" class="form-control"></textarea>
             </div>
         </div>
-        </div>
     </form>
 </div>
 <th:block th:include="include :: footer" />
@@ -306,10 +300,7 @@
 <script th:inline="javascript">
 
     var prefix = ctx + "system/customer";
-    $("#form-edit").validate({
-        focusCleanup: true
-    });
-
+    $("#form-edit").validate({focusCleanup: true});
     function submitHandler() {
         if ($.validate.form()) {
             if ($('textarea[name="comment"]').val()) {