seimin пре 11 месеци
родитељ
комит
f227364057
1 измењених фајлова са 8 додато и 15 уклоњено
  1. 8 15
      assets/views/system/tpl/notificationBj.html

+ 8 - 15
assets/views/system/tpl/notificationBj.html

@@ -42,6 +42,9 @@
42 42
         margin-top: 16px;
43 43
         font-size: 14px;
44 44
         color: #333;
45
+        display: flex;
46
+        justify-content: space-between;
47
+        align-items: center;
45 48
     }
46 49
 
47 50
     .modal-body-common .noticeNode span {
@@ -56,17 +59,12 @@
56 59
     .modal-body-common .infoCommon {
57 60
         font-size: 14px;
58 61
         color: #333;
59
-        float: left;
60 62
     }
61 63
 
62 64
     .modal-body-common .infoCommon span {
63 65
         color: #666;
64 66
     }
65 67
 
66
-    .modal-body-common .noticeDetails {
67
-        margin-left: 192px;
68
-    }
69
-
70 68
     /* tab */
71 69
     .modal-body-common .modal-body-tab {
72 70
         padding: 16px 16px 16px 8px;
@@ -80,7 +78,6 @@
80 78
         height: 40px;
81 79
         overflow: hidden;
82 80
         margin-left: 8px;
83
-        margin-top: 16px;
84 81
     }
85 82
 
86 83
     .modal-body-common .modal-body-tab .tab_hd .tab_hdItem {
@@ -191,12 +188,11 @@
191 188
     }
192 189
 
193 190
     textarea {
194
-        resize: none;
191
+        resize: vertical;
195 192
     }
196 193
 
197 194
     textarea.form-control {
198
-        height: 68px;
199
-        padding: 8px 16px;
195
+        padding: 8px;
200 196
         font-size: 12px;
201 197
     }
202 198
 
@@ -224,17 +220,14 @@
224 220
                 ng-model="editData.noticeRule">分钟</h2>
225 221
             <h2 ng-if="editData.noticeRule !== 'no'&&(editData.noticeCode == 'user_doing_overresp' || editData.noticeCode == 'manager_doing_overresp')">{{editData.processName}}-【解决时长】剩余<input
226 222
                     class="noticeRule" type="number" ng-model="editData.noticeRule">%</h2>
227
-            <div class="noticeNode">流程节点:<span>{{editData.noticeNode}}</span></div>
228
-            <div class="infoParent">
223
+            <div class="noticeNode">
224
+                <div>流程节点:<span>{{editData.noticeNode}}</span></div>
229 225
                 <div class="noticeState infoCommon">状态:<span>{{editData.noticeState}}</span></div>
230 226
                 <div class="noticeDetails infoCommon">被通知人:<span>{{editData.noticeDetails}}</span></div>
231 227
             </div>
232 228
         </div>
233 229
     </div>
234 230
     <div class="modal-body-tab">
235
-        <div class="modal-body-tab_hd">
236
-            <span><em>*</em> 通知模式:</span>
237
-        </div>
238 231
         <div class="tab_hd">
239 232
             <div class="tab_hdItem" ng-repeat="v in tabs" ng-class="$index == currentIndex?'active':''" ng-click="selectTab($index)">
240 233
                 <div class="tab_checkbox iconfont"
@@ -256,7 +249,7 @@
256 249
                     <div class="openaddlable control-label fontcolor-two fontsizes-14">通知内容:</div>
257 250
                     <div class="openaddinput">
258 251
                         <textarea class="form-control" ng-model="tabs[$index].processContent" ng-blur="textBlur($event)"
259
-                            ng-disabled="tabs[$index].disable" placeholder="{{varPlaceholder}}"></textarea>
252
+                            ng-disabled="tabs[$index].disable" placeholder="{{varPlaceholder}}" rows="15"></textarea>
260 253
                     </div>
261 254
                     <p class="tab_configure">
262 255
                         备注:[$变量名称$]可添加<em ng-repeat="v in varArr"><span ng-click="insertClick($event)">{{v}}</span><i ng-if="!$last">、</i><i ng-if="$last">。</i></em>