Browse Source

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

csx 3 years ago
parent
commit
8855bb405d

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

2036
           if (minites < 10) {
2036
           if (minites < 10) {
2037
             minites = '0' + minites
2037
             minites = '0' + minites
2038
           }
2038
           }
2039
-          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4  ) {
2039
+          if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10121 || this.$store.getters.xt_user.org.id == 4 || this.$store.getters.xt_user.org.id == 10013 || this.$store.getters.xt_user.org.id == 10014 ) {
2040
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
2040
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
2041
           } else {
2041
           } else {
2042
             if (schedual.schedule_type == 1) {
2042
             if (schedual.schedule_type == 1) {

+ 48 - 15
src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue View File

175
                     <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 19">
175
                     <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 19">
176
                     IUF+HD
176
                     IUF+HD
177
                     </div>
177
                     </div>
178
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 20">
179
+                    UF
180
+                    </div>
181
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 21">
182
+                    HD+
183
+                    </div>
184
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
185
+                    血浆胆红素吸附+HDF
186
+                    </div>
187
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
188
+                    血浆胆红素吸附
189
+                    </div>
190
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 24">
191
+                    I-HDF
192
+                    </div>
193
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 25">
194
+                    HD高通
195
+                    </div>
196
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 26">
197
+                    CVVH
198
+                    </div>
199
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 27">
200
+                    CVVHD
201
+                    </div>
202
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 28">
203
+                    CVVHDF
204
+                    </div>
178
                 </div>
205
                 </div>
179
             </div>
206
             </div>
180
             <div class="row">
207
             <div class="row">
185
                         Ca:{{ prescription.calcium ? prescription.calcium : "/" }}&nbsp;&nbsp;
212
                         Ca:{{ prescription.calcium ? prescription.calcium : "/" }}&nbsp;&nbsp;
186
                         Na:{{ prescription.sodium ? prescription.sodium : "/" }}&nbsp;&nbsp;
213
                         Na:{{ prescription.sodium ? prescription.sodium : "/" }}&nbsp;&nbsp;
187
                         HCO3:{{ prescription.bicarbonate ? prescription.bicarbonate : "/" }}&nbsp;&nbsp;
214
                         HCO3:{{ prescription.bicarbonate ? prescription.bicarbonate : "/" }}&nbsp;&nbsp;
188
-                        <!-- 糖:{{ prescription.amylaceum ? prescription.amylaceum : "/" }}&nbsp;&nbsp; -->
215
+                        糖:{{ prescription.amylaceum ? prescription.amylaceum : "/" }}&nbsp;&nbsp;
189
                     </div>
216
                     </div>
190
                 </div>
217
                 </div>
191
                 <div class="inline_block">
218
                 <div class="inline_block">
273
                 <td width="60" style="height:20px;line-height:20px">动脉压</td>
300
                 <td width="60" style="height:20px;line-height:20px">动脉压</td>
274
                 <td width="60" style="height:20px;line-height:20px">跨膜压</td>
301
                 <td width="60" style="height:20px;line-height:20px">跨膜压</td>
275
                 <td width="60" style="height:20px;line-height:20px">温度</td>
302
                 <td width="60" style="height:20px;line-height:20px">温度</td>
276
-                <td width="60" style="height:20px;line-height:20px">超滤率</td>
277
-                <td width="60" style="height:20px;line-height:20px">超滤量</td>
303
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id != 2">超滤率</td>
304
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id != 2">超滤量</td>
305
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换率</td>
306
+                <td width="60" style="height:20px;line-height:20px" v-if="prescription.mode_id == 2">置换量</td>
278
                 <td width="60" style="height:20px;line-height:20px">血容量</td>
307
                 <td width="60" style="height:20px;line-height:20px">血容量</td>
279
                 <td width="">病情变化及处理</td>
308
                 <td width="">病情变化及处理</td>
280
             </tr>
309
             </tr>
287
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
316
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
288
                     </span>
317
                     </span>
289
                 </td>
318
                 </td>
290
-                <td>&nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }}</td>
291
-                <td>&nbsp;{{ monitor.ktv ? monitor.ktv : "" }}</td>
292
-                <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
293
-                <td>&nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}</td>
294
-                <td>&nbsp;{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
319
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.pulse_frequency ? monitor.pulse_frequency : "/" }}</span></td>
320
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ktv ? monitor.ktv : "/" }}</span></td>
321
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "/" }}</span></td>
322
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.venous_pressure ? monitor.venous_pressure : "/" }}</span></td>
323
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
295
                 
324
                 
296
-                <td>&nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</td>
297
-                <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
298
-                <td>&nbsp;{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : ''}}</td>
299
-                <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
300
-                <td>&nbsp;{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "" }}</td>
325
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
326
+                <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
327
+                <td v-if="prescription.mode_id != 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
328
+                <td v-if="prescription.mode_id != 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
329
+                <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>
330
+                <td v-if="prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.displacement_quantity ? monitor.displacement_quantity : "/" }}</span></td>
331
+                <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : "/" }}</span></td>
301
                 <td style="text-align:left;padding-left:10px;">
332
                 <td style="text-align:left;padding-left:10px;">
302
                     <div style="line-height:20px;text-align: left;display: inline-block;">
333
                     <div style="line-height:20px;text-align: left;display: inline-block;">
303
                         &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}
334
                         &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}
376
             </td> -->
407
             </td> -->
377
                 <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
408
                 <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
378
                 <td height="32px">
409
                 <td height="32px">
379
-                <span>{{ getAdminUser(advice.advice_doctor) }}</span>
410
+                    <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
411
+                    <img style="height:30px" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
380
                 </td>
412
                 </td>
381
                 <!-- <td height="35px">
413
                 <!-- <td height="35px">
382
             <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
414
             <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
383
             <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
415
             <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
384
             </td> -->
416
             </td> -->
385
                 <td height="32px">
417
                 <td height="32px">
386
-                <span>{{ getAdminUser(advice.execution_staff) }}</span>
418
+                    <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
419
+                    <img style="height:30px" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
387
                 </td>
420
                 </td>
388
                 <td height="32px">
421
                 <td height="32px">
389
                 <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
422
                 <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>

+ 2 - 2
src/xt_pages/hospitalStation/components/inquiriesDetail.vue View File

110
       :visible.sync="innerVisible"
110
       :visible.sync="innerVisible"
111
       append-to-body>
111
       append-to-body>
112
 
112
 
113
-      <print v-if="activeName == 'first'" :paramsObj='paramsObj'></print>
114
-      <recordPrint v-if="activeName == 'second'" :patientid="patientid"></recordPrint>
113
+      <print v-if="activeName == 'first'" :paramsObj='paramsObj' :showBtn='true'></print>
114
+      <recordPrint v-if="activeName == 'second'" :patientid="patientid" :showBtn='true'></recordPrint>
115
     </el-dialog>
115
     </el-dialog>
116
   </el-dialog>
116
   </el-dialog>
117
 </div>
117
 </div>

+ 1 - 1
src/xt_pages/hospitalStation/doctorDesk.vue View File

59
                               ref="tab"
59
                               ref="tab"
60
                     >
60
                     >
61
                         <el-table-column prop="name" label="姓名" width='89'>
61
                         <el-table-column prop="name" label="姓名" width='89'>
62
-                            <template slot-scope="scope">{{scope.row.name}}</template>
62
+                            <template slot-scope="scope">{{ scope.$index + 1 }}. {{scope.row.name}}</template>
63
                         </el-table-column>
63
                         </el-table-column>
64
                         <el-table-column prop="name" label="就诊号" width="110">
64
                         <el-table-column prop="name" label="就诊号" width="110">
65
                             <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
65
                             <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>

+ 4 - 3
src/xt_pages/hospitalStation/print.vue View File

1
 <template>
1
 <template>
2
     <div>
2
     <div>
3
-        <!-- <template>
3
+        <template v-if="showBtn">
4
           <el-button
4
           <el-button
5
             style="float:right;"
5
             style="float:right;"
6
             :loading="loading"
6
             :loading="loading"
10
             type="primary"
10
             type="primary"
11
             >打印</el-button
11
             >打印</el-button
12
           >
12
           >
13
-        </template> -->
13
+        </template>
14
 
14
 
15
         <div class='dialysisPage' style="padding-top:40px;">
15
         <div class='dialysisPage' style="padding-top:40px;">
16
             <div v-if="org_id != 10138">
16
             <div v-if="org_id != 10138">
47
       printFour
47
       printFour
48
     },
48
     },
49
     props:{
49
     props:{
50
-      paramsObj:Object
50
+      paramsObj:Object,
51
+      showBtn:Boolean
51
     },
52
     },
52
     data() {
53
     data() {
53
       return {
54
       return {

+ 2 - 1
src/xt_pages/hospitalStation/recordPrint.vue View File

1
 <template>
1
 <template>
2
   <div>
2
   <div>
3
-    <template>
3
+    <template v-if="showBtn">
4
       <el-button
4
       <el-button
5
         style="position:fixed;right:25px;z-index:999"
5
         style="position:fixed;right:25px;z-index:999"
6
         size="small"
6
         size="small"
35
   },
35
   },
36
   props:{
36
   props:{
37
     patientid:Number,
37
     patientid:Number,
38
+    showBtn:Boolean
38
   },
39
   },
39
   data() {
40
   data() {
40
     return {
41
     return {

+ 1 - 1
src/xt_pages/hospitalStation/template/printOne.vue View File

23
               <div class="Rp">Rp:</div>
23
               <div class="Rp">Rp:</div>
24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
25
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
25
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
26
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
26
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
27
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
27
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
28
               </div>
28
               </div>
29
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
29
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">

+ 2 - 0
src/xt_pages/management/components/UserForm.vue View File

1670
 
1670
 
1671
       this.$refs[formName].validate(valid => {
1671
       this.$refs[formName].validate(valid => {
1672
         if (valid) {
1672
         if (valid) {
1673
+          console.log("hhhh23233323",this.userform)
1674
+       
1673
           UpdateForm(this.userform).then(response => {
1675
           UpdateForm(this.userform).then(response => {
1674
             if (response.data.state === 1) {
1676
             if (response.data.state === 1) {
1675
               var information = response.data.data.information;
1677
               var information = response.data.data.information;

+ 0 - 1
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

163
                 <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
163
                 <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
164
                              :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid"
164
                              :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid"
165
                              ref="child"></desk-record>
165
                              ref="child"></desk-record>
166
-c
167
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
166
                 <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
168
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
167
                 <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
169
                 <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->
168
                 <!--<dialysis-index v-if="titleType == '透析记录'" :record_date="record_date" :patientid='patientid'></dialysis-index>-->

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

23
               <div class="Rp">Rp:</div>
23
               <div class="Rp">Rp:</div>
24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
24
               <div class="drugsBox" v-for="(it,index) in item.advices" :key="index">
25
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
25
                   <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
26
-                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.drug.drug_spec}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
26
+                  <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;<span v-if="it.drug.min_unit != it.drug.dose_unit">{{it.drug.dose}}{{it.drug.dose_unit}}&nbsp;* &nbsp;</span>{{it.drug.min_number}}{{it.drug.min_unit}}/{{it.drug.max_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div>
27
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
27
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
28
               </div>
28
               </div>
29
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
29
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">

+ 15 - 14
src/xt_pages/stock/drugs/components/drugInOrder.vue View File

224
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
224
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
225
       "-" +
225
       "-" +
226
       (nowDay < 10 ? "0" + nowDay : nowDay);
226
       (nowDay < 10 ? "0" + nowDay : nowDay);
227
-     var start = window.sessionStorage.getItem('start_in_time')
228
-     console.log("start23323232322323",start)
229
-      var end =  window.sessionStorage.getItem('end_in_time')
230
-     if(start!= "null"){
231
-        console.log("hh232h23h32h3232322323")
232
-        this.start_time = start
233
-     }
234
      
227
      
228
+    var start_time =  window.sessionStorage.getItem('drug_start_in_time')
235
     
229
     
236
-     if(end != "null"){
237
-       
238
-        this.end_time = end
239
-     }
240
-   
230
+    var end_time =  window.sessionStorage.getItem('drug_end_in_time')
231
+    if(start_time !=null){
232
+      console.log("hh232323232红红火火")
233
+      this.start_time = start_time
234
+    }
235
+    if(end_time!=null){
236
+      this.end_time = end_time
237
+    }
238
+    window.sessionStorage.removeItem('drug_start_in_time')
239
+    window.sessionStorage.removeItem('drug_end_in_time')  
241
     this.GetConfigInfo()
240
     this.GetConfigInfo()
242
     this.fetchAllAdminUsers()
241
     this.fetchAllAdminUsers()
243
     //获取入库单数据
242
     //获取入库单数据
333
         this.$message.error("结束时间不能小于开始时间");
332
         this.$message.error("结束时间不能小于开始时间");
334
         this.start_time = "";
333
         this.start_time = "";
335
       } else {
334
       } else {
335
+        window.sessionStorage.setItem('drug_start_in_time',this.start_time)
336
         this.getlist()
336
         this.getlist()
337
         this.getDrugWarehouseInfoPrint()
337
         this.getDrugWarehouseInfoPrint()
338
       }
338
       }
343
         this.$message.error("结束时间不能小于开始时间");
343
         this.$message.error("结束时间不能小于开始时间");
344
         this.end_time = "";
344
         this.end_time = "";
345
       } else {
345
       } else {
346
+        window.sessionStorage.setItem('drug_end_in_time',this.end_time)
346
         this.getlist()
347
         this.getlist()
347
         this.getDrugWarehouseInfoPrint()
348
         this.getDrugWarehouseInfoPrint()
348
       }
349
       }
460
       })
461
       })
461
     },
462
     },
462
     PrintAction(){
463
     PrintAction(){
463
-      window.sessionStorage.setItem('start_in_time',this.start_time)
464
-      window.sessionStorage.setItem('end_in_time',this.end_time)
464
+      window.sessionStorage.setItem('drug_start_in_time',this.start_time)
465
+      window.sessionStorage.setItem('drug_end_in_time',this.end_time)
465
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
466
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
466
     },
467
     },
467
     select(){
468
     select(){

+ 9 - 9
src/xt_pages/stock/drugs/components/drugOutDetail.vue View File

179
             {{scope.row.count}}
179
             {{scope.row.count}}
180
           </template>
180
           </template>
181
         </el-table-column>
181
         </el-table-column>
182
-        <el-table-column label="总价" align="center">
182
+        <el-table-column label="总价5555" align="center">
183
           <template slot-scope="scope">
183
           <template slot-scope="scope">
184
             <!-- {{scope.row.price * scope.row.count}} -->
184
             <!-- {{scope.row.price * scope.row.count}} -->
185
             {{scope.row.total_price}}
185
             {{scope.row.total_price}}
232
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
232
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
233
       "-" +
233
       "-" +
234
       (nowDay < 10 ? "0" + nowDay : nowDay);
234
       (nowDay < 10 ? "0" + nowDay : nowDay);
235
-    var start = window.sessionStorage.getItem('start_out_time')
235
+    var start_time = window.sessionStorage.getItem('start_out_time')
236
     console.log("start",start)
236
     console.log("start",start)
237
-     var end =  window.sessionStorage.getItem('end_out_time')
238
-    if(start!="null"){
239
-       this.start_time = start   
237
+     var end_time =  window.sessionStorage.getItem('end_out_time')
238
+    if(start_time!=null){
239
+       this.start_time = start_time   
240
     }
240
     }
241
-    if(end!="null"){
241
+    if(end_time!=null){
242
      
242
      
243
-      this.end_time = end
243
+      this.end_time = end_time
244
     }
244
     }
245
     
245
     
246
     this.getDrugOutOrderPrint()
246
     this.getDrugOutOrderPrint()
401
       }
401
       }
402
     },
402
     },
403
     PrintAction: function() {
403
     PrintAction: function() {
404
-       window.sessionStorage.setItem('start_out_time',this.start_time)
405
-       window.sessionStorage.setItem('end_out_time',this.end_time)
404
+      //  window.sessionStorage.setItem('start_out_time',this.start_time)
405
+      //  window.sessionStorage.setItem('end_out_time',this.end_time)
406
        this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
406
        this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
407
     },
407
     },
408
     getlist(){
408
     getlist(){

+ 6 - 3
src/xt_pages/stock/drugs/drugInventory.vue View File

1
 <template>
1
 <template>
2
-  <div class="main-contain">
2
+  <div class="main-contain" style="height:100%;">
3
     <div class="position">
3
     <div class="position">
4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
4
       <bread-crumb :crumbs="crumbs"></bread-crumb>
5
     </div>
5
     </div>
6
-    <div class="app-container">
7
-        <el-tabs v-model="activeName">
6
+    <div class="app-container" style="height: calc(100vh - 118px);overflow: hidden;">
7
+        <el-tabs v-model="activeName" style="height: 100%;display: flex;flex-direction: column;">
8
             <el-tab-pane label="药品盘点" name="first">
8
             <el-tab-pane label="药品盘点" name="first">
9
                 <drug-inventory></drug-inventory>
9
                 <drug-inventory></drug-inventory>
10
             </el-tab-pane>
10
             </el-tab-pane>
77
 ::-webkit-scrollbar{
77
 ::-webkit-scrollbar{
78
     height: 20px !important;
78
     height: 20px !important;
79
 }
79
 }
80
+.el-tabs__content{
81
+  overflow-y: auto;
82
+}
80
 </style>
83
 </style>

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

630
       } else {
630
       } else {
631
         this.GetWarehouseOut();
631
         this.GetWarehouseOut();
632
       }
632
       }
633
-      this.GetWarehouseOut();
634
     },
633
     },
635
     endTimeChange(val) {
634
     endTimeChange(val) {
636
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
635
       var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);

+ 86 - 558
src/xt_pages/stock/drugs/inventory.vue View File

1
 <template>
1
 <template>
2
-    <div>
3
-        <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
4
-            <div>
5
-                <el-input
6
-                size="small"
7
-                style="width: 200px;margin-left:10px;"
8
-                class="filter-item"
9
-                v-model.trim="searchKey"
10
-                placeholder="请输入单据编号或操作人姓名"
11
-                />
12
-                <el-button
13
-                size="small"
14
-                class="filter-item"
15
-                type="primary"
16
-                icon="el-icon-search"
17
-                @click="search"
18
-                >搜索</el-button
19
-                >
20
-                <el-date-picker
21
-                size="small"
22
-                v-model="start_time"
23
-                type="date"
24
-                style="margin-left:5px;width:140px;"
25
-                placeholder="选择日期"
26
-                @change="changeStartTime">
27
-                </el-date-picker>
28
-                <el-date-picker
29
-                size="small"
30
-                v-model="end_time"
31
-                type="date"
32
-                style="margin-left:5px;width:140px;"
33
-                placeholder="选择日期"
34
-                @change="changeEndTime">
35
-                </el-date-picker>
36
-            </div>
37
-            <div>
38
-                <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
39
-                <el-button size="small" type="primary" @click="toCheck">核对</el-button>
40
-                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
41
-                <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
42
-            </div>
43
-        </div>
44
-        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
45
-           <el-table-column type="selection" width="55" align="center"> </el-table-column>
46
-            <el-table-column prop="date" label="盘点编号" align="center">
47
-                <template slot-scope="scope">
48
-                  {{scope.row.warehousing_order}}
49
-                </template>
50
-            </el-table-column>
51
-            <el-table-column prop="date" label="盘点日期" align="center">
52
-                <template slot-scope="scope">
53
-                  {{getTime(scope.row.start_time)}}
54
-                </template>
55
-            </el-table-column>
56
-            <el-table-column prop="date" label="药品名称" align="center">
2
+  <div>
3
+    <div>日期:2021-10-13    盘点人:赵强</div>
4
+    <el-collapse v-model="activeNames">
5
+      <el-collapse-item :name="index" v-for="(item,index) in 10" :key="index">
6
+        <template slot="title">
7
+          一致性 Consistency <el-button type="warning" icon="el-icon-remove" style="margin-left:20px;">移除</el-button>
8
+        </template>
9
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" style="width:100%">
10
+              <el-table-column prop="date" label="药品名称" width="200" align="center">
57
                 <template slot-scope="scope">
11
                 <template slot-scope="scope">
58
                   {{scope.row.drug_name}}
12
                   {{scope.row.drug_name}}
59
                 </template>
13
                 </template>
60
-            </el-table-column>
61
-            <el-table-column prop="date" label="药品规格" align="center">
14
+              </el-table-column>
15
+              <el-table-column  prop="name" label="规格" width="100"  align="center">
62
                 <template slot-scope="scope">
16
                 <template slot-scope="scope">
63
                   {{scope.row.specification_name}}
17
                   {{scope.row.specification_name}}
64
                 </template>
18
                 </template>
65
-            </el-table-column>
66
-            <el-table-column prop="name" label="盘点数量" align="center">
67
-                <template slot-scope="scope">
68
-                  {{scope.row.count}}{{scope.row.warehousing_unit}}<span v-if="scope.row.min_count>0">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
69
-                </template>
70
-            </el-table-column>
71
-            <el-table-column prop="name" label="盘点人" align="center">
72
-                <template slot-scope="scope">
73
-                  {{getDoctorName(scope.row.creater)}}
74
-                </template>
75
-            </el-table-column>
76
-            <el-table-column prop="name" label="审核日期" align="center">
77
-                <template slot-scope="scope">
78
-                  {{getTime(scope.row.checker_time)}}
79
-                </template>
80
-            </el-table-column>
81
-            <el-table-column prop="name" label="审核人" align="center">
82
-                <template slot-scope="scope">
83
-                   {{getDoctorName(scope.row.checker)}}
84
-                </template>
85
-            </el-table-column>
86
-            <el-table-column prop="name" label="状态" align="center">
87
-              <template slot-scope="scope">
88
-                 <span v-if="scope.row.checker_status == 1">盘点完成</span>
89
-                 <span v-if="scope.row.checker_status == 2">正在盘点</span>
90
-              </template>
91
-            </el-table-column>
92
-            <el-table-column label="操作" align="center" width="260">
93
-                <template slot-scope="scope">
94
-                  <el-button type="primary" size="small" @click="editInventory(scope.row.id,scope.row.checker_status,scope.$index)">编辑</el-button>
95
-                  <el-button type="danger" size="small" @click="deleteDrugInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
96
-                 
19
+              </el-table-column>
20
+              <el-table-column prop="name" label="单位" width="100"  align="center">
21
+                  <template slot-scope="scope">
22
+                    {{scope.row.warehousing_unit}}
97
                 </template>
23
                 </template>
98
-            </el-table-column>
99
-        </el-table>
100
-        <el-pagination
101
-            @size-change="handleSizeChange"
102
-            @current-change="handleCurrentChange"
103
-            :page-sizes="[10, 20, 40, 100]"
104
-            :page-size="10"
105
-            background
106
-            style="margin-top:20px;text-align: right"
107
-            layout="total, sizes, prev, pager, next, jumper"
108
-            :total="total"
109
-        >
110
-        </el-pagination>
111
-        <el-dialog
112
-        title="药品盘点"
113
-        :visible.sync="dialogVisible"
114
-        width="1200px"
115
-        class="addDrugsDialog">
116
-            <el-form :model="form" class="modifyDialog" label-width="120px">
117
-                <el-form-item label="药品ID">
118
-                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
119
-                </el-form-item>
120
-                <el-form-item label="药品名称">
121
-                  <el-autocomplete
122
-                    class="checkSearch"
123
-                    popper-class="my-autocomplete"
124
-                    v-model="form.drug_name"
125
-                    :fetch-suggestions="querySearchAsync"
126
-                    :trigger-on-focus="true"
127
-                    placeholder="请输入药品名称"
128
-                    @select="handleSelect"
129
-                    style="width:160px;"
130
-                  >
131
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
132
-                  <template slot-scope="{ item }">
133
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
134
-                  </template>
135
-                 </el-autocomplete>  
136
-                </el-form-item>
137
-                <el-form-item label="批次">
138
-                  <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
139
-                      <el-option
140
-                        v-for="(item,index) in numberList"
141
-                        :key="index"
142
-                        :label="item.batch_number"
143
-                        :value="item.id">
144
-                      </el-option>
145
-                  </el-select>
146
-                </el-form-item>
147
-         
148
-                <el-form-item label="规格">
149
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
150
-                </el-form-item>
151
-                <el-form-item label="进货价">
152
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
153
-                </el-form-item>
154
-                <el-form-item label="零售价">
155
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
156
-                </el-form-item>
157
-
158
-                <div style="width:100%;display:flex;">
159
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
160
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
161
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
162
-                      <el-option
163
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
164
-                        :key="index"
165
-                        :label="item.name"
166
-                        :value="item.name">
167
-                      </el-option>
168
-                    </el-select>
169
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
170
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
171
-                      <el-option
172
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
173
-                        :key="index"
174
-                        :label="item.name"
175
-                        :value="item.name">
176
-                      </el-option>
177
-                    </el-select>
178
-                    </el-form-item>
179
-                      
180
-                </div>
181
-
182
-                <el-form-item label="库存">
183
-                    <el-input v-model="form.total" :disabled="true"></el-input>
184
-                </el-form-item>
185
-                <el-form-item label="产地">
186
-                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
187
-                </el-form-item>
188
-                <el-form-item label="批准文号">
189
-                    <el-input v-model="form.number" :disabled="true"></el-input>
190
-                </el-form-item>
191
-                <el-form-item label="生产厂商">
192
-                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
193
-                </el-form-item>
194
-                <el-form-item label="备注">
195
-                    <div style="display:flex;">
196
-                        <el-input v-model="form.name"></el-input>
197
-                        <el-button style="margin-left:5px;" type="primary" @click="addInventory">添加</el-button>
198
-                    </div>
199
-                </el-form-item>
200
-            </el-form>
201
-            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
202
-                <el-table-column prop="date" label="耗材ID" width="100" align="center">
203
-                    <template slot-scope="scope">
204
-                       {{scope.row.drug_id}}
205
-                    </template>
206
-                </el-table-column>
207
-                <el-table-column prop="date" label="耗材名称" width="100" align="center">
208
-                   <template slot-scope="scope">
209
-                       {{scope.row.drug_name}}
210
-                    </template>
211
-                </el-table-column>
212
-                <el-table-column prop="name" label="规格" width="100" align="center">
213
-                   <template slot-scope="scope">
214
-                       {{scope.row.specification_name}}
215
-                    </template>
216
-                </el-table-column>
217
-                <el-table-column prop="name" label="单位" width="100" align="center">
218
-                     <template slot-scope="scope">
219
-                       {{scope.row.warehousing_unit}}
220
-                    </template>
221
-                </el-table-column>
222
-                <el-table-column prop="name"  label="盘点数量" width="100" align="center">
223
-                     <template slot-scope="scope">
224
-                       {{scope.row.count}}{{scope.row.warehousing_unit}}{{scope.row.min_count}}{{scope.row.min_unit}}
225
-                    </template>
226
-                </el-table-column>
227
-                <el-table-column prop="name" label="原进货价" width="100" align="center">
228
-                   <template slot-scope="scope">
229
-                       {{scope.row.last_price}}
230
-                    </template>
231
-                </el-table-column>
232
-                <el-table-column prop="name" label="原零售价" width="100" align="center">
233
-                    <template slot-scope="scope">
234
-                       {{scope.row.retail_price}}
235
-                    </template>
236
-                </el-table-column>
237
-             
238
-                <el-table-column  prop="name" label="生产厂商" width="100" align="center">
239
-                    <template slot-scope="scope">
240
-                       {{scope.row.manufacturer}}
241
-                    </template> 
242
-                </el-table-column>
243
-                <el-table-column prop="name" label="产地"  width="100" align="center">
24
+              </el-table-column>
25
+              <el-table-column prop="name" label="库存数量" width="100"  align="center">
244
                   <template slot-scope="scope">
26
                   <template slot-scope="scope">
245
-                       {{scope.row.drug_origin_place}}
27
+                    {{scope.row.total}}
246
                   </template> 
28
                   </template> 
247
-                </el-table-column>
248
-                <el-table-column prop="name" label="批准文号" width="100" align="center">
249
-                 <template slot-scope="scope">
250
-                       {{scope.row.number}}
29
+              </el-table-column>
30
+              <el-table-column prop="name" label="进价" width="100"  align="center">
31
+                  <template slot-scope="scope">
32
+                    {{scope.row.last_price}}
251
                   </template> 
33
                   </template> 
252
-                </el-table-column>
253
-                <el-table-column prop="name" label="备注" width="100" align="center">
254
-                    <template slot-scope="scope">
255
-                       {{scope.row.remark}}
256
-                    </template> 
257
-                </el-table-column>
258
-                <el-table-column
259
-                fixed="right"
260
-                width="100"
261
-                label="操作">
262
-                    <template slot-scope="scope">
263
-                        <el-button type="text" size="small" @click="toEdit(scope.row,scope.$index)">编辑</el-button>
264
-                        <el-button type="text" size="small" @click="toDelete(scope.$index)">删除</el-button>
265
-                       
266
-                    </template>
267
-                </el-table-column>
268
-            </el-table>
269
-            <span slot="footer" class="dialog-footer">
270
-                <el-button @click="dialogVisible = false">取 消</el-button>
271
-                <el-button type="primary" @click="saveDrugInventory">确 定</el-button>
272
-            </span>
273
-        </el-dialog>
274
-
275
-
276
-          <el-dialog
277
-            title="库房调价"
278
-            :visible.sync="editdialogVisible"
279
-            width="1200px">
280
-            <el-form :model="form" class="modifyDialog" label-width="120px">
281
-
282
-                <el-form-item label="耗材ID">
283
-                    <el-input v-model="form.drug_id" :disabled="true"></el-input>
284
-                </el-form-item>
285
-                <el-form-item label="药品名称">
286
-                  <el-autocomplete
287
-                    class="checkSearch"
288
-                    popper-class="my-autocomplete"
289
-                    v-model="form.drug_name"
290
-                    :fetch-suggestions="querySearchAsync"
291
-                    :trigger-on-focus="true"
292
-                    placeholder="请输入药品名称"
293
-                    @select="handleSelect"
294
-                    style="width:160px;"
295
-                  >
296
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
297
-                  <template slot-scope="{ item }">
298
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
299
-                  </template>
300
-                 </el-autocomplete>  
301
-                </el-form-item>
302
-                <el-form-item label="规格">
303
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
304
-                </el-form-item>
305
-               <el-form-item label="批次">
306
-                  <el-select v-model="form.batch_number" filterable placeholder="请选择" @change="changeNumber">
307
-                      <el-option
308
-                        v-for="(item,index) in numberList"
309
-                        :key="index"
310
-                        :label="item.batch_number"
311
-                        :value="item.id">
312
-                      </el-option>
313
-                  </el-select>
314
-                </el-form-item>
315
-              
316
-                <el-form-item label="进货价">
317
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
318
-                </el-form-item>
319
-                <el-form-item label="零售价">
320
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
321
-                </el-form-item>
322
-
323
-                <div style="width:100%;display:flex;">
324
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
325
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
326
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
327
-                      <el-option
328
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
329
-                        :key="index"
330
-                        :label="item.name"
331
-                        :value="item.name">
332
-                      </el-option>
333
-                    </el-select>
334
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
335
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
336
-                      <el-option
337
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
338
-                        :key="index"
339
-                        :label="item.name"
340
-                        :value="item.name">
341
-                      </el-option>
342
-                    </el-select>
343
-                 </el-form-item>
344
-                </div>
345
-                <el-form-item label="库存">
346
-                    <el-input v-model="form.total" :disabled="true"></el-input>
347
-                </el-form-item>
348
-                <el-form-item label="产地">
349
-                    <el-input v-model="form.drug_origin_place"></el-input>
350
-                </el-form-item>
351
-                <el-form-item label="批准文号">
352
-                    <el-input v-model="form.number"></el-input>
353
-                </el-form-item>
354
-                <el-form-item label="生产厂商">
355
-                    <el-input v-model="form.manufacturer"></el-input>
356
-                </el-form-item>
357
-                <el-form-item label="备注">
358
-                    <div style="display:flex;">
359
-                        <el-input v-model="form.remark"></el-input>
360
-                    </div>
361
-                </el-form-item>
362
-            </el-form>
363
-            <span slot="footer" class="dialog-footer">
364
-                <el-button @click="editdialogVisible = false">取 消</el-button>
365
-                <el-button type="primary" @click="saveInventory">确 定</el-button>
366
-            </span>
367
-        </el-dialog>
368
-
369
-      <el-dialog
370
-        title="药品盘点核对"
371
-        :visible.sync="checkDialogVisible"
372
-        width="30%"
373
-        >
374
-        <span>
375
-          <el-form :model="form">
376
-            <el-row>
377
-              <el-col>
378
-                <el-form-item label="核对时间">
379
-                 <el-date-picker
380
-                    size="small"
381
-                    v-model="check_time"
382
-                    type="date"
383
-                    style="margin-left:5px;width:140px;"
384
-                    placeholder="选择日期">
385
-                  </el-date-picker>
386
-                </el-form-item>  
387
-              </el-col>
388
-            </el-row>  
389
-             <el-row>
390
-              <el-col>
391
-                <el-form-item label="核对人">
392
-                  <el-select v-model="checker" placeholder="请选择">
393
-                    <el-option
394
-                    v-for="item in doctorList"
395
-                    :key="item.admin_user_id"
396
-                    :label="item.user_name"
397
-                    :value="item.admin_user_id">
398
-                    </el-option>
399
-                 </el-select>
400
-                </el-form-item>  
401
-              </el-col>
402
-            </el-row>  
403
-          </el-form>  
404
-        </span>
405
-        <span slot="footer" class="dialog-footer">
406
-            <el-button @click="checkDialogVisible = false">取 消</el-button>
407
-            <el-button type="primary" @click="SaveDrugCheckedInventory">保 存</el-button>
408
-        </span>
409
-    </el-dialog>
410
-
411
-
412
-       <el-dialog
413
-            title="库房调价"
414
-            :visible.sync="modifydialogVisible"
415
-            width="1200px">
416
-            <el-form :model="form" class="modifyDialog" label-width="120px">
417
-
418
-                <el-form-item label="耗材ID">
419
-                    <el-input v-model="form.drug_id"></el-input>
420
-                </el-form-item>
421
-                <el-form-item label="药品名称">
422
-                  <el-autocomplete
423
-                    class="checkSearch"
424
-                    popper-class="my-autocomplete"
425
-                    v-model="form.drug_name"
426
-                    :fetch-suggestions="querySearchAsync"
427
-                    :trigger-on-focus="true"
428
-                    placeholder="请输入药品名称"
429
-                    @select="handleSelect"
430
-                    style="width:160px;"
431
-                  >
432
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
433
-                  <template slot-scope="{ item }">
434
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
435
-                  </template>
436
-                 </el-autocomplete>  
437
-                </el-form-item>
438
-                <el-form-item label="规格">
439
-                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
440
-                </el-form-item>
441
-                <!-- <el-form-item label="单位">
442
-                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
443
-                </el-form-item> -->
444
-                <!-- <el-form-item prop="warehousing_unit" label="单位">
445
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
446
-                      <el-option
447
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
448
-                        :key="index"
449
-                        :label="item.name"
450
-                        :value="item.name">
451
-                      </el-option>
452
-                    </el-select>
453
-                </el-form-item> -->
454
-                <el-form-item label="进货价">
455
-                    <el-input v-model="form.last_price" :disabled="true"></el-input>
456
-                </el-form-item>
457
-                <el-form-item label="零售价">
458
-                    <el-input v-model="form.retail_price" :disabled="true"></el-input>
459
-                </el-form-item>
460
-                <!-- <el-form-item label="盘点数量">
461
-                    <el-input v-model="form.count"></el-input>
462
-                </el-form-item> -->
463
-              
464
-                <div style="width:100%;display:flex;">
465
-                    <el-form-item prop="dose" label="盘点数量" style="width:100%;">
466
-                      <el-input v-model="form.count" type="number" style="width:160px;" placeholder="盘点数量"></el-input>
467
-                      <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="最大单位" :disabled="true">
468
-                      <el-option
469
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
470
-                        :key="index"
471
-                        :label="item.name"
472
-                        :value="item.name">
473
-                      </el-option>
474
-                    </el-select>
475
-                    <el-input v-model="form.min_count"  style="width:160px;margin-left:10px" placeholder="盘点数量" ></el-input>
476
-                    <el-select v-model="form.min_unit"  style="width:160px;" placeholder="最小单位" :disabled="true">
477
-                      <el-option
478
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
479
-                        :key="index"
480
-                        :label="item.name"
481
-                        :value="item.name">
482
-                      </el-option>
483
-                    </el-select>
484
-                 </el-form-item>
485
-                </div>
486
-                <el-form-item label="库存">
487
-                    <el-input v-model="form.total" :disabled="true"></el-input>
488
-                </el-form-item>
489
-                <el-form-item label="产地">
490
-                    <el-input v-model="form.drug_origin_place" :disabled="true"></el-input>
491
-                </el-form-item>
492
-                <el-form-item label="批准文号">
493
-                    <el-input v-model="form.number" :disabled="true"></el-input>
494
-                </el-form-item>
495
-                <el-form-item label="生产厂商">
496
-                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
497
-                </el-form-item>
498
-                <el-form-item label="备注">
499
-                    <div style="display:flex;">
500
-                        <el-input v-model="form.remark"></el-input>
501
-                    </div>
502
-                </el-form-item>
503
-            </el-form>
504
-            <span slot="footer" class="dialog-footer">
505
-                <el-button @click="modifydialogVisible = false">取 消</el-button>
506
-                <el-button type="primary" @click="modifyInventory">确 定</el-button>
507
-            </span>
508
-        </el-dialog>
509
-
510
-
511
-         <el-dialog
512
-            title="校正"
513
-            :visible.sync="profdialogVisible"
514
-            width="1200px">
515
-            <el-form :model="form" class="modifyDialog" label-width="120px">
516
-
517
-                <el-form-item label="药品名称">
518
-                  <el-autocomplete
519
-                    class="checkSearch"
520
-                    popper-class="my-autocomplete"
521
-                    v-model="form.drug_name"
522
-                    :fetch-suggestions="querySearchAsync"
523
-                    :trigger-on-focus="true"
524
-                    placeholder="请输入药品名称"
525
-                    @select="handleSelect"
526
-                    style="width:160px;"
527
-                  >
528
-                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
529
-                  <template slot-scope="{ item }">
530
-                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
531
-                  </template>
532
-                 </el-autocomplete>  
533
-                </el-form-item>
534
-                <!-- <el-form-item label="单位">
535
-                    <el-input v-model="form.warehousing_unit"></el-input>
536
-                </el-form-item> -->
537
-                <el-form-item prop="warehousing_unit" label="单位">
538
-                    <el-select v-model="form.warehousing_unit" style="width:160px;" placeholder="单位" @change="changeMaxUnit">
539
-                      <el-option
540
-                        v-for="(item,index) in getDataConfig('hemodialysis','units')"
541
-                        :key="index"
542
-                        :label="item.name"
543
-                        :value="item.name">
544
-                      </el-option>
545
-                    </el-select>
546
-                </el-form-item>
547
-                <el-form-item label="盘点数量">
548
-                    <el-input v-model="form.count"></el-input>
549
-                </el-form-item>
550
-                <el-form-item label="校正数量">
551
-                    <el-input v-model="form.proof_count" type="number"></el-input>
552
-                </el-form-item>
553
-              
554
-                <el-form-item label="库存">
555
-                    <el-input v-model="form.total" :disabled="true"></el-input>
556
-                </el-form-item>
34
+              </el-table-column>
35
+              <el-table-column prop="name" label="零售价" width="100"  align="center">
36
+                  <template slot-scope="scope">
37
+                    {{scope.row.retail_price}}
38
+                  </template> 
39
+              </el-table-column>
40
+              <el-table-column prop="name"  label="零售总价" width="100"  align="center">
41
+                  <template slot-scope="scope">
42
+                    {{scope.row.count * scope.row.retail_price}}
43
+                  </template> 
44
+              </el-table-column>
45
+              <el-table-column prop="name" label="产地" width="100"  align="center">
46
+                  <template slot-scope="scope">
47
+                    {{scope.row.drug_origin_place}}
48
+                  </template> 
49
+              </el-table-column>
50
+              <el-table-column prop="name" label="生产厂商" width="100"  align="center">
51
+                  <template slot-scope="scope">
52
+                    {{scope.row.manufacturer}}
53
+                  </template> 
54
+              </el-table-column>
55
+              <el-table-column prop="name" label="实盘点" width="100"  align="center">
56
+                <template slot-scope="scope">
57
+                    {{scope.row.count}}{{scope.row.warehousing_unit}} <span v-if="scope.row.min_count">{{scope.row.min_count}}{{scope.row.min_unit}}</span>
58
+                  </template> 
59
+              </el-table-column>
60
+              <!-- <el-table-column  prop="name" label="亏损价格" width="100"  align="center">
61
+                <template slot-scope="scope">
557
                 
62
                 
558
-                <el-form-item label="备注">
559
-                    <div style="display:flex;">
560
-                        <el-input v-model="form.remark"></el-input>
561
-                    </div>
562
-                </el-form-item>
563
-            </el-form>
564
-            <span slot="footer" class="dialog-footer">
565
-                <el-button @click="profdialogVisible = false">取 消</el-button>
566
-                <el-button type="primary" @click="proofInventory">确 定</el-button>
567
-            </span>
568
-        </el-dialog>
569
-    </div>
63
+                  </template>  
64
+              </el-table-column> -->
65
+              <el-table-column prop="name" label="生产日期" width="100"  align="center">
66
+                  <template slot-scope="scope">
67
+                    {{getTime(scope.row.product_date)}}
68
+                  </template>  
69
+              </el-table-column>
70
+              <el-table-column prop="name" label="有效日期" width="100"  align="center">
71
+                  <template slot-scope="scope">
72
+                    {{getTime(scope.row.expiry_date)}}
73
+                  </template>  
74
+              </el-table-column>
75
+              <!-- <el-table-column
76
+              fixed="right"
77
+              width="100"
78
+              label="操作">
79
+                  <template slot-scope="scope">
80
+                      <el-button type="text" size="small">删除</el-button>
81
+                      <el-button type="text" size="small">编辑</el-button>
82
+                  </template>
83
+              </el-table-column> -->
84
+          </el-table>
85
+      </el-collapse-item>
86
+    </el-collapse>
87
+    <el-input v-model="input" placeholder="请输入内容"></el-input>
88
+  </div>
570
 </template>
89
 </template>
571
 
90
 
572
 <script>
91
 <script>
583
             value2:'',
102
             value2:'',
584
             tableData: [],
103
             tableData: [],
585
             dialogVisible:false,
104
             dialogVisible:false,
586
-           form: {
105
+            form: {
587
                 id:"",
106
                 id:"",
588
                 drug_name: '',
107
                 drug_name: '',
589
                 retail_price :'',
108
                 retail_price :'',
634
             profdialogVisible:false,
153
             profdialogVisible:false,
635
             index:"",
154
             index:"",
636
             unitList:[],
155
             unitList:[],
156
+            reasonList:[
157
+              {id:0,name:"默认"},
158
+              {id:1,name:"到期退货"},
159
+              {id:2,name:"异常退货"},
160
+              {id:3,name:"退货"},
161
+              {id:4,name:"人为损坏"},
162
+              {id:5,name:"不计入报损分析"},
163
+            ],
164
+            activeNames: [0]
637
         }
165
         }
638
     },
166
     },
639
     methods:{
167
     methods:{

+ 4 - 2
src/xt_pages/stock/stockInOrderAdd.vue View File

86
               <span>批号</span>
86
               <span>批号</span>
87
             </template>
87
             </template>
88
             <template slot-scope="scope">
88
             <template slot-scope="scope">
89
-              <el-form-item style="padding-top: 20px">
89
+              <el-form-item style="padding-top: 20px" >
90
                 <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
90
                 <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input>
91
               </el-form-item>
91
               </el-form-item>
92
-
93
             </template>
92
             </template>
94
           </el-table-column>
93
           </el-table-column>
95
 
94
 
285
 
284
 
286
           good_id: [
285
           good_id: [
287
             { validator: checkGoodId, trigger: 'blur' }
286
             { validator: checkGoodId, trigger: 'blur' }
287
+          ],
288
+          number:[
289
+            { required: true, message: '批号不能为空', trigge: 'blur' }
288
           ]
290
           ]
289
 
291
 
290
         },
292
         },

+ 29 - 12
src/xt_pages/stock/stockOutOrderAdd.vue View File

120
           
120
           
121
           <el-table-column  width="150" align="center">
121
           <el-table-column  width="150" align="center">
122
              <template slot="header" slot-scope="scope">
122
              <template slot="header" slot-scope="scope">
123
-              <span>批号<span style="color: red"></span></span>
123
+              <span>批号<span style="color: red">*</span></span>
124
             </template>
124
             </template>
125
             <template slot-scope="scope">
125
             <template slot-scope="scope">
126
-               <!-- <el-input placeholder="请输入批号" v-model="scope.row.number"></el-input> -->
127
-                <el-select v-model="scope.row.number" filterable placeholder="请选择">
126
+              <el-form-item  
127
+                :rules="tableRules.number">
128
+                <el-select v-model="scope.row.number" filterable placeholder="请选择" @change="changeNumberList(scope.row)">
128
                   <el-option
129
                   <el-option
129
                     v-for="(item,index) in numberList"
130
                     v-for="(item,index) in numberList"
130
                     :key="index"
131
                     :key="index"
131
                     :label="item.number"
132
                     :label="item.number"
132
-                    :value="item.number">
133
+                    :value="item.id">
133
                   </el-option>
134
                   </el-option>
134
                 </el-select>
135
                 </el-select>
136
+              </el-form-item>
135
             </template>
137
             </template>
136
           </el-table-column>
138
           </el-table-column>
137
 
139
 
324
       },
326
       },
325
       tableRules: {
327
       tableRules: {
326
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
328
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
327
-        count: [{ required: true, message: "数量不能为空", trigge: "blur" }]
329
+        count: [{ required: true, message: "数量不能为空", trigge: "blur" }],
330
+        number:[{ required: true, message: "批号不能为空",trigge:"blur"}],
328
       },
331
       },
329
       ruleForm: {
332
       ruleForm: {
330
         manufacturer: [
333
         manufacturer: [
456
       tempObj["good_unit"] = "";
459
       tempObj["good_unit"] = "";
457
       tempObj["number"] = ""
460
       tempObj["number"] = ""
458
       tempObj["specification_name"] = ""
461
       tempObj["specification_name"] = ""
459
-      tempObj["number"] = ""
460
       tempObj["expiry_date"] = ""
462
       tempObj["expiry_date"] = ""
461
       tempObj["product_date"] = ""
463
       tempObj["product_date"] = ""
462
       tempObj["license_number"] = ""
464
       tempObj["license_number"] = ""
465
+      tempObj["warehouse_info_id"] = 0
463
       this.recordInfo.recordData.push(tempObj);
466
       this.recordInfo.recordData.push(tempObj);
464
     },
467
     },
465
     handleDelete: function(index, row) {
468
     handleDelete: function(index, row) {
587
            
590
            
588
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
591
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
589
           }
592
           }
593
+          console.log("批次好",this.numberList)
590
           for(let i=0;i<this.recordInfo.recordData.length;i++){
594
           for(let i=0;i<this.recordInfo.recordData.length;i++){
591
             for(let j=0;j<this.manufacturerList.length;j++){
595
             for(let j=0;j<this.manufacturerList.length;j++){
592
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
596
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
598
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
602
                   this.recordInfo.recordData[i].dealer = this.dealerList[z].id
599
               }
603
               }
600
             }
604
             }
605
+          
606
+            for(let y=0;y<this.numberList.length;y++){
607
+               if(this.recordInfo.recordData[i].number == this.numberList[y].id){
608
+                   this.recordInfo.recordData[i].number = this.numberList[y].number
609
+               }
610
+            }
601
           }
611
           }
602
           const params = {
612
           const params = {
603
             stockOut: this.recordInfo.recordData
613
             stockOut: this.recordInfo.recordData
604
           };
614
           };
605
           console.log("2323223223",this.recordInfo.recordData);
615
           console.log("2323223223",this.recordInfo.recordData);
606
-          
616
+     
607
           postWarehouseOut(
617
           postWarehouseOut(
608
             params,
618
             params,
609
             this.warehouse_out_time,
619
             this.warehouse_out_time,
619
                var msg = response.data.data.msg
629
                var msg = response.data.data.msg
620
                var good_name = response.data.data.good_name
630
                var good_name = response.data.data.good_name
621
                var specification_name = response.data.data.specification_name
631
                var specification_name = response.data.data.specification_name
622
-               var str = good_name +"*" + specification_name +"无库存,请入库"
632
+               var str = good_name +"*" + specification_name +"该批次无库存,请入库"
623
                console.log("msg222222222",msg)
633
                console.log("msg222222222",msg)
624
                if(msg == 1){
634
                if(msg == 1){
625
                   this.$message.error(str)
635
                   this.$message.error(str)
711
          }
721
          }
712
 
722
 
713
        
723
        
714
-      }
715
-
716
-       
724
+      }    
717
     },
725
     },
718
 
726
 
719
     getStockBatchNumber(id){
727
     getStockBatchNumber(id){
731
     getDataConfig(module, filed_name) {
739
     getDataConfig(module, filed_name) {
732
       return getDataConfig(module, filed_name)
740
       return getDataConfig(module, filed_name)
733
     },
741
     },
742
+    changeNumberList(val){
743
+       console.log("val232332323223232332",val)
744
+       for(let i=0;i<this.recordInfo.recordData.length;i++){
745
+         if(val.good_id == this.recordInfo.recordData[i].good_id){
746
+            this.recordInfo.recordData[i].warehouse_info_id = val.number
747
+         }
748
+       }  
749
+      console.log("表格",this.recordInfo.recordData)
750
+    }
734
   },
751
   },
735
   created() {
752
   created() {
736
     var nowDate = new Date();
753
     var nowDate = new Date();
752
     tempObj["good_unit"] = ""
769
     tempObj["good_unit"] = ""
753
     tempObj["number"] = ""
770
     tempObj["number"] = ""
754
     tempObj["specification_name"] = ""
771
     tempObj["specification_name"] = ""
755
-    tempObj["number"] = ""
756
     tempObj["dealer"] = ""
772
     tempObj["dealer"] = ""
757
     tempObj["license_number"] = ""
773
     tempObj["license_number"] = ""
774
+    tempObj["warehouse_info_id"] = 0
758
     this.recordInfo.recordData.push(tempObj);
775
     this.recordInfo.recordData.push(tempObj);
759
     this.GetConfigInfo();
776
     this.GetConfigInfo();
760
     this.propForm.goodUnit = this.$store.getters.good_unit;
777
     this.propForm.goodUnit = this.$store.getters.good_unit;

+ 22 - 22
src/xt_pages/workforce/remind_print_setting.vue View File

20
           <div class="table_panel">
20
           <div class="table_panel">
21
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
21
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
22
               <div class="signPrint">
22
               <div class="signPrint">
23
-                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div> 
23
+                <div>分区/床位号:{{main_collection.zone.name}}/{{main_collection.number.number}}</div>
24
                 <div>姓名:
24
                 <div>姓名:
25
-                  <span v-if="type ==1">{{main_collection.patient.name}} </span> 
26
-                  <span v-if="type ==2">{{main_collection.patient}} </span> 
27
-                </div> 
28
-                <div>抗凝剂: 
25
+                  <span v-if="type ==1">{{main_collection.patient.name}} </span>
26
+                  <span v-if="type ==2">{{main_collection.patient}} </span>
27
+                </div>
28
+                <div>抗凝剂:
29
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
29
                   <span v-if="org_id == 10138">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
30
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
30
                   <span v-else >{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name: ''}}</span>
31
-                </div> 
31
+                </div>
32
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
32
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
33
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
33
                 <div v-if="org_id == 10188">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
34
-                <div>用量:  
34
+                <div>用量:
35
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
35
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
36
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
36
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
37
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
37
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
43
                   <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
43
                   <span v-if="main_collection.dialysissolution.anticoagulant == 9">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
44
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
44
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
45
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
45
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
46
-                </div> 
46
+                </div>
47
                 <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
47
                 <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
48
                 <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
48
                 <div v-if="org_id == 10188">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
49
                 <div v-if="org_id == 10188">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
49
                 <div v-if="org_id == 10188">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
50
-                <div>用法:静脉注射</div> 
50
+                <div>用法:静脉注射</div>
51
                 <div>打印时间:{{currentDate}}</div>
51
                 <div>打印时间:{{currentDate}}</div>
52
               </div>
52
               </div>
53
            </div>
53
            </div>
64
   import { uParseTime } from '@/utils/tools'
64
   import { uParseTime } from '@/utils/tools'
65
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
65
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
66
   import print from 'print-js'
66
   import print from 'print-js'
67
-  const moment = require('moment') 
67
+  const moment = require('moment')
68
   export default {
68
   export default {
69
     name: 'SchedulePrint',
69
     name: 'SchedulePrint',
70
     data() {
70
     data() {
97
       BreadCrumb
97
       BreadCrumb
98
     },
98
     },
99
     created() {
99
     created() {
100
-      console.log("type2323233223232",this.$route.query.type)  
100
+      // console.log("type2323233223232",this.$route.query.type)
101
      this.type = this.$route.query.type
101
      this.type = this.$route.query.type
102
      this.getPrintList()
102
      this.getPrintList()
103
      this.org_id = this.$store.getters.xt_user.org.id
103
      this.org_id = this.$store.getters.xt_user.org.id
104
      console.log("机构ID",this.org_id)
104
      console.log("机构ID",this.org_id)
105
      this.currentDate = this.getCurrentDate()
105
      this.currentDate = this.getCurrentDate()
106
-   
106
+
107
      this.modeOptions = this.$store.getters.treatment_mode
107
      this.modeOptions = this.$store.getters.treatment_mode
108
      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
108
      this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
109
     this.week_type = this.$route.query.week_type
109
     this.week_type = this.$route.query.week_type
110
     this.week_time  = this.$route.query.week_time
110
     this.week_time  = this.$route.query.week_time
111
     this.zone = this.$route.query.zone
111
     this.zone = this.$route.query.zone
112
     this.pre_status = this.$route.query.prestatus
112
     this.pre_status = this.$route.query.prestatus
113
-    
113
+
114
     if(parseInt(this.$route.query.type) == 1){
114
     if(parseInt(this.$route.query.type) == 1){
115
       const params = {
115
       const params = {
116
           week_type:this.week_type,
116
           week_type:this.week_type,
128
            var arr = list.sort(this.compare('sort'))
128
            var arr = list.sort(this.compare('sort'))
129
             console.log("Arr222222",arr)
129
             console.log("Arr222222",arr)
130
            this.scheduleData = arr
130
            this.scheduleData = arr
131
-            
131
+
132
              let a = response.data.data.day
132
              let a = response.data.data.day
133
               console.log("a",a)
133
               console.log("a",a)
134
               var myDate = new Date(a);
134
               var myDate = new Date(a);
171
     if(parseInt(this.$route.query.type) == 2){
171
     if(parseInt(this.$route.query.type) == 2){
172
        this.getNextScheduleWeekDay()
172
        this.getNextScheduleWeekDay()
173
     }
173
     }
174
-    
174
+
175
     },
175
     },
176
     methods: {
176
     methods: {
177
       getAdvice:function(doctor_advice) {
177
       getAdvice:function(doctor_advice) {
299
           var str = year + "年" + month + "月" + day + "日  " + days;
299
           var str = year + "年" + month + "月" + day + "日  " + days;
300
           return str;
300
           return str;
301
         }
301
         }
302
-        
303
-        
302
+
303
+
304
       },
304
       },
305
 
305
 
306
        compare(property) {
306
        compare(property) {
337
         // var arr = newArr.join(",")
337
         // var arr = newArr.join(",")
338
         // var str = ""
338
         // var str = ""
339
         // if(this.zone == 0){
339
         // if(this.zone == 0){
340
-        //    str = arr  
340
+        //    str = arr
341
         // }
341
         // }
342
         // if(zone != 0){
342
         // if(zone != 0){
343
         //   str = zone.join(",")
343
         //   str = zone.join(",")
360
         this.scheduleData = [];
360
         this.scheduleData = [];
361
         if (response.data.state == 1) {
361
         if (response.data.state == 1) {
362
           var scheduleData = response.data.data.schedule;
362
           var scheduleData = response.data.data.schedule;
363
-      
363
+
364
           for(let i=0;i<scheduleData.length;i++){
364
           for(let i=0;i<scheduleData.length;i++){
365
               scheduleData[i].sort = scheduleData[i].number.sort
365
               scheduleData[i].sort = scheduleData[i].number.sort
366
           }
366
           }
367
             var arr =   scheduleData.sort(this.compare('sort'))
367
             var arr =   scheduleData.sort(this.compare('sort'))
368
             console.log("元旦快乐",arr)
368
             console.log("元旦快乐",arr)
369
             this.scheduleData = arr
369
             this.scheduleData = arr
370
-          
370
+
371
             // var newList = []
371
             // var newList = []
372
             // for(let i=0;i<scheduleData.length;i++){
372
             // for(let i=0;i<scheduleData.length;i++){
373
             //   if(scheduleData.prescription.id > 0){
373
             //   if(scheduleData.prescription.id > 0){
374
             //      newList.push(scheduleData[i])
374
             //      newList.push(scheduleData[i])
375
-            //   } 
375
+            //   }
376
             // }
376
             // }
377
             // var arr =   newList.sort(this.compare('sort'))
377
             // var arr =   newList.sort(this.compare('sort'))
378
             // console.log("元旦快乐",arr)
378
             // console.log("元旦快乐",arr)
379
-            // this.scheduleData = arr 
379
+            // this.scheduleData = arr
380
         } else {
380
         } else {
381
           this.$message.error("网络错误");
381
           this.$message.error("网络错误");
382
           return false;
382
           return false;