更改

src/xt_pages/hospitalStation/components/prescriptionTable.vue

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

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -250,7 +250,7 @@ export default {
               });
             } else {
               const style =
-                "@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;}}";
+                "@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;}}";
               printJS({
                 printable: "printMain",
                 type: "html",
@@ -394,7 +394,6 @@ export default {
                 }
               });
             });
-            // console.log(projectPrint, "projectPrint----去重前");
             // 数组去重
             projectPrint = this.split_project(projectPrint);
             // 配对
@@ -411,6 +410,7 @@ export default {
             new_patients = this.split_project_1(new_patients)
           }
           this.printData = new_patients;
+          console.log(this.printData,'this.printData')
         });
       }
       this.innerVisible = true;

src/xt_pages/stock/warehouseManage/components/AddWareHouse.vue

@@ -21,7 +21,7 @@
           <el-input v-model="ruleForm.storehouse_name"></el-input>
         </el-form-item>
         <el-form-item label="仓库地址" prop="address">
-          <el-input type="textarea" v-model="ruleForm.address"></el-input>
+          <el-input type="textarea" v-model="ruleForm.address" @input="aa"></el-input>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="ruleForm.status" >
@@ -95,6 +95,10 @@ export default {
     };
   },
   methods: {
+
+    aa(){
+      console.log('op')
+    },
     changeadmin() {
       console.log("rrrrrrrrrrrrrrrrrrr")
     },

src/xt_pages/stock/warehouseManage/query.vue

@@ -229,7 +229,9 @@ export default {
     },
     // 新增仓库
     AddWareHouse(val) {
-      this.$refs.AddWareHouse.show(1, val);
+      this.$nextTick(() => {
+        this.$refs.AddWareHouse.show(1, val);
+      })
     },
     // 编辑仓库
     toEdit(data,val) {

src/xt_pages/user/vascularAccess.vue

@@ -190,7 +190,7 @@
                </el-form-item>
             </el-col>
              <el-col :span="8">
-               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
+               <el-form-item label="首次启用日期:" prop="first_start_time">
                   <el-date-picker
                     type="datetime"
                     format="yyyy-MM-dd"
@@ -362,7 +362,7 @@
                </el-form-item>
             </el-col>
              <el-col :span="8">
-               <el-form-item label="首次启用日期:" :required="true" prop="first_start_time">
+               <el-form-item label="首次启用日期:" prop="first_start_time">
                   <el-date-picker
                     type="datetime"
                     format="yyyy-MM-dd"
@@ -497,7 +497,7 @@
           access_project: [{ required: true, message: '请选择通路项目' }],
           blood_access_part_opera_id:[{required:true,message:'请选择血管通路类型'}],
           blood_access_part_id:[{required:true,message:"请选择血管通路"}],
-          first_start_time:[{required:true,message:"请选择首次启用日期"}],
+         //  first_start_time:[{required:true,message:"请选择首次启用日期"}],
           user_status:[{required:true,message:"请选择使用状态"}]
         },
         dialogVisible:false,