xmg123 1 vecka sedan
förälder
incheckning
21f3dbef5c

+ 17 - 17
package-lock.json Visa fil

@@ -3875,9 +3875,9 @@
3875 3875
       "dev": true
3876 3876
     },
3877 3877
     "electron-to-chromium": {
3878
-      "version": "1.5.155",
3879
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
3880
-      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng==",
3878
+      "version": "1.5.157",
3879
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz",
3880
+      "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==",
3881 3881
       "dev": true
3882 3882
     },
3883 3883
     "elegant-spinner": {
@@ -3993,27 +3993,27 @@
3993 3993
       }
3994 3994
     },
3995 3995
     "es-abstract": {
3996
-      "version": "1.23.9",
3997
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
3998
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
3996
+      "version": "1.23.10",
3997
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
3998
+      "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
3999 3999
       "dev": true,
4000 4000
       "requires": {
4001 4001
         "array-buffer-byte-length": "^1.0.2",
4002 4002
         "arraybuffer.prototype.slice": "^1.0.4",
4003 4003
         "available-typed-arrays": "^1.0.7",
4004 4004
         "call-bind": "^1.0.8",
4005
-        "call-bound": "^1.0.3",
4005
+        "call-bound": "^1.0.4",
4006 4006
         "data-view-buffer": "^1.0.2",
4007 4007
         "data-view-byte-length": "^1.0.2",
4008 4008
         "data-view-byte-offset": "^1.0.1",
4009 4009
         "es-define-property": "^1.0.1",
4010 4010
         "es-errors": "^1.3.0",
4011
-        "es-object-atoms": "^1.0.0",
4011
+        "es-object-atoms": "^1.1.1",
4012 4012
         "es-set-tostringtag": "^2.1.0",
4013 4013
         "es-to-primitive": "^1.3.0",
4014 4014
         "function.prototype.name": "^1.1.8",
4015
-        "get-intrinsic": "^1.2.7",
4016
-        "get-proto": "^1.0.0",
4015
+        "get-intrinsic": "^1.3.0",
4016
+        "get-proto": "^1.0.1",
4017 4017
         "get-symbol-description": "^1.1.0",
4018 4018
         "globalthis": "^1.0.4",
4019 4019
         "gopd": "^1.2.0",
@@ -4029,13 +4029,13 @@
4029 4029
         "is-shared-array-buffer": "^1.0.4",
4030 4030
         "is-string": "^1.1.1",
4031 4031
         "is-typed-array": "^1.1.15",
4032
-        "is-weakref": "^1.1.0",
4032
+        "is-weakref": "^1.1.1",
4033 4033
         "math-intrinsics": "^1.1.0",
4034
-        "object-inspect": "^1.13.3",
4034
+        "object-inspect": "^1.13.4",
4035 4035
         "object-keys": "^1.1.1",
4036 4036
         "object.assign": "^4.1.7",
4037 4037
         "own-keys": "^1.0.1",
4038
-        "regexp.prototype.flags": "^1.5.3",
4038
+        "regexp.prototype.flags": "^1.5.4",
4039 4039
         "safe-array-concat": "^1.1.3",
4040 4040
         "safe-push-apply": "^1.0.0",
4041 4041
         "safe-regex-test": "^1.1.0",
@@ -4048,7 +4048,7 @@
4048 4048
         "typed-array-byte-offset": "^1.0.4",
4049 4049
         "typed-array-length": "^1.0.7",
4050 4050
         "unbox-primitive": "^1.1.0",
4051
-        "which-typed-array": "^1.1.18"
4051
+        "which-typed-array": "^1.1.19"
4052 4052
       }
4053 4053
     },
4054 4054
     "es-define-property": {
@@ -7744,9 +7744,9 @@
7744 7744
       }
7745 7745
     },
7746 7746
     "marked": {
7747
-      "version": "15.0.11",
7748
-      "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.11.tgz",
7749
-      "integrity": "sha512-1BEXAU2euRCG3xwgLVT1y0xbJEld1XOrmRJpUwRCcy7rxhSCwMrmEu9LXoPhHSCJG41V7YcQ2mjKRr5BA3ITIA=="
7747
+      "version": "15.0.12",
7748
+      "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz",
7749
+      "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="
7750 7750
     },
7751 7751
     "math-expression-evaluator": {
7752 7752
       "version": "1.4.0",

+ 9 - 0
src/api/stock.js Visa fil

@@ -1178,4 +1178,13 @@ export function changeGoodWarehouseInfo(data){
1178 1178
     method:"post",
1179 1179
     data:data,
1180 1180
   })
1181
+}
1182
+
1183
+export function getRepatGoodList(data){
1184
+ 
1185
+  return request({
1186
+    url:"/api/good/getrepatgoodlist",
1187
+    method:"post",
1188
+    data:data
1189
+  })
1181 1190
 }

+ 1 - 1
src/xt_pages/Pharmacy/PatientDispensing.vue Visa fil

@@ -845,7 +845,7 @@ export default {
845 845
         this.$message.error("未选择任何数据");
846 846
         return;
847 847
       }else{
848
-        if(this.org_id != 10653 && this.org_id !=0){
848
+        if(this.org_id != 10653){
849 849
           this.$refs.patientprint.show(
850 850
             this.tableData,
851 851
             this.currentRow,

+ 12 - 8
src/xt_pages/Pharmacy/print/patientPrint.vue Visa fil

@@ -14,6 +14,7 @@
14 14
         <div>患者名称:{{name}}</div>
15 15
         <div>发药状态:{{state}}</div>
16 16
         <div>日期:{{times}}</div>
17
+        <div>患者签名:</div>
17 18
       </div>
18 19
 
19 20
       <el-table
@@ -66,6 +67,7 @@
66 67
           </template>
67 68
         </el-table-column>
68 69
       </el-table>
70
+      
69 71
     </div>
70 72
   </el-dialog>
71 73
 </template>
@@ -146,14 +148,6 @@ export default {
146 148
     print() {
147 149
       console.log(this.org_name,'this.org_name')
148 150
       Vue.prototype.printJson = printutils.printJson;
149
-      //   const style =
150
-      //     '@media print {.list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto}}';
151
-      //   printJS({
152
-      //     printable: "dialysis-print-box-1",
153
-      //     type: "html",
154
-      //     style: style,
155
-      //     scanStyles: false,
156
-      //   });
157 151
       this.printJson({
158 152
         title: `
159 153
         <div>
@@ -162,6 +156,7 @@ export default {
162 156
         <div style="width: 310px;padding: 10px 0;">患者名称:${this.name}</div>
163 157
         <div style="width: 320px;padding: 10px 0;">发药状态:${this.state}</div>
164 158
         <div style="width: 310px;padding: 10px 0;">日期:${this.times}</div>
159
+        <div style="width: 310px;padding: 10px 0;">患者签名:</div>
165 160
         </div></div>`, // 打印出来的标题
166 161
         data: this.tableData, // 需要打印的数据
167 162
         serial: true, // 是否需要打印序列号
@@ -213,6 +208,15 @@ export default {
213 208
             displayName: "备注",
214 209
           },
215 210
         ],
211
+        footer: `
212
+        <div style="width: 940px; margin-top: 30px; display: flex; justify-content: space-between;">
213
+          
214
+          <div style="width: 300px; border-top: 1px solid #000; text-align: center; padding-top: 5px;">
215
+            患者签名:________________
216
+          </div>
217
+         
218
+        </div>`
219
+  
216 220
       });
217 221
     },
218 222
   },

+ 13 - 11
src/xt_pages/data/components/addDrugs.vue Visa fil

@@ -384,17 +384,7 @@
384 384
                             </el-date-picker>
385 385
                         </el-form-item>
386 386
 
387
-                        <el-form-item label="是否零用:">
388
-
389
-                            <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
390
-                                <el-option
391
-                                        v-for="(item,index) in userList"
392
-                                        :key="index"
393
-                                        :label="item.name"
394
-                                        :value="item.id">
395
-                                </el-option>
396
-                            </el-select>
397
-                        </el-form-item>
387
+                       
398 388
 
399 389
 
400 390
                         <el-form-item label="药品备注:">
@@ -448,6 +438,18 @@
448 438
                 <el-form :model="form" label-width="130px"
449 439
                          style="display: flex;flex-wrap: wrap;justify-content: space-between;">
450 440
 
441
+                         <el-form-item label="是否零用:">
442
+
443
+                            <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
444
+                                <el-option
445
+                                        v-for="(item,index) in userList"
446
+                                        :key="index"
447
+                                        :label="item.name"
448
+                                        :value="item.id">
449
+                                </el-option>
450
+                            </el-select>
451
+                         </el-form-item>
452
+
451 453
                     <el-form-item label="标签:" prop="label">
452 454
                         <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
453 455
                             <el-option

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Visa fil

@@ -2434,7 +2434,7 @@
2434 2434
                         <span v-if="org_id == 9675 || org_id == 10447 || org_id == 10624 || org_id == 10471">L</span>
2435 2435
                       </div>
2436 2436
 
2437
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0">
2437
+                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0 || org_id == 10579">
2438 2438
                         在线Kt/V:
2439 2439
                         <div class="under_line" style="width: 100px; text-align: center">
2440 2440
                           {{

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue Visa fil

@@ -173,13 +173,13 @@
173 173
         </li> -->
174 174
 
175 175
 
176
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766">
176
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766&& this.$store.getters.xt_user.template_info.org_id != 10777">
177 177
           <label>处方脱水量 : </label>
178 178
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
179 179
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
180 180
         </li>
181 181
 
182
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 9478|| this.$store.getters.xt_user.template_info.org_id == 10766">
182
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 9478|| this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 10777">
183 183
           <label>处方脱水量 : </label>
184 184
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
185 185
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

+ 18 - 6
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Visa fil

@@ -161,7 +161,7 @@
161 161
                     </el-col>
162 162
 
163 163
                     <el-col :span="8"
164
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745 && this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766">
164
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745 && this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766&& this.$store.getters.xt_user.template_info.org_id != 10777">
165 165
                         <el-form-item label="处方脱水量(ml):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
166 166
                             <el-input
167 167
                                     type="number"
@@ -171,7 +171,7 @@
171 171
                     </el-col>
172 172
 
173 173
                     <el-col :span="8"
174
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745 || this.$store.getters.xt_user.template_info.org_id==10752|| this.$store.getters.xt_user.template_info.org_id==10757|| this.$store.getters.xt_user.template_info.org_id==9478|| this.$store.getters.xt_user.template_info.org_id==10766">
174
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745 || this.$store.getters.xt_user.template_info.org_id==10752|| this.$store.getters.xt_user.template_info.org_id==10757|| this.$store.getters.xt_user.template_info.org_id==9478|| this.$store.getters.xt_user.template_info.org_id==10766|| this.$store.getters.xt_user.template_info.org_id==10777">
175 175
                         <el-form-item label="处方脱水量(L):" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
176 176
                             <el-input
177 177
                                     type="number"
@@ -2869,7 +2869,7 @@ mu
2869 2869
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
2870 2870
         console.log("除非=======================")
2871 2871
 
2872
-        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726|| this.$store.getters.xt_user.template_info.org_id==10752 ||  this.$store.getters.xt_user.template_info.org_id==10697){
2872
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10777|| this.$store.getters.xt_user.template_info.org_id==10752 ||  this.$store.getters.xt_user.template_info.org_id==10697){
2873 2873
           if(this.predialysis!=undefined){
2874 2874
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
2875 2875
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
@@ -3421,8 +3421,20 @@ mu
3421 3421
           this.zongliang = this.dialysisPrescription.anticoagulant_zongliang
3422 3422
 
3423 3423
         }
3424
-        // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
3425
-        // console.log('this.schedual', schedual.mode_id)
3424
+
3425
+        if(this.dialysisPrescription.mode_id == 0){
3426
+          if(schedual!=undefined || schedual!=null){
3427
+            this.dialysisPrescription.mode_id == schedual.mode_id
3428
+          }
3429
+          
3430
+        }
3431
+
3432
+
3433
+       
3434
+        
3435
+       
3436
+        console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
3437
+        console.log('this.schedual', schedual.mode_id)
3426 3438
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || pre.mode_id == 13 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 13 || schedual.mode_id == 0 || schedual.mode_id == 37 || schedual.mode_id == 36 || schedual.mode_id == 35 || schedual.mode_id == 34|| schedual.mode_id == 41) {
3427 3439
           this.zhiShow = true
3428 3440
           this.huShow = true
@@ -3447,7 +3459,7 @@ mu
3447 3459
         this.pre = pre
3448 3460
         // console.log("pre1", pre);
3449 3461
         this.getPermission()
3450
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697|| this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9478 || this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 10768){
3462
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10777 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697|| this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9478 || this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 10768){
3451 3463
           this.getPatientBefor()
3452 3464
         }
3453 3465
 

+ 11 - 10
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue Visa fil

@@ -387,7 +387,7 @@
387 387
                 org_id == 10599 || 
388 388
                 org_id == 10612 ||
389 389
                 org_id == 10617 ||
390
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id==9779) &&
390
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id==9779 || org_id ==10777) &&
391 391
                 org_id!=10387
392 392
             "
393 393
           >
@@ -458,7 +458,7 @@
458 458
               && org_id!=10432 && org_id!=10445
459 459
               && org_id!=10410 && org_id!=10495 &&
460 460
                org_id!=10485 && org_id!=10395 && org_id!=10375
461
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766 && org_id!=9779)
461
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766 && org_id!=9779 && org_id!=10777)
462 462
               || org_id == 10387
463 463
             "
464 464
           >
@@ -529,7 +529,7 @@
529 529
                 org_id == 10410 ||
530 530
                 org_id == 10495  ||
531 531
                 org_id == 10395
532
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 9779)
532
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 9779 || org_id == 10777)
533 533
                 && org_id!=10387
534 534
             "
535 535
           >
@@ -584,7 +584,7 @@
584 584
               org_id!=10432 &&
585 585
               org_id!=10445 &&
586 586
               org_id!=10410 && org_id!=10495
587
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766&& org_id!=9779) ||
587
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766&& org_id!=9779 && org_id!=10777) ||
588 588
               org_id == 10387
589 589
             "
590 590
           >
@@ -700,7 +700,7 @@
700 700
                 org_id == 10395||
701 701
                 org_id == 10617 ||
702 702
                 org_id ==10677 ||
703
-                org_id == 10721 || org_id ==10727 || org_id == 10751 || org_id == 10752 || org_id== 10766
703
+                org_id == 10721 || org_id ==10727 || org_id == 10751 || org_id == 10752 || org_id== 10766 || org_id == 10777
704 704
 
705 705
                )&& org_id!=10598 && org_id!=10414
706 706
             "
@@ -1691,7 +1691,7 @@
1691 1691
                 org_id== 10432 ||
1692 1692
                 org_id== 10445 ||
1693 1693
                 org_id== 10410 ||
1694
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766) &&
1694
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 10777) &&
1695 1695
                 org_id!=10387
1696 1696
             "
1697 1697
           >
@@ -1739,7 +1739,7 @@
1739 1739
               org_id!=10445 &&
1740 1740
               org_id!=10410 &&
1741 1741
               org_id!=10485 &&
1742
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766)
1742
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766 && org_id!=10777)
1743 1743
               || org_id == 10387
1744 1744
             "
1745 1745
           >
@@ -1812,7 +1812,7 @@
1812 1812
                 org_id == 10599 ||
1813 1813
                 org_id ==10612 || 
1814 1814
                 org_id ==10617 || 
1815
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766)
1815
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 10777)
1816 1816
                 && org_id!=10387 && org_id!=10694
1817 1817
             "
1818 1818
           >
@@ -1897,7 +1897,8 @@
1897 1897
               org_id!=10751 &&
1898 1898
               org_id!=10752 &&
1899 1899
               org_id!=10757 &&
1900
-              org_id!=10766
1900
+              org_id!=10766 && 
1901
+              org_id!=10777
1901 1902
               )
1902 1903
               || org_id == 10387 || org_id == 10694
1903 1904
             "
@@ -1991,7 +1992,7 @@
1991 1992
                 org_id==10445 ||
1992 1993
                 org_id==10410 ||
1993 1994
                 org_id==10395 || 
1994
-                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206 || org_id == 10751 || org_id == 10752 || org_id == 10766) && org_id !=10558 && org_id!=10598 && org_id!=10414 
1995
+                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206 || org_id == 10751 || org_id == 10752 || org_id == 10766 || org_id == 10777) && org_id !=10558 && org_id!=10598 && org_id!=10414 
1995 1996
             "
1996 1997
           >
1997 1998
             <el-form-item label="置换率(ml/min):" :prop="isName('置换率')"

+ 6 - 6
src/xt_pages/dialysis/details/dialysisMonitoring.vue Visa fil

@@ -20,18 +20,18 @@
20 20
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
21 21
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
22 22
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
23
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10766) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9779" width="76px" > 超滤量(ml)</th>
24
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=9779) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
23
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10766) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9779|| this.$store.getters.xt_user.template_info.org_id == 10777" width="76px" > 超滤量(ml)</th>
24
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=9779&& this.$store.getters.xt_user.template_info.org_id!=10777) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
25 25
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
26
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 9779) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
27
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=10757 && this.$store.getters.xt_user.template_info.org_id!=9779) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
26
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 9779|| this.$store.getters.xt_user.template_info.org_id == 10777) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
27
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=10757 && this.$store.getters.xt_user.template_info.org_id!=9779&& this.$store.getters.xt_user.template_info.org_id!=10777) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
28 28
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
29 29
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
30 30
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
31 31
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
32 32
           <th v-if="isShow('透析液温度1')" width="92px">透析液温度(℃)</th>
33
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206 || org_id == 10751 || org_id == 10752 || org_id == 10766) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
34
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752 && org_id!=10766) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
33
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206 || org_id == 10751 || org_id == 10752 || org_id == 10766 || org_id == 10777) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
34
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752 && org_id!=10766 && org_id!=10777) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
35 35
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
36 36
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
37 37
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 9779 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744 && org_id!=10766&& org_id!=10768" width="92px"  > 置换量(ml)  </th>

+ 27 - 4
src/xt_pages/dialysis/dialysisPrintOrder.vue Visa fil

@@ -1056,6 +1056,19 @@
1056 1056
         >
1057 1057
         </div>
1058 1058
       </template>
1059
+
1060
+      <template v-if="org_template_info.template_id == 85 || org_id== 0">
1061
+        <div>
1062
+          <el-button
1063
+          :loading="loading"
1064
+          size="small"
1065
+          icon="el-icon-printer"
1066
+          @click="printThisPage"
1067
+          type="primary"
1068
+          >打印</el-button
1069
+        >
1070
+        </div>
1071
+      </template>
1059 1072
     </div>
1060 1073
     <div class="app-container" style="min-height: 0">
1061 1074
       <!--<div class="order-print-btn"-->
@@ -1593,6 +1606,12 @@
1593 1606
           v-if="org_template_info.template_id == 84">
1594 1607
 
1595 1608
           </DialysisPrintOrdereightyfour>
1609
+
1610
+          <DialysisPrintOrdereightsix v-bind:childResponse="childResponse"
1611
+          ref="childRef"
1612
+          v-if="org_template_info.template_id == 86 || org_id == 0">
1613
+          </DialysisPrintOrdereightsix>
1614
+         
1596 1615
         </div>
1597 1616
       </el-container>
1598 1617
     </div>
@@ -1696,6 +1715,7 @@ import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
1696 1715
 import DialysisPrintOrdereightythree from './template/DialysisPrintOrdereightythree'
1697 1716
 import DialysisPrintOrdereightyfour from './template/DialysisPrintOrdereightyfour'
1698 1717
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
1718
+import DialysisPrintOrdereightsix  from './template/DialysisPrintOrdereightsix.vue'
1699 1719
 export default {
1700 1720
   name: "dialysisPrintOrder",
1701 1721
   components: {
@@ -1784,6 +1804,7 @@ export default {
1784 1804
     DialysisPrintOrdereightythree,
1785 1805
     DialysisPrintOrdereightyfour,
1786 1806
     DialysisPrintOrderZero,
1807
+    DialysisPrintOrdereightsix,
1787 1808
     LabelBox,
1788 1809
     BreadCrumb,
1789 1810
     // DialysisPrintOrderSixtyFive
@@ -2447,7 +2468,7 @@ export default {
2447 2468
           style: style,
2448 2469
           scanStyles: false,
2449 2470
         });
2450
-      }else if (this.org_template_info.template_id == 73 ) {
2471
+      }else if (this.org_template_info.template_id == 73 || this.org_template_info.template_id == 86) {
2451 2472
         printJS({
2452 2473
           printable: "dialysis-print-box-1",
2453 2474
           type: "html",
@@ -2682,7 +2703,7 @@ export default {
2682 2703
 
2683 2704
       }
2684 2705
 
2685
-      if(this.org_id == 0 || this.org_id == 10206){
2706
+      if(this.org_id == 10206){
2686 2707
         printJS({
2687 2708
           printable: "dialysis-print-box-1-2",
2688 2709
           type: "html",
@@ -2746,9 +2767,11 @@ export default {
2746 2767
     getDialysisRecord() {
2747 2768
       this.loading = true;
2748 2769
       getDialysisRecord(this.queryParams).then((response) => {
2770
+
2749 2771
         if (response.data.state == 1) {
2750 2772
           this.childResponse = response;
2751
-           this.mode_id= response.data.data.patientInfo.DialysisSchedule.mode_id
2773
+          this.$refs.childRef.getDialysisRecord(response)
2774
+          this.mode_id= response.data.data.patientInfo.DialysisSchedule.mode_id
2752 2775
           this.date = response.data.data.patientInfo.DialysisSchedule.schedule_date
2753 2776
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
2754 2777
           this.patient_name = response.data.data.patientInfo.name
@@ -3190,7 +3213,7 @@ export default {
3190 3213
     changePatient(schedual) {
3191 3214
       console.log('schedual',schedual);
3192 3215
       var xtdate = parseTime(schedual.schedule_date, "{y}-{m}-{d}");
3193
-      console.log('fffff打印单单号',this.org_template_info.template_id);
3216
+      // console.log('fffff打印单单号',this.org_template_info.template_id);
3194 3217
       this.x_tdate=xtdate
3195 3218
 
3196 3219
       // this.queryParams.xtdate = xtdate;

+ 1 - 3
src/xt_pages/dialysis/newDoctorAdvice.vue Visa fil

@@ -557,9 +557,7 @@
557 557
               </el-option>
558 558
             </el-select>
559 559
             <label class="title"> <span class="name">病区选择</span> : </label>
560
-            <el-select v-model="partion_type" placeholder="请选择"
561
-                  @change="changePartionType" multiple  style="width: 120px;"
562
-              >
560
+            <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType" multiple  style="width: 200px;">
563 561
               <el-option
564 562
                 v-for="item in partitionArr"
565 563
                 :key="item.id"

+ 1 - 13
src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue Visa fil

@@ -1804,8 +1804,6 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
1804 1804
 
1805 1805
 import LabelBox from "../printItem/LabelBox";
1806 1806
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
1807
-// import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
1808
-// import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
1809 1807
 import print from "print-js";
1810 1808
 import html2pdf from 'html2pdf.js'
1811 1809
 import { UploadPrintOrder } from "@/api/role/admin"
@@ -1815,18 +1813,8 @@ import { jsPDF } from 'jspdf';
1815 1813
 export default {
1816 1814
   name: "dialysisPrintOrderSix",
1817 1815
   props: ["childResponse"],
1818
-  // props:{
1819
-  //   childResponse:{
1820
-  //     type: Object
1821
-  //   }
1822
-  //   ,
1823
-  //   x_tdate:{
1824
-  //     type:String
1825
-  //   }
1826
-  // },
1816
+  
1827 1817
   components: {
1828
-    // DialysisPrintOrderOne,
1829
-    // DialysisPrintOrderTwo,
1830 1818
     CheckBox,
1831 1819
     LabelBox,
1832 1820
     BreadCrumb,

+ 6 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Visa fil

@@ -1465,12 +1465,12 @@
1465 1465
                             {{ monitor.temperature ? monitor.temperature : "" }}
1466 1466
                           </td>
1467 1467
                           <td>
1468
-                            <span v-if="org_id!=9478 && org_id!=10744">
1468
+                            <span v-if="org_id!=9478 && org_id!=10744 && org_id!=10726">
1469 1469
                               {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
1470 1470
                               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
1471 1471
                             </span>
1472 1472
 
1473
-                            <span v-if="org_id == 9478 || org_id == 10744">
1473
+                            <span v-if="org_id == 9478 || org_id == 10744 || org_id == 10726">
1474 1474
                               {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
1475 1475
                               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "拒测" }}
1476 1476
                             </span>
@@ -1627,15 +1627,15 @@
1627 1627
                             <span v-if="org_id != 10644 && org_id != 0">{{ monitor.ultrafiltration_rate ?
1628 1628
                               monitor.ultrafiltration_rate : "" }}</span>
1629 1629
                             <span v-if="org_id == 10644">
1630
-                              <span v-if="monitor.patient_id == 39872 && monitor.monitoring_date == 1747670400">
1630
+                              <!-- <span v-if="monitor.patient_id == 39872 && monitor.monitoring_date == 1747670400">
1631 1631
                                  <span v-if="monindex == 1">
1632 1632
                                       0
1633 1633
                                  </span>
1634 1634
                                  <span v-if="monindex != 1">
1635 1635
                                   {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
1636 1636
                                  </span>
1637
-                              </span>
1638
-                              <span v-if="monitor.patient_id!=39872 && monitor.monitoring_date!=1747670400">
1637
+                              </span> -->
1638
+                              <span>
1639 1639
                                   <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
1640 1640
                                   monitor.ultrafiltration_volume : "0" }}</span>
1641 1641
                                   <span v-if="monindex == monitors.length - 1">{{ monitor.ultrafiltration_volume ?
@@ -2369,7 +2369,7 @@
2369 2369
                         <span v-if="org_id == 9675 || org_id == 10447 || org_id == 10624 || org_id == 10471">L</span>
2370 2370
                       </div>
2371 2371
 
2372
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0">
2372
+                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0 || org_id ==10579">
2373 2373
                         在线Kt/V:
2374 2374
                         <div class="under_line" style="width: 100px; text-align: center">
2375 2375
                           {{

+ 79 - 2
src/xt_pages/stock/stockInOrderAdd.vue Visa fil

@@ -360,6 +360,24 @@
360 360
         <el-button type="primary" @click="saveTextArea()">确 定</el-button>
361 361
       </span>
362 362
     </el-dialog>
363
+
364
+    <el-dialog
365
+      title="重复值警告"
366
+      :visible.sync="showDuplicateAlert"
367
+      width="30%"
368
+      append-to-body>
369
+      <div v-for="(item, index) in duplicateList" :key="index">
370
+        <el-alert
371
+          :title="`重复值: ${item.value} (出现 ${item.count} 次)`"
372
+          type="error"
373
+          :closable="false"
374
+          show-icon>
375
+        </el-alert>
376
+      </div>
377
+      <span slot="footer" class="dialog-footer">
378
+        <el-button type="primary" @click="showDuplicateAlert = false">我知道了</el-button>
379
+      </span>
380
+    </el-dialog>
363 381
   </div>
364 382
 
365 383
 </template>
@@ -379,7 +397,8 @@
379 397
     postWarehouse,
380 398
     postSearchGoodList,
381 399
     toCheckWarehouseInfo,
382
-    toReturnCheckWarehouseInfo
400
+    toReturnCheckWarehouseInfo,
401
+    getRepatGoodList
383 402
   } from '@/api/stock'
384 403
   import BreadCrumb from '../components/bread-crumb'
385 404
 
@@ -512,6 +531,9 @@
512 531
         currentRow:{},
513 532
         currentIndex:0,
514 533
         textarea:"",
534
+        duplicateList:[],
535
+        showDuplicateAlert:false,
536
+        good_id:0,
515 537
       }
516 538
     },
517 539
     methods: {
@@ -1065,7 +1087,9 @@
1065 1087
        toCheckWarehouseInfo(params).then(response=>{
1066 1088
           if(response.data.state == 1){
1067 1089
             var list = response.data.data.list
1068
-            this.$message.success("审核成功!")
1090
+            // var total_one = response.data.data.total_one
1091
+            // var total_two = response.data.data.total_two
1092
+            // this.$message.success("审核成功!,追溯码成功"+total_one+"个"+"追溯码重复"+total_two+"个")
1069 1093
             this.showCheck = false
1070 1094
             this.showReturnCheck = true
1071 1095
             this.$router.back(-1)
@@ -1117,6 +1141,9 @@
1117 1141
        }
1118 1142
      },
1119 1143
      changeGoodCode(row,index){
1144
+        
1145
+        this.good_id = 0
1146
+        this.good_id = row.good_id
1120 1147
         this.textarea=""
1121 1148
         this.textarea = row.good_code
1122 1149
         this.currentRow = row
@@ -1168,8 +1195,44 @@
1168 1195
 
1169 1196
           }
1170 1197
         }
1198
+        if (this.checkDuplicates()) {
1199
+          this.showDuplicateAlert = true
1200
+          return
1201
+        }
1202
+
1203
+        if(this.org_id == 10164 || this.org_id == 0){
1204
+           
1205
+          this.getRepatGood(this.textarea,this.good_id)
1206
+        }
1207
+      
1171 1208
         this.dialogVisible = false
1172 1209
       },
1210
+      getCodeList() {
1211
+        return this.textarea.replace(/\n/g,',')  .split(',').map(item => item.trim()).filter(item => item !== '') 
1212
+      },
1213
+      checkDuplicates() {
1214
+        const codes = this.getCodeList()
1215
+        const countMap = new Map()
1216
+        this.duplicateList = []
1217
+        this.duplicateCount = 0
1218
+        
1219
+        // 统计出现次数
1220
+        codes.forEach(code => {
1221
+          countMap.set(code, (countMap.get(code) || 0) + 1)
1222
+        })
1223
+        
1224
+        // 找出重复项
1225
+        countMap.forEach((count, code) => {
1226
+          if (count > 1) {
1227
+            this.duplicateList.push({
1228
+              value: code,
1229
+              count: count
1230
+            })
1231
+            this.duplicateCount += (count - 1)
1232
+          }
1233
+        })
1234
+      return this.duplicateList.length > 0
1235
+     },
1173 1236
      getGoodCode(val){
1174 1237
         var newArr = []
1175 1238
         var total = 0
@@ -1182,6 +1245,20 @@
1182 1245
             return ""
1183 1246
           }
1184 1247
         }
1248
+     },
1249
+     getRepatGood(val,good_id){
1250
+       console.log("val-----",val)
1251
+       console.log("good_id",good_id)
1252
+       var params = {
1253
+        good_str:val,
1254
+        good_id:good_id,
1255
+       }
1256
+       getRepatGoodList(params).then(response=>{
1257
+         if(response.data.state == 1){
1258
+           var msg = response.data.data.msg
1259
+           
1260
+         }
1261
+       })
1185 1262
      }
1186 1263
     }
1187 1264
     ,

+ 7 - 6
src/xt_pages/user/components/PatientDetail.vue Visa fil

@@ -1986,20 +1986,21 @@ export default {
1986 1986
       fetchPatient(id).then((response) => {
1987 1987
           console.log(response.data.data);
1988 1988
           if (response.data.state === 1) {
1989
-            
1990
-            this.$emit("tran-patient-info", response.data.data.patient);
1991
-            var patietInfo = response.data.data.patient;
1992
-            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
1993 1989
             var viewModels = response.data.data.viewModels
1994 1990
             var is_sub_super_admin = false
1995
-            var user_id = this.$store.getters.xt_user.user.id
1991
+            var user_name = this.$store.getters.xt_user.user.user_name
1996 1992
             this.is_show = false
1997 1993
             for(let i=0;i<viewModels.length;i++){
1998
-              if(user_id == viewModels[i].user_id){
1994
+              if(user_name == viewModels[i].user_name){
1999 1995
                   is_sub_super_admin = is_sub_super_admin
2000 1996
               }
2001 1997
             }
2002 1998
             this.is_show = is_sub_super_admin
1999
+            console.log("is_shjow==========",this.is_show)
2000
+            this.$emit("tran-patient-info", response.data.data.patient);
2001
+            var patietInfo = response.data.data.patient;
2002
+            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
2003
+          
2003 2004
             console.log("触发了吗无222222", patietInfo);
2004 2005
             this.form.avatar = patietInfo.avatar;
2005 2006
             this.form.name = patietInfo.name;

+ 4 - 3
src/xt_pages/user/components/PatientForm.vue Visa fil

@@ -2100,15 +2100,16 @@ export default {
2100 2100
             var patietInfo = response.data.data.patient;
2101 2101
             var viewModels = response.data.data.viewModels
2102 2102
             var is_sub_super_admin = false
2103
-            var user_id = this.$store.getters.xt_user.user.id
2104
-            console.log("user_id=====",user_id)
2103
+            var user_name = this.$store.getters.xt_user.user.user_name
2104
+            console.log("user_id=====",this.$store.getters.xt_user.user)
2105 2105
             this.is_show = false
2106 2106
             for(let i=0;i<viewModels.length;i++){
2107
-              if(user_id == viewModels[i].user_id){
2107
+              if(user_name == viewModels[i].user_name){
2108 2108
                   is_sub_super_admin = is_sub_super_admin
2109 2109
               }
2110 2110
             }
2111 2111
             this.is_show = is_sub_super_admin
2112
+            console.log("is_show==============",this.is_show)
2112 2113
             this.fileList = []
2113 2114
             var arrNew = []
2114 2115
             if(patietInfo.org_logo!=""){

+ 13 - 13
src/xt_permission.js Visa fil

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 13
 router.beforeEach((to, from, next) => {
14 14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28 28
 //  // 线上注释
29 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))