seimin 1 year ago
parent
commit
b8c88bd1a4

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1
 {
1
 {
2
   "/service": {
2
   "/service": {
3
-    "target": "http://192.168.4.223",
3
+    "target": "http://192.168.3.108",
4
     "logLevel": "debug",
4
     "logLevel": "debug",
5
     "changeOrigin": true,
5
     "changeOrigin": true,
6
     "pathRewrite": {
6
     "pathRewrite": {

+ 6 - 3
src/app/views/washing-batch-view/washing-batch-view.component.html

@@ -1,8 +1,11 @@
1
 <div class="washingBatchView">
1
 <div class="washingBatchView">
2
   <!-- 头部 -->
2
   <!-- 头部 -->
3
   <div class="head">
3
   <div class="head">
4
-    <div class="logo"><img [src]="tool.logoUrl" [alt]="tool.logoTitle"></div>
5
-    <div class="title">被服洗涤</div>
4
+    <div class="head_logo">
5
+      <div class="logo"><img [src]="tool.logoUrl" [alt]="tool.logoTitle"></div>
6
+      <div class="title">被服洗涤</div>
7
+    </div>
8
+    <div class="red">请选择被服科室绑定分类和父级被服分类后进行搜索</div>
6
   </div>
9
   </div>
7
   <!-- 主体 -->
10
   <!-- 主体 -->
8
   <div class="main">
11
   <div class="main">
@@ -128,7 +131,7 @@
128
 
131
 
129
 <!-- 打印的内容 -->
132
 <!-- 打印的内容 -->
130
 <div id="print-section" hidden>
133
 <div id="print-section" hidden>
131
-  <table style="overflow: hidden;">
134
+  <table style="overflow: hidden;width: 100%;">
132
     <thead>
135
     <thead>
133
       <tr style="display: flex;justify-content: center;text-align: center;font-weight: bold;page-break-inside: avoid;" *ngIf="listOfData.length">
136
       <tr style="display: flex;justify-content: center;text-align: center;font-weight: bold;page-break-inside: avoid;" *ngIf="listOfData.length">
134
         <td style="flex: 2; border: 1px solid #ccc;">科室名称</td>
137
         <td style="flex: 2; border: 1px solid #ccc;">科室名称</td>

+ 7 - 0
src/app/views/washing-batch-view/washing-batch-view.component.less

@@ -16,6 +16,13 @@
16
       background-color: #fff;
16
       background-color: #fff;
17
       display: flex;
17
       display: flex;
18
       align-items: center;
18
       align-items: center;
19
+      justify-content: space-between;
20
+      padding: 0 20px 0 4px;
21
+      .head_logo{
22
+        flex: 1;
23
+        display: flex;
24
+        align-items: center;
25
+      }
19
       .logo{
26
       .logo{
20
         width: 300px;
27
         width: 300px;
21
         height: 100%;
28
         height: 100%;

+ 5 - 1
src/app/views/washing-batch/washing-batch.component.ts

@@ -128,7 +128,11 @@ export class WashingBatchComponent implements OnInit {
128
   coopData:any = {};
128
   coopData:any = {};
129
   openRecallModal(data): void {
129
   openRecallModal(data): void {
130
     this.coopData = data;
130
     this.coopData = data;
131
-    this.recallOrderShow = true;
131
+    if(data.batchState.value == 1){
132
+      this.recallOrderShow = true;
133
+    }else{
134
+      this.router.navigateByUrl("/washingBatchView/" + this.coopData.id);
135
+    }
132
   }
136
   }
133
   // 设置为洗涤中
137
   // 设置为洗涤中
134
   confirmRec() {
138
   confirmRec() {