Browse Source

新分支

28169 11 months ago
parent
commit
d3b96b9ac6

+ 9 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue View File

1227
             <td>医嘱</td>
1227
             <td>医嘱</td>
1228
             <td width='80'>执行时间</td>
1228
             <td width='80'>执行时间</td>
1229
             <td width='80'>执行者签名</td>
1229
             <td width='80'>执行者签名</td>
1230
+            <td width='80'>核对人签名</td>
1230
           </tr>
1231
           </tr>
1231
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index" >
1232
           <tr v-for="(advice, advice_index) in tableAdvice" :key="advice_index" >
1232
             <td>{{ getTime(advice.start_time, "{y}-{m}-{d}") }}</td>
1233
             <td>{{ getTime(advice.start_time, "{y}-{m}-{d}") }}</td>
1259
                 <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
1260
                 <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset />
1260
               </span>
1261
               </span>
1261
             </td>
1262
             </td>
1263
+            <td>
1264
+              <span v-if="setAdminUserES(advice.checker) == ''">
1265
+                {{ getAdminUser(advice.checker) }}
1266
+              </span>
1267
+              <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
1268
+                <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt srcset />
1269
+              </span>
1270
+            </td>
1262
           </tr>
1271
           </tr>
1263
         </table>
1272
         </table>
1264
       </div>
1273
       </div>

+ 20 - 1
src/xt_pages/outpatientTool/components/detail.vue View File

27
                           :value="item.id">
27
                           :value="item.id">
28
                   </el-option>
28
                   </el-option>
29
               </el-select>
29
               </el-select>
30
+
31
+            <el-select size="small" v-model="item_time_type" placeholder="请选择"
32
+                       style="width:150px;margin-left:10px;" @change="changeTimeItem">
33
+              <el-option
34
+                label="处方时间"
35
+                value="0">
36
+              </el-option>
37
+              <el-option
38
+                label="结算时间"
39
+                value="1">
40
+              </el-option>
41
+            </el-select>
42
+
30
               <el-date-picker
43
               <el-date-picker
31
                       v-model="chargeDate"
44
                       v-model="chargeDate"
32
                       type="daterange"
45
                       type="daterange"
137
       tableData: [],
150
       tableData: [],
138
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
151
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
139
       item_type: '0',
152
       item_type: '0',
153
+      item_time_type:'0',
140
       items: [
154
       items: [
141
         { id: 1, name: '药品' },
155
         { id: 1, name: '药品' },
142
         { id: 2, name: '项目' },
156
         { id: 2, name: '项目' },
287
     },
301
     },
288
     changeItem() {
302
     changeItem() {
289
       this.getSummaryDetailList()
303
       this.getSummaryDetailList()
304
+    },changeTimeItem(){
305
+
306
+      this.getSummaryDetailList()
307
+
290
     },
308
     },
291
     searchAction() {
309
     searchAction() {
292
       this.item_type = '0'
310
       this.item_type = '0'
392
         start_time: start_time,
410
         start_time: start_time,
393
         end_time: end_time,
411
         end_time: end_time,
394
         type: this.item_type,
412
         type: this.item_type,
395
-        keyword: this.keywords
413
+        keyword: this.keywords,
414
+        time_type:this.item_time_type
396
       }
415
       }
397
       GetSummaryDetail(params).then(response => {
416
       GetSummaryDetail(params).then(response => {
398
         if (response.data.state == 0) {
417
         if (response.data.state == 0) {

+ 16 - 1
src/xt_pages/outpatientTool/components/gather.vue View File

24
             :value="item.id">
24
             :value="item.id">
25
           </el-option>
25
           </el-option>
26
         </el-select>
26
         </el-select>
27
+        <el-select size="small" v-model="item_time_type" placeholder="请选择"
28
+                   style="width:150px;margin-left:10px;" @change="changeTimeItem">
29
+          <el-option
30
+            label="处方时间"
31
+            value="0">
32
+          </el-option>
33
+          <el-option
34
+            label="结算时间"
35
+            value="1">
36
+          </el-option>
37
+        </el-select>
27
         <el-date-picker
38
         <el-date-picker
28
           v-model="chargeDate"
39
           v-model="chargeDate"
29
           type="daterange"
40
           type="daterange"
105
       tableData: [],
116
       tableData: [],
106
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
117
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
107
       item_type: '0',
118
       item_type: '0',
119
+      item_time_type:'0',
108
       items: [
120
       items: [
109
         { id: 1, name: '药品' },
121
         { id: 1, name: '药品' },
110
         { id: 2, name: '项目' },
122
         { id: 2, name: '项目' },
138
     changeDate() {
150
     changeDate() {
139
       // console.log(this.chargeDate)
151
       // console.log(this.chargeDate)
140
       this.getSummaryDetailList()
152
       this.getSummaryDetailList()
153
+    },changeTimeItem(){
154
+      this.getSummaryDetailList()
141
     },
155
     },
142
     changeItem() {
156
     changeItem() {
143
       this.getSummaryDetailList()
157
       this.getSummaryDetailList()
157
         start_time: start_time,
171
         start_time: start_time,
158
         end_time: end_time,
172
         end_time: end_time,
159
         type: this.item_type,
173
         type: this.item_type,
160
-        keyword: this.keywords
174
+        keyword: this.keywords,
175
+        time_type:this.item_time_type,
161
       }
176
       }
162
       GetSummaryDetail(params).then(response => {
177
       GetSummaryDetail(params).then(response => {
163
         if (response.data.state == 0) {
178
         if (response.data.state == 0) {