Преглед изворни кода

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

XMLWAN пре 4 година
родитељ
комит
00ce0b5382

+ 7 - 6
src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue Прегледај датотеку

@@ -393,11 +393,7 @@
393 393
           </el-col>
394 394
           
395 395
 
396
-          <el-col :span="24">
397
-            <el-form-item label="备注: ">
398
-              <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
399
-            </el-form-item>
400
-          </el-col>
396
+          
401 397
 
402 398
           <el-col :span="8">
403 399
             <el-form-item label="透析期间: " v-if="isShow('透析期间')">
@@ -545,9 +541,14 @@
545 541
               <el-input v-model="assessmentBeforeDislysis.edema" @focus="showInnerDialog('16')"></el-input>
546 542
             </el-form-item>
547 543
           </el-col>
544
+          
548 545
 
549 546
          
550
-
547
+          <el-col :span="24">
548
+            <el-form-item label="备注: ">
549
+              <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
550
+            </el-form-item>
551
+          </el-col>
551 552
          
552 553
       
553 554
         </el-row>

+ 2 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFive.vue Прегледај датотеку

@@ -1058,10 +1058,8 @@
1058 1058
             医生签名
1059 1059
             <span style="display: inline-block;width:100px;text-align: left;">
1060 1060
               &nbsp;
1061
-              <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
1062
-              <span v-if="doctorForm.url !== ''">
1063
-                <img class="es-img" :src="doctorForm.url" />
1064
-              </span>
1061
+              <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
1062
+              <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
1065 1063
             </span>
1066 1064
             核对护士
1067 1065
             <span style="display: inline-block;width:100px;text-align: left;">

+ 8 - 8
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Прегледај датотеку

@@ -105,12 +105,12 @@
105 105
           >结算单
106 106
           </el-button>
107 107
 
108
-          <el-button v-if="this.$store.getters.xt_user.org_id == 9919"
108
+          <el-button v-if="this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877"
109 109
           size="small" @click="open(10)" type="primary"
110 110
           >退号
111 111
           </el-button>
112 112
 
113
-          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
113
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877"
114 114
           size="small" @click="open(11)" type="primary"
115 115
           >撤销明细
116 116
           </el-button>
@@ -480,7 +480,7 @@
480 480
     },
481 481
     methods: {
482 482
       query() {
483
-        if (this.$store.getters.xt_user.org_id == 4) {
483
+        if (this.$store.getters.xt_user.org_id == 4 ||  this.$store.getters.xt_user.org_id == 3877) {
484 484
           var that = this
485 485
           axios.get('http://127.0.0.1:9532/api/org/info', {
486 486
             params: {}
@@ -567,7 +567,7 @@
567 567
         }
568 568
 
569 569
         this.loadingtwo = true
570
-        if (this.$store.getters.xt_user.org_id == 9919) {
570
+        if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
571 571
           var that = this
572 572
           axios.get('http://127.0.0.1:9532/api/settle/get', {
573 573
             params: form
@@ -623,7 +623,7 @@
623 623
           forms['admin_user_id'] = this.$store.getters.xt_user.user.id
624 624
         this.loadingone = true
625 625
 
626
-        if (this.$store.getters.xt_user.org_id == 9919) {
626
+        if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
627 627
           var that = this
628 628
 
629 629
           axios.get('http://127.0.0.1:9532/api/register/get', {
@@ -1246,7 +1246,7 @@
1246 1246
           }
1247 1247
 
1248 1248
         } else if (index == 5) {
1249
-          if (this.$store.getters.xt_user.org_id == 9919) {
1249
+          if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
1250 1250
 
1251 1251
             var that = this
1252 1252
             this.$confirm('是否退费', '退费', {
@@ -1338,7 +1338,7 @@
1338 1338
 
1339 1339
           var that = this
1340 1340
 
1341
-          if (this.$store.getters.xt_user.org_id == 9919) {
1341
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 3877 ) {
1342 1342
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
1343 1343
               params: params
1344 1344
             })
@@ -1582,7 +1582,7 @@
1582 1582
 
1583 1583
           }
1584 1584
           this.loadingtwo = true
1585
-          if (this.$store.getters.xt_user.org_id == 9919) {
1585
+          if (this.$store.getters.xt_user.org_id == 9919 ||  this.$store.getters.xt_user.org_id == 3877) {
1586 1586
             var that = this
1587 1587
             axios.get('http://127.0.0.1:9532/api/pre_upload/get', {
1588 1588
               params: form

+ 98 - 104
src/xt_pages/user/inspectionInfectious.vue Прегледај датотеку

@@ -6,112 +6,106 @@
6 6
       v-loading="pageLoading"
7 7
       element-loading-text="拼命加载中"
8 8
     >
9
-      <el-row :gutter="20">
10
-        <el-col :span="17" v-loading="itemLoading">
11
-          <div class="filter-container" style="float:right">
12
-            <el-button
13
-              size="small"
14
-              class="filter-item"
15
-              type="primary"
16
-              @click="openNew()"
17
-              icon="el-icon-circle-plus-outline"
18
-              :disabled="project ? false : true"
19
-              >新增</el-button
20
-            >
21
-            <el-button
22
-              size="small"
23
-              class="filter-item"
24
-              type="primary"
25
-              icon="el-icon-edit-outline"
26
-              @click="openEdit()"
27
-              :disabled="itemDate ? false : true"
28
-              >修改</el-button
29
-            >
30
-            <el-button
31
-              size="small"
32
-              class="filter-item"
33
-              type="danger"
34
-              icon="el-icon-delete"
35
-              @click="deleteInspection()"
36
-              :disabled="itemDate ? false : true"
37
-              >删除</el-button
38
-            >
39
-          </div>
40
-          <div class="filter-container">
41
-            <el-button class="filter-item" type="text" style="color:#000"
42
-              >{{ itemName }}
43
-              <span v-if="itemDate">(检查日期:{{ itemDate }})</span></el-button>
44
-              <span style="color:red">次数:{{total}}</span>
45
-          </div>
46
-          <el-table
47
-            :header-cell-style="{
48
-              backgroundColor: 'rgb(245, 247, 250)',
49
-              color: '#606266'
50
-            }"
51
-            :row-style="{ color: '#303133' }"
52
-            :data="items"
53
-            border
54
-            style="width: 100%"
55
-            id="user-inspection-order"
9
+      <div class="filter-container" style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
10
+        <div>
11
+          {{ itemName }}
12
+          <span v-if="itemDate">(检查日期:{{ itemDate }})</span>
13
+          <span>次数:{{total}}</span>
14
+        </div>
15
+        <div>
16
+          <el-button
17
+            size="small"
18
+            type="primary"
19
+            @click="openNew()"
20
+            icon="el-icon-circle-plus-outline"
21
+            :disabled="project ? false : true"
22
+            >新增</el-button
56 23
           >
57
-            <el-table-column
58
-              prop="item_name"
59
-              label="检验项目"
60
-              align="center"
61
-              min-width="180"
62
-            >
63
-              <template slot-scope="scope">
64
-                {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
65
-              </template>
66
-            </el-table-column>
67
-            <el-table-column
68
-              prop="name"
69
-              label="结果"
70
-              align="center"
71
-              min-width="80"
72
-            >
73
-              <template slot-scope="scope">
74
-                <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
75
-                <span v-else>{{ scope.row.value }}</span>
76
-                <span v-if="scope.row.range_type == 1">
77
-                  {{scope.row.value_direction}}
78
-                </span>
79
-              </template>
80
-            </el-table-column>
81
-            <el-table-column
82
-              prop="address"
83
-              label="参考值"
84
-              align="center"
85
-              min-width="120"
86
-            >
87
-              <template slot-scope="scope">
88
-                <span v-if="scope.row.range_type == 1"
89
-                  >{{ scope.row.range_min }}~{{ scope.row.range_max }}</span
90
-                >
91
-                <span v-else>{{ scope.row.range_value }}</span>
92
-              </template>
93
-            </el-table-column>
94
-            <el-table-column
95
-              prop="unit"
96
-              label="单位"
97
-              align="center"
98
-              min-width="200"
99
-            >
100
-            </el-table-column>
101
-          </el-table>
102
-          <el-pagination
103
-            align="right"
104
-            @current-change="handleCurrentChangePage"
105
-            :current-page="queryParams.page"
106
-            :page-size="1"
107
-            background
108
-            style="margin-top:20px;"
109
-            layout="total, prev, pager, next, jumper"
110
-            :total="total"
24
+          <el-button
25
+            size="small"
26
+            type="primary"
27
+            icon="el-icon-edit-outline"
28
+            @click="openEdit()"
29
+            :disabled="itemDate ? false : true"
30
+            >修改</el-button
31
+          >
32
+          <el-button
33
+            size="small"
34
+            type="danger"
35
+            icon="el-icon-delete"
36
+            @click="deleteInspection()"
37
+            :disabled="itemDate ? false : true"
38
+            >删除</el-button
111 39
           >
112
-          </el-pagination>
113
-        </el-col>
114
-      </el-row>
40
+        </div>
41
+      </div>
42
+      <el-table
43
+        :header-cell-style="{
44
+          backgroundColor: 'rgb(245, 247, 250)',
45
+          color: '#606266'
46
+        }"
47
+        :row-style="{ color: '#303133' }"
48
+        :data="items"
49
+        border
50
+        style="width: 100%"
51
+        id="user-inspection-order"
52
+      >
53
+        <el-table-column
54
+          prop="item_name"
55
+          label="检验项目"
56
+          align="center"
57
+          min-width="180"
58
+        >
59
+          <template slot-scope="scope">
60
+            {{ scope.row.item_name }} {{ scope.row.item_name_addition }}
61
+          </template>
62
+        </el-table-column>
63
+        <el-table-column
64
+          prop="name"
65
+          label="结果"
66
+          align="center"
67
+          min-width="80"
68
+        >
69
+          <template slot-scope="scope">
70
+            <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span>
71
+            <span v-else>{{ scope.row.value }}</span>
72
+            <span v-if="scope.row.range_type == 1">
73
+              {{scope.row.value_direction}}
74
+            </span>
75
+          </template>
76
+        </el-table-column>
77
+        <el-table-column
78
+          prop="address"
79
+          label="参考值"
80
+          align="center"
81
+          min-width="120"
82
+        >
83
+          <template slot-scope="scope">
84
+            <span v-if="scope.row.range_type == 1"
85
+              >{{ scope.row.range_min }}~{{ scope.row.range_max }}</span
86
+            >
87
+            <span v-else>{{ scope.row.range_value }}</span>
88
+          </template>
89
+        </el-table-column>
90
+        <el-table-column
91
+          prop="unit"
92
+          label="单位"
93
+          align="center"
94
+          min-width="200"
95
+        >
96
+        </el-table-column>
97
+      </el-table>
98
+      <el-pagination
99
+        align="right"
100
+        @current-change="handleCurrentChangePage"
101
+        :current-page="queryParams.page"
102
+        :page-size="1"
103
+        background
104
+        style="margin-top:20px;"
105
+        layout="total, prev, pager, next, jumper"
106
+        :total="total"
107
+      >
108
+      </el-pagination>
115 109
     </div>
116 110
 
117 111
     <el-dialog