Przeglądaj źródła

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

28169 1 tydzień temu
rodzic
commit
f6fda978aa

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue Wyświetl plik

@@ -614,7 +614,7 @@
614 614
                         型号:
615 615
                         <div class="under_line" style="width: 60%; text-align: center">
616 616
                           <span v-if="record.bed_id !=0 && record.bed_id !=''">
617
-                            {{ getnumberlist(record.bed_id) }} 
617
+                            {{ getnumberlist(record.bed_id) ? getnumberlist(record.bed_id) :'东丽' }} 
618 618
                           </span>
619 619
                         </div>
620 620
                       </div>

+ 7 - 7
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Wyświetl plik

@@ -919,7 +919,7 @@
919 919
                         >
920 920
 
921 921
 
922
-                          <span v-if="org_id==10206">
922
+                          <span v-if="org_id==10206 || org_id == 10624">
923 923
                               {{
924 924
                             record.prescription.replacement_total
925 925
                               ? record.prescription.replacement_total
@@ -936,7 +936,7 @@
936 936
                           </span>
937 937
 
938 938
 
939
-                          <span v-if="org_id!=10206&&org_id!=10510">
939
+                          <span v-if="org_id!=10206&&org_id!=10510&&org_id!=10624">
940 940
                             {{
941 941
                             record.prescription &&
942 942
                             record.prescription.displace_liqui_value
@@ -1759,12 +1759,12 @@
1759 1759
                             v-if="
1760 1760
                              (record.prescription.mode_id == 2 ||
1761 1761
                               record.prescription.mode_id == 5 ||
1762
-                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478 && org_id!=10206 && org_id!=10598
1762
+                              record.prescription.mode_id == 12 )&&org_id!=10478 && org_id!=10206 && org_id!=10598&& org_id!=10402
1763 1763
                             "
1764 1764
                             width="50"
1765 1765
                           >
1766
-                          <span v-if="org_id!=0&&org_id!=10683">置换量</span>
1767
-                          <span v-if="org_id ==0||org_id==10683">置换液速度</span>
1766
+                          <span v-if="org_id!=10683">置换量</span>
1767
+                          <span v-if="org_id==10683">置换液速度</span>
1768 1768
                             <br />
1769 1769
                             <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">
1770 1770
                               <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
@@ -2021,8 +2021,8 @@
2021 2021
                             v-if="
2022 2022
                               (record.prescription.mode_id == 2 ||
2023 2023
                               record.prescription.mode_id == 5 ||
2024
-                              record.prescription.mode_id == 12 || org_id == 0)
2025
-                              && org_id!=10478 && org_id!=10206 && org_id!=10598
2024
+                              record.prescription.mode_id == 12 )
2025
+                              && org_id!=10478 && org_id!=10206 && org_id!=10598 && org_id!=10402
2026 2026
                             "
2027 2027
                             style="width: 50px"
2028 2028
                           >

+ 11 - 11
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Wyświetl plik

@@ -977,14 +977,14 @@
977 977
                         class="under_line"
978 978
                         style="width: 70px; text-align: center"
979 979
                       >
980
-                      <span v-if="org_id ==10206 "> {{
980
+                      <!-- <span v-if="org_id ==10206 "> {{
981 981
                           prescription.replacement_total
982 982
                             ? prescription.replacement_total
983 983
                             : "/"
984 984
                         }}
985 985
                         </span>
986 986
 
987
-                        <span v-if="org_id ==10510 || org_id == 0">
987
+                        <span v-if="org_id ==10510 ">
988 988
                           <span v-if="prescription!=null &&( prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12)">{{
989 989
                             afterdialysis.displace_liqui_value
990 990
                             ? afterdialysis.displace_liqui_value
@@ -992,8 +992,8 @@
992 992
                            }}
993 993
                         </span>
994 994
                         <span v-else>/</span>
995
-                        </span>
996
-                        <span v-if="org_id!=10206&& org_id!=10510 && org_id!=0"> {{
995
+                        </span> -->
996
+                        <span v-if="org_id!=10206&& org_id!=10510 "> {{
997 997
                           prescription.displace_liqui_value
998 998
                             ? prescription.displace_liqui_value
999 999
                             : "0"
@@ -1013,14 +1013,14 @@
1013 1013
                         class="under_line"
1014 1014
                         style="width: 70px; text-align: center"
1015 1015
                       >
1016
-                      <span v-if="org_id ==10206"> {{
1016
+                      <span v-if="org_id ==10206 || org_id == 10624 || org_id == 0"> {{
1017 1017
                           prescription.replacement_total
1018 1018
                             ? prescription.replacement_total
1019 1019
                             : "/"
1020 1020
                         }}
1021 1021
                        </span>
1022 1022
 
1023
-                        <span v-if="org_id ==10510 || org_id == 0">
1023
+                        <span v-if="org_id ==10510">
1024 1024
                           <span v-if="prescription!=null && (prescription.mode_id ==2 || prescription.mode_id ==5 || prescription.mode_id==12)">{{
1025 1025
                             afterdialysis.displace_liqui_value
1026 1026
                             ? afterdialysis.displace_liqui_value
@@ -1033,7 +1033,7 @@
1033 1033
                         </span>
1034 1034
 
1035 1035
 
1036
-                        <span v-if="org_id!=10206 && org_id!=10510&&org_id!=0"> {{
1036
+                        <span v-if="org_id!=10206 && org_id!=10510&& org_id!=10624 && org_id!=0"> {{
1037 1037
                           prescription.displace_liqui_value
1038 1038
                             ? prescription.displace_liqui_value
1039 1039
                             : "/"
@@ -1859,9 +1859,9 @@
1859 1859
                         </td>
1860 1860
                         <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id == 0 || org_id ==10724">超滤率<br/>(ml/h)</td>
1861 1861
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
1862
-                        <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0 && org_id!=10206" width="50">
1862
+                        <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=10402 && org_id!=10206" width="50">
1863 1863
                           <span v-if="org_id == 10683">置换液速度</span>
1864
-                          <span v-if="org_id!=0&&org_id!=10683">置换量</span>
1864
+                          <span v-if="org_id!=10683">置换量</span>
1865 1865
                           <br />
1866 1866
                           <span v-if="org_id!=10598 && org_id!=10567 && org_id!=10724 && org_id!=10644">
1867 1867
                             <span v-if="org_id!=0&&org_id!=10683">(ml)</span>
@@ -2002,12 +2002,12 @@
2002 2002
                             (prescription.mode_id == 2 ||
2003 2003
                             prescription.mode_id == 5 ||
2004 2004
                             prescription.mode_id == 12)
2005
-                            && org_id!=0 && org_id!=10478 && org_id!=10206
2005
+                            && org_id!=10402 && org_id!=10478 && org_id!=10206
2006 2006
                           "
2007 2007
                           style="width: 50px"
2008 2008
                         >
2009 2009
                           <span>
2010
-                           <span v-if="org_id!=0&&org_id!=10683">
2010
+                           <span v-if="org_id!=10683">
2011 2011
                             {{
2012 2012
                               monitor.displacement_quantity
2013 2013
                                 ? monitor.displacement_quantity

+ 24 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue Wyświetl plik

@@ -124,7 +124,26 @@
124 124
             <div class="inline_block" style="margin-right:30px;">
125 125
               血液净化器类型
126 126
               <div class="inline_block under_line" style="width:150px;text-align: center;">
127
-                  {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : ''}}
127
+                <span v-if="prescription.dialyzer_perfusion_apparatus !=''">
128
+                  {{
129
+                    prescription.dialyzer_perfusion_apparatus
130
+                      ? prescription.dialyzer_perfusion_apparatus
131
+                      : ""
132
+                  }}
133
+                </span>
134
+                <span v-if="prescription.dialysis_dialyszers !=''">
135
+                  {{
136
+                    prescription.dialysis_dialyszers
137
+                      ? prescription.dialysis_dialyszers
138
+                      : "/"
139
+                  }}
140
+                </span>
141
+                <span v-if="prescription.dialysis_strainer !=''">
142
+                  {{
143
+                    prescription.dialysis_strainer?
144
+                    prescription.dialysis_strainer:""
145
+                  }}
146
+                </span>
128 147
               </div>
129 148
             </div>
130 149
             <div class="inline_block" style="margin-right:30px;">
@@ -136,12 +155,12 @@
136 155
         </div>
137 156
         <div class="row">
138 157
           血管通路部位
139
-          <div class="inline_block under_line" style="width:200px;text-align: left;">
158
+          <div class="inline_block under_line" style="width:200px;text-align: center;">
140 159
             {{ predialysis.blood_access_part_id }}
141 160
           </div>
142 161
 
143 162
           血管通路
144
-          <div class="inline_block under_line" style="width:200px;text-align: left;">
163
+          <div class="inline_block under_line" style="width:200px;text-align: center;">
145 164
 
146 165
             {{ predialysis.blood_access_part_opera_name?predialysis.blood_access_part_opera_name:"/" }}
147 166
             <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="内瘘"></label-box>
@@ -170,11 +189,11 @@
170 189
 
171 190
         <div class="row">
172 191
           导管
173
-          <div class="inline_block under_line" style="width:200px;text-align: left;">
192
+          <div class="inline_block under_line" style="width:200px;text-align: center;">
174 193
             {{ predialysis.catheter ? predialysis.catheter : "" }}
175 194
           </div>
176 195
           内瘘
177
-          <div class="inline_block under_line" style="width:200px;text-align: left;">
196
+          <div class="inline_block under_line" style="width:200px;text-align: center;">
178 197
             {{ predialysis.internal_fistula ? predialysis.internal_fistula : "" }}
179 198
           </div>
180 199
         </div>

+ 3 - 2
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Wyświetl plik

@@ -583,10 +583,11 @@
583 583
                       型号:
584 584
                       <div class="under_line" style="width: 60%; text-align: center">
585 585
                         <span v-if="dialysisOrder && dialysisOrder.bed_id !=0">
586
-                          {{ getnumberlist(dialysisOrder.bed_id) }}
586
+                          {{ getnumberlist(dialysisOrder.bed_id) ? getnumberlist(dialysisOrder.bed_id) :'东丽' }}
587 587
                         </span>
588 588
                         <span v-else>
589
-                          {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) }}
589
+                          {{ getnumberlist(patientInfo.DialysisSchedule.bed_id) ?
590
+                             getnumberlist(patientInfo.DialysisSchedule.bed_id) :'东丽' }}
590 591
                         </span>
591 592
                         <!-- {{predialysis.machine_type ? predialysis.machine_type : ""}} -->
592 593
                       </div>

+ 221 - 216
src/xt_pages/drugSourceCode/drugChange.vue Wyświetl plik

@@ -1,228 +1,229 @@
1 1
 <template>
2 2
   <div>
3
-    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
4
-      <div class="cell clearfix">
5
-        <span>入库时间:</span>
6
-        <el-date-picker
7
-          size="small"
8
-          v-model="start_time"
9
-          prefix-icon="el-icon-date"
10
-          :editable="false"
11
-          style="width: 196px;"
12
-          type="date"
13
-          placeholder="选择日期时间"
14
-          align="right"
15
-          format="yyyy-MM-dd"
16
-          value-format="yyyy-MM-dd"
17
-        ></el-date-picker>-
18
-        <el-date-picker
19
-          size="small"
20
-          v-model="end_time"
21
-          prefix-icon="el-icon-date"
22
-          :editable="false"
23
-          style="width: 196px;margin-right:10px;"
24
-          type="date"
25
-          placeholder="选择日期时间"
26
-          align="right"
27
-          format="yyyy-MM-dd"
28
-          value-format="yyyy-MM-dd"
29
-        ></el-date-picker>
30
-      </div>
31
-
32
-
33
-      <div>
34
-        <div>销售状态:</div>
35
-        <el-select size="small" v-model="is_sale" placeholder="请选择"
36
-                   style="width:100px;margin-left:10px;" @change="changeStock">
37
-          <el-option
38
-            label="不限"
39
-            value="3">
40
-          </el-option>
41
-          <el-option
42
-            v-for="item,index in items"
43
-            :key="index"
44
-            :label="item.name"
45
-            :value="item.id">
46
-          </el-option>
47
-        </el-select>
48
-      </div>
49
-
50
-      <div>
51
-        <div>变更状态:</div>
52
-        <el-select size="small" v-model="change_type" placeholder="请选择"
53
-                   style="width:100px;margin-left:10px;" @change="change">
54
-          <el-option
55
-            label="不限"
56
-            value="3">
57
-          </el-option>
58
-          <el-option
59
-            v-for="item,index in changes"
60
-            :key="index"
61
-            :label="item.name"
62
-            :value="item.id">
63
-          </el-option>
64
-        </el-select>
65
-      </div>
66
-      <div>
67
-        <el-button type="primary" @click="query()">查询</el-button>
68
-        <el-button type="primary" @click="change_stock()">销售变更</el-button>
69
-        <el-button type="primary" @click="exportdata()">导出</el-button>
70
-
71
-        <!--        <el-button type="primary" @click="change()">变更</el-button>-->
72
-      </div>
3
+    <div class="position">
4
+      <BreadCrumb :crumbs="crumbs"></BreadCrumb>
73 5
     </div>
74
-    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
6
+    <div class="app-container">
7
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
8
+        <div class="cell clearfix">
9
+          <span>入库时间:</span>
10
+          <el-date-picker
11
+            size="small"
12
+            v-model="start_time"
13
+            prefix-icon="el-icon-date"
14
+            :editable="false"
15
+            style="width: 196px;"
16
+            type="date"
17
+            placeholder="选择日期时间"
18
+            align="right"
19
+            format="yyyy-MM-dd"
20
+            value-format="yyyy-MM-dd"
21
+          ></el-date-picker>-
22
+          <el-date-picker
23
+            size="small"
24
+            v-model="end_time"
25
+            prefix-icon="el-icon-date"
26
+            :editable="false"
27
+            style="width: 196px;margin-right:10px;"
28
+            type="date"
29
+            placeholder="选择日期时间"
30
+            align="right"
31
+            format="yyyy-MM-dd"
32
+            value-format="yyyy-MM-dd"
33
+          ></el-date-picker>
34
+        </div>
35
+        <div>
36
+          <span>销售状态:</span>
37
+          <el-select size="small" v-model="is_sale" placeholder="请选择"
38
+                    style="width:100px;" @change="changeStock">
39
+            <el-option
40
+              label="不限"
41
+              value="3">
42
+            </el-option>
43
+            <el-option
44
+              v-for="item,index in items"
45
+              :key="index"
46
+              :label="item.name"
47
+              :value="item.id">
48
+            </el-option>
49
+          </el-select>
50
+        </div>
51
+        <div>
52
+          <span>变更状态:</span>
53
+          <el-select size="small" v-model="change_type" placeholder="请选择"
54
+                    style="width:100px;" @change="change">
55
+            <el-option
56
+              label="不限"
57
+              value="3">
58
+            </el-option>
59
+            <el-option
60
+              v-for="item,index in changes"
61
+              :key="index"
62
+              :label="item.name"
63
+              :value="item.id">
64
+            </el-option>
65
+          </el-select>
66
+        </div>
67
+        <div>
68
+          <el-button type="primary" @click="query()">查询</el-button>
69
+          <el-button type="primary" @click="change_stock()">销售变更</el-button>
70
+          <el-button type="primary" @click="exportdata()">导出</el-button>
71
+
72
+          <!--        <el-button type="primary" @click="change()">变更</el-button>-->
73
+        </div>
74
+      </div>
75
+      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
75 76
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
76 77
               max-height="600"
77 78
               @select="selectCostInfo"
78 79
               @selection-change="changeCostInfoTableData"
79 80
               @select-all="changeAllCostInfoTableData"
80 81
               highlight-current-row>
81
-      <el-table-column
82
-        align="center"
83
-        type="selection"
84
-        width="55"
85
-      ></el-table-column>
86
-      <el-table-column align="center" prop="name" label="药品名称">
87
-        <template slot-scope="scope">{{scope.row.drug_name}}</template>
88
-      </el-table-column>
89
-
90
-      <el-table-column align="center" prop="name" label="规格单位">
91
-        <template slot-scope="scope">{{scope.row.spec}}</template>
92
-      </el-table-column>
93
-
94
-      <el-table-column  align="center" prop="name" label="追溯码">
95
-        <template slot-scope="scope">
96
-            <div @click="getDrugCode(scope.row.advice_id,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div> 
82
+        <el-table-column
83
+          align="center"
84
+          type="selection"
85
+          width="55"
86
+        ></el-table-column>
87
+        <el-table-column align="center" prop="name" label="药品名称">
88
+          <template slot-scope="scope">{{scope.row.drug_name}}</template>
89
+        </el-table-column>
90
+
91
+        <el-table-column align="center" prop="name" label="规格单位">
92
+          <template slot-scope="scope">{{scope.row.spec}}</template>
93
+        </el-table-column>
94
+
95
+        <el-table-column  align="center" prop="name" label="追溯码">
96
+          <template slot-scope="scope">
97
+              <div @click="getDrugCode(scope.row.advice_id,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div>
98
+            </template>
99
+          <!-- <template slot-scope="scope">{{scope.row.drug_code}}</template> -->
100
+        </el-table-column>
101
+
102
+        <el-table-column align="center" prop="name" label="患者姓名">
103
+          <template slot-scope="scope">
104
+            <!-- {{scope.row.p.name}} -->
105
+            {{ getPatientName(scope.row.patient_id) }}
97 106
           </template>
98
-        <!-- <template slot-scope="scope">{{scope.row.drug_code}}</template> -->
99
-      </el-table-column>
100
-
101
-      <el-table-column align="center" prop="name" label="患者姓名">
102
-        <template slot-scope="scope">
103
-          <!-- {{scope.row.p.name}} -->
104
-           {{ getPatientName(scope.row.patient_id) }}
105
-        </template>
106
-      </el-table-column>
107
-
108
-      <el-table-column align="center" prop="name" label="批号">
109
-        <template slot-scope="scope">{{scope.row.batch_number}}</template>
110
-      </el-table-column>
111
-      <el-table-column align="center" prop="name" label="数量">
112
-        <template slot-scope="scope">
113
-          <div>{{scope.row.count}}{{scope.row.unit}}</div>
114
-        </template>
115
-      </el-table-column>
116
-
117
-      <el-table-column align="center" prop="total" label="开方日期">
118
-        <template slot-scope="scope">
119
-          <div>{{scope.row.p_date}}</div>
120
-        </template>
121
-      </el-table-column>
122
-
123
-
124
-      <el-table-column align="center" prop="total" label="销售状态">
125
-        <template slot-scope="scope">
126
-          <div>{{scope.row.is_sale?'已销售':'未销售'}}</div>
127
-        </template>
128
-      </el-table-column>
129
-
130
-      <el-table-column align="center" prop="total" label="变更状态">
131
-        <template slot-scope="scope">
132
-          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
133
-        </template>
134
-      </el-table-column>
135
-
136
-      <el-table-column align="center" prop="total" label="盘存日期">
137
-        <template slot-scope="scope">
138
-          <div>{{scope.row.pc_date}}</div>
139
-        </template>
140
-      </el-table-column>
141
-
142
-      <el-table-column label="操作" width="200">
143
-        <template slot-scope="scope">
144
-          <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0 || scope.row.is_bg == 0" type="primary" @click="sigle_stock(scope.row)">销售变更</el-button>
145
-          <el-button v-if="scope.row.is_sale == 1 || scope.row.is_bg == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
146
-        </template>
147
-      </el-table-column>
148
-    </el-table>
149
-    <el-pagination
150
-      @size-change="handleSizeChange"
151
-      @current-change="handleCurrentChange"
152
-      :page-size="5"
153
-      :page-sizes="[10, 20, 50, 100,500,1000,2000]"
154
-      background
155
-      style="margin-top:20px;float: right"
156
-      :total="value"
157
-    ></el-pagination>
158
-
159
-    <el-table v-show="false" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
160
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
161
-              max-height="600"
162
-              @select="selectCostInfo"
163
-              @selection-change="changeCostInfoTableData"
164
-              @select-all="changeAllCostInfoTableData"
165
-              highlight-current-row>
166
-      <el-table-column
167
-        align="center"
168
-        type="selection"
169
-        width="55"
170
-      ></el-table-column>
171
-      <el-table-column align="center" prop="name" label="药品名称">
172
-        <template slot-scope="scope">{{scope.row.drug_name}}</template>
173
-      </el-table-column>
174
-      <el-table-column align="center" prop="name" label="药品类型">
175
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
176
-      </el-table-column>
177
-      <el-table-column align="center" prop="name" label="规格单位">
178
-        <template slot-scope="scope">{{scope.row.spec}}</template>
179
-      </el-table-column>
180
-      <el-table-column align="center" prop="name" label="国家编码">
181
-        <template slot-scope="scope">{{scope.row.code}}</template>
182
-      </el-table-column>
183
-      <el-table-column align="center" prop="name" label="批号">
184
-        <template slot-scope="scope">{{scope.row.batch_number}}</template>
185
-      </el-table-column>
186
-      <el-table-column align="center" prop="name" label="数量">
187
-        <template slot-scope="scope">
188
-          <div>{{scope.row.count}}{{scope.row.unit}}</div>
189
-        </template>
190
-      </el-table-column>
191
-
192
-      <el-table-column align="center" prop="total" label="开方日期">
193
-        <template slot-scope="scope">
194
-          <div>{{scope.row.p_date}}</div>
195
-        </template>
196
-      </el-table-column>
197
-
198
-
199
-      <el-table-column align="center" prop="total" label="结算日期">
200
-        <template slot-scope="scope">
201
-          <div>{{scope.row.e_date}}</div>
202
-        </template>
203
-      </el-table-column>
204
-
205
-
206
-      <el-table-column align="center" prop="total" label="盘存状态">
207
-        <template slot-scope="scope">
208
-          <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
209
-        </template>
210
-      </el-table-column>
211
-
212
-      <el-table-column align="center" prop="total" label="变更状态">
213
-        <template slot-scope="scope">
214
-          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
215
-        </template>
216
-      </el-table-column>
217
-
218
-      <el-table-column align="center" prop="total" label="盘存日期">
219
-        <template slot-scope="scope">
220
-          <div>{{scope.row.pc_date}}</div>
221
-        </template>
222
-      </el-table-column>
223
-
224
-    </el-table>
107
+        </el-table-column>
108
+
109
+        <el-table-column align="center" prop="name" label="批号">
110
+          <template slot-scope="scope">{{scope.row.batch_number}}</template>
111
+        </el-table-column>
112
+        <el-table-column align="center" prop="name" label="数量">
113
+          <template slot-scope="scope">
114
+            <div>{{scope.row.count}}{{scope.row.unit}}</div>
115
+          </template>
116
+        </el-table-column>
117
+
118
+        <el-table-column align="center" prop="total" label="开方日期">
119
+          <template slot-scope="scope">
120
+            <div>{{scope.row.p_date}}</div>
121
+          </template>
122
+        </el-table-column>
123
+
124
+
125
+        <el-table-column align="center" prop="total" label="销售状态">
126
+          <template slot-scope="scope">
127
+            <div>{{scope.row.is_sale?'已销售':'未销售'}}</div>
128
+          </template>
129
+        </el-table-column>
225 130
 
131
+        <el-table-column align="center" prop="total" label="变更状态">
132
+          <template slot-scope="scope">
133
+            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
134
+          </template>
135
+        </el-table-column>
136
+
137
+        <el-table-column align="center" prop="total" label="盘存日期">
138
+          <template slot-scope="scope">
139
+            <div>{{scope.row.pc_date}}</div>
140
+          </template>
141
+        </el-table-column>
142
+
143
+        <el-table-column label="操作" width="200">
144
+          <template slot-scope="scope">
145
+            <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0 || scope.row.is_bg == 0" type="primary" @click="sigle_stock(scope.row)">销售变更</el-button>
146
+            <el-button v-if="scope.row.is_sale == 1 || scope.row.is_bg == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
147
+          </template>
148
+        </el-table-column>
149
+      </el-table>
150
+      <el-pagination
151
+        @size-change="handleSizeChange"
152
+        @current-change="handleCurrentChange"
153
+        :page-size="5"
154
+        :page-sizes="[10, 20, 50, 100,500,1000,2000]"
155
+        background
156
+        style="margin-top:20px;float: right"
157
+        :total="value"
158
+      ></el-pagination>
159
+
160
+      <el-table v-show="false" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
161
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
162
+                max-height="600"
163
+                @select="selectCostInfo"
164
+                @selection-change="changeCostInfoTableData"
165
+                @select-all="changeAllCostInfoTableData"
166
+                highlight-current-row>
167
+        <el-table-column
168
+          align="center"
169
+          type="selection"
170
+          width="55"
171
+        ></el-table-column>
172
+        <el-table-column align="center" prop="name" label="药品名称">
173
+          <template slot-scope="scope">{{scope.row.drug_name}}</template>
174
+        </el-table-column>
175
+        <el-table-column align="center" prop="name" label="药品类型">
176
+          <template slot-scope="scope">{{scope.row.drug_type}}</template>
177
+        </el-table-column>
178
+        <el-table-column align="center" prop="name" label="规格单位">
179
+          <template slot-scope="scope">{{scope.row.spec}}</template>
180
+        </el-table-column>
181
+        <el-table-column align="center" prop="name" label="国家编码">
182
+          <template slot-scope="scope">{{scope.row.code}}</template>
183
+        </el-table-column>
184
+        <el-table-column align="center" prop="name" label="批号">
185
+          <template slot-scope="scope">{{scope.row.batch_number}}</template>
186
+        </el-table-column>
187
+        <el-table-column align="center" prop="name" label="数量">
188
+          <template slot-scope="scope">
189
+            <div>{{scope.row.count}}{{scope.row.unit}}</div>
190
+          </template>
191
+        </el-table-column>
192
+
193
+        <el-table-column align="center" prop="total" label="开方日期">
194
+          <template slot-scope="scope">
195
+            <div>{{scope.row.p_date}}</div>
196
+          </template>
197
+        </el-table-column>
198
+
199
+
200
+        <el-table-column align="center" prop="total" label="结算日期">
201
+          <template slot-scope="scope">
202
+            <div>{{scope.row.e_date}}</div>
203
+          </template>
204
+        </el-table-column>
205
+
206
+
207
+        <el-table-column align="center" prop="total" label="盘存状态">
208
+          <template slot-scope="scope">
209
+            <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
210
+          </template>
211
+        </el-table-column>
212
+
213
+        <el-table-column align="center" prop="total" label="变更状态">
214
+          <template slot-scope="scope">
215
+            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
216
+          </template>
217
+        </el-table-column>
218
+
219
+        <el-table-column align="center" prop="total" label="盘存日期">
220
+          <template slot-scope="scope">
221
+            <div>{{scope.row.pc_date}}</div>
222
+          </template>
223
+        </el-table-column>
224
+
225
+      </el-table>
226
+    </div>
226 227
     <el-dialog
227 228
         title="药品追溯码"
228 229
         :visible.sync="dialogVisibleOne"
@@ -287,7 +288,11 @@ export default {
287 288
       dialogVisibleOne:false,
288 289
       currentRow:{},
289 290
       currentIndex:0,
290
-      patientList:[]
291
+      patientList:[],
292
+      crumbs: [
293
+        { path: false, name: '药品追溯' },
294
+        { path: false, name: '药品变更' }
295
+      ],
291 296
     }
292 297
   },
293 298
   methods: {
@@ -300,7 +305,7 @@ export default {
300 305
         }
301 306
        },
302 307
        getDrugCode(id,DrugCode,index){
303
-            this.id = id 
308
+            this.id = id
304 309
             this.textarea = DrugCode
305 310
             this.currentIndex = index
306 311
             this.dialogVisibleOne = true

+ 225 - 212
src/xt_pages/drugSourceCode/drugStock.vue Wyświetl plik

@@ -1,218 +1,223 @@
1 1
 <template>
2 2
   <div>
3
-    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
4
-      <div class="cell clearfix">
5
-        <span>入库时间:</span>
6
-        <el-date-picker
7
-          size="small"
8
-          v-model="start_time"
9
-          prefix-icon="el-icon-date"
10
-          :editable="false"
11
-          style="width: 196px;"
12
-          type="date"
13
-          placeholder="选择日期时间"
14
-          align="right"
15
-          format="yyyy-MM-dd"
16
-          value-format="yyyy-MM-dd"
17
-          @change="startTimeChange"
18
-        ></el-date-picker>-
19
-        <el-date-picker
20
-          size="small"
21
-          v-model="end_time"
22
-          prefix-icon="el-icon-date"
23
-          :editable="false"
24
-          style="width: 196px;margin-right:10px;"
25
-          type="date"
26
-          placeholder="选择日期时间"
27
-          align="right"
28
-          format="yyyy-MM-dd"
29
-          value-format="yyyy-MM-dd"
30
-          @change="endTimeChange"
31
-        ></el-date-picker>
32
-      </div>
33
-
34
-
35
-      <div>
36
-        <div>盘存状态:</div>
37
-        <el-select size="small" v-model="stock_type" placeholder="请选择"
38
-                   style="width:100px;margin-left:10px;" @change="changeStock">
39
-          <el-option
40
-            label="不限"
41
-            value="0">
42
-          </el-option>
43
-          <el-option
44
-            v-for="item,index in items"
45
-            :key="index"
46
-            :label="item.name"
47
-            :value="item.id">
48
-          </el-option>
49
-        </el-select>
50
-      </div>
51
-
52
-      <div>
53
-        <div>变更状态:</div>
54
-        <el-select size="small" v-model="change_type" placeholder="请选择"
55
-                   style="width:100px;margin-left:10px;" @change="change">
56
-          <el-option
57
-            label="不限"
58
-            value="0">
59
-          </el-option>
60
-          <el-option
61
-            v-for="item,index in changes"
62
-            :key="index"
63
-            :label="item.name"
64
-            :value="item.id">
65
-          </el-option>
66
-        </el-select>
67
-      </div>
68
-      <div>
69
-        <el-button type="primary" @click="query()" >查询</el-button>
70
-        <el-button type="primary" v-loading="isloading" @click="stock()">盘存</el-button>
71
-        <el-button type="primary" @click="exportdata()">导出</el-button>
72
-
73
-        <!--        <el-button type="primary" @click="change()">变更</el-button>-->
3
+    <div class="position">
4
+      <BreadCrumb :crumbs="crumbs"></BreadCrumb>
5
+    </div>
6
+    <div class="app-container">
7
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
8
+        <div class="cell clearfix" >
9
+          <span>入库时间:</span>
10
+          <el-date-picker
11
+            size="small"
12
+            v-model="start_time"
13
+            prefix-icon="el-icon-date"
14
+            :editable="false"
15
+            style="width: 196px;"
16
+            type="date"
17
+            placeholder="选择日期时间"
18
+            align="right"
19
+            format="yyyy-MM-dd"
20
+            value-format="yyyy-MM-dd"
21
+            @change="startTimeChange"
22
+          ></el-date-picker>-
23
+          <el-date-picker
24
+            size="small"
25
+            v-model="end_time"
26
+            prefix-icon="el-icon-date"
27
+            :editable="false"
28
+            style="width: 196px;margin-right:10px;"
29
+            type="date"
30
+            placeholder="选择日期时间"
31
+            align="right"
32
+            format="yyyy-MM-dd"
33
+            value-format="yyyy-MM-dd"
34
+            @change="endTimeChange"
35
+          ></el-date-picker>
36
+        </div>
37
+
38
+        <div>
39
+          <span>盘存状态:</span>
40
+          <el-select size="small" v-model="stock_type" placeholder="请选择"
41
+                    style="width:100px;" @change="changeStock">
42
+            <el-option
43
+              label="不限"
44
+              value="0">
45
+            </el-option>
46
+            <el-option
47
+              v-for="item,index in items"
48
+              :key="index"
49
+              :label="item.name"
50
+              :value="item.id">
51
+            </el-option>
52
+          </el-select>
53
+        </div>
54
+
55
+        <div>
56
+          <span>变更状态:</span>
57
+          <el-select size="small" v-model="change_type" placeholder="请选择"
58
+                    style="width:100px;" @change="change">
59
+            <el-option
60
+              label="不限"
61
+              value="0">
62
+            </el-option>
63
+            <el-option
64
+              v-for="item,index in changes"
65
+              :key="index"
66
+              :label="item.name"
67
+              :value="item.id">
68
+            </el-option>
69
+          </el-select>
70
+        </div>
71
+        <div>
72
+          <el-button type="primary" @click="query()" >查询</el-button>
73
+          <el-button type="primary" v-loading="isloading" @click="stock()">盘存</el-button>
74
+          <el-button type="primary" @click="exportdata()">导出</el-button>
75
+
76
+          <!--        <el-button type="primary" @click="change()">变更</el-button>-->
77
+        </div>
74 78
       </div>
79
+      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
80
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
81
+                max-height="600"
82
+                @select="selectCostInfo"
83
+                @selection-change="changeCostInfoTableData"
84
+                @select-all="changeAllCostInfoTableData"
85
+                highlight-current-row>
86
+        <el-table-column
87
+          align="center"
88
+          type="selection"
89
+          width="55"
90
+        ></el-table-column>
91
+        <el-table-column align="center" prop="name" label="药品名称">
92
+          <template slot-scope="scope">{{scope.row.drug_name}}</template>
93
+        </el-table-column>
94
+
95
+        <el-table-column align="center" prop="name" label="规格单位">
96
+          <template slot-scope="scope">{{scope.row.spec}}</template>
97
+        </el-table-column>
98
+
99
+        <el-table-column align="center" prop="name" label="追溯码">
100
+          <template slot-scope="scope">{{scope.row.drug_code}}</template>
101
+        </el-table-column>
102
+
103
+        <el-table-column align="center" prop="name" label="批号">
104
+          <template slot-scope="scope">{{scope.row.drug_code}}</template>
105
+        </el-table-column>
106
+
107
+        <el-table-column align="center" prop="name" label="批号">
108
+          <template slot-scope="scope">{{scope.row.batch_number}}</template>
109
+        </el-table-column>
110
+        <el-table-column align="center" prop="name" label="入库数量">
111
+          <template slot-scope="scope">
112
+            <div>{{scope.row.count}}{{scope.row.unit}}</div>
113
+          </template>
114
+        </el-table-column>
115
+
116
+        <el-table-column align="center" prop="total" label="生产日期">
117
+          <template slot-scope="scope">
118
+            <div>{{scope.row.p_date}}</div>
119
+          </template>
120
+        </el-table-column>
121
+
122
+
123
+
124
+
125
+
126
+        <el-table-column align="center" prop="total" label="盘存状态">
127
+          <template slot-scope="scope">
128
+            <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
129
+          </template>
130
+        </el-table-column>
131
+
132
+        <el-table-column align="center" prop="total" label="变更状态">
133
+          <template slot-scope="scope">
134
+            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
135
+          </template>
136
+        </el-table-column>
137
+
138
+        <el-table-column align="center" prop="total" label="盘存日期">
139
+          <template slot-scope="scope">
140
+            <div>{{scope.row.pc_date}}</div>
141
+          </template>
142
+        </el-table-column>
143
+
144
+        <el-table-column label="操作" width="200">
145
+          <template slot-scope="scope">
146
+            <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
147
+            <el-button v-if="scope.row.is_pc == 1 || scope.row.is_pc == 1"  type="primary" @click="deleteStock(scope.row)">撤销</el-button>
148
+          </template>
149
+        </el-table-column>
150
+      </el-table>
151
+
152
+
153
+      <el-table v-show="false" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
154
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
155
+                max-height="600"
156
+                @select="selectCostInfo"
157
+                @selection-change="changeCostInfoTableData"
158
+                @select-all="changeAllCostInfoTableData"
159
+                highlight-current-row>
160
+        <el-table-column
161
+          align="center"
162
+          type="selection"
163
+          width="55"
164
+        ></el-table-column>
165
+        <el-table-column align="center" prop="name" label="药品名称">
166
+          <template slot-scope="scope">{{scope.row.drug_name}}</template>
167
+        </el-table-column>
168
+        <el-table-column align="center" prop="name" label="药品类型">
169
+          <template slot-scope="scope">{{scope.row.drug_type}}</template>
170
+        </el-table-column>
171
+        <el-table-column align="center" prop="name" label="规格单位">
172
+          <template slot-scope="scope">{{scope.row.spec}}</template>
173
+        </el-table-column>
174
+        <el-table-column align="center" prop="name" label="国家编码">
175
+          <template slot-scope="scope">{{scope.row.code}}</template>
176
+        </el-table-column>
177
+        <el-table-column align="center" prop="name" label="批号">
178
+          <template slot-scope="scope">{{scope.row.batch_number}}</template>
179
+        </el-table-column>
180
+        <el-table-column align="center" prop="name" label="入库数量">
181
+          <template slot-scope="scope">
182
+            <div>{{scope.row.count}}{{scope.row.unit}}</div>
183
+          </template>
184
+        </el-table-column>
185
+
186
+        <el-table-column align="center" prop="total" label="生产日期">
187
+          <template slot-scope="scope">
188
+            <div>{{scope.row.p_date}}</div>
189
+          </template>
190
+        </el-table-column>
191
+
192
+
193
+        <el-table-column align="center" prop="total" label="有效日期">
194
+          <template slot-scope="scope">
195
+            <div>{{scope.row.e_date}}</div>
196
+          </template>
197
+        </el-table-column>
198
+
199
+
200
+        <el-table-column align="center" prop="total" label="盘存状态">
201
+          <template slot-scope="scope">
202
+            <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
203
+          </template>
204
+        </el-table-column>
205
+
206
+        <el-table-column align="center" prop="total" label="变更状态">
207
+          <template slot-scope="scope">
208
+            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
209
+          </template>
210
+        </el-table-column>
211
+
212
+        <el-table-column align="center" prop="total" label="盘存日期">
213
+          <template slot-scope="scope">
214
+            <div>{{scope.row.pc_date}}</div>
215
+          </template>
216
+        </el-table-column>
217
+
218
+      </el-table>
75 219
     </div>
76
-    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
77
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
78
-              max-height="600"
79
-              @select="selectCostInfo"
80
-              @selection-change="changeCostInfoTableData"
81
-              @select-all="changeAllCostInfoTableData"
82
-              highlight-current-row>
83
-      <el-table-column
84
-        align="center"
85
-        type="selection"
86
-        width="55"
87
-      ></el-table-column>
88
-      <el-table-column align="center" prop="name" label="药品名称">
89
-        <template slot-scope="scope">{{scope.row.drug_name}}</template>
90
-      </el-table-column>
91
-
92
-      <el-table-column align="center" prop="name" label="规格单位">
93
-        <template slot-scope="scope">{{scope.row.spec}}</template>
94
-      </el-table-column>
95
-
96
-      <el-table-column align="center" prop="name" label="追溯码">
97
-        <template slot-scope="scope">{{scope.row.drug_code}}</template>
98
-      </el-table-column>
99
-
100
-      <el-table-column align="center" prop="name" label="批号">
101
-        <template slot-scope="scope">{{scope.row.drug_code}}</template>
102
-      </el-table-column>
103
-
104
-      <el-table-column align="center" prop="name" label="批号">
105
-        <template slot-scope="scope">{{scope.row.batch_number}}</template>
106
-      </el-table-column>
107
-      <el-table-column align="center" prop="name" label="入库数量">
108
-        <template slot-scope="scope">
109
-          <div>{{scope.row.count}}{{scope.row.unit}}</div>
110
-        </template>
111
-      </el-table-column>
112
-
113
-      <el-table-column align="center" prop="total" label="生产日期">
114
-        <template slot-scope="scope">
115
-          <div>{{scope.row.p_date}}</div>
116
-        </template>
117
-      </el-table-column>
118
-
119
-
120
-
121
-
122
-
123
-      <el-table-column align="center" prop="total" label="盘存状态">
124
-        <template slot-scope="scope">
125
-          <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
126
-        </template>
127
-      </el-table-column>
128
-
129
-      <el-table-column align="center" prop="total" label="变更状态">
130
-        <template slot-scope="scope">
131
-          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
132
-        </template>
133
-      </el-table-column>
134
-
135
-      <el-table-column align="center" prop="total" label="盘存日期">
136
-        <template slot-scope="scope">
137
-          <div>{{scope.row.pc_date}}</div>
138
-        </template>
139
-      </el-table-column>
140
-
141
-      <el-table-column label="操作" width="200">
142
-        <template slot-scope="scope">
143
-          <el-button v-if="!scope.row.is_pc || scope.row.is_pc == 0" type="primary" @click="sigle_stock(scope.row)">盘存</el-button>
144
-          <el-button v-if="scope.row.is_pc == 1 || scope.row.is_pc == 1"  type="primary" @click="deleteStock(scope.row)">撤销</el-button>
145
-        </template>
146
-      </el-table-column>
147
-    </el-table>
148
-
149
-
150
-    <el-table v-show="false" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
151
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
152
-              max-height="600"
153
-              @select="selectCostInfo"
154
-              @selection-change="changeCostInfoTableData"
155
-              @select-all="changeAllCostInfoTableData"
156
-              highlight-current-row>
157
-      <el-table-column
158
-        align="center"
159
-        type="selection"
160
-        width="55"
161
-      ></el-table-column>
162
-      <el-table-column align="center" prop="name" label="药品名称">
163
-        <template slot-scope="scope">{{scope.row.drug_name}}</template>
164
-      </el-table-column>
165
-      <el-table-column align="center" prop="name" label="药品类型">
166
-        <template slot-scope="scope">{{scope.row.drug_type}}</template>
167
-      </el-table-column>
168
-      <el-table-column align="center" prop="name" label="规格单位">
169
-        <template slot-scope="scope">{{scope.row.spec}}</template>
170
-      </el-table-column>
171
-      <el-table-column align="center" prop="name" label="国家编码">
172
-        <template slot-scope="scope">{{scope.row.code}}</template>
173
-      </el-table-column>
174
-      <el-table-column align="center" prop="name" label="批号">
175
-        <template slot-scope="scope">{{scope.row.batch_number}}</template>
176
-      </el-table-column>
177
-      <el-table-column align="center" prop="name" label="入库数量">
178
-        <template slot-scope="scope">
179
-          <div>{{scope.row.count}}{{scope.row.unit}}</div>
180
-        </template>
181
-      </el-table-column>
182
-
183
-      <el-table-column align="center" prop="total" label="生产日期">
184
-        <template slot-scope="scope">
185
-          <div>{{scope.row.p_date}}</div>
186
-        </template>
187
-      </el-table-column>
188
-
189
-
190
-      <el-table-column align="center" prop="total" label="有效日期">
191
-        <template slot-scope="scope">
192
-          <div>{{scope.row.e_date}}</div>
193
-        </template>
194
-      </el-table-column>
195
-
196
-
197
-      <el-table-column align="center" prop="total" label="盘存状态">
198
-        <template slot-scope="scope">
199
-          <div>{{scope.row.is_pc?'已盘存':'未盘存'}}</div>
200
-        </template>
201
-      </el-table-column>
202
-
203
-      <el-table-column align="center" prop="total" label="变更状态">
204
-        <template slot-scope="scope">
205
-          <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
206
-        </template>
207
-      </el-table-column>
208
-
209
-      <el-table-column align="center" prop="total" label="盘存日期">
210
-        <template slot-scope="scope">
211
-          <div>{{scope.row.pc_date}}</div>
212
-        </template>
213
-      </el-table-column>
214
-
215
-    </el-table>
220
+
216 221
 
217 222
   </div>
218 223
 
@@ -250,7 +255,11 @@ export default {
250 255
       changes: [
251 256
         { id: 1, name: '已变更' },
252 257
         { id: 2, name: '未变更' },
253
-      ]
258
+      ],
259
+      crumbs: [
260
+        { path: false, name: '药品追溯' },
261
+        { path: false, name: '药品盘点' }
262
+      ],
254 263
     }
255 264
   },
256 265
   methods: {
@@ -478,3 +487,7 @@ export default {
478 487
 }
479 488
 </script>
480 489
 
490
+<style lang="scss" scoped>
491
+
492
+</style>
493
+

+ 4 - 4
src/xt_pages/hospitalStation/components/deskPrescription.vue Wyświetl plik

@@ -3203,8 +3203,8 @@ export default {
3203 3203
       for (let i = 0; i < this.teamList.length; i++) {
3204 3204
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
3205 3205
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
3206
-            this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3207
-            return
3206
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3207
+            // return
3208 3208
           }
3209 3209
         }
3210 3210
       }
@@ -3212,8 +3212,8 @@ export default {
3212 3212
       for (let i = 0; i < this.curDrugs.length; i++) {
3213 3213
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
3214 3214
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
3215
-            this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3216
-            return
3215
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3216
+            // return
3217 3217
 
3218 3218
           }
3219 3219
         }

+ 4 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Wyświetl plik

@@ -3754,8 +3754,8 @@ export default {
3754 3754
       for (let i = 0; i < this.teamList.length; i++) {
3755 3755
         for (let a = 0; a < this.curPrescriptions.project.length; a++) {
3756 3756
           if (this.teamList[i].id == this.curPrescriptions.project[a].project_id && this.teamList[i].type == this.curPrescriptions.project[a].type) {
3757
-            this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3758
-            return
3757
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
3758
+            // return
3759 3759
           }
3760 3760
         }
3761 3761
       }
@@ -3763,8 +3763,8 @@ export default {
3763 3763
       for (let i = 0; i < this.curDrugs.length; i++) {
3764 3764
         for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
3765 3765
           if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
3766
-            this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3767
-            return
3766
+            // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
3767
+            // return
3768 3768
 
3769 3769
           }
3770 3770
         }

+ 4 - 4
src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue Wyświetl plik

@@ -1430,8 +1430,8 @@
1430 1430
         for (let i = 0; i < this.teamList.length; i++) {
1431 1431
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1432 1432
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
1433
-              this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1434
-              return
1433
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1434
+              // return
1435 1435
             }
1436 1436
           }
1437 1437
         }
@@ -1439,8 +1439,8 @@
1439 1439
         for (let i = 0; i < this.curDrugs.length; i++) {
1440 1440
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1441 1441
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
1442
-              this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1443
-              return
1442
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1443
+              // return
1444 1444
 
1445 1445
             }
1446 1446
           }

+ 12 - 12
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue Wyświetl plik

@@ -219,7 +219,7 @@
219 219
                                                 <template slot-scope="scope">{{ scope.row.type == 3?scope.row.zuobiao_stock_num :""}}</template>
220 220
                                               </el-table-column>
221 221
 
222
-                                           
222
+
223 223
 
224 224
 
225 225
                                                 <el-table-column label="规格" width="60">
@@ -228,13 +228,13 @@
228 228
                                                 <el-table-column label="单价" width="40">
229 229
                                                     <template slot-scope="scope">{{ scope.row.price }}</template>
230 230
                                                 </el-table-column>
231
-                                               
231
+
232 232
                                                 <el-table-column label="库存" width="60" v-if="org_id != 10206" >
233 233
                                                 <template slot-scope="scope">
234
-                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span> 
234
+                                                  <span v-if="scope.row.type == 3">{{scope.row.sum_count}}</span>
235 235
                                                 </template>
236 236
                                               </el-table-column>
237
-                                                
237
+
238 238
                                             </el-table>
239 239
                                         </div>
240 240
                                     </el-tab-pane>
@@ -1627,8 +1627,8 @@
1627 1627
         for (let i = 0; i < this.teamList.length; i++) {
1628 1628
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1629 1629
             if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
1630
-              this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1631
-              return
1630
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的项目')
1631
+              // return
1632 1632
             }
1633 1633
           }
1634 1634
         }
@@ -1636,8 +1636,8 @@
1636 1636
         for (let i = 0; i < this.curDrugs.length; i++) {
1637 1637
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1638 1638
             if (this.curDrugs[i].id == this.curPrescriptions.advices[a].id) {
1639
-              this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1640
-              return
1639
+              // this.$message.error('当前处方存在相同的药品,无法添加相同的药品')
1640
+              // return
1641 1641
 
1642 1642
             }
1643 1643
           }
@@ -1882,7 +1882,7 @@
1882 1882
                     tempAdvice.push(obj)
1883 1883
                   }
1884 1884
                   }
1885
-                
1885
+
1886 1886
                 }
1887 1887
                 //项目
1888 1888
                 for (let b = 0; b < prescription.project.length; b++) {
@@ -2134,7 +2134,7 @@
2134 2134
                     }
2135 2135
 
2136 2136
 
2137
-               
2137
+
2138 2138
                   }
2139 2139
                 }
2140 2140
                 // var preTime = nowTime
@@ -2198,7 +2198,7 @@
2198 2198
         getHisProject().then(response => {
2199 2199
           if (response.data.state == 1) {
2200 2200
             var project = response.data.data.project
2201
-            
2201
+
2202 2202
             for (let i = 0; i < project.length; i++) {
2203 2203
               let obj = {
2204 2204
                 id: project[i].id,
@@ -2594,7 +2594,7 @@
2594 2594
               min_str = (total % min_number) + min_unit;
2595 2595
               }
2596 2596
           }
2597
-         
2597
+
2598 2598
           if(max_str == "" && min_str == ""){
2599 2599
               return "0"
2600 2600
           }else{

+ 26 - 11
src/xt_pages/user/inspection.vue Wyświetl plik

@@ -143,11 +143,29 @@
143 143
               >
144 144
                 <template slot-scope="scope">
145 145
                     <div v-if="items[0].value.indexOf('http') < 0">
146
-                      <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
147
-                      <span v-else>{{ scope.row.value }}</span>
146
+                      <span v-if="scope.row.range_type == 2">
147
+                        <span v-if="scope.row.value=='阳性'" style="color: red"> {{ scope.row.value }}</span>
148
+                        <span v-else> {{ scope.row.value }}</span>
149
+                      </span>
148 150
                       <span v-if="scope.row.range_type == 1">
149
-                    {{ scope.row.value_direction }}
150
-                    </span>
151
+                        <span v-if="scope.row.value < parseFloat(scope.row.range_min) ">
152
+                          {{ scope.row.value }} <span style="color: blue;" v-if="scope.row.value>0">↓</span>
153
+                        </span>
154
+                        <span v-if="parseFloat(scope.row.range_min)<= parseFloat( scope.row.value) && parseFloat(scope.row.value)<= parseFloat(scope.row.range_max) ">
155
+                          {{ scope.row.value }}
156
+                        </span>
157
+                        <span v-if="parseFloat(scope.row.value) >parseFloat(scope.row.range_max) ">
158
+                          {{ scope.row.value }} <span style="color: red;" v-if="scope.row.value>0">↑</span>
159
+                        </span>
160
+                        <span v-if ="scope.row.range_max ==''||scope.row.range_min ==''">
161
+                          {{ scope.row.value }}
162
+                        </span>
163
+                      </span>
164
+                      <!-- <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span> -->
165
+                      <!-- <span v-else>{{ scope.row.value }}</span> -->
166
+                      <!-- <span v-if="scope.row.range_type == 1">
167
+                        {{ scope.row.value_direction }}
168
+                      </span> -->
151 169
                     </div>
152 170
                   <div v-else>
153 171
                     <img :src="scope.row.value">
@@ -425,7 +443,7 @@
425 443
         </el-row>
426 444
         <el-row>
427 445
           <template v-for="(item, index) in form.imgs">
428
-            <el-col :span="5" :key="index">
446
+            <el-col :span="5" >
429 447
               <div>
430 448
                 <el-row>
431 449
                   <img width="100px" :src="item.img_url" alt="">
@@ -1260,7 +1278,7 @@ export default {
1260 1278
         this.queryParams.project_id = this.project.project_id
1261 1279
         this.queryParams.page = 1
1262 1280
         this.total = 0
1263
-        console.log("wowowowowow")
1281
+        console.log("wowowowowow",this.queryParams)
1264 1282
         this.fetchPatientInspections(this.queryParams)
1265 1283
       }
1266 1284
     },
@@ -1270,6 +1288,7 @@ export default {
1270 1288
       this.queryParams.page = val
1271 1289
       this.fetchPatientInspections(this.queryParams)
1272 1290
     },
1291
+    // 数据源
1273 1292
     fetchPatientInspections(params) {
1274 1293
       this.items = []
1275 1294
       this.isPic = false
@@ -1330,7 +1349,6 @@ export default {
1330 1349
               
1331 1350
               console.log("item=-----------------",item)
1332 1351
               if (item.item_id > 0) {
1333
-                
1334 1352
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
1335 1353
                   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278 || this.org_id == 10702){
1336 1354
                     item.value = inspectionsMap[items[index].id].inspect_value
@@ -1340,7 +1358,7 @@ export default {
1340 1358
                     item.item_name = ""
1341 1359
                   }
1342 1360
                 } else {
1343
-                  item.value = inspectionsMap[items[index].item_id].inspect_value
1361
+                  item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
1344 1362
                   item.item_name = inspectionsMap[items[index].item_id].item_name
1345 1363
                 }
1346 1364
 
@@ -1390,9 +1408,6 @@ export default {
1390 1408
               }
1391 1409
 
1392 1410
               console.log("woowwoow",this.isPic)
1393
-
1394
-
1395
-
1396 1411
               console.log("isPicwowowow",this.items)
1397 1412
             }
1398 1413
           }

+ 100 - 100
src/xt_pages/workforce/scheduleTablePrintTwo.vue Wyświetl plik

@@ -6,7 +6,7 @@
6 6
         <el-button  type="primary" @click="printAction">打印</el-button>
7 7
       </div>
8 8
       <div class="tab" style="margin-top: 10px;">
9
-        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" 
9
+        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0"
10 10
           style='width: 100%;table-layout:fixed;text-align: center;word-break: break-all;word-wrap: break-word;'
11 11
         >
12 12
             <tr>
@@ -44,7 +44,7 @@
44 44
                 <td v-if="seven_day == 7">下午</td>
45 45
                 <td v-if="seven_day == 7">晚上</td>
46 46
             </tr>
47
-            <tr v-else> 
47
+            <tr v-else>
48 48
                 <td colspan="3" v-if="first_day == 1 && schedule_type==1">上午</td>
49 49
                 <td colspan="3" v-if="first_day == 1 && schedule_type==2">下午</td>
50 50
                 <td colspan="3" v-if="first_day == 1 && schedule_type==3">晚上</td>
@@ -75,7 +75,7 @@
75 75
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
76 76
                     <span v-if="item.Mon_M.patient_id">
77 77
                       <span>{{ item.Mon_M.patient }} </span>&nbsp;
78
-                      <span >{{ item.Mon_M.mode_name }}</span>&nbsp;
78
+                      <span v-if="item.Mon_M.mode_id !=1">{{ item.Mon_M.mode_name }}</span>&nbsp;
79 79
                       <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
80 80
                       </span>
81 81
                     </span>
@@ -83,60 +83,60 @@
83 83
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
84 84
                     <span v-if="item.Tue_M.patient_id">
85 85
                         <span>{{ item.Tue_M.patient }} </span>&nbsp;
86
-                        <span >{{ item.Tue_M.mode_name }}</span>&nbsp;
86
+                        <span v-if="item.Tue_M.mode_id !=1">{{ item.Tue_M.mode_name }}</span>&nbsp;
87 87
                         <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>
88 88
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
89
-                         
89
+
90 90
                         </span>
91 91
                     </span>
92 92
                   </td>
93 93
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
94 94
                       <span v-if="item.Wed_M.patient_id">
95 95
                         <span>{{ item.Wed_M.patient }} </span>&nbsp;
96
-                          <span >{{ item.Wed_M.mode_name }}</span>&nbsp;
96
+                          <span v-if="item.Wed_M.mode_id !=1">{{ item.Wed_M.mode_name }}</span>&nbsp;
97 97
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>
98 98
                           <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
99
-                            
99
+
100 100
                           </span>
101 101
                       </span>
102 102
                   </td>
103 103
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
104 104
                       <span v-if="item.Thurs_M.patient_id">
105 105
                         <span>{{ item.Thurs_M.patient }} </span>&nbsp;
106
-                          <span >{{ item.Thurs_M.mode_name }}</span>&nbsp;
106
+                          <span v-if="item.Thurs_M.mode_id !=1">{{ item.Thurs_M.mode_name }}</span>&nbsp;
107 107
                           <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
108 108
                           <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}
109
-                          
109
+
110 110
                           </span>
111 111
                       </span>
112 112
                   </td>
113 113
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
114 114
                       <span v-if="item.Fri_M.patient_id">
115 115
                         <span>{{ item.Fri_M.patient }} </span>&nbsp;
116
-                          <span >{{ item.Fri_M.mode_name }}</span>&nbsp;
116
+                          <span v-if="item.Fri_M.mode_id !=1">{{ item.Fri_M.mode_name }}</span>&nbsp;
117 117
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
118 118
                           <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
119
-                            
119
+
120 120
                           </span>
121 121
                       </span>
122 122
                   </td>
123 123
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
124 124
                       <span v-if="item.Sat_M.patient_id">
125 125
                         <span>{{ item.Sat_M.patient }} </span>&nbsp;
126
-                          <span >{{ item.Sat_M.mode_name }}</span>&nbsp;
127
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
126
+                          <span v-if="item.Sat_M.mode_id !=1">{{ item.Sat_M.mode_name }}</span>&nbsp;
127
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span>
128 128
                           <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}
129
-                          
129
+
130 130
                           </span>
131 131
                       </span>
132 132
                   </td>
133 133
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
134 134
                       <span v-if="item.Sun_M.patient_id">
135 135
                         <span>{{ item.Sun_M.patient }} </span>&nbsp;
136
-                          <span >{{ item.Sun_M.mode_name }}</span>&nbsp;
136
+                          <span v-if="item.Sun_M.mode_id !=1">{{ item.Sun_M.mode_name }}</span>&nbsp;
137 137
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
138 138
                           <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}
139
-                          
139
+
140 140
                           </span>
141 141
                       </span>
142 142
                   </td>
@@ -146,8 +146,8 @@
146 146
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
147 147
                     <span v-if="item.Mon_A.patient_id">
148 148
                       <span>{{ item.Mon_A.patient }} </span>&nbsp;
149
-                      <span >{{ item.Mon_A.mode_name }}</span>&nbsp;
150
-                      <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
149
+                      <span v-if="item.Mon_A.mode_id !=1">{{ item.Mon_A.mode_name }}</span>&nbsp;
150
+                      <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_A.anticoagulant)}}</span>
151 151
                       <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
152 152
                       </span>
153 153
                     </span>
@@ -155,10 +155,10 @@
155 155
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
156 156
                       <span v-if="item.Tue_A.patient_id">
157 157
                         <span>{{ item.Tue_A.patient }} </span>&nbsp;
158
-                          <span >{{ item.Tue_A.mode_name }}</span>&nbsp;
158
+                          <span v-if="item.Tue_A.mode_id !=1">{{ item.Tue_A.mode_name }}</span>&nbsp;
159 159
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
160 160
                           <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}
161
-                          
161
+
162 162
                           </span>
163 163
 
164 164
                       </span>
@@ -166,51 +166,51 @@
166 166
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
167 167
                       <span v-if="item.Wed_A.patient_id">
168 168
                         <span>{{ item.Wed_A.patient }} </span>&nbsp;
169
-                          <span >{{ item.Wed_A.mode_name }}</span>&nbsp;
169
+                          <span v-if="item.Wed_A.mode_id !=1">{{ item.Wed_A.mode_name }}</span>&nbsp;
170 170
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
171 171
                           <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}
172
-                          
172
+
173 173
                           </span>
174 174
                       </span>
175 175
                   </td>
176 176
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
177 177
                       <span v-if="item.Thurs_A.patient_id">
178 178
                         <span>{{ item.Thurs_A.patient }} </span>&nbsp;
179
-                          <span >{{ item.Thurs_A.mode_name }}</span>&nbsp;
180
-                          <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
179
+                          <span v-if="item.Thurs_A.mode_id !=1">{{ item.Thurs_A.mode_name }}</span>&nbsp;
180
+                          <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span>
181 181
 
182 182
                           <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}
183
-                          
183
+
184 184
                           </span>
185 185
                       </span>
186 186
                   </td>
187 187
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
188 188
                       <span v-if="item.Fri_A.patient_id">
189 189
                         <span>{{ item.Fri_A.patient }} </span>&nbsp;
190
-                          <span >{{ item.Fri_A.mode_name }}</span>&nbsp;
191
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
190
+                          <span v-if="item.Fri_A.mode_id !=1">{{ item.Fri_A.mode_name }}</span>&nbsp;
191
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span>
192 192
                           <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}
193
-                            
193
+
194 194
                           </span>
195 195
                       </span>
196 196
                   </td>
197 197
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
198 198
                       <span v-if="item.Sat_A.patient_id">
199 199
                         <span>{{ item.Sat_A.patient }} </span>&nbsp;
200
-                          <span >{{ item.Sat_A.mode_name }}</span>&nbsp;
201
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
200
+                          <span v-if="item.Sat_A.mode_id !=1">{{ item.Sat_A.mode_name }}</span>&nbsp;
201
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span>
202 202
                           <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}
203
-                            
203
+
204 204
                           </span>
205 205
                       </span>
206 206
                   </td>
207 207
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
208 208
                       <span v-if="item.Sun_A.patient_id">
209 209
                         <span>{{ item.Sun_A.patient }} </span>&nbsp;
210
-                          <span >{{ item.Sun_A.mode_name }}</span>&nbsp;
210
+                          <span v-if="item.Sun_A.mode_id !=1">{{ item.Sun_A.mode_name }}</span>&nbsp;
211 211
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
212 212
                           <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}
213
-                          
213
+
214 214
                           </span>
215 215
 
216 216
                       </span>
@@ -221,7 +221,7 @@
221 221
                   <td colspan="3" style="min-width:50px;" v-if="first_day == 1">
222 222
                     <span v-if="item.Mon_N.patient_id">
223 223
                       <span>{{ item.Mon_N.patient }} </span>&nbsp;
224
-                      <span >{{ item.Mon_N.mode_name }}</span>&nbsp;
224
+                      <span v-if="item.Mon_N.mode_id !=1">{{ item.Mon_N.mode_name }}</span>&nbsp;
225 225
                       <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
226 226
                       <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
227 227
                       </span>
@@ -230,60 +230,60 @@
230 230
                   <td colspan="3" style="min-width:50px;"  v-if="second_day == 2">
231 231
                       <span v-if="item.Tue_N.patient_id">
232 232
                         <span>{{ item.Tue_N.patient }} </span>&nbsp;
233
-                          <span >{{ item.Tue_N.mode_name }}</span>&nbsp;
233
+                          <span v-if="item.Tue_N.mode_id !=1">{{ item.Tue_N.mode_name }}</span>&nbsp;
234 234
                           <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
235 235
                           <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}
236
-                            
236
+
237 237
                           </span>
238 238
                       </span>
239 239
                   </td>
240 240
                   <td colspan="3" style="min-width:50px;" v-if="three_day == 3">
241 241
                       <span v-if="item.Wed_N.patient_id">
242 242
                         <span>{{ item.Wed_N.patient }} </span>&nbsp;
243
-                          <span >{{ item.Wed_N.mode_name }}</span>&nbsp;
243
+                          <span v-if="item.Wed_N.mode_id !=1">{{ item.Wed_N.mode_name }}</span>&nbsp;
244 244
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
245 245
                           <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}
246
-                          
246
+
247 247
                           </span>
248 248
                       </span>
249 249
                   </td>
250 250
                   <td colspan="3" style="min-width:50px;" v-if="four_day == 4">
251 251
                       <span v-if="item.Thurs_N.patient_id">
252 252
                         <span>{{ item.Thurs_N.patient }} </span>&nbsp;
253
-                          <span >{{ item.Thurs_N.mode_name }}</span>&nbsp;
254
-                          <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
253
+                          <span v-if="item.Thurs_N.mode_id !=1">{{ item.Thurs_N.mode_name }}</span>&nbsp;
254
+                          <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span>
255 255
                           <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}
256
-                          
256
+
257 257
                           </span>
258 258
                       </span>
259 259
                   </td>
260 260
                   <td colspan="3" style="min-width:50px;" v-if="five_day == 5">
261 261
                       <span v-if="item.Fri_N.patient_id">
262 262
                         <span>{{ item.Fri_N.patient }} </span>&nbsp;
263
-                          <span >{{ item.Fri_N.mode_name }}</span>&nbsp;
263
+                          <span v-if="item.Fri_N.mode_id !=1">{{ item.Fri_N.mode_name }}</span>&nbsp;
264 264
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
265 265
                           <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}
266
-                            
266
+
267 267
                           </span>
268 268
                       </span>
269 269
                   </td>
270 270
                   <td colspan="3" style="min-width:50px;" v-if="six_day == 6">
271 271
                       <span v-if="item.Sat_N.patient_id">
272 272
                         <span>{{ item.Sat_N.patient }} </span>&nbsp;
273
-                          <span >{{ item.Sat_N.mode_name }}</span>&nbsp;
274
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
273
+                          <span v-if="item.Sat_N.mode_id !=1">{{ item.Sat_N.mode_name }}</span>&nbsp;
274
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span>
275 275
                           <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}
276
-                          
276
+
277 277
                           </span>
278 278
                       </span>
279 279
                   </td>
280 280
                   <td colspan="3" style="min-width:50px;" v-if="seven_day == 7">
281 281
                       <span v-if="item.Sun_N.patient_id">
282 282
                         <span>{{ item.Sun_N.patient }} </span>&nbsp;
283
-                          <span >{{ item.Sun_N.mode_name }}</span>&nbsp;
283
+                          <span v-if="item.Sun_N.mode_id !=1">{{ item.Sun_N.mode_name }}</span>&nbsp;
284 284
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
285 285
                           <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}
286
-                            
286
+
287 287
                           </span>
288 288
                       </span>
289 289
                   </td>
@@ -293,7 +293,7 @@
293 293
                   <td style="min-width:50px;" v-if="first_day == 1">
294 294
                     <span v-if="item.Mon_M.patient_id">
295 295
                       <span>{{ item.Mon_M.patient }} </span><br/>
296
-                      <span >{{ item.Mon_M.mode_name }}</span><br/>
296
+                      <span v-if="item.Mon_M.mode_id !=1">{{ item.Mon_M.mode_name }}</span><br/>
297 297
                       <span v-if="org_id ==0">{{getAnticoagulant(item.Mon_M.anticoagulant)}}</span>
298 298
                       <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}
299 299
                       </span>
@@ -302,40 +302,40 @@
302 302
                   <td style="min-width:50px;" v-if="first_day == 1 ">
303 303
                   <span v-if="item.Mon_A.patient_id">
304 304
                     <span>{{ item.Mon_A.patient }} </span><br/>
305
-                    <span >{{ item.Mon_A.mode_name }}</span><br/>
305
+                    <span v-if="item.Mon_A.mode_id !=1">{{ item.Mon_A.mode_name }}</span><br/>
306 306
                      <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_A.anticoagulant)  }}</span>
307 307
                     <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}
308
-                     
308
+
309 309
                     </span>
310 310
                   </span>
311 311
                   </td>
312 312
                   <td style="min-width:50px;" v-if="first_day == 1 " >
313 313
                       <span v-if="item.Mon_N.patient_id">
314 314
                           <span>{{ item.Mon_N.patient }} </span><br/>
315
-                          <span >{{ item.Mon_N.mode_name }}</span><br/>
315
+                          <span v-if="item.Mon_N.mode_id !=1">{{ item.Mon_N.mode_name }}</span><br/>
316 316
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Mon_N.anticoagulant)  }}</span>
317 317
                           <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}
318
-                          
318
+
319 319
                           </span>
320 320
                       </span>
321 321
                   </td>
322 322
                   <td style="min-width:50px;"  v-if="second_day == 2">
323 323
                     <span v-if="item.Tue_M.patient_id">
324 324
                         <span>{{ item.Tue_M.patient }} </span><br/>
325
-                        <span >{{ item.Tue_M.mode_name }}</span><br/>
325
+                        <span v-if="item.Tue_M.mode_id !=1">{{ item.Tue_M.mode_name }}</span><br/>
326 326
                         <span v-if="org_id==0">{{getAnticoagulant(item.Tue_M.anticoagulant )  }}</span>
327 327
                         <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}
328
-                         
328
+
329 329
                         </span>
330 330
                     </span>
331 331
                   </td>
332 332
                   <td style="min-width:50px;"  v-if="second_day == 2">
333 333
                       <span v-if="item.Tue_A.patient_id">
334 334
                         <span>{{ item.Tue_A.patient }} </span><br/>
335
-                          <span >{{ item.Tue_A.mode_name }}</span><br/>
335
+                          <span v-if="item.Tue_A.mode_id !=1">{{ item.Tue_A.mode_name }}</span><br/>
336 336
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Tue_A.anticoagulant)}}</span>
337 337
                           <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}
338
-                          
338
+
339 339
                           </span>
340 340
 
341 341
                       </span>
@@ -343,151 +343,151 @@
343 343
                   <td style="min-width:50px;"  v-if="second_day == 2">
344 344
                       <span v-if="item.Tue_N.patient_id">
345 345
                         <span>{{ item.Tue_N.patient }} </span><br/>
346
-                          <span >{{ item.Tue_N.mode_name }}</span><br/>
346
+                          <span v-if="item.Tue_N.mode_id !=1">{{ item.Tue_N.mode_name }}</span><br/>
347 347
                           <span v-if="org_id==0">{{getAnticoagulant(item.Tue_N.anticoagulant)  }}</span>
348 348
                           <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}
349
-                            
349
+
350 350
                           </span>
351 351
                       </span>
352 352
                   </td>
353 353
                   <td style="min-width:50px;" v-if="three_day == 3">
354 354
                       <span v-if="item.Wed_M.patient_id">
355 355
                         <span>{{ item.Wed_M.patient }} </span><br/>
356
-                          <span >{{ item.Wed_M.mode_name }}</span><br/>
356
+                          <span v-if="item.Wed_M.mode_id !=1">{{ item.Wed_M.mode_name }}</span><br/>
357 357
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Wed_M.anticoagulant)  }}</span>
358 358
                           <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}
359
-                            
359
+
360 360
                           </span>
361 361
                       </span>
362 362
                   </td>
363 363
                   <td style="min-width:50px;" v-if="three_day == 3">
364 364
                       <span v-if="item.Wed_A.patient_id">
365 365
                         <span>{{ item.Wed_A.patient }} </span><br/>
366
-                          <span >{{ item.Wed_A.mode_name }}</span><br/>
366
+                          <span v-if="item.Wed_A.mode_id !=1">{{ item.Wed_A.mode_name }}</span><br/>
367 367
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Wed_A.anticoagulant)}}</span>
368 368
                           <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}
369
-                          
369
+
370 370
                           </span>
371 371
                       </span>
372 372
                   </td>
373 373
                   <td style="min-width:50px;" v-if="three_day == 3">
374 374
                       <span v-if="item.Wed_N.patient_id">
375 375
                         <span>{{ item.Wed_N.patient }} </span><br/>
376
-                          <span >{{ item.Wed_N.mode_name }}</span><br/>
376
+                          <span v-if="item.Wed_N.mode_id !=1">{{ item.Wed_N.mode_name }}</span><br/>
377 377
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
378 378
                           <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}
379
-                          
379
+
380 380
                           </span>
381 381
                       </span>
382 382
                   </td>
383 383
                   <td style="min-width:50px;" v-if="four_day == 4">
384 384
                       <span v-if="item.Thurs_M.patient_id">
385 385
                         <span>{{ item.Thurs_M.patient }} </span><br/>
386
-                          <span >{{ item.Thurs_M.mode_name }}</span><br/>
386
+                          <span v-if="item.Thurs_M.mode_id !=1">{{ item.Thurs_M.mode_name }}</span><br/>
387 387
                           <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
388 388
                           <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}
389
-                          
389
+
390 390
                           </span>
391 391
                       </span>
392 392
                   </td>
393 393
                   <td style="min-width:50px;" v-if="four_day == 4">
394 394
                       <span v-if="item.Thurs_A.patient_id">
395 395
                         <span>{{ item.Thurs_A.patient }} </span><br/>
396
-                          <span >{{ item.Thurs_A.mode_name }}</span><br/>
397
-                          <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span> 
396
+                          <span v-if="item.Thurs_A.mode_id !=1">{{ item.Thurs_A.mode_name }}</span><br/>
397
+                          <span v-if="org_id ==0">{{getAnticoagulant(item.Thurs_A.anticoagulant) }}</span>
398 398
 
399 399
                           <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}
400
-                          
400
+
401 401
                           </span>
402 402
                       </span>
403 403
                   </td>
404 404
                   <td style="min-width:50px;" v-if="four_day == 4">
405 405
                       <span v-if="item.Thurs_N.patient_id">
406 406
                         <span>{{ item.Thurs_N.patient }} </span><br/>
407
-                          <span >{{ item.Thurs_N.mode_name }}</span><br/>
408
-                          <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span> 
407
+                          <span v-if="item.Thurs_N.mode_id !=1">{{ item.Thurs_N.mode_name }}</span><br/>
408
+                          <span v-if="org_id ==0" >{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span>
409 409
                           <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}
410
-                          
410
+
411 411
                           </span>
412 412
                       </span>
413 413
                   </td>
414 414
                   <td style="min-width:50px;" v-if="five_day == 5">
415 415
                       <span v-if="item.Fri_M.patient_id">
416 416
                         <span>{{ item.Fri_M.patient }} </span><br/>
417
-                          <span >{{ item.Fri_M.mode_name }}</span><br/>
417
+                          <span v-if="item.Fri_M.mode_id !=1">{{ item.Fri_M.mode_name }}</span><br/>
418 418
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
419 419
                           <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}
420
-                            
420
+
421 421
                           </span>
422 422
                       </span>
423 423
                   </td>
424 424
                   <td style="min-width:50px;" v-if="five_day == 5">
425 425
                       <span v-if="item.Fri_A.patient_id">
426 426
                         <span>{{ item.Fri_A.patient }} </span><br/>
427
-                          <span >{{ item.Fri_A.mode_name }}</span><br/>
428
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span> 
427
+                          <span v-if="item.Fri_A.mode_id !=1">{{ item.Fri_A.mode_name }}</span><br/>
428
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span>
429 429
                           <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}
430
-                            
430
+
431 431
                           </span>
432 432
                       </span>
433 433
                   </td>
434 434
                   <td style="min-width:50px;" v-if="five_day == 5">
435 435
                       <span v-if="item.Fri_N.patient_id">
436 436
                         <span>{{ item.Fri_N.patient }} </span><br/>
437
-                          <span >{{ item.Fri_N.mode_name }}</span><br/>
437
+                          <span v-if="item.Fri_N.mode_id !=1">{{ item.Fri_N.mode_name }}</span><br/>
438 438
                           <span v-if="org_id == 0">{{getAnticoagulant(item.Fri_N.anticoagulant)  }}</span>
439 439
                           <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}
440
-                            
440
+
441 441
                           </span>
442 442
                       </span>
443 443
                   </td>
444 444
                   <td style="min-width:50px;" v-if="six_day == 6">
445 445
                       <span v-if="item.Sat_M.patient_id">
446 446
                         <span>{{ item.Sat_M.patient }} </span><br/>
447
-                          <span >{{ item.Sat_M.mode_name }}</span><br/>
448
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span> 
447
+                          <span v-if="item.Sat_M.mode_id !=1">{{ item.Sat_M.mode_name }}</span><br/>
448
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span>
449 449
                           <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}
450
-                          
450
+
451 451
                           </span>
452 452
                       </span>
453 453
                   </td>
454 454
                   <td style="min-width:50px;" v-if="six_day == 6">
455 455
                       <span v-if="item.Sat_A.patient_id">
456 456
                         <span>{{ item.Sat_A.patient }} </span><br/>
457
-                          <span >{{ item.Sat_A.mode_name }}</span><br/>
458
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span> 
457
+                          <span v-if="item.Sat_A.mode_id !=1">{{ item.Sat_A.mode_name }}</span><br/>
458
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span>
459 459
                           <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}
460
-                            
460
+
461 461
                           </span>
462 462
                       </span>
463 463
                   </td>
464 464
                   <td style="min-width:50px;" v-if="six_day == 6">
465 465
                       <span v-if="item.Sat_N.patient_id">
466 466
                         <span>{{ item.Sat_N.patient }} </span><br/>
467
-                          <span >{{ item.Sat_N.mode_name }}</span><br/>
468
-                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span> 
467
+                          <span v-if="item.Sat_N.mode_id !=1">{{ item.Sat_N.mode_name }}</span><br/>
468
+                          <span v-if="org_id ==0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span>
469 469
                           <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}
470
-                          
470
+
471 471
                           </span>
472 472
                       </span>
473 473
                   </td>
474 474
                   <td style="min-width:50px;" v-if="seven_day == 7">
475 475
                       <span v-if="item.Sun_M.patient_id">
476 476
                         <span>{{ item.Sun_M.patient }} </span><br/>
477
-                          <span >{{ item.Sun_M.mode_name }}</span><br/>
477
+                          <span v-if="item.Sun_M.mode_id !=1">{{ item.Sun_M.mode_name }}</span><br/>
478 478
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
479 479
                           <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}
480
-                          
480
+
481 481
                           </span>
482 482
                       </span>
483 483
                   </td>
484 484
                   <td style="min-width:50px;" v-if="seven_day == 7">
485 485
                       <span v-if="item.Sun_A.patient_id">
486 486
                         <span>{{ item.Sun_A.patient }} </span><br/>
487
-                          <span >{{ item.Sun_A.mode_name }}</span><br/>
487
+                          <span v-if="item.Sun_A.mode_id !=1">{{ item.Sun_A.mode_name }}</span><br/>
488 488
                           <span v-if="org_id ==0">{{getAnticoagulant(item.Sun_A.anticoagulant)}}</span>
489 489
                           <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}
490
-                          
490
+
491 491
                           </span>
492 492
 
493 493
                       </span>
@@ -495,10 +495,10 @@
495 495
                   <td style="min-width:50px;" v-if="seven_day == 7">
496 496
                       <span v-if="item.Sun_N.patient_id">
497 497
                         <span>{{ item.Sun_N.patient }} </span><br/>
498
-                          <span >{{ item.Sun_N.mode_name }}</span><br/>
498
+                          <span v-if="item.Sun_N.mode_id !=1">{{ item.Sun_N.mode_name }}</span><br/>
499 499
                           <span v-if="org_id ==0">{{ getAnticoagulant(item.Sun_N.anticoagulant ) }}</span>
500 500
                           <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}
501
-                            
501
+
502 502
                           </span>
503 503
                       </span>
504 504
                   </td>
@@ -509,7 +509,7 @@
509 509
       </div>
510 510
     </div>
511 511
   </div>
512
-</template> 
512
+</template>
513 513
 
514 514
 <script>
515 515
 import {getSchedulesTwo,getWeekPanelsOne,getPatientSheduleCount,getAllZones,getSolutionSchedule} from "@/api/schedule";
@@ -556,7 +556,7 @@ export default {
556 556
         }
557 557
     },
558 558
     created(){
559
-      
559
+
560 560
         this.org_id = this.$store.getters.xt_user.org.id
561 561
         this.getAllZones()
562 562
         this.modeOptions = this.$store.getters.treatment_mode;
@@ -634,7 +634,7 @@ export default {
634 634
               this.getPatientSheduleCount()
635 635
           }
636 636
         })
637
-      },  
637
+      },
638 638
       compare(p) { //这是比较函数
639 639
       return function (m, n) {
640 640
         var a = m[p];
@@ -1576,7 +1576,7 @@ export default {
1576 1576
         }else{
1577 1577
           return this.Screencasting =false
1578 1578
         }
1579
-        
1579
+
1580 1580
       },
1581 1581
       getAnticoagulant(val){
1582 1582
         var name= ""
@@ -1649,7 +1649,7 @@ export default {
1649 1649
       }
1650 1650
     }
1651 1651
   }
1652
-  
1652
+
1653 1653
 }
1654 1654
 </style>
1655 1655
 <style lang="scss" scoped>