[fix]销售模块,客户基础资料审核流程载入审核流程avtiviti.js。

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> ');
                                 }

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){

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";

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";

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,

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

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

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