From 4d828636d01398f41c74a04302d27fbc13d1d350 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Sat, 20 Apr 2024 15:34:24 +0800
Subject: [PATCH] =?UTF-8?q?[update]=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=9A=E5=8A=A1=E5=91=98=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/erp/material/edit.html |  3 ++-
 .../templates/system/customer/detail.html      | 18 ++++++++++++++++--
 .../system/customer/taskModifyApply.html       |  3 +++
 .../system/customer/taskYwjlVerify.html        |  3 +++
 .../system/customer/taskYwzgVerify.html        |  3 +++
 .../system/customer/taskZozjVerify.html        |  5 ++++-
 6 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
index 6b9df60a..90504a87 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html
@@ -86,6 +86,7 @@
                 <label class="col-sm-3 control-label">工程员：</label>
                 <div class="col-sm-8">
                     <select name="businessMembers" th:field="*{businessMembers}"  id="businessMembers_edit" class="form-control m-b" required >
+                        <option value=""> </option>
                     </select>
                 </div>
             </div>
@@ -261,7 +262,7 @@
                     if (res.rows.length > 0) {
                         var usertData = res.rows;
                         for (let i in usertData) {
-                            $("select[name='businessMembers']").append(
+                            $("form-material- select[name='businessMembers']").append(
                                 "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
                         }
                     } else {
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 c2dd528e..e99e5d19 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
@@ -243,13 +243,27 @@
     <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" />
+        <input name="businessMembers" th:field="*{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">
-        <textarea name="customerRemarks" class="form-control"></textarea>
+        <textarea name="customerRemarks" th:field="*{customerRemarks}" class="form-control"></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_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}">
+        </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>
     </div>
     <div class="container">
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 e9f57631..64259703 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
@@ -10,6 +10,9 @@
     <form class="form-horizontal m" id="form-edit" th:object="${formData}">
         <input name="id" th:field="*{id}" type="hidden">
         <input name="taskId" th:field="*{taskId}" type="hidden">
+        <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" />
         <div class="form-group">
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 8fcc32be..1cd3bd7d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
@@ -10,6 +10,9 @@
     <form class="form-horizontal m" id="form-edit" th:object="${formData}">
         <input name="id" th:field="*{id}" type="hidden">
         <input name="taskId" th:field="*{taskId}" type="hidden">
+        <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="p_COM_comment" />
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
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 f9bd0c37..d49f76be 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
@@ -10,6 +10,9 @@
     <form class="form-horizontal m" id="form-edit" th:object="${formData}">
         <input name="id" th:field="*{id}" type="hidden">
         <input name="taskId" th:field="*{taskId}" type="hidden">
+        <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="p_COM_comment" />
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
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 d25a2ba1..f2c40d60 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
@@ -10,6 +10,9 @@
     <form class="form-horizontal m" id="form-edit" th:object="${formData}">
         <input name="id" th:field="*{id}" type="hidden">
         <input name="taskId" th:field="*{taskId}" type="hidden">
+        <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="p_COM_comment" />
         <div class="form-group">
             <label class="col-sm-3 control-label">申请人：</label>
@@ -302,7 +305,7 @@
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
 <script th:inline="javascript">
 
-    var prefix = ctx + "system/customer";;
+    var prefix = ctx + "system/customer";
     $("#form-edit").validate({
         focusCleanup: true
     });