From 2a8710c50e2f7c4dd0e333dcf650a2dff960fff4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 14 九月 2023 12:46:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

---
 src/main/webapp/views/processPermissions/processPermissions.html |   59 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/main/webapp/views/processPermissions/processPermissions.html b/src/main/webapp/views/processPermissions/processPermissions.html
index 63c634b..42c52b5 100644
--- a/src/main/webapp/views/processPermissions/processPermissions.html
+++ b/src/main/webapp/views/processPermissions/processPermissions.html
@@ -32,7 +32,7 @@
                                 <option value="2">鎶ヤ环娴佺▼</option>
                                 <option value="3">鎶ラ攢娴佺▼</option>
 <!--                                <option value="4">鍑哄樊娴佺▼</option>-->
-<!--                                <option value="5">鍚堝悓瀹℃壒</option>-->
+                                <option value="7">鍚堝悓绠$悊</option>
                             </select>
                         </div>
                     </div>
@@ -158,34 +158,35 @@
 <!--                        <input class="layui-input" name="standby6" placeholder="璇疯緭鍏ュ鐢ㄥ瓧娈�6">-->
 <!--                    </div>-->
 <!--                </div>-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="layui-form-label layui-form-required">鏉冮檺绫诲瀷: </label>-->
-<!--                    <div class="layui-input-block">-->
-<!--                        <select name="processMemo" lay-vertype="tips" lay-verify="required">-->
-<!--                            <option value="">璇烽�夋嫨鐘舵��</option>-->
-<!--                            <option value="1">鏍镐环娴佺▼</option>-->
-<!--                            <option value="2">鎶ヤ环娴佺▼</option>-->
-<!--                            <option value="3">鎶ラ攢娴佺▼</option>-->
-<!--                            <option value="4">鍑哄樊娴佺▼</option>-->
-<!--                        </select>-->
-<!--                    </div>-->
-<!--                </div>-->
-<!--                <div class="layui-form-item">-->
-<!--                    <label class="layui-form-label layui-form-required">鏉冮檺鑺傜偣: </label>-->
-<!--                    <div class="layui-input-block">-->
-<!--                        <select name="process" lay-vertype="tips" lay-verify="required">-->
-<!--                            <option value="">璇烽�夋嫨鐘舵��</option>-->
-<!--                            <option value="1-1">1-1</option>-->
-<!--                            <option value="2-1">2-1</option>-->
-<!--                            <option value="3-1">3-1</option>-->
-<!--                            <option value="3-2">3-2</option>-->
-<!--                            <option value="4-1">4-1</option>-->
-<!--                            <option value="5-1">5-1</option>-->
-<!--                            <option value="6-1">6-1</option>-->
-<!--                            <option value="7-1">7-1</option>-->
-<!--                        </select>-->
-<!--                    </div>-->
-<!--                </div>-->
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">鏉冮檺绫诲瀷: </label>
+                    <div class="layui-input-block">
+                        <select name="processMemo" lay-vertype="tips" lay-verify="required">
+                            <option value="">璇烽�夋嫨鐘舵��</option>
+                            <option value="1">鏍镐环娴佺▼</option>
+                            <option value="2">鎶ヤ环娴佺▼</option>
+                            <option value="3">鎶ラ攢娴佺▼</option>
+                            <option value="4">鍑哄樊娴佺▼</option>
+                            <option value="7">鍚堝悓绠$悊</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label layui-form-required">鏉冮檺鑺傜偣: </label>
+                    <div class="layui-input-block">
+                        <select name="process" lay-vertype="tips" lay-verify="required">
+                            <option value="">璇烽�夋嫨鐘舵��</option>
+                            <option value="1-1">1-1</option>
+                            <option value="2-1">2-1</option>
+                            <option value="3-1">3-1</option>
+                            <option value="3-2">3-2</option>
+                            <option value="4-1">4-1</option>
+                            <option value="5-1">5-1</option>
+                            <option value="6-1">6-1</option>
+                            <option value="7-1">7-1</option>
+                        </select>
+                    </div>
+                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">澶囨敞: </label>
                     <div class="layui-input-block">

--
Gitblit v1.9.1