From df38533f41f52ff80b586b2fe3d4f763525e2f37 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 12 Apr 2024 18:46:55 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E6=A8=A1=E5=9D=97,?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=B5=81=E7=A8=8B=E8=BD=BD=E5=85=A5=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8Bavtiviti.js=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/erp/material/material.html   | 2 +-
 .../resources/templates/system/customer/customer.html     | 7 ++++++-
 .../main/resources/templates/system/customer/detail.html  | 3 +++
 .../main/resources/templates/system/customer/edit.html    | 8 +++-----
 .../templates/system/customer/taskModifyApply.html        | 2 +-
 .../templates/system/customer/taskYwjlVerify.html         | 2 +-
 .../templates/system/customer/taskYwzgVerify.html         | 2 +-
 .../templates/system/customer/taskZozjVerify.html         | 3 ++-
 8 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
index 92fbc386..574d76a8 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -711,7 +711,7 @@
                             // 有待办人展示审批按钮，
                             if (row.todoUserId) {
                                 var todoUserIdList = row.todoUserId.split(",");
-                                if(todoUserIdList.includes(loginName) || loginName == 'admin'){
+                                if(todoUserIdList.includes(loginName)){
                                     var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
                                     actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+row.instanceTypeName+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                 }
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 3eb30076..e9cd86e8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
@@ -339,7 +339,9 @@
 </div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: select2-js"/>
-
+<script th:src="@{/js/activiti.js}"></script>
+<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 editFlag = [[${@permission.hasPermi('system:customer:edit')}]];
     var removeFlag = [[${@permission.hasPermi('system:customer:remove')}]];
@@ -518,6 +520,9 @@
                             actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i> 作废</a>');
                             // 编辑
                             actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                        }else{
+                            actions.push('<a class="btn btn-default btn-xs" href="javascript:void(0)" disabled ><i class="fa fa-edit"></i> 编辑</a> ');
+
                         }
                         // 已作废
                         if(row.useStatus=="2" && !row.restoreInstanceId){
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 7b0a9c11..c2dd528e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html
@@ -275,6 +275,9 @@
 <th:block th:include="include :: footer" />
 <th:block th:include="include :: select2-js"/>
 <th:block th:include="include :: datetimepicker-js" />
+<script th:src="@{/js/activiti.js}"></script>
+<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 prefixShippingaddress = ctx + "system/shippingaddress";
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 411e49f0..df430dfc 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/edit.html
@@ -246,15 +246,13 @@
                 </div>
             </div>
         </form>
-        <div class="col-sm-6">
-            <button class="btn-primary">审批通过</button>
-            <button class="btn-danger">审批拒绝</button>
-        </div>
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: select2-js"/>
-
     <th:block th:include="include :: datetimepicker-js" />
+    <script th:src="@{/js/activiti.js}"></script>
+    <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";
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 4ccb94ba..e9f57631 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskModifyApply.html
@@ -294,7 +294,7 @@
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
-<script type="text/javascript">
+<script th:src="javascript">
     var prefix = ctx + "system/customer";
     $("#form-edit").validate({
         onkeyup: false,
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 35245e90..8fcc32be 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwjlVerify.html
@@ -300,7 +300,7 @@
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
-<script type="text/javascript">
+<script th:inline="javascript">
     var prefix = ctx + "system/customer";
     $("#form-edit").validate({
         focusCleanup: true
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 195b7f82..f9bd0c37 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskYwzgVerify.html
@@ -300,7 +300,7 @@
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
-<script type="text/javascript">
+<script th:inline="javascript">
     var prefix = ctx + "system/customer";
     $("#form-edit").validate({
         focusCleanup: true
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 5d6d2b9b..d25a2ba1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/taskZozjVerify.html
@@ -300,7 +300,8 @@
 <script th:src="@{/js/activiti.js}"></script>
 <script th:src="@{/ajax/libs/vue/vue.js}"></script>
 <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
-<script type="text/javascript">
+<script th:inline="javascript">
+
     var prefix = ctx + "system/customer";;
     $("#form-edit").validate({
         focusCleanup: true