拉取代码

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

@@ -4,6 +4,8 @@
     <div class="address">
       <div class="contentHead">工时大类
 				<div>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="operation(1)">{{activeCategory1.disable==1?'停用':'启用'}}</button>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addLogModal(1)">日志</button>
 					<button nz-button class="mar-rig-10 btn cancel" nzType="default" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="delCategoryModal(1)">删除</button>
           <button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory1.id && categoryList1.length" (click)="editCategoryModal(1)">编辑</button>
 					<button nz-button nzType="primary" nzSize="small" (click)="addCategoryModal(1)">新增</button>
@@ -11,12 +13,14 @@
 			</div>
       <overlay-scrollbars #osComponentRef1 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分</div>
+        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disable==0?'禁用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
     <div class="address">
       <div class="contentHead">工时小类
 				<div>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.disable==1 && activeCategory1.id" (click)="operation(2)">{{activeCategory2.disable==1?'停用':'启用'}}</button>
+					<button nz-button class="mar-rig-10 btn" nzType="primary" nzSize="small" *ngIf="activeCategory2.id && activeCategory1.id" (click)="addLogModal(2)">日志</button>
 					<button nz-button class="mar-rig-10 btn cancel" *ngIf="activeCategory2.id && activeCategory1.id" nzType="default" nzSize="small" (click)="delCategoryModal(2)">删除</button>
           <button nz-button class="mar-rig-10 btn" *ngIf="activeCategory2.id && activeCategory1.id" nzType="primary" nzSize="small" (click)="editCategoryModal(2)">编辑</button>
 					<button nz-button nzType="primary" nzSize="small" *ngIf="activeCategory1.id" (click)="addCategoryModal(2)">新增</button>
@@ -24,7 +28,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef2 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
-        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分</div>
+        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分 - {{item.disable==0?'禁用':'启用'}}</div>
       </overlay-scrollbars>
     </div>
   </div>
@@ -121,3 +125,47 @@
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmDel()" (cancelDelEvent)="cancelDel()" [content]="delContent" confirmTxt="是" cancelTxt="否">
 </app-dialog-delete>
+
+<!-- 启用/停用模态框 -->
+<app-dialog-delete [delModal]="operationModal" (hideDelModalEvent)="hideOperationModal()" [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmOperation()" (cancelDelEvent)="cancelOperation()" [content]="operationContent" confirmTxt="是" cancelTxt="否">
+</app-dialog-delete>
+
+<!-- 日志查看模态框 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="logModal">
+	  <div class="modalBody modalLogBody">
+	    <div class="title">日志查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+	    </div>
+	    <div class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="listLogOfData" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="loading2">
+	          <thead>
+	            <tr class="thead">
+								<th>动作</th>
+	              <th>操作时间</th>
+	              <th>操作人</th>
+	              <th>调整记录</th>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of listLogOfData">
+	            	<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>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+				<div class="list-template__pagination">
+				  <nz-pagination [(nzPageIndex)]="pageLogIndex" [(nzTotal)]="listLogLength" nzShowSizeChanger [(nzPageSize)]="pageLogSize"
+				    (nzPageIndexChange)="getLogList()" (nzPageSizeChange)="getLogList()">
+				  </nz-pagination>
+				</div>
+	    </div>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>

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

@@ -298,6 +298,123 @@
           }
         }
       }
+			
+			.modalLogBody {
+			  width: 80%;
+			  height: auto;
+			
+			  .content {
+			    width: 100%;
+			    height: auto;
+			    padding: 19px 14px 0 14px;
+			    max-height: 500px;
+			    overflow-y: auto;
+					
+					.list-template__bottom {
+					  background: #f9fafb;
+					  border: 1px solid #e5e9ed;
+					  border-radius: 8px;
+					  // padding-bottom: 56px;
+					  position: relative;
+					  .list-template__nzTable {
+					    padding: 16px 16px 0;
+					
+					    .thead {
+					      background-image: linear-gradient(to right, @bg-start, @bg-end);
+					
+					      th {
+					        background: transparent;
+					        color: #fff;
+					        text-align: center;
+					      }
+					    }
+					
+					    .ant-table-body {
+					      border-bottom: 1px solid #e5e9ed;
+					    }
+					
+					    .ant-table-tbody {
+					      tr {
+					        text-align: center;
+					        color: #333;
+					
+					        td {
+					          border: none;
+					
+					          &.tab_hover:hover{
+					            text-decoration: underline;
+					            cursor: pointer;
+					          }
+					
+					          .coop {
+					            button{
+					              color: #333;
+					            }
+					            span,button {
+					              display: inline-block;
+					              padding: 0 8px;
+					              cursor: pointer;
+					              position: relative;
+					
+					              &::after {
+					                content: "|";
+					                position: absolute;
+					                top: 0;
+					                right: 0;
+					              }
+					
+					              &:hover,
+					              &:active {
+					                color: @primary-color;
+					              }
+					
+					              &:nth-last-child(1) {
+					                &::after {
+					                  content: "";
+					                }
+					              }
+					            }
+					          }
+					        }
+					      }
+					    }
+					  }
+					}
+										
+			    .addForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 14px;
+			          text-align: left;
+			        }
+			      }
+			    }
+			
+			    .editForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 0;
+			          text-align: left;
+			        }
+			      }
+			    }
+					.list-template__pagination {
+						text-align: right;
+						padding: 20px 0;
+					}
+			  }
+				
+				
+			  button {
+			    &:nth-child(1) {
+			      margin-right: 20px;
+			    }
+			  }
+			}
     }
   }
 }

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

@@ -161,7 +161,110 @@ export class ConfigurationManHourComponent implements OnInit {
 	hideDelModal() {
 	  this.delModal = false;
 	}
-
+	
+	// 日志列表
+	listLogOfData: any[] = []; //日志数据
+	pageLogIndex: number = 1; //日志当前页码
+	pageLogSize: number = 10; //日志每页展示条数
+	listLogLength: number = 10; //日志总数据量
+	loading2:boolean = false;
+	getLogList(type) {
+	  if (type == 1) {
+	    this.pageLogIndex = 1;
+	  }
+	  let postData = {
+	  	idx: 0,
+	  	sum: 99999,
+	  	workHourManagementLog: {
+	  		workHourId: this.itemData.id,
+	  	},
+	  };
+	  this.loading2 = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "workHourManagementLog", postData)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      if (data.status == 200) {
+					this.logModal = true
+	        this.listLogOfData = data.list;
+	        this.listLogLength = data.totalNum;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
+	
+	// 启用/停用工时
+	operationModal: boolean = false; 
+	operationContent: string = null; 
+	operation(type:number){
+		if(type==1){
+			let msg = this.activeCategory1.disable==1?'停用':'启用'
+			this.operationContent = `您确认${msg}大类工时吗？${msg}后所有小类同时${msg}`
+		}else{
+			let msg = this.activeCategory2.disable==1?'停用':'启用'
+			this.operationContent = `您确认${msg}小类工时吗？`
+		}
+		this.coopType = type;
+		this.operationModal = true
+	}
+	
+	hideOperationModal(){
+		this.operationModal = false
+	}
+	
+	// 取消启用/停用弹框
+	cancelOperation(){
+		this.hideOperationModal();
+	}
+	
+	// 确认启用/停用
+	confirmOperation() {
+	  let that = this;
+		let disable = null
+	  that.btnLoading = true;
+		if(this['activeCategory' + this.coopType].disable==1){
+			disable = 0
+		}else{
+			disable = 1
+		}
+		let postData = {
+		  workHourManagement: {
+				...this['activeCategory' + this.coopType],
+				disable:disable,
+				upType: 'disable'
+		  }
+		}
+	  that.mainService
+	    .coopData('updData', 'workHourManagement', postData)
+	    .subscribe((data) => {
+	      that.btnLoading = false;
+	      that.hideOperationModal();
+				if(this.coopType==1){
+					this.categoryList2 = []
+				}
+	      if (data["status"] == 200) {
+	        that.showPromptModal("操作", true, "");
+	      } else {
+	        that.showPromptModal("操作", false, data["msg"]);
+	      }
+	    });
+	}
+	
+	// 查看日志
+	itemData:any = {};
+	logModal:boolean = false;
+	addLogModal(type){
+		this.itemData = this['activeCategory' + type];
+		console.log(this['activeCategory' + type])
+		this.getLogList(1)
+	}
+	
+	// 关闭日志
+	hideModal() {
+	  this.logModal = false;
+	}
+	
   // 获取工时
   loading1:boolean = false;
   tableCategoryHeight:number = 0;

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

@@ -9,7 +9,8 @@
           <div class="value">
             <span class="unitPrice">单价：{{ item.consumableEndPrice }}元</span>
             <button nz-button class="btn default ml8" (click)="editConsumable(item)">编辑</button>
-          </div>
+						<button nz-button class="btn default ml8" (click)="logView(1,item)">日志</button>
+					</div>
         </div>
 
         <div class="row">
@@ -39,7 +40,8 @@
           <div class="value">
             <span class="unitPrice">单价：{{ item.wage }}元</span>
             <button nz-button class="btn default ml8" (click)="editWorkHourManagement(item)">编辑</button>
-          </div>
+						<button nz-button class="btn default ml8" (click)="logView(2,item)">日志</button>
+					</div>
         </div>
 
         <div class="row">
@@ -137,3 +139,44 @@
 <!-- 删除模态框 -->
 <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
 (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+
+<!-- 日志查看模态框 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="logModal">
+	  <div class="modalBody modalLogBody">
+	    <div class="title">日志查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+	    </div>
+	    <div class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="listLogOfData" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="loading2">
+	          <thead>
+	            <tr class="thead">
+								<th>动作</th>
+	              <th>操作时间</th>
+	              <th>操作人</th>
+	              <th>调整记录</th>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of listLogOfData">
+								<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
+								<td *ngIf="operationType==1">{{ data.time|date:'yyyy-MM-dd HH:mm'}}</td>
+								<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>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+			<!-- 	<div class="list-template__pagination">
+				  <nz-pagination [(nzPageIndex)]="pageLogIndex" [(nzTotal)]="listLogLength" nzShowSizeChanger [(nzPageSize)]="pageLogSize"
+				    (nzPageIndexChange)="getLogList()" (nzPageSizeChange)="getLogList()">
+				  </nz-pagination>
+				</div> -->
+	    </div>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>

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

@@ -333,6 +333,124 @@
           }
         }
       }
+			
+			
+			.modalLogBody {
+			  width: 80%;
+			  height: auto;
+			
+			  .content {
+			    width: 100%;
+			    height: auto;
+			    padding: 19px 14px 20px 14px;
+			    max-height: 500px;
+			    overflow-y: auto;
+					
+					.list-template__bottom {
+					  background: #f9fafb;
+					  border: 1px solid #e5e9ed;
+					  border-radius: 8px;
+					  // padding-bottom: 56px;
+					  position: relative;
+					  .list-template__nzTable {
+					    padding: 16px 16px 0;
+					
+					    .thead {
+					      background-image: linear-gradient(to right, @bg-start, @bg-end);
+					
+					      th {
+					        background: transparent;
+					        color: #fff;
+					        text-align: center;
+					      }
+					    }
+					
+					    .ant-table-body {
+					      border-bottom: 1px solid #e5e9ed;
+					    }
+					
+					    .ant-table-tbody {
+					      tr {
+					        text-align: center;
+					        color: #333;
+					
+					        td {
+					          border: none;
+					
+					          &.tab_hover:hover{
+					            text-decoration: underline;
+					            cursor: pointer;
+					          }
+					
+					          .coop {
+					            button{
+					              color: #333;
+					            }
+					            span,button {
+					              display: inline-block;
+					              padding: 0 8px;
+					              cursor: pointer;
+					              position: relative;
+					
+					              &::after {
+					                content: "|";
+					                position: absolute;
+					                top: 0;
+					                right: 0;
+					              }
+					
+					              &:hover,
+					              &:active {
+					                color: @primary-color;
+					              }
+					
+					              &:nth-last-child(1) {
+					                &::after {
+					                  content: "";
+					                }
+					              }
+					            }
+					          }
+					        }
+					      }
+					    }
+					  }
+					}
+										
+			    .addForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 14px;
+			          text-align: left;
+			        }
+			      }
+			    }
+			
+			    .editForm {
+			      .ant-form-item {
+			        margin-bottom: 14px;
+			
+			        .ant-form-item-label {
+			          line-height: 0;
+			          text-align: left;
+			        }
+			      }
+			    }
+					.list-template__pagination {
+						text-align: right;
+						padding: 20px 0;
+					}
+			  }
+				
+				
+			  button {
+			    &:nth-child(1) {
+			      margin-right: 20px;
+			    }
+			  }
+			}
     }
   }
 }

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

@@ -38,7 +38,81 @@ export class IncidentHandleOrderComponent implements OnInit {
     this.getHospitalConfig();
     this.getWorkHourManagementList();
   }
-
+	
+	// 工时日志列表
+	listLogOfData: any[] = []; //日志数据
+	pageLogIndex: number = 1; //日志当前页码
+	pageLogSize: number = 10; //日志每页展示条数
+	listLogLength: number = 10; //日志总数据量
+	loading2:boolean = false;
+	getHourLogList() {
+	  let data = {
+	    idx: 0,
+	    sum: 99999,
+	    workHourManagementLog: {
+				workHourId: this.itemData.id,
+				repairSummaryId: this.summaryId
+	    },
+	  };
+	  this.loading2 = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "workHourManagementLog", data)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      if (data.status == 200) {
+					this.logModal = true
+	        this.listLogOfData = data.list;
+	        // this.listLogLength = data.totalNum;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
+	
+	// 耗材日志列表
+	getConsumableLogList() {
+	  let data = {
+	    idx: 0,
+	    sum: 99999,
+			assetConsumablesHistory: {
+			  assetConsumablesId: this.itemData.consumableId,
+				repairSummaryId: this.summaryId
+			},
+	  };
+	  this.loading2 = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "assetConsumablesHistory", data)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      if (data.status == 200) {
+					this.logModal = true
+	        this.listLogOfData = data.list;
+	        // this.listLogLength = data.totalNum;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
+	
+	// 查看日志
+	itemData:any = {};
+	logModal:boolean = false;
+	operationType:any;
+	logView(type, data){
+		this.operationType = type;
+		this.itemData = data;
+		if(type==1){ //耗材
+			this.getConsumableLogList()
+		}else{ //日志
+			this.getHourLogList()
+		}
+	}
+	
+	// 关闭日志
+	hideModal() {
+	  this.logModal = false;
+	}
+	
   // ============耗材start=================
 
   // 新增耗材/工时弹框
@@ -312,6 +386,7 @@ export class IncidentHandleOrderComponent implements OnInit {
       workHourManagement: {
         hosId: this.hosId,
         showSecond: 1,
+				disable:1
       },
       idx: 0,
       sum: 9999,

src/app/services/tool.service.ts

@@ -312,6 +312,9 @@ export class ToolService {
 				case "callCenter":
 				  coopBtns.callCenter = true; //呼叫中心
 				  break;
+				case "log":
+				  coopBtns.log = true; //日志
+				  break;
       }
     });
     console.log(coopBtns);

src/app/views/assets-consumable/assets-consumable.component.html

@@ -51,7 +51,8 @@
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit($event, data)">编辑</span>
                 <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
-              </div>
+								<span *ngIf="coopBtns.log" (click)="showLogModal($event, data)">日志</span>
+							</div>
             </td>
           </tr>
         </tbody>
@@ -134,6 +135,46 @@
       </div>
     </div>
   </div>
+	
+	<!-- 日志查看模态框 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="logModal">
+	  <div class="modalBody modalLogBody">
+	    <div class="title">日志查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+	    </div>
+	    <div class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="listLogOfData" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="loading2">
+	          <thead>
+	            <tr class="thead">
+								<th>动作</th>
+	              <th>操作时间</th>
+	              <th>操作人</th>
+	              <th>调整记录</th>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of listLogOfData">
+								<td>{{ data.operationType ? data.operationType.name : '-' }}</td>
+	              <td>{{ data.time|date:'yyyy-MM-dd HH:mm'}}</td>
+	              <td>{{ data.operator ? data.operator.name : '-' }}</td>
+	              <td>{{ data.logRemark ? data.logRemark : '-' }}</td>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+				<div class="list-template__pagination">
+				  <nz-pagination [(nzPageIndex)]="pageLogIndex" [(nzTotal)]="listLogLength" nzShowSizeChanger [(nzPageSize)]="pageLogSize"
+				    (nzPageIndexChange)="getLogList()" (nzPageSizeChange)="getLogList()">
+				  </nz-pagination>
+				</div>
+	    </div>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>
+	
   <!-- 模态框 -->
   <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>

src/app/views/assets-consumable/assets-consumable.component.less

@@ -172,5 +172,122 @@
         }
       }
     }
+		
+		.modalLogBody {
+		  width: 80%;
+		  height: auto;
+		
+		  .content {
+		    width: 100%;
+		    height: auto;
+		    padding: 19px 14px 0 14px;
+		    max-height: 500px;
+		    overflow-y: auto;
+				
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  // padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				}
+									
+		    .addForm {
+		      .ant-form-item {
+		        margin-bottom: 14px;
+		
+		        .ant-form-item-label {
+		          line-height: 14px;
+		          text-align: left;
+		        }
+		      }
+		    }
+		
+		    .editForm {
+		      .ant-form-item {
+		        margin-bottom: 14px;
+		
+		        .ant-form-item-label {
+		          line-height: 0;
+		          text-align: left;
+		        }
+		      }
+		    }
+				.list-template__pagination {
+					text-align: right;
+					padding: 20px 0;
+				}
+		  }
+			
+			
+		  button {
+		    &:nth-child(1) {
+		      margin-right: 20px;
+		    }
+		  }
+		}
   }
 }

src/app/views/assets-consumable/assets-consumable.component.ts

@@ -167,7 +167,52 @@ export class AssetsConsumableComponent implements OnInit {
     this.isLoading = true;
     this.changeInpSubject.next([type, model, e]);
   }
-
+	
+	// 日志列表
+	listLogOfData: any[] = []; //日志数据
+	pageLogIndex: number = 1; //日志当前页码
+	pageLogSize: number = 10; //日志每页展示条数
+	listLogLength: number = 10; //日志总数据量
+	loading2:boolean = false;
+	getLogList(type) {
+	  if (type == 1) {
+	    this.pageLogIndex = 1;
+	  }
+	  let data = {
+	    idx: this.pageLogIndex - 1,
+	    sum: this.pageLogSize,
+	    assetConsumablesHistory: {
+	      assetConsumablesId: this.itemData.id,
+	    },
+	  };
+	  this.loading2 = true;
+	  this.mainService
+	    .getFetchDataList("simple/data", "assetConsumablesHistory", data)
+	    .subscribe((data) => {
+	      this.loading2 = false;
+	      if (data.status == 200) {
+					this.logModal = true
+	        this.listLogOfData = data.list;
+	        this.listLogLength = data.totalNum;
+	      }else{
+	        this.message.error(data.msg || "请求数据失败");
+	      }
+	    });
+	}
+	
+	// 查看日志
+	itemData:any = {};
+	logModal:boolean = false;
+	showLogModal(data, e){
+		this.itemData = data;
+		this.getLogList(1)
+	}
+	
+	// 关闭日志
+	hideModal() {
+	  this.logModal = false;
+	}
+	
   // 获取产品列表
   assetProductsearchList: any = [];
   assetProductaddList: any = [];

src/app/views/hushijiandan/hushijiandan.component.html

@@ -2534,7 +2534,7 @@
 <!-- 在模态框所在的 div 添加属性 [appDrag] -->
 <div appDrag class="modal" [ngClass]="{'isKeyClass': iskeySwitch}" *ngIf="isShowNurseCode">
   <div class="header drag-title">
-    <h2>签到二维码</h2>
+    <h2>交接码</h2>
     <i
       class="icon-close icon_transport transport-guanbi1"
       (click)="closeNurseCode()"

src/app/views/incident-management/incident-management.component.html

@@ -62,6 +62,13 @@
             </nz-option>
           </nz-select>
         </div>
+				<div class="list-template__searchItem">
+				  <span class="label">评分</span>：
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+				    nzPlaceHolder="请选择评分" [(ngModel)]="searchDTO.score">
+				    <nz-option [nzLabel]="data.name" [nzValue]="data.id" *ngFor="let data of scoreData"></nz-option>
+				  </nz-select>
+				</div>
       </div>
       <div nz-col nzXl='6' class="list-template__btns">
         <button nz-button class="btn default ml8" (click)='search()'>搜索</button>

src/app/views/incident-management/incident-management.component.ts

@@ -356,6 +356,9 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
         incidentsign: this.searchDTO.incidentsign,
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
         statusId: this.searchDTO.statusId || undefined,
+				wxdegree:{
+					id:this.searchDTO.score || undefined,
+				},
         todoingUser: this.searchDTO.todoingUser ? { id: this.searchDTO.todoingUser } : undefined,
         levelCategory: this.validateSearchForm.value.levelCategory ? { id: this.validateSearchForm.value.levelCategory } : undefined,
         acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
@@ -504,10 +507,15 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
   }
 
   // 获取工单状态
+	scoreData:any;
   getGdStates() {
     this.mainService.getDictionary("list", "incident_status").subscribe((data) => {
       this.gdStates = data || [];
     });
+		this.mainService.getDictionary("list", "incident_degree").subscribe((data) => {
+		  this.scoreData = data || [];
+		});
+		
   }
 
   // 获取逾期查询
@@ -700,6 +708,9 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
         incidentsign: this.searchDTO.incidentsign,
         department: this.searchDTO.department ? { id: this.searchDTO.department } : undefined,
         statusId: this.searchDTO.statusId || undefined,
+				wxdegree:{
+					id:this.searchDTO.score || undefined,
+				},
         todoingUser: this.searchDTO.todoingUser ? { id: this.searchDTO.todoingUser } : undefined,
         levelCategory: this.validateSearchForm.value.levelCategory ? { id: this.validateSearchForm.value.levelCategory } : undefined,
         acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,