统计分类

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.241",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/data-dictionary/data-dictionary.component.html

@@ -11,13 +11,15 @@
   <div class="userInfo">
     <div class="top display_flex justify-content_space-between align-items_center">
       <div class="searchItem">
-        <span class="label">父级被服分类</span>：
-        <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
-          nzPlaceHolder="请选择父级被服分类" [(ngModel)]="searchDto.parent" (ngModelChange)="getAll()">
-          <ng-container *ngFor="let data of parentList">
-            <nz-option [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
-          </ng-container>
-        </nz-select>
+        <ng-container *ngIf="checkedDictionary.type === 'dictionaryTree'">
+          <span class="label">父级被服分类</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+            nzPlaceHolder="请选择父级被服分类" [(ngModel)]="searchDto.parent" (ngModelChange)="getAll()">
+            <ng-container *ngFor="let data of parentList">
+              <nz-option [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+            </ng-container>
+          </nz-select>
+        </ng-container>
       </div>
       <div class="display_flex align-items_center">
         <span>已选择 {{selectedDictionary.length}} 个</span>
@@ -35,10 +37,10 @@
             <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
               (nzCheckedChange)="checkAll($event)"></th>
             <th nzWidth="15%">名称</th>
-            <th nzWidth="15%">父级被服分类</th>
+            <th nzWidth="15%" *ngIf="checkedDictionary.type === 'dictionaryTree'">父级被服分类</th>
             <th nzWidth="10%">值</th>
             <th nzWidth="10%">排序号</th>
-            <th nzWidth="10%">单价</th>
+            <th nzWidth="10%" *ngIf="checkedDictionary.type === 'dictionaryTree'">单价</th>
             <th nzWidth="15%">附加说明</th>
             <th nzWidth="20%">操作</th>
           </tr>
@@ -48,10 +50,10 @@
             <td nzShowCheckbox [(nzDisabled)]="!coopBtns.edit" [(nzChecked)]="mapOfCheckedId[data.id]"
               (nzCheckedChange)="refreshStatus()"></td>
             <td>{{ data.name }}</td>
-            <td>{{ data.parentName }}</td>
+            <td *ngIf="checkedDictionary.type === 'dictionaryTree'">{{ data.parentName }}</td>
             <td>{{ data.value }}</td>
             <td>{{ data.orders }}</td>
-            <td>{{ data.extra3 }}</td>
+            <td *ngIf="checkedDictionary.type === 'dictionaryTree'">{{ data.extra3 }}</td>
             <td>{{ data.desc }}</td>
             <td>
               <button nz-button nzType="primary" *ngIf="coopBtns.edit" nzSize="small" (click)="showModal($event,'edit',data)">编辑</button>
@@ -80,7 +82,7 @@
               </nz-select>
             </nz-form-control>
           </nz-form-item>
-          <nz-form-item>
+          <nz-form-item *ngIf="checkedDictionary.type === 'dictionaryTree'">
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="parent">父级被服分类</nz-form-label>
             <nz-form-control nzErrorTip="请选择父级被服分类!">
               <nz-select formControlName="parent" nzPlaceHolder="请选择父级被服分类">
@@ -113,7 +115,7 @@
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
-          <nz-form-item>
+          <nz-form-item *ngIf="checkedDictionary.type === 'dictionaryTree'">
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="extra3">单价</nz-form-label>
             <nz-form-control nzErrorTip="请输入单价!">
               <nz-input-group>

src/app/views/data-dictionary/data-dictionary.component.ts

@@ -54,7 +54,6 @@ export class DataDictionaryComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.hosId = this.tool.getCurrentHospital().id;
     this.getDictionaryList();
-    this.getParentList();
     this.tableHeight = document.body.clientHeight - 312;
   }
 
@@ -65,6 +64,13 @@ export class DataDictionaryComponent implements OnInit {
         id: -1,
         dictionaryName: '被服种类',
         key: 'clothes_type',
+        type: 'dictionaryTree',
+      },
+      {
+        id: -2,
+        dictionaryName: '统计分类',
+        key: 'statistics_date_type',
+        type: 'dictionary',
       }
     ];
     if (Object.keys(this.checkedDictionary).length) {
@@ -106,19 +112,31 @@ export class DataDictionaryComponent implements OnInit {
   // 获取选中数据字典列表
   getAll() {
     this.dictionaryLoading = true;
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      dictionaryTree: {
-        hosId: this.hosId,
-        level: 2,
-        parent: this.searchDto.parent || undefined,
-        key: this.checkedDictionary.key,
-        deleted: 0,
-      },
-    };
+    let postData = {};
+    if(this.checkedDictionary.type === 'dictionary'){
+      postData = {
+        idx: 0,
+        sum: 9999,
+        dictionary: {
+          key: this.checkedDictionary.key,
+          deleted: 0,
+        },
+      }
+    }else if(this.checkedDictionary.type === 'dictionaryTree'){
+      postData = {
+        idx: 0,
+        sum: 9999,
+        dictionaryTree: {
+          hosId: this.hosId,
+          level: 2,
+          parent: this.searchDto.parent || undefined,
+          key: this.checkedDictionary.key,
+          deleted: 0,
+        },
+      }
+    }
     this.mainService
-      .getFetchDataList("simple/data", "dictionaryTree", postData)
+      .getFetchDataList("simple/data", this.checkedDictionary.type, postData)
       .subscribe((result) => {
         this.dictionaryLoading = false;
         if (result.status == 200) {
@@ -134,6 +152,7 @@ export class DataDictionaryComponent implements OnInit {
     this.checkedDictionary = data ? data : {};
     this.mapOfCheckedId = {};
     this.getAll();
+    this.checkedDictionary.type === 'dictionaryTree' && this.getParentList();
   }
 
   selectedUser(data) {
@@ -161,22 +180,31 @@ export class DataDictionaryComponent implements OnInit {
 
   // 新增/编辑模态框
   showModal(e, type, data?) {
+    e.stopPropagation();
     this.dictionaryModal = true;
     this.add = type == "add";
     if (type == "edit") {
       this.initForm();
       this.dataEdit = data;
-      this.validateForm.controls.key.setValue(data.key);
-      this.validateForm.controls.parent.setValue(data.parent);
-      this.validateForm.controls.name.setValue(data.name);
-      this.validateForm.controls.value.setValue(data.value);
-      this.validateForm.controls.orders.setValue(data.orders);
-      this.validateForm.controls.extra3.setValue(data.extra3);
-      this.validateForm.controls.desc.setValue(data.desc);
+      if(this.checkedDictionary.type === 'dictionaryTree'){
+        this.validateForm.controls.key.setValue(data.key);
+        this.validateForm.controls.parent.setValue(data.parent);
+        this.validateForm.controls.name.setValue(data.name);
+        this.validateForm.controls.value.setValue(data.value);
+        this.validateForm.controls.orders.setValue(data.orders);
+        this.validateForm.controls.extra3.setValue(data.extra3);
+        this.validateForm.controls.desc.setValue(data.desc);
+      } else if(this.checkedDictionary.type === 'dictionary'){
+        this.validateForm.controls.key.setValue(data.key);
+        this.validateForm.controls.name.setValue(data.name);
+        this.validateForm.controls.value.setValue(data.value);
+        this.validateForm.controls.orders.setValue(data.orders);
+        this.validateForm.controls.desc.setValue(data.desc);
+      }
+
     } else {
       this.initForm();
     }
-    e.stopPropagation();
   }
 
   // 隐藏模态框
@@ -186,15 +214,26 @@ export class DataDictionaryComponent implements OnInit {
 
   // 初始化新增form表单dictionary
   initForm() {
-    this.validateForm = this.fb.group({
-      key: [this.checkedDictionary.key, [Validators.required]],
-      parent: [null, [Validators.required]],
-      name: [null, [Validators.required]],
-      value: [null, [Validators.required]],
-      orders: [0, [Validators.required]],
-      extra3: [0, [Validators.required]],
-      desc: [null, [Validators.required]],
-    });
+    if(this.checkedDictionary.type === 'dictionaryTree'){
+      this.validateForm = this.fb.group({
+        key: [this.checkedDictionary.key, [Validators.required]],
+        parent: [null, [Validators.required]],
+        name: [null, [Validators.required]],
+        value: [null, [Validators.required]],
+        orders: [0, [Validators.required]],
+        extra3: [0, [Validators.required]],
+        desc: [null, [Validators.required]],
+      });
+    } else if(this.checkedDictionary.type === 'dictionary'){
+      this.validateForm = this.fb.group({
+        key: [this.checkedDictionary.key, [Validators.required]],
+        name: [null, [Validators.required]],
+        value: [null, [Validators.required]],
+        orders: [0, [Validators.required]],
+        desc: [null, [Validators.required]],
+      });
+    }
+
   }
 
   // 新增/编辑提交
@@ -207,31 +246,52 @@ export class DataDictionaryComponent implements OnInit {
     this.btnLoading = true;
     let postData;
 
-    if (this.add) {
-      postData = {
-        hosId: this.hosId,
-        key: this.validateForm.value.key,
-        parent: this.validateForm.value.parent,
-        name: this.validateForm.value.name,
-        value: this.validateForm.value.value,
-        orders: this.validateForm.value.orders,
-        extra3: this.validateForm.value.extra3,
-        desc: this.validateForm.value.desc,
-        level: 2,
-      };
-    } else {
-      postData = {
-        hosId: this.hosId,
-        key: this.validateForm.value.key,
-        parent: this.validateForm.value.parent,
-        name: this.validateForm.value.name,
-        value: this.validateForm.value.value,
-        orders: this.validateForm.value.orders,
-        extra3: this.validateForm.value.extra3,
-        desc: this.validateForm.value.desc,
-        id: this.dataEdit.id,
-        level: 2,
-      };
+    if(this.checkedDictionary.type === 'dictionaryTree'){
+      if (this.add) {
+        postData = {
+          hosId: this.hosId,
+          key: this.validateForm.value.key,
+          parent: this.validateForm.value.parent,
+          name: this.validateForm.value.name,
+          value: this.validateForm.value.value,
+          orders: this.validateForm.value.orders,
+          extra3: this.validateForm.value.extra3,
+          desc: this.validateForm.value.desc,
+          level: 2,
+        };
+      } else {
+        postData = {
+          hosId: this.hosId,
+          key: this.validateForm.value.key,
+          parent: this.validateForm.value.parent,
+          name: this.validateForm.value.name,
+          value: this.validateForm.value.value,
+          orders: this.validateForm.value.orders,
+          extra3: this.validateForm.value.extra3,
+          desc: this.validateForm.value.desc,
+          id: this.dataEdit.id,
+          level: 2,
+        };
+      }
+    }else if(this.checkedDictionary.type === 'dictionary'){
+      if (this.add) {
+        postData = {
+          key: this.validateForm.value.key,
+          name: this.validateForm.value.name,
+          value: this.validateForm.value.value,
+          orders: this.validateForm.value.orders,
+          desc: this.validateForm.value.desc,
+        };
+      } else {
+        postData = {
+          key: this.validateForm.value.key,
+          name: this.validateForm.value.name,
+          value: this.validateForm.value.value,
+          orders: this.validateForm.value.orders,
+          desc: this.validateForm.value.desc,
+          id: this.dataEdit.id,
+        };
+      }
     }
     this.addHandler(postData);
   }
@@ -239,7 +299,7 @@ export class DataDictionaryComponent implements OnInit {
   //新增/编辑
   addHandler(postData) {
     this.mainService
-      .simplePost("addData", "dictionaryTree", postData)
+      .simplePost("addData", this.checkedDictionary.type, postData)
       .subscribe((result) => {
         this.hideModal();
         this.btnLoading = false;
@@ -278,7 +338,7 @@ export class DataDictionaryComponent implements OnInit {
     this.btnLoading = true;
     let selectedDictionary = this.selectedDictionary.map((item) => item.id);
     let postData = this.isDelSingle ? [this.dataEdit.id] : selectedDictionary;
-    this.mainService.simplePost("rmvData", "dictionaryTree", postData).subscribe((result) => {
+    this.mainService.simplePost("rmvData", this.checkedDictionary.type, postData).subscribe((result) => {
       this.hideDelDictionaryModal();
       this.btnLoading = false;
       if (result.status == 200) {

src/app/views/task-type-management/task-type-management.component.html

@@ -42,20 +42,24 @@
     <div class="list" *ngIf="!taskTypeLoading&&!loading4&&((add&&allTaskType.length===0)||allTaskType.length)">
       <!-- 基础信息 -->
       <div *ngIf="tabModalName=='jcxx'">
-        <nz-form-label class="label" nzRequired>类型名称</nz-form-label>
-        <input nz-input class="mb8" [(ngModel)]="taskName" placeholder="请填写类型名称" nzSize="default" />
-        <div nz-row class="mb8">
-          <nz-form-label class="label" nzRequired nz-col nzSpan="5" style="text-align: left;">关联班次</nz-form-label>
-          <div nz-col nzSpan="18" class="mt8">
+        <div nz-row class="mb8 display_flex align-items_center">
+          <nz-form-label class="label" nzRequired>类型名称</nz-form-label>
+          <input nz-input class="flex_1" [(ngModel)]="taskName" placeholder="请填写类型名称" nzSize="default" />
+        </div>
+        <div nz-row class="mb8 display_flex align-items_center">
+          <nz-form-label class="label" nzRequired nz-col style="text-align: left;">关联班次</nz-form-label>
+          <div nz-col class="flex_1">
             <nz-checkbox-group class="w100" [(ngModel)]="allScheduleClass"></nz-checkbox-group>
           </div>
         </div>
-        <nz-form-label class="label" nzRequired>关联类型</nz-form-label>
-        <!-- 关联类型禁止修改 -->
-        <nz-select class="mb8 w100" nzShowSearch nzPlaceHolder="请选择关联类型" [ngModel]="association.id"
-          (ngModelChange)="asso($event)" [nzDisabled]="!add">
-          <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allAssociation"></nz-option>
-        </nz-select>
+        <div nz-row class="mb8 display_flex align-items_center">
+          <nz-form-label class="label" nzRequired>关联类型</nz-form-label>
+          <!-- 关联类型禁止修改 -->
+          <nz-select class="flex_1" nzShowSearch nzPlaceHolder="请选择关联类型" [ngModel]="association.id"
+            (ngModelChange)="asso($event)" [nzDisabled]="!add">
+            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allAssociation"></nz-option>
+          </nz-select>
+        </div>
         <ng-container *ngIf="association.value == 'ordinary'">
           <nz-form-label class="label" nzRequired>关联业务</nz-form-label>
           <!-- 关联业务禁止修改 -->
@@ -275,17 +279,23 @@
           <nz-form-label class="label">携带设备</nz-form-label>
           <nz-checkbox-group class="handlerType" [nzDisabled]="isRemarks == 1" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
         </div>
-        <div nz-row>
+        <div nz-row class="mb8 display_flex align-items_center">
           <nz-form-label class="label">急单权重</nz-form-label>
-          <input nz-input type="number" class="mb8" [(ngModel)]="urgeWeight" placeholder="请填写急单权重" nzSize="default" />
+          <input nz-input type="number" class="flex_1" [(ngModel)]="urgeWeight" placeholder="请填写急单权重" nzSize="default" />
         </div>
-        <div nz-row>
+        <div nz-row class="mb8 display_flex align-items_center">
           <nz-form-label class="label">普单权重</nz-form-label>
-          <input nz-input type="number" class="mb8" [(ngModel)]="commonWeight" placeholder="请填写普单权重" nzSize="default" />
+          <input nz-input type="number" class="flex_1" [(ngModel)]="commonWeight" placeholder="请填写普单权重" nzSize="default" />
         </div>
-        <div nz-row>
+        <div nz-row class="mb8 display_flex align-items_center">
           <nz-form-label class="label">统计备注</nz-form-label>
-          <input nz-input type="text" class="mb8" [(ngModel)]="countRemark" placeholder="请填写统计备注" nzSize="default" />
+          <input nz-input type="text" class="flex_1" [(ngModel)]="countRemark" placeholder="请填写统计备注" nzSize="default" />
+        </div>
+        <div nz-row class="mb8 display_flex align-items_center">
+          <nz-form-label class="label">统计分类</nz-form-label>
+          <nz-select class="flex_1" nzShowSearch nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsDateType.id">
+            <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allStatisticsDateType"></nz-option>
+          </nz-select>
         </div>
       </div>
       <!-- 规则信息 -->

src/app/views/task-type-management/task-type-management.component.ts

@@ -77,6 +77,7 @@ export class TaskTypeManagementComponent implements OnInit {
   //基础信息请求参数
   hosId; //当前院区
   allAssociation: Array<any>; //关联类型
+  allStatisticsDateType: Array<any>; //统计分类
   allRelatedBusiness: Array<any>; //关联业务
   allTaskType = []; //任务类型列表
   allTaskTypeShow; //任务类型列表选择标识
@@ -91,6 +92,10 @@ export class TaskTypeManagementComponent implements OnInit {
     id: "",
     value: "",
   }; //关联类型
+  statisticsDateType: any = {
+    id: "",
+    value: "",
+  }; //统计分类
   relatedBusiness: any = {
     id: "",
     value: "",
@@ -321,6 +326,7 @@ export class TaskTypeManagementComponent implements OnInit {
 
     this.getAllHospital(); // 获取所有院区
     this.getAllAssociation(); // 获取所有关联类型
+    this.getallStatisticsDateType(); // 获取统计分类
     this.getAllRelatedBusiness(); // 获取所有关联业务
     this.getAllGoods(); //获取携带设备
     this.getAllScheduleClass(); //获取班次列表
@@ -615,6 +621,15 @@ export class TaskTypeManagementComponent implements OnInit {
         that.allAssociation = data;
       });
   }
+  // 获取统计分类
+  getallStatisticsDateType() {
+    var that = this;
+    that.mainService
+      .getDictionary("list", "statistics_date_type")
+      .subscribe((data) => {
+        that.allStatisticsDateType = data;
+      });
+  }
   // 获取是否限制业务发起时间-字典
   getReserveType() {
     this.mainService
@@ -839,6 +854,17 @@ export class TaskTypeManagementComponent implements OnInit {
       id: data.associationType.id + "",
       value: data.associationType.value,
     };
+    if(data.statisticsDateType){
+      this.statisticsDateType = {
+        id: data.statisticsDateType.id + "",
+        value: data.statisticsDateType.value,
+      };
+    }else{
+      this.statisticsDateType = {
+        id: null,
+        value: "",
+      };
+    }
     this.getType();
     this.departments = [];
     this.mapOfCheckedId = {};
@@ -1152,6 +1178,9 @@ export class TaskTypeManagementComponent implements OnInit {
       that.showPromptModal(that.add ? "新增" : "编辑", false, "请选择关联类型");
       return;
     }
+    if (this.statisticsDateType.id) {
+      this.taskData.taskType["statisticsDateType"] = this.statisticsDateType;
+    }
     if (this.tabModalName == "ysgc") {
       if (!this.departmentStrategy.idv) {
         that.showPromptModal(

src/common.less

@@ -16,6 +16,9 @@
 .w100 {
   width: 100% !important;
 }
+.w135 {
+  width: 135px !important;
+}
 .wp75 {
   width: 75% !important;
 }