Browse Source

Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 2022-10-17_vue_schedule_branch

test_user 2 years ago
parent
commit
f3a4bb445c
30 changed files with 3057 additions and 161 deletions
  1. 8 0
      src/api/config.js
  2. 22 10
      src/router/modules/dialysis.js
  3. 30 1
      src/xt_pages/data/basicConfig.vue
  4. 11 8
      src/xt_pages/data/components/dialysisAfter.vue
  5. 10 8
      src/xt_pages/data/components/dialysisBefore.vue
  6. 9 8
      src/xt_pages/data/components/dialysisComputer.vue
  7. 11 8
      src/xt_pages/data/components/dialysisMonitor.vue
  8. 11 8
      src/xt_pages/data/components/dialysisOff.vue
  9. 15 10
      src/xt_pages/data/components/dialysisPrescription.vue
  10. 12 9
      src/xt_pages/data/components/dialysisSummary.vue
  11. 10 8
      src/xt_pages/data/components/doubleCheck.vue
  12. 11 8
      src/xt_pages/data/components/receiveTreatmentAsses.vue
  13. 1 0
      src/xt_pages/data/showConfig.vue
  14. 3 3
      src/xt_pages/dialysis/PatientBox.vue
  15. 2 2
      src/xt_pages/dialysis/details/DialysisPrescription.vue
  16. 2 2
      src/xt_pages/dialysis/details/assessmentAfter.vue
  17. 1 1
      src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue
  18. 6 6
      src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue
  19. 32 16
      src/xt_pages/dialysis/details/dialog/monitor_dialog.vue
  20. 8 8
      src/xt_pages/dialysis/details/dialysisMonitoring.vue
  21. 24 3
      src/xt_pages/dialysis/dialysisPrintOrder.vue
  22. 8 9
      src/xt_pages/dialysis/newDoctorAdvice.vue
  23. 2679 0
      src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue
  24. 1 0
      src/xt_pages/stock/drugs/drugStockFlow.vue
  25. 67 16
      src/xt_pages/stock/drugs/drugStockOutOrder.vue
  26. 9 1
      src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue
  27. 3 0
      src/xt_pages/stock/stockFlow.vue
  28. 40 5
      src/xt_pages/stock/stockOutOrder.vue
  29. 8 0
      src/xt_pages/stock/stockOutOrderEdit.vue
  30. 3 3
      src/xt_pages/workforce/remind_print_setting_one.vue

+ 8 - 0
src/api/config.js View File

@@ -217,3 +217,11 @@ export function changeSettleOpenConfig(params) {
217 217
     params: params
218 218
   })
219 219
 }
220
+
221
+export function changeGoodOutOpen(params) {
222
+  return request({
223
+    url: '/api/changegoodoutopen',
224
+    method: 'Get',
225
+    params: params
226
+  })
227
+}

+ 22 - 10
src/router/modules/dialysis.js View File

@@ -38,24 +38,24 @@ export default {
38 38
     //     noCache: true
39 39
     //   }
40 40
     // },
41
-    {
42
-      path: '/dialysis/dialysisDoctorAdvice',
43
-      component: () => import('@/xt_pages/dialysis/dialysisDoctorAdvice'),
44
-      name: '透析医嘱',
45
-      meta: {
46
-        title: '透析医嘱',
47
-        noCache: true
48
-      }
49
-    },
50 41
     // {
51 42
     //   path: '/dialysis/dialysisDoctorAdvice',
52
-    //   component: () => import('@/xt_pages/dialysis/newDoctorAdvice'),
43
+    //   component: () => import('@/xt_pages/dialysis/dialysisDoctorAdvice'),
53 44
     //   name: '透析医嘱',
54 45
     //   meta: {
55 46
     //     title: '透析医嘱',
56 47
     //     noCache: true
57 48
     //   }
58 49
     // },
50
+    {
51
+      path: '/dialysis/dialysisDoctorAdvice',
52
+      component: () => import('@/xt_pages/dialysis/newDoctorAdvice'),
53
+      name: '透析医嘱',
54
+      meta: {
55
+        title: '透析医嘱',
56
+        noCache: true
57
+      }
58
+    },
59 59
     {
60 60
       path: '/dialysis/doctorAdvicePrint',
61 61
       component: () => import('@/xt_pages/dialysis/doctorAdvicePrint'),
@@ -359,6 +359,18 @@ export default {
359 359
         noCache: true
360 360
       }
361 361
     },
362
+    {
363
+      path: '/dialysis/print/batch/sixtyOne',
364
+      component: () =>
365
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyOne'),
366
+      hidden: true,
367
+      is_menu: false,
368
+      name: 'dialysis_batch_sixtyOne',
369
+      meta: {
370
+        title: '批量打印',
371
+        noCache: true
372
+      }
373
+    },
362 374
     {
363 375
       path: '/dialysis/print/batch/seven',
364 376
       component: () =>

+ 30 - 1
src/xt_pages/data/basicConfig.vue View File

@@ -42,6 +42,9 @@
42 42
             <p style="margin-top:20px;">药品在保存处方时出库:
43 43
                 <el-switch v-model="drug_out_open" @change="changeDrugOpen"></el-switch>
44 44
             </p>
45
+             <p style="margin-top:20px;">耗材在保存处方时出库:
46
+                <el-switch v-model="good_out_open" @change="changeGoodOutOpen"></el-switch>
47
+            </p>
45 48
 
46 49
             <p style="margin-top:20px;">药品耗材在结算时出库:
47 50
                 <el-switch v-model="drug_settle_open" @change="changeSettleOpen"></el-switch>
@@ -101,7 +104,7 @@
101 104
 
102 105
 <script>
103 106
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
104
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig} from '@/api/config'
107
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList,postXtHisProjectIsOpen,changeStockSetting,changeAdviceConfig,changePrescriptionConfig,changeDrugOpenConfig,changeSettleOpenConfig,changeGoodOutOpen} from '@/api/config'
105 108
 
106 109
 export default {
107 110
   name: "printTemplate",
@@ -124,6 +127,7 @@ export default {
124 127
       is_open_prescription_xt_his:false,
125 128
       drug_out_open:false,
126 129
       drug_settle_open:false,
130
+      good_out_open:false,
127 131
     };
128 132
   },
129 133
   methods: {
@@ -175,6 +179,12 @@ export default {
175 179
               this.drug_settle_open = false
176 180
             }
177 181
 
182
+            if(response.data.data.is_out_open == 1){
183
+              this.good_out_open = true
184
+            }else{
185
+              this.good_out_open = false
186
+            }
187
+
178 188
           } else {
179 189
             this.$message.error(response.data.msg)
180 190
           }
@@ -435,7 +445,26 @@ export default {
435 445
             this.getInitIsOpenConfig()
436 446
           }
437 447
       })
448
+    },
449
+    
450
+    changeGoodOutOpen(){
451
+      var good_open = 0
452
+      if(this.good_out_open == false){
453
+        good_open = 2
454
+      }
455
+      if(this.good_out_open == true){
456
+         good_open = 1
457
+      }
458
+      var params= {
459
+        good_open:good_open,
460
+      }
461
+      changeGoodOutOpen(params).then(response=>{
462
+        if(response.data.state == 1){
463
+          this.$message.success("保存成功!")
464
+        }
465
+      })
438 466
     }
467
+    
439 468
 
440 469
   },
441 470
   created() {

+ 11 - 8
src/xt_pages/data/components/dialysisAfter.vue View File

@@ -48,6 +48,16 @@
48 48
               @click="handleHide(scope.$index, scope.row)"
49 49
             >
50 50
             </el-button>
51
+
52
+            <el-button
53
+              v-if="scope.row.is_show == 2"
54
+              size="small"
55
+              type="primary"
56
+              icon="el-icon-view"
57
+              @click="handleShow(scope.$index, scope.row)"
58
+            >
59
+            </el-button>
60
+            
51 61
             <el-button
52 62
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
53 63
               size="small"
@@ -57,14 +67,7 @@
57 67
             >
58 68
             </el-button>
59 69
 
60
-             <el-button
61
-              v-if="scope.row.is_show == 2"
62
-              size="small"
63
-              type="primary"
64
-              icon="el-icon-view"
65
-              @click="handleShow(scope.$index, scope.row)"
66
-            >
67
-            </el-button>
70
+           
68 71
             <el-button
69 72
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
70 73
               size="small"

+ 10 - 8
src/xt_pages/data/components/dialysisBefore.vue View File

@@ -47,14 +47,6 @@
47 47
               icon="el-icon-remove-outline"
48 48
               @click="handleHide(scope.$index, scope.row)"
49 49
             >
50
-            </el-button>
51
-            <el-button
52
-              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
53
-              size="small"
54
-              type="danger"
55
-              icon="el-icon-remove-outline"
56
-              @click="handleHideOne(scope.$index, scope.row)"
57
-            >
58 50
             </el-button>
59 51
 
60 52
              <el-button
@@ -65,6 +57,16 @@
65 57
               @click="handleShow(scope.$index, scope.row)"
66 58
             >
67 59
             </el-button>
60
+
61
+            <el-button
62
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
63
+              size="small"
64
+              type="danger"
65
+              icon="el-icon-remove-outline"
66
+              @click="handleHideOne(scope.$index, scope.row)"
67
+            >
68
+            </el-button>
69
+
68 70
             <el-button
69 71
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
70 72
               size="small"

+ 9 - 8
src/xt_pages/data/components/dialysisComputer.vue View File

@@ -50,6 +50,14 @@
50 50
               @click="handleHide(scope.$index, scope.row)"
51 51
             >
52 52
             </el-button>
53
+            <el-button
54
+              v-if="scope.row.is_show == 2"
55
+              size="small"
56
+              type="primary"
57
+              icon="el-icon-view"
58
+              @click="handleShow(scope.$index, scope.row)"
59
+            >
60
+            </el-button>
53 61
             <el-button
54 62
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
55 63
               size="small"
@@ -59,14 +67,7 @@
59 67
             >
60 68
             </el-button>
61 69
 
62
-             <el-button
63
-              v-if="scope.row.is_show == 2"
64
-              size="small"
65
-              type="primary"
66
-              icon="el-icon-view"
67
-              @click="handleShow(scope.$index, scope.row)"
68
-            >
69
-            </el-button>
70
+            
70 71
             <el-button
71 72
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
72 73
               size="small"

+ 11 - 8
src/xt_pages/data/components/dialysisMonitor.vue View File

@@ -48,6 +48,16 @@
48 48
               @click="handleHide(scope.$index, scope.row)"
49 49
             >
50 50
             </el-button>
51
+
52
+           <el-button
53
+              v-if="scope.row.is_show == 2"
54
+              size="small"
55
+              type="primary"
56
+              icon="el-icon-view"
57
+              @click="handleShow(scope.$index, scope.row)"
58
+            >
59
+            </el-button>
60
+            
51 61
             <el-button
52 62
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
53 63
               size="small"
@@ -57,14 +67,7 @@
57 67
             >
58 68
             </el-button>
59 69
 
60
-             <el-button
61
-              v-if="scope.row.is_show == 2"
62
-              size="small"
63
-              type="primary"
64
-              icon="el-icon-view"
65
-              @click="handleShow(scope.$index, scope.row)"
66
-            >
67
-            </el-button>
70
+            
68 71
             <el-button
69 72
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
70 73
               size="small"

+ 11 - 8
src/xt_pages/data/components/dialysisOff.vue View File

@@ -47,6 +47,16 @@
47 47
               @click="handleHide(scope.$index, scope.row)"
48 48
             >
49 49
             </el-button>
50
+          
51
+            <el-button
52
+              v-if="scope.row.is_show == 2"
53
+              size="small"
54
+              type="primary"
55
+              icon="el-icon-view"
56
+              @click="handleShow(scope.$index, scope.row)"
57
+            >
58
+            </el-button>
59
+
50 60
             <el-button
51 61
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
52 62
               size="small"
@@ -56,14 +66,7 @@
56 66
             >
57 67
             </el-button>
58 68
 
59
-             <el-button
60
-              v-if="scope.row.is_show == 2"
61
-              size="small"
62
-              type="primary"
63
-              icon="el-icon-view"
64
-              @click="handleShow(scope.$index, scope.row)"
65
-            >
66
-            </el-button>
69
+           
67 70
             <el-button
68 71
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
69 72
               size="small"

+ 15 - 10
src/xt_pages/data/components/dialysisPrescription.vue View File

@@ -48,14 +48,7 @@
48 48
               @click="handleHide(scope.$index, scope.row)"
49 49
             >
50 50
             </el-button>
51
-            <el-button
52
-              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
53
-              size="small"
54
-              type="danger"
55
-              icon="el-icon-remove-outline"
56
-              @click="handleHideOne(scope.$index, scope.row)"
57
-            >
58
-            </el-button>
51
+           
59 52
 
60 53
              <el-button
61 54
               v-if="scope.row.is_show == 2"
@@ -65,6 +58,16 @@
65 58
               @click="handleShow(scope.$index, scope.row)"
66 59
             >
67 60
             </el-button>
61
+
62
+           <el-button
63
+              v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
64
+              size="small"
65
+              type="danger"
66
+              icon="el-icon-remove-outline"
67
+              @click="handleHideOne(scope.$index, scope.row)"
68
+            >
69
+            </el-button>
70
+
68 71
             <el-button
69 72
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
70 73
               size="small"
@@ -103,7 +106,8 @@ export default {
103 106
             if (response.data.state == 1) {
104 107
               let params = {
105 108
                 id: response.data.data.id,
106
-                is_show: response.data.data.is_show
109
+                is_show: response.data.data.is_show,
110
+                is_write:response.data.data.is_write,
107 111
               };
108 112
               store.dispatch("updateFiledConfigList", params).then(() => {});
109 113
               this.$emit("change", params);
@@ -127,7 +131,8 @@ export default {
127 131
             if (response.data.state == 1) {
128 132
               let params = {
129 133
                 id: response.data.data.id,
130
-                is_show: response.data.data.is_show
134
+                is_show: response.data.data.is_show,
135
+                is_write:response.data.data.is_write,
131 136
               };
132 137
               store.dispatch("updateFiledConfigList", params).then(() => {});
133 138
               this.$emit("change", params);

+ 12 - 9
src/xt_pages/data/components/dialysisSummary.vue View File

@@ -48,6 +48,15 @@
48 48
               @click="handleHide(scope.$index, scope.row)"
49 49
             >
50 50
             </el-button>
51
+          
52
+            <el-button
53
+              v-if="scope.row.is_show == 2"
54
+              size="small"
55
+              type="primary"
56
+              icon="el-icon-view"
57
+              @click="handleShow(scope.$index, scope.row)"
58
+            >
59
+            </el-button>
51 60
             <el-button
52 61
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
53 62
               size="small"
@@ -57,14 +66,7 @@
57 66
             >
58 67
             </el-button>
59 68
 
60
-             <el-button
61
-              v-if="scope.row.is_show == 2"
62
-              size="small"
63
-              type="primary"
64
-              icon="el-icon-view"
65
-              @click="handleShow(scope.$index, scope.row)"
66
-            >
67
-            </el-button>
69
+            
68 70
             <el-button
69 71
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
70 72
               size="small"
@@ -127,7 +129,7 @@ export default {
127 129
             if (response.data.state == 1) {
128 130
               let params = {
129 131
                 id: response.data.data.id,
130
-                is_show: response.data.data.is_show
132
+                is_show: response.data.data.is_show,
131 133
               };
132 134
               store.dispatch("updateFiledConfigList", params).then(() => {});
133 135
               this.$emit("change", params);
@@ -169,6 +171,7 @@ export default {
169 171
     },
170 172
   
171 173
     handleShowOne: function(index, row) {
174
+      console.log("row233223322332332wo",row)
172 175
       this.$confirm("是否将该字段设为必填?", "提示", {
173 176
         confirmButtonText: "确 定",
174 177
         cancelButtonText: "取 消",

+ 10 - 8
src/xt_pages/data/components/doubleCheck.vue View File

@@ -48,6 +48,16 @@
48 48
               @click="handleHide(scope.$index, scope.row)"
49 49
             >
50 50
             </el-button>
51
+
52
+           <el-button
53
+              v-if="scope.row.is_show == 2"
54
+              size="small"
55
+              type="primary"
56
+              icon="el-icon-view"
57
+              @click="handleShow(scope.$index, scope.row)"
58
+            >
59
+            </el-button>
60
+
51 61
             <el-button
52 62
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
53 63
               size="small"
@@ -57,14 +67,6 @@
57 67
             >
58 68
             </el-button>
59 69
 
60
-             <el-button
61
-              v-if="scope.row.is_show == 2"
62
-              size="small"
63
-              type="primary"
64
-              icon="el-icon-view"
65
-              @click="handleShow(scope.$index, scope.row)"
66
-            >
67
-            </el-button>
68 70
             <el-button
69 71
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
70 72
               size="small"

+ 11 - 8
src/xt_pages/data/components/receiveTreatmentAsses.vue View File

@@ -48,6 +48,16 @@
48 48
               @click="handleHide(scope.$index, scope.row)"
49 49
             >
50 50
             </el-button>
51
+
52
+           <el-button
53
+              v-if="scope.row.is_show == 2"
54
+              size="small"
55
+              type="primary"
56
+              icon="el-icon-view"
57
+              @click="handleShow(scope.$index, scope.row)"
58
+            >
59
+            </el-button>
60
+          
51 61
             <el-button
52 62
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 1"
53 63
               size="small"
@@ -57,14 +67,7 @@
57 67
             >
58 68
             </el-button>
59 69
 
60
-             <el-button
61
-              v-if="scope.row.is_show == 2"
62
-              size="small"
63
-              type="primary"
64
-              icon="el-icon-view"
65
-              @click="handleShow(scope.$index, scope.row)"
66
-            >
67
-            </el-button>
70
+            
68 71
             <el-button
69 72
               v-if="scope.row.is_write!=undefined&&scope.row.is_write == 0"
70 73
               size="small"

+ 1 - 0
src/xt_pages/data/showConfig.vue View File

@@ -123,6 +123,7 @@ export default {
123 123
         if (this.dialysis_prescription_data[i].id == object.id) {
124 124
           this.dialysis_prescription_data[i].is_show = object.is_show;
125 125
            if(object.is_write!=undefined){
126
+            console.log("obj3323322332",object.is_write)
126 127
            this.dialysis_prescription_data[i].is_write = object.is_write
127 128
           }
128 129
         }

+ 3 - 3
src/xt_pages/dialysis/PatientBox.vue View File

@@ -98,9 +98,9 @@
98 98
             {{schedule.assessment_before_dislysis? schedule.assessment_before_dislysis.weight_before: ""}}
99 99
             <span v-if="schedule.assessment_after_dislysis &&schedule.assessment_after_dislysis.weight_after > 0">/{{schedule.assessment_after_dislysis? schedule.assessment_after_dislysis.weight_after: ""}}</span>
100 100
           </span>
101
-          <span v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
101
+          <!-- <span v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
102 102
             核酸检测日期:<span v-if="schedule.dialysis_order!=null">{{getTimeOne(schedule.dialysis_order.nuclein_date)}}</span>
103
-          </span>
103
+          </span> -->
104 104
         </p>
105 105
         <p>
106 106
           <span v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
@@ -171,7 +171,7 @@
171 171
         </p>
172 172
       
173 173
         <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
174
-           备注:{{schedule.patient.sch_remark}}
174
+           排班备注:{{schedule.dialysis_order&& schedule.dialysis_order.schedule_remark?schedule.dialysis_order.schedule_remark:schedule.patient.schedule_remark}}
175 175
         </p>
176 176
       </div>
177 177
       <div

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue View File

@@ -142,8 +142,8 @@
142 142
           <label>目标超滤量 : </label>
143 143
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
144 144
           
145
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
146
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
145
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
146
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
147 147
         </li>
148 148
 
149 149
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

+ 2 - 2
src/xt_pages/dialysis/details/assessmentAfter.vue View File

@@ -17,8 +17,8 @@
17 17
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
18 18
             actual_ultrafiltration
19 19
           }}</span>
20
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || 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 == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ) " >ml</span>
21
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  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!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432"  >L</span>
20
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || 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 == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
21
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  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!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445"  >L</span>
22 22
         </li>
23 23
         <li v-if="isShow('导管')">
24 24
           <label>导管 : </label>

+ 1 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue View File

@@ -28,7 +28,7 @@
28 28
           <el-col :span="8" v-if="isShow('实际超滤量')">
29 29
             <el-form-item
30 30
               label="实际超滤量(ml): "
31
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432"  >
31
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
32 32
               <el-input v-model="form.actual_ultrafiltration"></el-input>
33 33
             </el-form-item>
34 34
             <el-form-item label="实际超滤量(L): " v-else>

+ 6 - 6
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -95,7 +95,7 @@
95 95
                     </el-col>
96 96
 
97 97
                     <el-col :span="8"
98
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432)">
98
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445)">
99 99
                         <el-form-item label="目标超滤量(ml):">
100 100
                             <el-input
101 101
                                     type="number"
@@ -106,7 +106,7 @@
106 106
 
107 107
 
108 108
                     <el-col :span="8"
109
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432">
109
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445">
110 110
                         <el-form-item label="目标超滤量(L):">
111 111
                             <el-input
112 112
                                     type="number"
@@ -486,7 +486,7 @@
486 486
 
487 487
 
488 488
                     <el-col :span="8"
489
-                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46 || this.$store.getters.xt_user.template_info.template_id == 53)"
489
+                            v-if="isShows('置换量') && ((this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46 || this.$store.getters.xt_user.template_info.template_id == 53)&& this.$store.getters.xt_user.template_info.org_id!=10441)"
490 490
                             v-show="zhiShow">
491 491
                         <el-form-item label="置换量(ml):">
492 492
                             <el-input
@@ -496,7 +496,7 @@
496 496
                         </el-form-item>
497 497
                     </el-col>
498 498
                     <el-col :span="8"
499
-                            v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 46 && this.$store.getters.xt_user.template_info.template_id != 53"
499
+                            v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 46 && this.$store.getters.xt_user.template_info.template_id != 53) || this.$store.getters.xt_user.template_info.org_id == 10441"
500 500
                             v-show="zhiShow">
501 501
                         <el-form-item label="置换量(L):">
502 502
                             <el-input
@@ -730,7 +730,7 @@
730 730
                     </el-col>
731 731
 
732 732
                     <el-col :span="8"
733
-                            v-if="isShows('置换液总量') && ((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10249)"
733
+                            v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
734 734
                             v-show="totalShow">
735 735
                         <el-form-item label="置换液总量(ml)">
736 736
                             <el-input
@@ -739,7 +739,7 @@
739 739
                         </el-form-item>
740 740
                     </el-col>
741 741
                     <el-col :span="8"
742
-                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249"
742
+                            v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
743 743
                             v-show="totalShow">
744 744
                         <el-form-item label="置换液总量(L)">
745 745
                             <el-input

+ 32 - 16
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

@@ -237,7 +237,8 @@
237 237
                 template_id == 60 ||
238 238
                 org_id == 10210 ||
239 239
                 org_id == 9555 || org_id == 10387
240
-                || org_id == 10432)
240
+                || org_id == 10432
241
+                || org_id == 10445)
241 242
             "
242 243
           >
243 244
             <template slot-scope="scope">
@@ -294,7 +295,7 @@
294 295
               template_id != 60 &&
295 296
               org_id!= 10210 &&
296 297
               org_id != 9555 && org_id!=10387
297
-              && org_id!=10432
298
+              && org_id!=10432 && org_id!=10445
298 299
             "
299 300
           >
300 301
             <template slot-scope="scope">
@@ -343,7 +344,8 @@
343 344
                 template_id == 56 ||
344 345
                 template_id == 47 ||
345 346
                 template_id == 60 ||
346
-                org_id == 10432)
347
+                org_id == 10432 ||
348
+                org_id == 10445)
347 349
             "
348 350
           >
349 351
             <template slot-scope="scope">
@@ -391,7 +393,8 @@
391 393
               template_id != 48 &&
392 394
               template_id != 47 &&
393 395
               template_id != 60 &&
394
-              org_id!=10432
396
+              org_id!=10432 &&
397
+              org_id!=10445
395 398
             "
396 399
           >
397 400
             <template slot-scope="scope">
@@ -449,7 +452,9 @@
449 452
                 template_id == 53 ||
450 453
                 template_id == 54 ||
451 454
                 template_id == 56 ||
452
-                org_id ==10432
455
+                org_id ==10432 || 
456
+                org_id ==10445
457
+              
453 458
                )
454 459
             "
455 460
           >
@@ -475,7 +480,8 @@
475 480
               template_id != 53 &&
476 481
               template_id != 54 &&
477 482
               template_id != 56 &&
478
-              org_id !=10432
483
+              org_id !=10432 && 
484
+              org_id !=10445
479 485
             "
480 486
           >
481 487
             <template slot-scope="scope">
@@ -519,7 +525,8 @@
519 525
                 template_id == 56 ||
520 526
                 template_id == 48 ||
521 527
                 org_id == 10340 ||
522
-                org_id == 10432)
528
+                org_id == 10432 ||
529
+                org_id == 10445)
523 530
             "
524 531
           >
525 532
             <template slot-scope="scope">
@@ -550,7 +557,8 @@
550 557
               template_id != 56 &&
551 558
               template_id != 48 &&
552 559
               org_id !=10340 &&
553
-              org_id !=10432
560
+              org_id !=10432 &&
561
+              org_id !=10445
554 562
             "
555 563
           >
556 564
             <template slot-scope="scope">
@@ -1041,7 +1049,8 @@
1041 1049
                 template_id == 56 ||
1042 1050
                 template_id == 47 ||
1043 1051
                 template_id == 60 ||
1044
-                org_id== 10432)
1052
+                org_id== 10432 || 
1053
+                org_id== 10445)
1045 1054
             "
1046 1055
           >
1047 1056
             <el-form-item label="超滤率(ml/h)">
@@ -1082,7 +1091,8 @@
1082 1091
               template_id != 56 &&
1083 1092
               template_id != 47 &&
1084 1093
               template_id != 60 &&
1085
-              org_id!=10432
1094
+              org_id!=10432 && 
1095
+              org_id!=10445
1086 1096
             "
1087 1097
           >
1088 1098
             <el-form-item label="超滤率(L/h)">
@@ -1133,7 +1143,8 @@
1133 1143
                 org_id == 9555 ||
1134 1144
                 org_id == 10340 ||
1135 1145
                 org_id == 10387 ||
1136
-                org_id == 10432)
1146
+                org_id == 10432 ||
1147
+                org_id == 10445)
1137 1148
             "
1138 1149
           >
1139 1150
             <el-form-item label="超滤量(ml):">
@@ -1184,7 +1195,8 @@
1184 1195
               org_id !=  10340 &&
1185 1196
               org_id != 9555 &&
1186 1197
               org_id!=10387&&
1187
-              org_id!=10432
1198
+              org_id!=10432 && 
1199
+              org_id!=10445
1188 1200
             "
1189 1201
           >
1190 1202
             <el-form-item label="超滤量(L):">
@@ -1220,7 +1232,8 @@
1220 1232
               template_id != 54 &&
1221 1233
               template_id != 56 &&
1222 1234
               template_id != 53 &&
1223
-              org_id!=10432
1235
+              org_id!=10432 &&
1236
+              org_id!=10445
1224 1237
             "
1225 1238
           >
1226 1239
             <el-form-item label="置换率(L/h):">
@@ -1242,7 +1255,8 @@
1242 1255
                 template_id == 54 ||
1243 1256
                 template_id == 56 ||
1244 1257
                 template_id == 48 ||
1245
-                org_id==10432)
1258
+                org_id==10432 ||
1259
+                org_id!=10445)
1246 1260
             "
1247 1261
           >
1248 1262
             <el-form-item label="置换率(ml/min):">
@@ -1271,7 +1285,8 @@
1271 1285
               template_id != 56 &&
1272 1286
               template_id != 48 &&
1273 1287
               org_id!=10340 && 
1274
-              org_id!=10432
1288
+              org_id!=10432 && 
1289
+              org_id!=10445
1275 1290
             "
1276 1291
           >
1277 1292
             <el-form-item label="置换量(L):">
@@ -1297,7 +1312,8 @@
1297 1312
                 template_id == 56 ||
1298 1313
                 template_id == 48 ||
1299 1314
                 org_id!=10340 ||
1300
-                org_id ==10432)
1315
+                org_id ==10432 ||
1316
+                org_id ==10445)
1301 1317
             "
1302 1318
           >
1303 1319
             <el-form-item label="置换量(ml):">

+ 8 - 8
src/xt_pages/dialysis/details/dialysisMonitoring.vue View File

@@ -14,17 +14,17 @@
14 14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15 15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16 16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
17
-          <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 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432)" width="76px" > 超滤量(ml)</th>
18
-          <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 && 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!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432"  width="76px"> 超滤量(L) </th>
19
-          <th v-if="isShow('超滤率') && (template_id ==6 || 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)" width="50px"> 超滤率 <br />(ml/h) </th>
20
-          <th v-if="isShow('超滤率') && template_id !=6 && 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" width="50px"> 超滤率 <br />(L/h) </th>
17
+          <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 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445)" width="76px" > 超滤量(ml)</th>
18
+          <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 && 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!=10387 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445"  width="76px"> 超滤量(L) </th>
19
+          <th v-if="isShow('超滤率') && (template_id ==6 || 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)" width="50px"> 超滤率 <br />(ml/h) </th>
20
+          <th v-if="isShow('超滤率') && template_id !=6 && 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" width="50px"> 超滤率 <br />(L/h) </th>
21 21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
22 22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
23
-          <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) " width="92px" > 置换率(ml/min) </th>
24
-          <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" width="92px" > 置换率(L/h)  </th>
23
+          <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) " width="92px" > 置换率(ml/min) </th>
24
+          <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" width="92px" > 置换率(L/h)  </th>
25 25
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
26
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || 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 )" width="92px"  > 置换量(ml)  </th>
27
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && 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)" width="92px" > 置换量(L) </th>
26
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || 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 )" width="92px"  > 置换量(ml)  </th>
27
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && 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)" width="92px" > 置换量(L) </th>
28 28
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
29 29
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
30 30
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>

+ 24 - 3
src/xt_pages/dialysis/dialysisPrintOrder.vue View File

@@ -772,6 +772,18 @@
772 772
           >打印</el-button
773 773
         >
774 774
       </template>
775
+       <template v-if="org_template_info.template_id == 62">
776
+        <div>
777
+          <el-button
778
+            :loading="loading"
779
+            size="small"
780
+            icon="el-icon-printer"
781
+            @click="printThisPage"
782
+            type="primary"
783
+            >打印</el-button
784
+          >
785
+        </div>
786
+      </template>
775 787
       
776 788
     </div>
777 789
     <div class="app-container" style="min-height: 0">
@@ -1204,6 +1216,10 @@
1204 1216
           v-bind:childResponse="childResponse"
1205 1217
             v-if="org_template_info.template_id == 61">
1206 1218
           </DialysisPrintOrderSixtyOne>
1219
+          <DialysisPrintOrderSixtyTwo
1220
+          v-bind:childResponse="childResponse"
1221
+            v-if="org_template_info.template_id == 62">
1222
+          </DialysisPrintOrderSixtyTwo>
1207 1223
         </div>
1208 1224
       </el-container>
1209 1225
     </div>
@@ -1283,9 +1299,11 @@ import DialysisPrintOrderFiftyEight from "./template/DialysisPrintOrderFiftyEigh
1283 1299
 import DialysisPrintOrderFiftyNine from "./template/DialysisPrintOrderFiftyNine";
1284 1300
 import DialysisPrintOrderSixty from "./template/DialysisPrintOrderSixty";
1285 1301
 import DialysisPrintOrderSixtyOne from "./template/DialysisPrintOrderSixtyOne"
1302
+import DialysisPrintOrderSixtyTwo from "./template/DialysisPrintOrderSixtyTwo"
1286 1303
 export default {
1287 1304
   name: "dialysisPrintOrder",
1288 1305
   components: {
1306
+    DialysisPrintOrderSixtyTwo,
1289 1307
     DialysisPrintOrderSixtyOne,
1290 1308
     DialysisPrintOrderSixty,
1291 1309
     DialysisPrintOrderFiftyNine,
@@ -1530,7 +1548,7 @@ export default {
1530 1548
         '@media print {#dialysis-print-box-1{margin:0 auto;}.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 940px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}@page {margin-top:5px;}.table-box1 tr {border-bottom: 1px solid #000;}';
1531 1549
       const style10 =
1532 1550
         '@media print {.dialysis-print-order{width:960px;margin:0 auto} .dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:40px;font-size:14px}   .dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:40px;font-size:14px} .dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;line-height:35px} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}@page {margin-left:30px;margin-right:40px;}';
1533
-
1551
+      
1534 1552
       // 三明曙光样式
1535 1553
       const style11 =
1536 1554
         '@media print {.dialysis-print-order{width:960px;margin:100px auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:30px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:15px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
@@ -1541,6 +1559,9 @@ export default {
1541 1559
       // 长沙南鸭样式
1542 1560
       const style14 =// 防止分页错位问题:table设置border: none;.tr设置page-break-inside:avoid; // 防止table数据太多,tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
1543 1561
         '@media print {.dialysis-print-order{width:960px;margin:0 auto} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: 0} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 0} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:left;border-collapse:collapse;line-height:25px;font-size:14px} ';
1562
+      // 营口北方医院
1563
+      const style15 =
1564
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:35px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
1544 1565
       
1545 1566
       if (this.org_template_info.template_id == 1) {
1546 1567
         printJS({
@@ -1604,11 +1625,11 @@ export default {
1604 1625
           style: style4,
1605 1626
           scanStyles: false,
1606 1627
         });
1607
-      } else if (this.org_template_info.template_id == 8) {
1628
+      } else if (this.org_template_info.template_id == 8||this.org_template_info.template_id == 62) {
1608 1629
         printJS({
1609 1630
           printable: "dialysis-print-box",
1610 1631
           type: "html",
1611
-          style: style,
1632
+          style: style15,
1612 1633
           scanStyles: false,
1613 1634
         });
1614 1635
       } else if (

+ 8 - 9
src/xt_pages/dialysis/newDoctorAdvice.vue View File

@@ -152,11 +152,11 @@
152 152
           </ul>
153 153
         </div>
154 154
       </div>
155
-      <div style="margin-top: 10px;margin-left:600px;margin-bottom:10px">
155
+      <!-- <div style="margin-top: 10px;margin-left:600px;margin-bottom:10px">
156 156
         <el-button type="primary" size="small" @click="toExcution">执行医嘱</el-button>
157 157
         <el-button type="primary" size="small" @click="toCheck">医嘱核对</el-button>
158 158
         <el-button type="primary" size="small" @click="toSettle">收费</el-button>
159
-      </div>
159
+      </div> -->
160 160
 
161 161
 
162 162
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
@@ -737,7 +737,7 @@ export default {
737 737
                         parent_id:0,
738 738
                         groupno:0,
739 739
                         sort:item.device_number.sort,
740
-                        assess_time:item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
740
+                        assess_time:item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
741 741
                       }
742 742
                       item.doctor_advice.push(obj)
743 743
                     })
@@ -762,7 +762,7 @@ export default {
762 762
            if(this.is_sort == 1){
763 763
               schedules.map(item => {
764 764
                   item.is_sort = item.device_number.sort
765
-                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
765
+                  item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
766 766
               })
767 767
               
768 768
                newList = schedules.sort(this.compare('is_sort'))
@@ -799,7 +799,6 @@ export default {
799 799
                     it.number = item.device_number.number
800 800
                     it.zone_name = item.device_number.zone.name
801 801
                     it.sort = item.device_number.sort,
802
-                   
803 802
                     arr.push(it)
804 803
                 })
805 804
                 item.is_sort = item.device_number.sort
@@ -868,7 +867,7 @@ export default {
868 867
            if(this.is_sort == 1){
869 868
               schedules.map(item => {
870 869
                   item.is_sort = item.device_number.sort
871
-                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
870
+                  item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
872 871
               })
873 872
               
874 873
                newList = schedules.sort(this.compare('is_sort'))
@@ -879,7 +878,7 @@ export default {
879 878
             if(this.is_sort == 2){
880 879
               schedules.map(item => {
881 880
                   item.is_sort = item.device_number.sort
882
-                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
881
+                  item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
883 882
               })
884 883
                newList = schedules.sort(this.compare('assess_time'))
885 884
             }
@@ -898,11 +897,11 @@ export default {
898 897
                     it.number = item.device_number.number
899 898
                     it.zone_name = item.device_number.zone.name
900 899
                     it.sort = item.device_number.sort,
901
-                   
902 900
                     arr.push(it)
903 901
                 })
904 902
               item.is_sort = item.device_number.sort
905
-              it.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
903
+              
904
+              item.assess_time = item.dialysisassesmentbefor&&item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
906 905
             })
907 906
             if(this.schedulType == 0){
908 907
                 newSchedules = arr

File diff suppressed because it is too large
+ 2679 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue


+ 1 - 0
src/xt_pages/stock/drugs/drugStockFlow.vue View File

@@ -498,6 +498,7 @@
498 498
        getDrugFlow(params).then(response=>{
499 499
           if(response.data.state ==1){
500 500
             var list = response.data.data.list
501
+
501 502
             console.log("list2o2o33o23233o3oowo",list)
502 503
             this.tableList = list
503 504
             var total = response.data.data.total

+ 67 - 16
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -292,8 +292,8 @@
292 292
 
293 293
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
294 294
                   <td style="border-right: none; border-inline-end:none;text-align: center">
295
-                    <span v-if="is_sys==1">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
296
-                    <!-- <span v-if="is_sys == 1"> {{getOutCount(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> -->
295
+                    <span v-if="is_sys==1 || is_sys == 5">{{getOutCountSix(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
296
+                    <span v-if="is_sys == 12">{{getOutCountSeven(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)}}</span>
297 297
                     <span v-if="is_sys == 0"> {{getOutCountOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
298 298
                   </td>
299 299
                </tr>
@@ -303,7 +303,7 @@
303 303
             <template slot-scope="scope">
304 304
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
305 305
                   <td style="border-right: none; border-inline-end:none;text-align: center">
306
-                    <span v-if="is_sys == 1">{{getBatchNumber(item.warehousing_detail_id)}}</span> 
306
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getBatchNumber(item.warehousing_detail_id)}}</span> 
307 307
                     <span v-if="is_sys == 0">{{getBatchNumberOne(item.batch_number)}}</span>
308 308
                   </td>
309 309
                </tr>
@@ -322,7 +322,7 @@
322 322
             <template slot-scope="scope">
323 323
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
324 324
                   <td style="border-right: none; border-inline-end: none;text-align: center">
325
-                    <span v-if="is_sys == 1">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
325
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
326 326
                     <span v-if="is_sys == 0">
327 327
                       <span v-if="scope.row.child.length == 1">
328 328
                          {{getPriceTwo(item.warehouse_out_id,item.drug_id)}}
@@ -341,7 +341,7 @@
341 341
             <template slot-scope="scope">
342 342
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
343 343
                   <td style="border-right: none; border-inline-end: none;text-align: center">
344
-                    <span v-if="is_sys == 1">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
344
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
345 345
                     <span v-if="is_sys == 0">
346 346
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
347 347
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
@@ -355,7 +355,7 @@
355 355
             <template slot-scope="scope">
356 356
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
357 357
                   <td style="border-right: none; border-inline-end: none;text-align: center">
358
-                    <span v-if="is_sys == 1"> {{getAllManufacturerName(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
358
+                    <span v-if="is_sys == 1 || is_sys == 5  || is_sys == 12"> {{getAllManufacturerName(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
359 359
                     <span v-if="is_sys == 0"> {{getManufacturerName(scope.row.manufacturer)}}</span>
360 360
                   </td>
361 361
                </tr>
@@ -365,7 +365,7 @@
365 365
             <template slot-scope="scope">
366 366
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
367 367
                   <td style="border-right: none; border-inline-end: none;text-align: center">
368
-                    <span v-if="is_sys == 1"> {{getProductDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
368
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12"> {{getProductDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
369 369
                     <span v-if="is_sys == 0"> {{getTime(scope.row.product_date)}}</span>
370 370
                   </td>
371 371
                </tr>
@@ -375,7 +375,7 @@
375 375
             <template slot-scope="scope">
376 376
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
377 377
                   <td style="border-right: none; border-inline-end: none;text-align: center">
378
-                   <span v-if="is_sys == 1"> {{getExpiryDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
378
+                   <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12"> {{getExpiryDate(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
379 379
                    <span v-if="is_sys == 0"> {{getTime(scope.row.expiry_date)}}</span>
380 380
                   </td>
381 381
                </tr>
@@ -385,7 +385,7 @@
385 385
             <template slot-scope="scope">
386 386
                 <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
387 387
                   <td style="border-right: none; border-inline-end: none;text-align: center">
388
-                    <span v-if="is_sys ==1">{{getDealer(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
388
+                    <span v-if="is_sys ==1 || is_sys ==5 || is_sys ==12">{{getDealer(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
389 389
                     <span v-if="is_sys ==0">{{getDealerName(scope.row.dealer)}}</span>  
390 390
                   </td>
391 391
                </tr>
@@ -395,7 +395,7 @@
395 395
             <template slot-scope="scope">
396 396
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
397 397
                   <td style="border-right: none; border-inline-end: none;text-align: center">
398
-                    <span v-if="is_sys == 1">{{getNumber(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
398
+                    <span v-if="is_sys == 1 || is_sys == 5  || is_sys == 12">{{getNumber(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span> 
399 399
                     <span v-if="is_sys == 0">{{scope.row.number}}</span> 
400 400
                   </td>
401 401
                </tr>
@@ -405,7 +405,7 @@
405 405
             <template slot-scope="scope">
406 406
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
407 407
                   <td style="border-right: none; border-inline-end: none;text-align: center">
408
-                    <span v-if="is_sys == 1">{{getRemark(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
408
+                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getRemark(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
409 409
                     <span v-if="is_sys == 0">{{scope.row.remark}}</span>
410 410
                   </td>
411 411
                </tr>
@@ -878,6 +878,10 @@ export default {
878 878
     },
879 879
 
880 880
     handleDelete: function (index, row) {
881
+      if (row.is_sys == 5) {
882
+        this.$message.error("结算出库数据不能删除!");
883
+        return;
884
+      }
881 885
       if (row.is_sys == 12) {
882 886
         this.$message.error("调拨出库数据不能删除!");
883 887
         return;
@@ -965,6 +969,11 @@ export default {
965 969
           this.$message.error("调拨出库数据不能删除!");
966 970
           return false;
967 971
         }
972
+        if (this.selectedTableData[i].is_sys == 5) {
973
+          this.$message.error("结算出库数据不能删除!");
974
+          return false;
975
+        }
976
+      
968 977
         if (this.selectedTableData[i].is_sys == 0) {
969 978
           ids.push(this.selectedTableData[i].id);
970 979
           if(this.selectedTableData[i].supply_cancel_out_id >0){
@@ -1227,7 +1236,7 @@ export default {
1227 1236
             this.drugFlowList = drugFlowList;
1228 1237
           }
1229 1238
 
1230
-          if (is_sys == 0 || is_sys == 12) {
1239
+          if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
1231 1240
             var flowlist = response.data.data.flowlist;
1232 1241
             this.drugFlowList = [];
1233 1242
             for (let i = 0; i < flowlist.length; i++) {
@@ -1268,14 +1277,14 @@ export default {
1268 1277
               list[i].number = "";
1269 1278
             }
1270 1279
             list[i].child = []
1271
-            if(list[i].is_sys == 1){
1280
+            if(list[i].is_sys == 1 ){
1272 1281
               for(let j=0;j<drugListOne.length;j++){
1273 1282
                 if(list[i].drug_id == drugListOne[j].drug_id){
1274 1283
                   list[i].child.push(drugListOne[j])
1275 1284
                 }
1276 1285
              }
1277 1286
             }
1278
-            if(list[i].is_sys == 0){
1287
+            if(list[i].is_sys == 0 || list[i].is_sys == 5  || list[i].is_sys == 12){
1279 1288
               for(let j=0;j<drugListTwo.length;j++){
1280 1289
                 if(list[i].drug_id == drugListTwo[j].drug_id){
1281 1290
                   list[i].child.push(drugListTwo[j])
@@ -1305,7 +1314,7 @@ export default {
1305 1314
           if (val.is_sys == 1) {
1306 1315
             this.drugDialogVisible = true;
1307 1316
           }
1308
-          if (val.is_sys == 0 || val.is_sys == 12) {
1317
+          if (val.is_sys == 0 || val.is_sys == 12 || val.is_sys == 5) {
1309 1318
             this.drugDialogVisibleTwo = true;
1310 1319
           }
1311 1320
           var userListOne = response.data.data.outList;
@@ -1647,14 +1656,56 @@ export default {
1647 1656
       var total = 0
1648 1657
       var max_str = ""
1649 1658
       var min_str = ""
1659
+      console.log("outlist",this.outList)
1660
+      console.log("warehouse_info_id",warehouse_info_id)
1650 1661
       for(let j=0;j<this.outList.length;j++){
1651 1662
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
1652 1663
            arr.push(this.outList[j])
1653 1664
         }
1654 1665
       }
1655
-      
1666
+       console.log("arr23322332",arr)
1667
+      if(arr.length > 0){
1668
+        for(let i=0;i<arr.length;i++){
1669
+           total +=arr[i].count
1670
+        }
1671
+      }
1672
+     
1673
+      if (total < min_number) {
1674
+        min_str = total + min_unit;
1675
+      }
1676
+      if (total == 0) {
1677
+        min_str = "";
1678
+        max_str = "";
1679
+      }
1680
+      if (total >= min_number) {
1681
+        if (parseInt(total / min_number) != 0) {
1682
+          max_str = parseInt(total / min_number) + max_unit;
1683
+        }
1684
+        if (total % min_number != 0) {
1685
+          min_str = (total % min_number) + min_unit;
1686
+        }
1687
+      }
1688
+      return max_str + min_str;
1689
+    },
1690
+     getOutCountSeven(warehouse_info_id,max_unit,min_unit,min_number,drug_id){
1691
+      var arr = []
1692
+      var total = 0
1693
+      var max_str = ""
1694
+      var min_str = ""
1695
+      console.log("outlist",this.outList)
1696
+      console.log("warehouse_info_id",warehouse_info_id)
1697
+      for(let j=0;j<this.outList.length;j++){
1698
+        if(this.outList[i].count_unit == max_unit){
1699
+           this.outList[i].count = this.outList[i].count * min_number
1700
+        }
1701
+        if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
1702
+           arr.push(this.outList[j])
1703
+        }
1704
+      }
1705
+       console.log("arr23322332",arr)
1656 1706
       if(arr.length > 0){
1657 1707
         for(let i=0;i<arr.length;i++){
1708
+
1658 1709
            total +=arr[i].count
1659 1710
         }
1660 1711
       }

+ 9 - 1
src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue View File

@@ -626,6 +626,10 @@ export default {
626 626
         this.$message.error("调拨出库数据不能新增!");
627 627
         return;
628 628
       }
629
+      if (parseInt(this.$route.query.is_sys) == 5) {
630
+        this.$message.error("结算出库数据不能新增!");
631
+        return;
632
+      }
629 633
       if (row.supply_cancel_out_id > 0) {
630 634
         this.$message.error("采购出库数据不能新增!");
631 635
         return;
@@ -667,6 +671,10 @@ export default {
667 671
         this.$message.error("调拨出库数据不能删除!");
668 672
         return;
669 673
       }
674
+      if (parseInt(this.$route.query.is_sys) == 5) {
675
+        this.$message.error("结算出库数据不能删除!");
676
+        return;
677
+      }
670 678
      if(parseInt(this.$route.query.is_check) == 1){
671 679
         this.$message.error("已审核的单据不能删除!")
672 680
         return false
@@ -1294,7 +1302,7 @@ export default {
1294 1302
     if (sys == 1) {
1295 1303
       this.drug_show = true;
1296 1304
     }
1297
-    if (sys == 12) {
1305
+    if (sys == 12 || sys==5) {
1298 1306
       this.drug_show = true;
1299 1307
     }
1300 1308
     if (parseInt(this.$route.query.supply_cancel_out_id) > 0 || parseInt(this.$route.query.is_check) == 1) {

+ 3 - 0
src/xt_pages/stock/stockFlow.vue View File

@@ -70,6 +70,7 @@
70 70
              <span v-if="scope.row.consumable_type == 11">盘亏</span>
71 71
              <span v-if="scope.row.consumable_type == 12">调拨出库</span>
72 72
              <span v-if="scope.row.consumable_type == 13">调拨入库</span>
73
+             <span v-if="scope.row.consumable_type == 15">结算出库</span>
73 74
            </template>
74 75
         </el-table-column>
75 76
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -82,6 +83,7 @@
82 83
             <span v-if="scope.row.consumable_type == 11">{{scope.row.warehouse_out_order_number}}</span>
83 84
             <span v-if="scope.row.consumable_type == 12">{{scope.row.warehouse_out_order_number}}</span>
84 85
             <span v-if="scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
86
+            <span v-if="scope.row.consumable_type == 15">{{scope.row.warehouse_out_order_number}}</span>
85 87
            </template>
86 88
         </el-table-column>
87 89
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -223,6 +225,7 @@
223 225
           {id:11,name:"盘亏"},
224 226
           {id:12,name:"调拨出库"},
225 227
           {id:13,name:"调拨入库"},
228
+          {id:15,name:"结算出库"},
226 229
         ],
227 230
         countList:[],
228 231
         outCountList:[],

+ 40 - 5
src/xt_pages/stock/stockOutOrder.vue View File

@@ -177,6 +177,7 @@
177 177
             <span v-if="scope.row.is_sys == 1">自动出库</span>
178 178
             <span v-if="scope.row.is_sys == 0">手动出库</span>
179 179
             <span v-if="scope.row.is_sys == 12">调拨出库</span>
180
+            <span v-if="scope.row.is_sys == 5">结算出库</span>
180 181
           </template>
181 182
         </el-table-column>
182 183
 
@@ -232,6 +233,8 @@
232 233
         :total="total"
233 234
       >
234 235
       </el-pagination>
236
+
237
+
235 238
       <!--  详情 -->
236 239
       <div v-show="tableShow" style="margin-top: 10px">
237 240
         <el-table
@@ -599,8 +602,12 @@
599 602
               <template slot="header" slot-scope="scope">
600 603
                 <span>使用人</span>
601 604
               </template>
602
-              <template slot-scope="scope"> 系统 </template>
605
+              <template slot-scope="scope"> 
606
+                <span v-if="scope.row.is_sys == 0">系统 </span> 
607
+                <span v-if="scope.row.is_sys == 5"> {{getRow(scope.row)}} </span> 
608
+              </template>
603 609
             </el-table-column>
610
+
604 611
             <el-table-column min-width="35" align="center">
605 612
               <template slot="header" slot-scope="scope">
606 613
                 <span>使用数量</span>
@@ -1043,6 +1050,7 @@ export default {
1043 1050
         { id: 1, name: "手动出库" },
1044 1051
         { id: 2, name: "自动出库" },
1045 1052
         { id: 3, name: "调拨出库" },
1053
+        { id: 5, name:"结算出库"  }
1046 1054
       ],
1047 1055
       check_type:0,
1048 1056
       checkList:[
@@ -1265,6 +1273,10 @@ export default {
1265 1273
         this.$message.error("调拨出库数据不能删除!");
1266 1274
         return false;
1267 1275
       }
1276
+     if (row.is_sys == 5) {
1277
+        this.$message.error("结算出库数据不能删除!");
1278
+        return false;
1279
+      }
1268 1280
       if (row.supply_cancel_out_id > 0) {
1269 1281
         this.$message.error("采购出库数据不能删除!");
1270 1282
         return false;
@@ -1339,6 +1351,7 @@ export default {
1339 1351
       const ids = [];
1340 1352
       const idOne = [];
1341 1353
       for (let i = 0; i < this.selectedTableData.length; i++) {
1354
+         
1342 1355
         if(this.selectedTableData[i].is_check == 1){
1343 1356
           this.$message.error("已审核单据不能删除!")
1344 1357
           return false
@@ -1347,6 +1360,10 @@ export default {
1347 1360
           this.$message.error("自动出库数据不能删除!");
1348 1361
           return false;
1349 1362
         }
1363
+        if (this.selectedTableData[i].is_sys == 5) {
1364
+          this.$message.error("结算出库数据不能删除!");
1365
+          return false;
1366
+        }
1350 1367
         if (this.selectedTableData[i].is_sys == 12) {
1351 1368
           this.$message.error("调拨出库数据不能删除!");
1352 1369
           return false;
@@ -1399,7 +1416,7 @@ export default {
1399 1416
     },
1400 1417
 
1401 1418
     handleSearch(val) {
1402
-      console.log("val322332232332i",val)
1419
+    
1403 1420
       this.is_sys = val.is_sys;
1404 1421
       this.tableList = [];
1405 1422
       this.editdialogVisibleThree = false;
@@ -1955,6 +1972,7 @@ export default {
1955 1972
           for (let i = 0; i <arrTwo.length; i++) {
1956 1973
             var obj = arrTwo[i];
1957 1974
             obj["is_total"] = 0;
1975
+            
1958 1976
             this.userList.push(obj);
1959 1977
             if(arrTwo[i].is_sys == 1){
1960 1978
               total = total + arrTwo[i].count - arrTwo[i].cancel_count;
@@ -1963,7 +1981,9 @@ export default {
1963 1981
             }
1964 1982
             
1965 1983
           }
1966
-          console.log("user_list23322323232323",this.userList)
1984
+
1985
+
1986
+         
1967 1987
           this.userList.push({
1968 1988
             is_total: 1,
1969 1989
             total: total,
@@ -1971,10 +1991,12 @@ export default {
1971 1991
           if (val.is_sys == 1) {
1972 1992
             this.editdialogVisibleThree = true;
1973 1993
           }
1974
-          if (val.is_sys == 0) {
1994
+          if (val.is_sys == 0 || val.is_sys == 5) {
1975 1995
             this.editdialogVisibleTwo = true;
1976 1996
           }
1977
-          }
1997
+
1998
+           console.log("我的世界332323223我",this.userList)
1999
+         }
1978 2000
 
1979 2001
    
1980 2002
         }
@@ -2348,6 +2370,19 @@ export default {
2348 2370
      }
2349 2371
      
2350 2372
      
2373
+    },
2374
+    getRow(row){
2375
+      console.log("row233323232",row)
2376
+      var name = ""
2377
+      if(this.stockFlowList!=null && this.stockFlowList.length > 0){
2378
+        for(let i=0;i<this.stockFlowList.length;i++){
2379
+          if(row.patient_id == this.stockFlowList[i].patient_id){
2380
+              name = this.stockFlowList[i].name
2381
+          }
2382
+        }
2383
+      }
2384
+     
2385
+      return name
2351 2386
     }
2352 2387
   },
2353 2388
 };

+ 8 - 0
src/xt_pages/stock/stockOutOrderEdit.vue View File

@@ -481,6 +481,10 @@
481 481
         return name;
482 482
       },
483 483
       handleEdit: function(index, row) {
484
+      if(parseInt(this.$route.query.is_sys) == 5){
485
+         this.$message.error("结算出库数据不能新增!")
486
+          return
487
+       }
484 488
        if(parseInt(this.$route.query.is_sys) == 12){
485 489
          this.$message.error("调拨出库数据不能新增!")
486 490
           return
@@ -519,6 +523,10 @@
519 523
        if(parseInt(this.$route.query.is_sys) == 12){
520 524
          this.$message.error("调拨出库数据不能删除!")
521 525
           return
526
+       }
527
+       if(parseInt(this.$route.query.is_sys) == 5){
528
+         this.$message.error("结算出库数据不能删除!")
529
+          return
522 530
        }
523 531
         if(row.supply_cancel_out_id >0){
524 532
           this.$message.error("采购出库数据不能删除!")

+ 3 - 3
src/xt_pages/workforce/remind_print_setting_one.vue View File

@@ -364,9 +364,9 @@
364 364
         }
365 365
       },
366 366
       printAction: function() {
367
-        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
368
-        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
369
-        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
367
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
368
+        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
369
+        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
370 370
         if (this.org_id == 9671 || this.org_id == 10340) {
371 371
           printJS({
372 372
             printable: 'print_content',