3月30日杨青

src/router/modules/device.js

@@ -50,7 +50,7 @@ export default {
     },
     {
       path: '/device/airDisinfect',
-      component: () => import('@/xt_pages/device/airDisinfect'),
+      component: () => import('@/xt_pages/device/airDisinfectTwo'),
       name: 'airDisinfect',
       meta: {
         title: 'airDisinfect',

src/xt_pages/device/airDisinfect.vue

@@ -5,8 +5,9 @@
     </div>
     <div class="app-container">
         <div style="float:right;margin-bottom:10px;">
-            <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
-            <!-- <el-button type="danger">删除</el-button> -->
+          <!-- <el-button type="primary" @click="dialogFormVisible = true">打印</el-button> -->
+          <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
+            
         </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" >
             <el-table-column type="selection" width="55" align="center"></el-table-column>
@@ -191,8 +192,7 @@
                 <el-button type="primary" @click="saveAirDisinfect('form')">保 存</el-button>
             </div>
         </el-dialog>
-
-       
+ 
       <el-dialog
         class="centerDialog"
         width="1000px"
@@ -312,8 +312,10 @@
           { path: false, name: '院感管理' },
           { path: false, name: '透析室空气消毒记录表' }
         ],
+
         dialogFormVisible:false,
         editDialogFormVisible:false,
+        datevalue:'',
         tableData: [],
         form: {
           id:0,

src/xt_pages/user/components/PatientForm.vue

@@ -1196,13 +1196,13 @@ export default {
     }
   },
   data() {
-    var checkName = (rule, value, callback) => {
-      const regName=/^([\u4E00-\u9FA5]{1,20}|[a-zA-Z\.\s])$/;
-      if (regName.test(value)){
-        return callback();
-      }
-      callback(new Error("请输入正确的名字"));
-    };
+    // var checkName = (rule, value, callback) => {
+    //   const regName=/^([\u4E00-\u9FA5]{1,20}|[a-zA-Z\.\s])$/;
+    //   if (regName.test(value)){
+    //     return callback();
+    //   }
+    //   callback(new Error("请输入正确的名字"));
+    // };
     var checkage = (rule, value, callback) =>{
       const regage=/^(?:[1-9][0-9]?|1[01][0-9]|120)$/
         if(regage.test(value)){
@@ -1346,7 +1346,7 @@ export default {
           { required: true, message: "请选择治疗状态", trigger: "blur" }
         ],
         name: [{ required: true, message: "请填写姓名", trigger: "blur" },
-        { validator: checkName,min:2,max:5, message: '请输入正确的名字', trigger: 'blur'}
+        // { validator: checkName,min:2,max:5, message: '请输入正确的名字', trigger: 'blur'}
         ],
         gender: [{ required: true, message: "请选择性别", trigger: "blur" }],
         idCardNo: [

src/xt_pages/workforce/components/template_table.vue

@@ -2,7 +2,7 @@
   <div  >
     <div id="tem_table_data" v-show="schedulingTableVisible">
       <slot></slot>
-      <div class="table_contain">
+      <div class="table_contain temtable_contain">
         <div class="left_contain">
           <div
             class="cell clearfix"
@@ -108,7 +108,7 @@
             :data="opera_device_numbers"
             :span-method="spanMethod"
             show-summary
-            height="675"
+            height="750"
             style="width: 100%; cursor: pointer"
             :cell-class-name="cellClass"
             :row-class-name="rowClass"
@@ -4553,7 +4553,7 @@ export default {
 <style lang="scss">
 .table_contain {
   display: flex;
-  margin-top: 30px;
+  
 .left_contain {
   width: 14%;
   margin-right: 50px;
@@ -4605,6 +4605,9 @@ export default {
 //     padding: 5px 0 !important;
 // }
 }
+.temtable_contain{
+  margin-top: 30px !important;
+}
 .infectious{
   color: red !important;
 }