Bladeren bron

修改方济医院bug

csx 5 jaren geleden
bovenliggende
commit
fc2be283ac

+ 2 - 2
src/pages/main/PrintIndex.vue Bestand weergeven

10
           <!--&lt;!&ndash;<el-button size="mini" type="primary" icon="el-icon-printer" @click="printThisPage">打印</el-button>&ndash;&gt;-->
10
           <!--&lt;!&ndash;<el-button size="mini" type="primary" icon="el-icon-printer" @click="printThisPage">打印</el-button>&ndash;&gt;-->
11
         <!--</div>-->
11
         <!--</div>-->
12
       </div>
12
       </div>
13
-      <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id != 2"> </DialysisPrintOrderOne>
14
-      <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id == 2"></DialysisPrintOrderTwo>
13
+      <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==1"> </DialysisPrintOrderOne>
14
+      <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==2||org_template_info.template_id ==0"></DialysisPrintOrderTwo>
15
 
15
 
16
     </div>
16
     </div>
17
   </div>
17
   </div>

+ 4 - 3
src/pages/main/WaitingArea.vue Bestand weergeven

342
 
342
 
343
         var zones = []
343
         var zones = []
344
         zones.push({value: 0, text: '全部分区'})
344
         zones.push({value: 0, text: '全部分区'})
345
+
345
         for (var zoneId in zoneMap) {
346
         for (var zoneId in zoneMap) {
346
           zones.push({value: zoneMap[zoneId].id, text: zoneMap[zoneId].name})
347
           zones.push({value: zoneMap[zoneId].id, text: zoneMap[zoneId].name})
347
         }
348
         }
348
 
349
 
349
-        zones = zones.sort(function (a, b) {
350
-          return a.id > b.id
351
-        })
350
+        // zones = zones.sort(function (a, b) {
351
+        //   return a.value > b.value
352
+        // })
352
         return zones
353
         return zones
353
       },
354
       },
354
       processScheduals: function (scheduals) {
355
       processScheduals: function (scheduals) {

+ 13 - 2
src/pages/main/dialog/OrdersDialog.vue Bestand weergeven

7
         <span class="success">&nbsp;</span>
7
         <span class="success">&nbsp;</span>
8
       </div>
8
       </div>
9
       <div class="yzNav" style="width:100%;">
9
       <div class="yzNav" style="width:100%;">
10
-        <span @click="openNewAdvice">新增医嘱</span>
10
+        <span  @click="openNewAdvice"
11
+               :class="{ forbid: this.$store.getters.user.user.user_type == 3 }"
12
+        >新增医嘱</span>
11
         <span
13
         <span
12
           v-if="isShowExce"
14
           v-if="isShowExce"
13
           @click="execAdvice"
15
           @click="execAdvice"
24
         >医嘱核对</span>
26
         >医嘱核对</span>
25
         <span
27
         <span
26
           @click="openNewChild"
28
           @click="openNewChild"
27
-          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1}"
29
+          :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1 || this.$store.getters.user.user.user_type == 3 }"
28
         >添加子药</span>
30
         >添加子药</span>
29
         <span v-if="currentSubAdvices.length <= 0" @click="modifyAdviceAction"
31
         <span v-if="currentSubAdvices.length <= 0" @click="modifyAdviceAction"
30
               :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 }">修改医嘱</span>
32
               :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 }">修改医嘱</span>
1062
         this.$refs.exec_time.open()
1064
         this.$refs.exec_time.open()
1063
       },
1065
       },
1064
       openNewChild () {
1066
       openNewChild () {
1067
+        if (this.$store.getters.user.user.user_type == 3) {
1068
+          Toast.fail('你没有权限添加子药!')
1069
+          return
1070
+        }
1071
+
1065
         if (this.currentAdvices.length == 0) {0
1072
         if (this.currentAdvices.length == 0) {0
1066
           return false
1073
           return false
1067
         }
1074
         }
1092
         return
1099
         return
1093
       },
1100
       },
1094
       openNewAdvice () {
1101
       openNewAdvice () {
1102
+        if (this.$store.getters.user.user.user_type == 3) {
1103
+          Toast.fail('你没有权限新增医嘱!')
1104
+          return
1105
+        }
1095
 
1106
 
1096
         this.currentAdvices = []
1107
         this.currentAdvices = []
1097
         this.currentSubAdvices = []
1108
         this.currentSubAdvices = []

+ 1 - 1
src/pages/main/dialog/PrescriptionDialog.vue Bestand weergeven

172
             <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.dialyzer_perfusion_apparatus"/>
172
             <input  @focus="inputFocus" id="dt" v-model="dialysisPrescription.dialyzer_perfusion_apparatus"/>
173
           </div>
173
           </div>
174
         </div>
174
         </div>
175
-        <div class="line" v-if="this.$store.getters.user.template_info.template_id == 2"></div>
175
+        <div class="line"></div>
176
 
176
 
177
         <div @click="showSubMenu('body_fluid')" class="item" ref="body_fluid" v-if="isShow('体液过多症状')">
177
         <div @click="showSubMenu('body_fluid')" class="item" ref="body_fluid" v-if="isShow('体液过多症状')">
178
           <label class="name" for="knj">体液过多症状</label>
178
           <label class="name" for="knj">体液过多症状</label>

+ 3 - 3
src/pages/main/template/DialysisPrintOrderOne.vue Bestand weergeven

1156
 
1156
 
1157
         const style = '@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:25px;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;}'
1157
         const style = '@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:25px;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;}'
1158
 
1158
 
1159
-        if (this.org_template_info.template_id != 2) {
1159
+        if (this.org_template_info.template_id == 1) {
1160
           printJS({
1160
           printJS({
1161
             printable: 'dialysis-print-box',
1161
             printable: 'dialysis-print-box',
1162
             type: 'html',
1162
             type: 'html',
1163
             style: style,
1163
             style: style,
1164
             scanStyles: false
1164
             scanStyles: false
1165
           })
1165
           })
1166
-        } else if (this.org_template_info.template_id == 2) {
1166
+        } else if (this.org_template_info.template_id == 2||this.org_template_info.template_id == 0) {
1167
           printJS({
1167
           printJS({
1168
             printable: 'dialysis-print-box-1',
1168
             printable: 'dialysis-print-box-1',
1169
             type: 'html',
1169
             type: 'html',
1434
         }
1434
         }
1435
         return ''
1435
         return ''
1436
       }, getAge: function(val) {
1436
       }, getAge: function(val) {
1437
-        if (this.org_template_info.template_id == 2) {
1437
+        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
1438
           if (val.age == 0) {
1438
           if (val.age == 0) {
1439
             return jsGetAge(val.birth, '-')
1439
             return jsGetAge(val.birth, '-')
1440
           } else {
1440
           } else {

+ 3 - 3
src/pages/main/template/DialysisPrintOrderTwo.vue Bestand weergeven

1157
 
1157
 
1158
         const style = '@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}.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:14px}.dialysis-print-order .print-table-no{width:100%;text-align:left;border-collapse:collapse;font-size:14px} .dialysis-print-order .under_line {display: inline-block;border-bottom: 1px solid #999;text-align:left;white-space: nowrap;width: 50%;} .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: 30px; }.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;}'
1158
         const style = '@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}.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:14px}.dialysis-print-order .print-table-no{width:100%;text-align:left;border-collapse:collapse;font-size:14px} .dialysis-print-order .under_line {display: inline-block;border-bottom: 1px solid #999;text-align:left;white-space: nowrap;width: 50%;} .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: 30px; }.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;}'
1159
 
1159
 
1160
-        if (this.org_template_info.template_id != 2) {
1160
+        if (this.org_template_info.template_id == 1) {
1161
           printJS({
1161
           printJS({
1162
             printable: 'dialysis-print-box',
1162
             printable: 'dialysis-print-box',
1163
             type: 'html',
1163
             type: 'html',
1164
             style: style,
1164
             style: style,
1165
             scanStyles: false
1165
             scanStyles: false
1166
           })
1166
           })
1167
-        } else if (this.org_template_info.template_id == 2) {
1167
+        } else if (this.org_template_info.template_id == 2||this.org_template_info.template_id == 0) {
1168
           printJS({
1168
           printJS({
1169
             printable: 'dialysis-print-box-1',
1169
             printable: 'dialysis-print-box-1',
1170
             type: 'html',
1170
             type: 'html',
1550
         }
1550
         }
1551
         return ''
1551
         return ''
1552
       }, getAge: function(val) {
1552
       }, getAge: function(val) {
1553
-        if (this.org_template_info.template_id == 2) {
1553
+        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
1554
           if (val.age == 0) {
1554
           if (val.age == 0) {
1555
             return jsGetAge(val.birth, '-')
1555
             return jsGetAge(val.birth, '-')
1556
           } else {
1556
           } else {