工时耗材添加日志

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -155,7 +155,7 @@
 	            	<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
 	            	<td>{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
 	            	<td>{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>
-	            	<td>{{ data.logRemark ? data.logRemark : '-' }}</td>
+	            	<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore.value }}</span></td>
 	            </tr>
 	          </tbody>
 	        </nz-table>

src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.ts

@@ -173,8 +173,8 @@ export class ConfigurationManHourComponent implements OnInit {
 	    this.pageLogIndex = 1;
 	  }
 	  let postData = {
-	  	idx: 0,
-	  	sum: 99999,
+	  	idx: this.pageLogIndex - 1,
+	  	sum: this.pageLogSize,
 	  	workHourManagementLog: {
 	  		workHourId: this.itemData.id,
 	  	},

src/app/components/incidentManagement/incident-handle-order/incident-handle-order.component.html

@@ -164,7 +164,7 @@
 								<td *ngIf="operationType==2">{{ data.operationTime|date:'yyyy-MM-dd HH:mm'}}</td>
 								<td *ngIf="operationType==1">{{ data.operator ? data.operator.name : '-' }}</td>
 								<td *ngIf="operationType==2">{{ data.operationUserDTO ? data.operationUserDTO.name : '-' }}</td>
-								<td>{{ data.logRemark ? data.logRemark : '-' }}</td>
+								<td>{{ data.logRemark ? data.logRemark : '-' }} <span *ngIf="data.operationType.value==6">单价:{{ data.currentPrice }} &nbsp;&nbsp;积分:{{ data.currentScore.value }}</span></td>
 	            </tr>
 	          </tbody>
 	        </nz-table>

src/app/share/detail-drug/detail-drug.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
 
   display: flex;
   justify-content: center;

src/app/share/detail-ordinary/detail-ordinary.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
   display: flex;
   justify-content: center;
   align-items: center;

src/app/share/detail-others/detail-others.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
 
   display: flex;
   justify-content: center;

src/app/share/detail-patients/detail-patients.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
   display: flex;
   justify-content: center;
   align-items: center;

src/app/share/detail-sample/detail-sample.component.less

@@ -6,7 +6,7 @@
   left: 0;
   top: 0;
   background: rgba(0, 0, 0, 0.4);
-  z-index: 9;
+  z-index: 9999;
   display: flex;
   justify-content: center;
   align-items: center;

src/app/views/fuwutai/fuwutai.component.html

@@ -1622,7 +1622,7 @@
           </div>
           <!-- 近期配送 end -->
           <!-- 转出院记录 start -->
-          <div class="cots_body weifenpai patientLog" *ngIf="currentRTab == 1" [ngClass]="{ top185: hurseInfoHiding != 1 }">
+     <!--     <div class="cots_body weifenpai patientLog" *ngIf="currentRTab == 1" [ngClass]="{ top185: hurseInfoHiding != 1 }">
             <overlay-scrollbars
               #osComponentRef14
               [ngStyle]="{ height: '100%' }"
@@ -1661,7 +1661,7 @@
                 </nz-table>
               </div>
             </overlay-scrollbars>
-          </div>
+          </div> -->
           <!-- 转出院记录 end -->
           <!-- 近期维修 start -->
           <div class="cots_body weifenpai" *ngIf="currentRTab == 2" [ngClass]="{ top185: hurseInfoHiding != 1 }">

src/app/views/fuwutai/fuwutai.component.ts

@@ -1795,13 +1795,14 @@ export class FuwutaiComponent implements OnInit {
     let dataObj = {
       workOrder: {
         serTaskTypes: types,
-        serGdState: 4,
+        // serGdState: 4,
         range: "0",
         platform: 3,
         searchDays: 100,
-        startDept: {
-          id: id,
-        },
+				createDept: this.applyDept
+        // startDept: {
+        //   id: id,
+        // },
       },
       idx: 0,
       sum: 5,
@@ -2696,7 +2697,7 @@ export class FuwutaiComponent implements OnInit {
       if(this.applyDept){
         this.rightTitle_tab = [
           { id: 0, name: '近期配送' },
-          { id: 1, name: '转出院记录' },
+          // { id: 1, name: '转出院记录' },
         ]
         this.rightTitleHandler(this.rightTitle_tab[0].id);
       }
@@ -3508,7 +3509,7 @@ export class FuwutaiComponent implements OnInit {
     if(this.applyDept && this.currentTabIndex !== '故障报修'){
       this.rightTitle_tab = [
         { id: 0, name: '近期配送' },
-        { id: 1, name: '转出院记录' },
+        // { id: 1, name: '转出院记录' },
       ]
       this.rightTitleHandler(this.rightTitle_tab[0].id);
     }