汇总单页面优化

assets/views/system/tpl/gsChange.html

@@ -102,7 +102,7 @@
 <div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
     <form role="form" class="row">
         <div class="margin-left-30 margin-right-30 margin-top-20">
-            <div class="margin-bottom-15 anline">
+            <div class="margin-bottom-15 anline" ng-show="isAdd">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">工时:</div>
                 <div class="pull-right openaddinput fault">
                     <multi-select-tree
@@ -115,7 +115,7 @@
                         multi-select="true"
                         data-callback="onFilterCallback(item)"
                         data-select-only-leafs="true"
-                        reset-search-input="false"
+                        reset-search-input="true"
                         data-trans-label="workName"
                         data-switch-view="false"
                     >
@@ -123,6 +123,12 @@
                 </div>
             </div>
             <div class="margin-bottom-15 anline" ng-show="!isAdd">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">工时:</div>
+                <div class="pull-right openaddinput fault" style="padding-top: 2px;text-align: left;">
+                    {{dataInfo.workHourManagement[0].workName}}
+                </div>
+            </div>
+            <div class="margin-bottom-15 anline" ng-show="!isAdd">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>数量:</div>
                 <div class="pull-right openaddinput">
                     <input style="width: 100%;" type="number" ng-model="dataInfo.num" ng-change="changeNum(dataInfo.num)" step="1" min="1">

assets/views/system/tpl/hcChange.html

@@ -96,10 +96,10 @@
 <div class="modal-body margin-top-15 margin-left-15 margin-bottom-15 margin-right-15 addrequster">
     <form role="form" class="row">
         <div class="margin-left-30 margin-right-30 margin-top-20">
-            <div class="margin-bottom-15 anline">
+            <div class="margin-bottom-15 anline" ng-show="isAdd">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">耗材:</div>
                 <div class="pull-right openaddinput">
-                    <ui-select ng-model="dataInfo.consumable" theme="bootstrap" ng-disabled={{!isAdd}}>
+                    <ui-select ng-model="dataInfo.consumable" theme="bootstrap">
                         <ui-select-match placeholder="请选择耗材">
                             {{$select.selected.name}}
                         </ui-select-match>
@@ -109,6 +109,12 @@
                     </ui-select>
                 </div>
             </div>
+            <div class="margin-bottom-15 anline" ng-show="!isAdd">
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">耗材:</div>
+                <div class="pull-right openaddinput fault" style="padding-top: 2px;text-align: left;">
+                    {{dataInfo.consumable.name}}
+                </div>
+            </div>
             <div class="margin-bottom-15 anline">
                 <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14"><span class="red">*</span>数量:</div>
                 <div class="pull-right openaddinput">