Bladeren bron

feat: 是否支持父级科室耗材

seimin 1 jaar geleden
bovenliggende
commit
7f53bda294

+ 9 - 3
assets/js/controllers/system/organizationdesign/responsibilityDeptCtrl.js

@@ -139,6 +139,7 @@ app.controller("responsibilityDeptlistCtrl", [
139
             parent:selectdata.parent,
139
             parent:selectdata.parent,
140
             addSummary: $scope.summaryOrderList.find(v => v.value == selectdata.addSummary) || $scope.summaryOrderList.find(v => v.value == 0),
140
             addSummary: $scope.summaryOrderList.find(v => v.value == selectdata.addSummary) || $scope.summaryOrderList.find(v => v.value == 0),
141
             supportZero: $scope.summaryOrderList.find(v => v.value == selectdata.supportZero) || $scope.summaryOrderList.find(v => v.value == 0),
141
             supportZero: $scope.summaryOrderList.find(v => v.value == selectdata.supportZero) || $scope.summaryOrderList.find(v => v.value == 0),
142
+            parentDeptConsumable: $scope.summaryOrderList.find(v => v.value == selectdata.parentDeptConsumable) || $scope.summaryOrderList.find(v => v.value == 0),
142
           };
143
           };
143
           $scope.branchList = [];
144
           $scope.branchList = [];
144
           $scope.title = "责任科室修改";
145
           $scope.title = "责任科室修改";
@@ -170,7 +171,8 @@ app.controller("responsibilityDeptlistCtrl", [
170
               deptdata.phone &&
171
               deptdata.phone &&
171
               deptdata.branch &&
172
               deptdata.branch &&
172
               deptdata.addSummary &&
173
               deptdata.addSummary &&
173
-              deptdata.supportZero
174
+              deptdata.supportZero &&
175
+              deptdata.parentDeptConsumable
174
             ) {
176
             ) {
175
               var fildata = {
177
               var fildata = {
176
                 dutyDepartment: {
178
                 dutyDepartment: {
@@ -183,6 +185,7 @@ app.controller("responsibilityDeptlistCtrl", [
183
                   parent:deptdata.parent,
185
                   parent:deptdata.parent,
184
                   addSummary: deptdata.addSummary.value,
186
                   addSummary: deptdata.addSummary.value,
185
                   supportZero: deptdata.supportZero.value,
187
                   supportZero: deptdata.supportZero.value,
188
+                  parentDeptConsumable: deptdata.parentDeptConsumable.value,
186
                 },
189
                 },
187
               };
190
               };
188
               api_user_data
191
               api_user_data
@@ -270,6 +273,7 @@ app.controller("responsibilityDeptlistCtrl", [
270
             parent:'',
273
             parent:'',
271
             addSummary: $scope.summaryOrderList.find(v => v.value == 0),
274
             addSummary: $scope.summaryOrderList.find(v => v.value == 0),
272
             supportZero: $scope.summaryOrderList.find(v => v.value == 0),
275
             supportZero: $scope.summaryOrderList.find(v => v.value == 0),
276
+            parentDeptConsumable: $scope.summaryOrderList.find(v => v.value == 0),
273
           };
277
           };
274
           $scope.title = "责任科室新增";
278
           $scope.title = "责任科室新增";
275
           $scope.parentList = [];
279
           $scope.parentList = [];
@@ -296,7 +300,8 @@ app.controller("responsibilityDeptlistCtrl", [
296
               deptdata.phone &&
300
               deptdata.phone &&
297
               deptdata.branch &&
301
               deptdata.branch &&
298
               deptdata.addSummary &&
302
               deptdata.addSummary &&
299
-              deptdata.supportZero
303
+              deptdata.supportZero &&
304
+              deptdata.parentDeptConsumable
300
             ) {
305
             ) {
301
               $modalInstance.close(deptdata);
306
               $modalInstance.close(deptdata);
302
             } else {
307
             } else {
@@ -314,7 +319,7 @@ app.controller("responsibilityDeptlistCtrl", [
314
         },
319
         },
315
       });
320
       });
316
       modalInstance.result.then(function (selectedItem) {
321
       modalInstance.result.then(function (selectedItem) {
317
-        if (selectedItem.dept && selectedItem.phone && selectedItem.branch && selectedItem.addSummary && selectedItem.supportZero) {
322
+        if (selectedItem.dept && selectedItem.phone && selectedItem.branch && selectedItem.addSummary && selectedItem.supportZero && selectedItem.parentDeptConsumable) {
318
           var fildata = {
323
           var fildata = {
319
             dutyDepartment: {
324
             dutyDepartment: {
320
               phone: selectedItem.phone,
325
               phone: selectedItem.phone,
@@ -323,6 +328,7 @@ app.controller("responsibilityDeptlistCtrl", [
323
               parent:selectedItem.parent?selectedItem.parent:undefined,
328
               parent:selectedItem.parent?selectedItem.parent:undefined,
324
               addSummary: selectedItem.addSummary.value,
329
               addSummary: selectedItem.addSummary.value,
325
               supportZero: selectedItem.supportZero.value,
330
               supportZero: selectedItem.supportZero.value,
331
+              parentDeptConsumable: selectedItem.parentDeptConsumable.value,
326
             },
332
             },
327
           };
333
           };
328
           api_user_data
334
           api_user_data

+ 13 - 0
assets/views/system/tpl/responsibilityDeptchange.html

@@ -68,6 +68,19 @@
68
                     </ui-select>
68
                     </ui-select>
69
                 </div>
69
                 </div>
70
             </div>
70
             </div>
71
+            <div class="margin-bottom-15 anline">
72
+                <div class="pull-left openaddlable control-label fontcolor-two fontsizes-14">是否支持父级科室耗材<span class="red">*</span>:</div>
73
+                <div class="pull-right openaddinput">
74
+                    <ui-select ng-model="deptdata.parentDeptConsumable" theme="bootstrap">
75
+                        <ui-select-match placeholder="请选择">
76
+                            {{$select.selected.name}}
77
+                        </ui-select-match>
78
+                        <ui-select-choices repeat="item in summaryOrderList | filter: $select.search">
79
+                            <div ng-bind-html="item.name | highlight: $select.search"></div>
80
+                        </ui-select-choices>
81
+                    </ui-select>
82
+                </div>
83
+            </div>
71
         </div>
84
         </div>
72
     </form>
85
     </form>
73
 </div>
86
 </div>