huangyw 3 年之前
父節點
當前提交
4f9c9323e7

+ 1 - 1
src/xt_pages/hospitalStation/components/prescriptionTable.vue 查看文件

1
 <template>
1
 <template>
2
   <div class="prescriptionTable">
2
   <div class="prescriptionTable">
3
-    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;"
3
+    <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99.9%;"
4
               :row-style="{ color: '#303133' }"
4
               :row-style="{ color: '#303133' }"
5
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
5
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
6
       <el-table-column align="center" prop="day" width="70" label="序号">
6
       <el-table-column align="center" prop="day" width="70" label="序号">

+ 2 - 2
src/xt_pages/outpatientDoctorStation/pastInquiries.vue 查看文件

250
               });
250
               });
251
             } else {
251
             } else {
252
               const style =
252
               const style =
253
-                "@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
253
+                "@media print {html {height: auto;margin: 0px;} #prescription-print{font-size:14px;border:1px solid white;margin-bottom:40px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;font-size:14px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 80%;}}#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 20px;}.infoTitle{display: flex;margin-top:10px;line-height: 24px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:450px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}.NoCell{display: flex;justify-content: space-between;margin-bottom: 10px;}.underLine{display: inline-block;border-bottom: 1px solid #000;text-align: center;line-height: 24px;}.basicCell{display: flex;} .basicCell span{line-height: 24px;margin-bottom: 10px;}}";
254
               printJS({
254
               printJS({
255
                 printable: "printMain",
255
                 printable: "printMain",
256
                 type: "html",
256
                 type: "html",
394
                 }
394
                 }
395
               });
395
               });
396
             });
396
             });
397
-            // console.log(projectPrint, "projectPrint----去重前");
398
             // 数组去重
397
             // 数组去重
399
             projectPrint = this.split_project(projectPrint);
398
             projectPrint = this.split_project(projectPrint);
400
             // 配对
399
             // 配对
411
             new_patients = this.split_project_1(new_patients)
410
             new_patients = this.split_project_1(new_patients)
412
           }
411
           }
413
           this.printData = new_patients;
412
           this.printData = new_patients;
413
+          console.log(this.printData,'this.printData')
414
         });
414
         });
415
       }
415
       }
416
       this.innerVisible = true;
416
       this.innerVisible = true;

+ 5 - 1
src/xt_pages/stock/warehouseManage/components/AddWareHouse.vue 查看文件

21
           <el-input v-model="ruleForm.storehouse_name"></el-input>
21
           <el-input v-model="ruleForm.storehouse_name"></el-input>
22
         </el-form-item>
22
         </el-form-item>
23
         <el-form-item label="仓库地址" prop="address">
23
         <el-form-item label="仓库地址" prop="address">
24
-          <el-input type="textarea" v-model="ruleForm.address"></el-input>
24
+          <el-input type="textarea" v-model="ruleForm.address" @input="aa"></el-input>
25
         </el-form-item>
25
         </el-form-item>
26
         <el-form-item label="状态" prop="status">
26
         <el-form-item label="状态" prop="status">
27
           <el-radio-group v-model="ruleForm.status" >
27
           <el-radio-group v-model="ruleForm.status" >
95
     };
95
     };
96
   },
96
   },
97
   methods: {
97
   methods: {
98
+
99
+    aa(){
100
+      console.log('op')
101
+    },
98
     changeadmin() {
102
     changeadmin() {
99
       console.log("rrrrrrrrrrrrrrrrrrr")
103
       console.log("rrrrrrrrrrrrrrrrrrr")
100
     },
104
     },

+ 3 - 1
src/xt_pages/stock/warehouseManage/query.vue 查看文件

229
     },
229
     },
230
     // 新增仓库
230
     // 新增仓库
231
     AddWareHouse(val) {
231
     AddWareHouse(val) {
232
-      this.$refs.AddWareHouse.show(1, val);
232
+      this.$nextTick(() => {
233
+        this.$refs.AddWareHouse.show(1, val);
234
+      })
233
     },
235
     },
234
     // 编辑仓库
236
     // 编辑仓库
235
     toEdit(data,val) {
237
     toEdit(data,val) {

文件差異過大導致無法顯示
+ 622 - 477
src/xt_pages/supply/components/addGoodReturn.vue


+ 3 - 3
src/xt_pages/user/vascularAccess.vue 查看文件

190
                </el-form-item>
190
                </el-form-item>
191
             </el-col>
191
             </el-col>
192
              <el-col :span="8">
192
              <el-col :span="8">
193
-               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
193
+               <el-form-item label="首次启用日期:" prop="first_start_time">
194
                   <el-date-picker
194
                   <el-date-picker
195
                     type="datetime"
195
                     type="datetime"
196
                     format="yyyy-MM-dd"
196
                     format="yyyy-MM-dd"
362
                </el-form-item>
362
                </el-form-item>
363
             </el-col>
363
             </el-col>
364
              <el-col :span="8">
364
              <el-col :span="8">
365
-               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
365
+               <el-form-item label="首次启用日期:" prop="first_start_time">
366
                   <el-date-picker
366
                   <el-date-picker
367
                     type="datetime"
367
                     type="datetime"
368
                     format="yyyy-MM-dd"
368
                     format="yyyy-MM-dd"
497
           access_project: [{ required: true, message: '请选择通路项目' }],
497
           access_project: [{ required: true, message: '请选择通路项目' }],
498
           blood_access_part_opera_id:[{required:true,message:'请选择血管通路类型'}],
498
           blood_access_part_opera_id:[{required:true,message:'请选择血管通路类型'}],
499
           blood_access_part_id:[{required:true,message:"请选择血管通路"}],
499
           blood_access_part_id:[{required:true,message:"请选择血管通路"}],
500
-          first_start_time:[{required:true,message:"请选择首次启用日期"}],
500
+         //  first_start_time:[{required:true,message:"请选择首次启用日期"}],
501
           user_status:[{required:true,message:"请选择使用状态"}]
501
           user_status:[{required:true,message:"请选择使用状态"}]
502
         },
502
         },
503
         dialogVisible:false,
503
         dialogVisible:false,