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

src/xt_pages/management/components/RepairForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-row class="row">
-      <!-- <el-col :span="5">
+      <el-col :span="5">
         <span class="machineClass">机号:</span>
         <el-select style="width:100px" v-model="forms.bed">
           <el-option
@@ -11,7 +11,7 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-col> -->
+      </el-col>
       <el-col :span="11">
         <span class="machineClass">日期查询:</span>
         <el-date-picker
@@ -52,7 +52,6 @@
           <el-button type="primary" @click="printCard">打印</el-button>
       </el-col>
     </el-row>
-    <el-row>
 
       <el-table
         ref="multipleTable"
@@ -81,9 +80,9 @@
 
         <el-table-column prop="date" label= "型号" width="80" align="center">
           <template slot-scope="scope">
-            <span v-if="getRepairName(scope.row.equitment_id) == 1">透析机</span> 
-            <span v-if="getRepairName(scope.row.equitment_id) == 2">水处理机</span> 
-            <span v-if="getRepairName(scope.row.equitment_id) == 3">其他</span> 
+            <span v-if="getRepairName(scope.row.equitment_id) == 1">透析机</span>
+            <span v-if="getRepairName(scope.row.equitment_id) == 2">水处理机</span>
+            <span v-if="getRepairName(scope.row.equitment_id) == 3">其他</span>
           </template>
         </el-table-column>
 
@@ -136,9 +135,9 @@
               {{ scope.row.reason }}
               </template>
            </el-table-column>
- 
-      
-        
+
+
+
         <el-table-column label="操作" align="center" min-width="150px">
           <template slot-scope="scope">
             <el-tooltip
@@ -333,7 +332,7 @@
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table> -->
+      </el-table>
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -415,32 +414,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-              <el-form-item class="formItem" label="功能及附件检查:">
-                  <el-input
-                    type="textarea"
-                    :rows="2"
-                      placeholder="请输入内容"
-                      v-model="guaForm.function_accessories_inspection"
-                    style="width:85%">
-                  </el-input>
-              </el-form-item>
-            </el-col>
-        </el-row>
-        <el-row>
-        <el-col :span="24">
-            <el-form-item class="formItem" label="其他:">
-                <el-input
-                  type="textarea"
-                  :rows="2"
-                    placeholder="请输入内容"
-                    v-model="guaForm.other_information"
-                  style="width:85%">
-                </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="故障发生阶段">
@@ -471,7 +444,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="故障现象:" required prop="fault_description">
+            <el-form-item label="故障描述:" required prop="fault_description">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -482,7 +455,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="维修内容:">
+            <el-form-item label="原因分析:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -493,7 +466,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="维修结果:">
+            <el-form-item label="处理过程:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -543,7 +516,7 @@
         </el-row>
         <el-row>
           <el-col :span="20">
-            <el-form-item label="备注:">
+            <el-form-item label="原因:">
               <el-input
                 type="textarea"
                 :rows="2"
@@ -554,21 +527,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="20">
-            <el-form-item label="维修者:">
-              <el-select v-model="guaForm.admin_user_id" placeholder="请选择" >
-                      <el-option
-                      v-for="item in docList"
-                      :key="item.admin_user_id"
-                      :label="item.user_name"
-                      :value="item.admin_user_id"
-                      style="width:185px">
-                      </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
 <!--        <button @click="lili">调试</button>-->
@@ -616,7 +574,7 @@
                 >
                  保养维护内容
                 </td>
-              
+
                 <td
                   :colspan="3"
                   style="text-align:center;width:60px;font-size:15px;"
@@ -630,7 +588,7 @@
                 >
                  维修者
                 </td>
-              
+
                 <td
                   :rowspan="2"
                   style="text-align:center;width:120px;font-size:15px;"
@@ -646,11 +604,11 @@
                 </td>
 
 
-               
-               
+
+
               </tr>
               <tr>
-              
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   功能及附件检查
                 </td>
@@ -659,7 +617,7 @@
                   其他
                 </td>
 
-                 
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   故障现象
                 </td>
@@ -671,9 +629,9 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   维修结果
                 </td>
-           
-               
-            
+
+
+
               </tr>
               <tr v-for="item in this.tableData" :key="item.id">
                 <td style="text-align:center;font-size:15px;height:30px">
@@ -681,11 +639,11 @@
                 </td>
 
                 <td style="text-align:center;font-size:15px;height:30px">
-                  <span v-if="getRepairName(item.equitment_id) == 1">透析机</span> 
-                  <span v-if="getRepairName(item.equitment_id) == 2">水处理机</span> 
-                  <span v-if="getRepairName(item.equitment_id) == 3">其他</span> 
+                  <span v-if="getRepairName(item.equitment_id) == 1">透析机</span>
+                  <span v-if="getRepairName(item.equitment_id) == 2">水处理机</span>
+                  <span v-if="getRepairName(item.equitment_id) == 3">其他</span>
                 </td>
-                
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{item.function_accessories_inspection }}
                 </td>
@@ -693,11 +651,11 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.other_information }}
                 </td>
-                 
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ item.fault_description }}
                 </td>
-                
+
                 <td style="text-align:center;font-size:15px;height:30px">
                    {{item.cause_analysis }}
                 </td>
@@ -710,7 +668,7 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ getName(item.admin_user_id) }}
                 </td>
-                
+
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{ getTime(item.guarantee_date) }}
                 </td>
@@ -718,7 +676,7 @@
                 <td style="text-align:center;font-size:15px;height:30px">
                   {{item.reason }}
                 </td>
-             
+
               </tr>
             </table>
           </div>
@@ -745,7 +703,6 @@ export default {
   name: "RepairForm",
   data() {
     return {
-      nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
       dialogVisible: false,
       selectCulture: [],
       forms: {
@@ -769,10 +726,7 @@ export default {
         exclude: "",
         reason: "",
         code_information: "",
-        image_name: "",
-        admin_user_id:this.$store.getters.xt_user.user.id,
-        function_accessories_inspection:"",
-        other_information:"",
+        image_name: ""
       },
       isIndeterminate: false,
       checkAllStatus: false,
@@ -800,9 +754,6 @@ export default {
       limit: 10,
       page: 1,
       total: 0,
-      macherList:[],
-      docList:[],
-      hiddenShow:false,
     };
   },
   methods: {
@@ -835,10 +786,6 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair是", repair);
-          var macherList = response.data.data.macherList
-         
-          this.macherList = macherList
-          this.docList = response.data.data.docList
           // eslint-disable-next-line no-unused-vars
           var total = response.data.data.total;
           this.total = total;
@@ -877,7 +824,6 @@ export default {
               repair[index].exclude = "未解决";
             }
           }
-          console.log("repair------",repair)
           this.tableData = repair;
         }
       });
@@ -900,7 +846,6 @@ export default {
         if (response.data.state === 1) {
           var repair = response.data.data.repair;
           console.log("repair", repair);
-          this.docList = response.data.data.docList
           this.guaForm.guarantee_date = uParseTime(
             repair.guarantee_date,
             "{y}-{m}-{d}"
@@ -928,9 +873,6 @@ export default {
           this.guaForm.code_information = repair.code_information;
           this.guaForm.id = repair.id;
           this.filename = repair.image_name;
-          this.guaForm.admin_user_id = repair.admin_user_id
-          this.guaForm.function_accessories_inspection = repair.function_accessories_inspection
-          this.guaForm.other_information= repair.other_information
         }
       });
     },
@@ -1137,50 +1079,9 @@ export default {
         });
       });
     },
-    getDeviceName(id){
-      var device_name= ""
-      for(let i=0;i<this.macherList.length;i++){
-        if(id == this.macherList[i].id){
-           device_name = this.macherList[i].device_name
-        }
-      }
-      return device_name
-    },
-    getRepairName(id){
-      var device_type= ""
-      for(let i=0;i<this.macherList.length;i++){
-        if(id == this.macherList[i].id){
-          device_type = this.macherList[i].device_type
-        }
-      }
-      return device_type
-    },
-    getName(admin_user_id){
-      var user_name = ""
-      for(let i=0;i<this.docList.length;i++){
-        if(admin_user_id == this.docList[i].admin_user_id){
-           user_name = this.docList[i].user_name
-        }
-      }
-      return user_name
-    },
-    printCard() {
-        this.hiddenShow = true;
-        var ptime = Math.round(new Date().getTime() / 1000);
-        this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
-
-        const style =
-          "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
-
-        setTimeout(() => {
-          printJS({
-            printable: "print-card-info-one",
-            type: "html",
-            style: style,
-            scanStyles: false
-          });
-        }, 1);
-      },
+    printCard(){
+      console.log('sadfgadsf');
+    }
   },
   created() {
     this.getAllSubregion();

src/xt_pages/management/components/UserForm.vue

@@ -362,7 +362,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.start_time"
-                style="width:185px"
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -374,7 +374,6 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.end_time"
-                style="width:185px"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -634,7 +633,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.starttime"
-                style="width:185px"
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -646,7 +645,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.endtime"
-                style="width:185px"
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -800,37 +799,37 @@
               <tr>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px;"
+                  style="text-align:center;min-width:40px; font-size:15px;"
                 >
                   机号
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:100px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   日期
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:50px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   班次
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:70px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   患者
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   透析方式
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                   使用次数
                 </td>
@@ -842,19 +841,19 @@
                 </td>
                 <td
                   :colspan="4"
-                  style="text-align:center;width:60px;font-size:15px"
+                  style="text-align:center;font-size:15px"
                 >
                   机表(床单元、床旁桌)消毒
                 </td>
                 <td
-                  :colspan="5"
-                  style="text-align:center;width:80px;font-size:15px"
+                  :colspan="6"
+                  style="text-align:center;font-size:15px"
                 >
                   液路消毒
                 </td>
                 <td
                   :rowspan="2"
-                  style="text-align:center;width:80px;font-size:15px"
+                  style="text-align:center;min-width:40px;font-size:15px"
                 >
                  透析机消毒液(更换)
                 </td>
@@ -878,31 +877,34 @@
                 </td>
               </tr>
               <tr>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒方式
                 </td>
-                <td style="text-align:center;width:50px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒状态
                 </td>
-                <td style="text-align:center;width:95px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液浓度
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒方式
                 </td>
-                <td style="text-align:center;width:50px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
+                  开始消毒时间
+                </td>
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒时长/min
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒状态
                 </td>
-                <td style="text-align:center;width:70px;font-size:15px">
+                <td style="text-align:center;min-width:40px;font-size:15px">
                   消毒液残留
                 </td>
               </tr>
@@ -2509,7 +2511,7 @@ export default {
             this.bedNumberTwo = []
 
           }
-          
+
         }
       });
     },
@@ -2593,7 +2595,6 @@ export default {
       this.getBedForm(newvalue);
       this.value = newvalue;
     }
-
   }
 };
 </script>
@@ -2635,7 +2636,7 @@ export default {
     text-align: right;
   }
   .el-input--prefix .el-input__inner {
-    padding-left: 15px;
+    // padding-left: 15px;
   }
   .el-input--prefix .el-input__inner {
     padding-right: 15px;

src/xt_pages/management/components/WaterForm.vue

@@ -36,19 +36,31 @@
          </el-row>
          <el-row>
             <el-col :span="8">
-                <el-form-item label="原水电导度(μs/cm):"   class="st" label-width="100px">
-                    <el-input  v-model="form.water_conductivity" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
-                    <!-- <el-input-number v-model="form.water_conductivity" :controls="false" :precision="2" ></el-input-number> -->
+                <el-form-item label="原水电导度(μs/cm):" prop="water_conductivity"  class="st" label-width="100px">
+                    <el-input  v-model="form.water_conductivity" style="width:100px" 
+                        oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                    >
+                    </el-input>
+                    <!-- <el-input  v-model="form.water_conductivity" style="width:100px" oninput="value=value.replace(/[^\d+(.\d{1,2})?$]/g,'')" ></el-input> /[^\d^\.]/g,''-->
+                    <!-- <el-input  v-model="form.water_conductivity" style="width:100px" onkeyup="value=value.match(/^\d+(.\d{1,2})?$/g,'')" ></el-input> -->
+                    <!-- <el-input-number  auto-complete="off" v-model.number="form.water_conductivity" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="原水压力(Mpa):"  class="st">
-                    <el-input  v-model="form.water_pressure" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <el-input  v-model="form.water_pressure" style="width:100px" 
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                    >
+                    </el-input>
+                    <!-- <el-input-number  auto-complete="off" v-model.number="form.water_pressure" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="温度:"  class="st">
-                    <el-input  v-model="form.temperature" style="width:100px" oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    <el-input  v-model="form.temperature" style="width:100px"
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
+                    <!-- <el-input-number  auto-complete="off" v-model.number="form.temperature" :precision="2" :controls="false"></el-input-number> -->
                 </el-form-item>
             </el-col>
          </el-row>
@@ -60,72 +72,66 @@
                 </el-form-item>
             </el-col>
          </el-row>
-         <el-row>
-            <span>反渗一级</span>
-         </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="RO膜进水:"  class="st">
-                    <el-input  v-model="form.first_ro_membrane_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span >反渗</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜浓水:"  class="st">
-                    <el-input  v-model="form.first_ro_film_thick_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜进水</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜出水:"  class="st">
-                    <el-input  v-model="form.first_ro_membrane_effluent" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜浓水</span>
             </el-col>
-         </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="产水电导度(μs/cm):"  class="st">
-                    <el-input  v-model="form.first_production_of_water_conductivity" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >RO膜出水</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="产水量(L/h):"  class="st">
-                    <el-input  v-model="form.first_water_yield" style="width:100px" type="number"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <span >产水电导度(μs/cm)</span>
+            </el-col>
+            <el-col :span="4">
+                <span >产水量(L/h)</span>
             </el-col>
-         
-         </el-row>
-         <el-row>
-            <span>反渗二级</span>
          </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="RO膜进水:"  class="st">
-                    <el-input  v-model="form.last_ro_membrane_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span>一级</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜浓水:"  class="st">
-                    <el-input  v-model="form.last_ro_film_thick_water" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_ro_membrane_water" style="width:100px" type="number"></el-input>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="RO膜出水:"  class="st">
-                    <el-input  v-model="form.last_ro_membrane_effluent" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_ro_film_thick_water" style="width:100px" type="number"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_ro_membrane_effluent" style="width:100px" type="number"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_production_of_water_conductivity" style="width:100px" type="number"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model.number="form.first_water_yield" style="width:100px" type="number"></el-input>
             </el-col>
          </el-row>
-         <el-row>
-            <el-col :span="8">
-                <el-form-item label="产水电导度(μs/cm):"  class="st">
-                    <el-input  v-model="form.last_production_of_water_conductivity" type="number" style="width:100px"></el-input>
-                </el-form-item>
+         <el-row :gutter="20">
+            <el-col :span="4" style="text-align: center;">
+                <span>二级</span>
             </el-col>
-            <el-col :span="8">
-                <el-form-item label="产水量(L/h):"  class="st">
-                    <el-input  v-model="form.last_water_yield" type="number" style="width:100px"></el-input>
-                </el-form-item>
+            <el-col :span="4">
+                <el-input v-model.number="form.last_ro_membrane_water"  style="width:100px" type="number"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.last_ro_film_thick_water"  style="width:100px" type="number"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input  v-model="form.last_ro_membrane_effluent"  style="width:100px" type="number"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model="form.last_production_of_water_conductivity"  style="width:100px" type="number"></el-input>
+            </el-col>
+            <el-col :span="4">
+                <el-input v-model.number="form.last_water_yield"  style="width:100px" type="number"></el-input>
             </el-col>
          </el-row>
-
          <el-row>
             <el-col :span="8">
                 <el-form-item label="碳罐(MPa):"  class="st">
@@ -159,19 +165,23 @@
             <el-col :span="8">
                 <el-form-item label="硬度监测(mg/l):"  class="st">
                     <el-input  v-model="form.hardness_monitoring" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="总氯检测(mg/l):"  class="st">
                     <el-input  v-model="form.total_chlorine_detection" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
+                     
                 </el-form-item>
             </el-col>
             <el-col :span="8">
                 <el-form-item label="PH值检测:"  class="st">
                     <el-input  v-model="form.ph_detection" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -180,7 +190,8 @@
             <el-col :span="8">
                 <el-form-item label="过氧乙酸浓度(mg/l):"  class="st">
                     <el-input  v-model="form.concentration_of_peroxyacetic_acid" style="width:100px"
-                     oninput="value=value.replace(/[^\d^\.]/g,'')" maxlength='4'></el-input>
+                    oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"
+                     ></el-input>
                 </el-form-item>
             </el-col>
          </el-row>
@@ -339,11 +350,11 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
             ],
             checked:"",
             rules: {
-             admin_user_id: [{ required: true, message: '请选择记录人' }],
+                admin_user_id: [{ required: true, message: '请选择记录人' }],
            },
            nurseList:[],
         }
-
+       
     },
     methods:{
         saveWater(formName){
@@ -607,15 +618,41 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
 
            }
          })
-       }
+       },
+    //    limitInput (e) {
+    //     e.target.value = e.target.value.replace(/(^\s*)|(\s*$)/g, "");
+    //     const reg = /[^\d.]/g;
+
+    //     // 只能是数字和小数点，不能是其他输入
+    //     e.target.value = e.target.value.replace(reg, "");
+
+    //     // 保证第一位只能是数字，不能是点
+    //     e.target.value = e.target.value.replace(/^\./g, "");
+    //     // 小数只能出现1位
+    //     e.target.value = e.target.value
+    //       .replace(".", "$#$")
+    //       .replace(/\./g, "")
+    //       .replace("$#$", ".");
+    //     // 小数点后面保留2位
+    //     e.target.value = e.target.value.replace(
+    //       /^(\-)*(\d+)\.(\d\d).*$/,
+    //       "$1$2.$3"
+    //     );
+    //     }
     },
     created(){
-      
        this.getAllDoctorList()
+    },
+    mounted(){
+        
     }
  }
+ 
 </script>
-<style >
+<style scoped>
+.el-row {
+    margin-bottom: 20px;
+}
 .newMain .el-form-item__label {
     width: 110px !important;
 }

src/xt_pages/management/home.vue

@@ -893,7 +893,7 @@
                                         </el-table-column>
                                         <el-table-column label="床单位更换" align="center" min-width="100px" >
                                                 <template slot-scope="scope">
-                                                  
+
                                                    <span v-if="scope.row.bed_way ==0">/</span>
                                                    <span v-if="scope.row.bed_way ==1">床单</span>
                                                    <span v-if="scope.row.bed_way ==2">被套</span>
@@ -1382,7 +1382,7 @@
                       <div v-show="zhiShow">
                        <el-tabs type="border-card" v-model="activeNameSix" @tab-click="handleClick">
                          <el-tab-pane label="新增质量控制" name="first">
-  
+
                            <span style="margin-bottom: 20px;display: block;">细菌培养</span>
                            <el-form :model="qualityForm" ref="qualityForm" :rules="qualitRules">
                              <el-row>
@@ -1579,7 +1579,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormTwo.sort" ></el-input>
@@ -1632,9 +1632,9 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                           
 
-                          
+
+
                           <div v-if="device_type == 1">
                            <span style="margin-bottom: 20px;display: block;">透析液离子浓度检测</span>
                             <el-form ref="qualityFormThree" :model="qualityFormThree" :rules="ruleThree">
@@ -1689,9 +1689,9 @@
                                         </el-date-picker>
                                     </el-form-item>
                                 </el-col>
-                                
+
                               </el-row>
-                            
+
                               <el-row>
                                 <el-col :span="8">
                                   <!-- <span>Na<sup>+</sup></span> -->
@@ -1791,11 +1791,11 @@
 
 
 
-                           
+
                             <el-divider></el-divider>
-                         </div>     
-                             
-                        
+                         </div>
+
+
                             <span style="margin-bottom: 20px;display: block;">有毒化合物检测</span>
                             <el-form ref="qualityFormFour" :model="qualityFormFour" :rules="diaRules">
                               <el-row>
@@ -1866,7 +1866,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormFour.sort" ></el-input>
@@ -1993,7 +1993,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormFive.sort" ></el-input>
@@ -2046,7 +2046,7 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                            
+
 
 
 
@@ -2120,7 +2120,7 @@
                                       </el-date-picker>
                                     </el-form-item>
                                   </el-col>
-                                
+
                                   <el-col :span="8">
                                     <el-form-item label="顺序号:" required prop="sort">
                                       <el-input style="width:150px" v-model="qualityFormSix.sort" ></el-input>
@@ -2174,8 +2174,8 @@
                               </el-form>
                             <el-divider></el-divider>
 
-                           
-                           
+
+
                             <span style="margin-bottom: 20px;display: block;">PH值检测</span>
                             <el-form ref="qualityFormSeven" :model="qualityFormSeven" :rules="diaRules">
                               <el-row>
@@ -2246,7 +2246,7 @@
                                     </el-date-picker>
                                   </el-form-item>
                                 </el-col>
-                               
+
                                 <el-col :span="8">
                                   <el-form-item label="顺序号:" required prop="sort">
                                      <el-input style="width:150px" v-model="qualityFormSeven.sort" ></el-input>
@@ -2302,7 +2302,7 @@
 
 
 
-                          
+
 
                          </el-tab-pane>
 
@@ -2316,7 +2316,7 @@
                           暂无数据
                         </div>
                    </el-tab-pane>
-                   
+
                     <el-tab-pane label="维修维护" name="five">
                        <el-tabs type="border-card" v-model="activeNameFive" @tab-click="handleClick">
                          <el-tab-pane label="新增维修维护" name="first">
@@ -2351,7 +2351,7 @@
                              <el-row>
                                  <el-col :span="8">
                                   <el-form-item label="到达时间:">
-                                   
+
                                          <el-date-picker
                                           type="datetime"
                                           format="yyyy-MM-dd HH:mm"
@@ -2848,7 +2848,7 @@ export default {
           device_name: [{ required: true, message: '请填写序列号' }],
           devicetype: [{ required: true, message: '请填写设备类型' }],
           unit_type: [{ required: true, message: '请填写设备型号' }],
-        
+
         },
         qualitRules: {
           detection_unit: [{ required: true, message: '请填写检测单位' }],
@@ -3416,7 +3416,7 @@ export default {
               }
 
             }
-            
+
           }
         })
       },
@@ -3455,16 +3455,16 @@ export default {
           if (response.data.state === 1) {
             var addmacher = response.data.data.addmacher
             var warning = response.data.data.warning
-          
+
             var time = this.getTimestamp(this.userform.date) - warning.stime
             var germ = response.data.data.germ
-          
+
             var timetwo = this.getTimestamp(this.userform.date) - germ.stime
-           
+
             var clean = response.data.data.clean
             var timethree = this.getTimestamp(this.userform.date) - clean.stime
             var number = response.data.data.number
-          
+
             this.Number = number
             if (addmacher.device_type === 1) {
               this.sShow = false
@@ -3505,7 +3505,7 @@ export default {
             var zone = response.data.data.zone
 
             const arr1 = []
-          
+
             for (let index = 0; index < mode.length; index++) {
               if (mode[index].treate_mode === 1) {
                 mode[index] = 'HD'
@@ -3594,7 +3594,7 @@ export default {
             this.form.machine_status = addmacher.machine_status
             this.form.user_total = addmacher.user_total
             this.form.remarks = addmacher.remarks
-           
+
             if (addmacher.rubbish_date !== 0) {
               this.form.rubbish_date = uParseTime(addmacher.rubbish_date, '{y}-{m}-{d}')
             }
@@ -3701,16 +3701,16 @@ export default {
         var bed_numberss = parseInt(bed_numbers)
         this.form.bed_number = bed_numberss
         this.$refs[formName].validate(valid => {
-          UpdateMachineInfo(this.form).then(response => {         
+          UpdateMachineInfo(this.form).then(response => {
             if (response.data.state === 1) {
-              var addmacher = response.data.data.addmacher         
-              this.$message.success('修改成功')           
+              var addmacher = response.data.data.addmacher
+              this.$message.success('修改成功')
               for (let i = 0; i < this.tableDatatwo.length; i++) {
                 if (this.tableDatatwo[i].id == addmacher.id) {
                   for (let j = 0; j < this.deviceMode.length; j++) {
                     if (this.deviceMode[j].id === parseInt(addmacher.unit_type)) {
                       addmacher.device_mode = this.deviceMode[j].device_mode
-                    
+
                     }
                   }
 
@@ -4371,7 +4371,7 @@ export default {
             }
             this.userform.date = uParseTime(patients.schedule_date, '{y}-{m}-{d}')
             this.userform.patient_name = patients.name
-            this.userform.patient_id = patients.patient_id 
+            this.userform.patient_id = patients.patient_id
             var zone = response.data.data.zone
             this.userform.zone = zone.id
             var number = response.data.data.number
@@ -4520,7 +4520,7 @@ export default {
         this.userform.user_total = parseInt(this.userform.user_total)
 
         console.log("user_form",this.userform)
-      
+
         this.$refs[formName].validate((valid) => {
           if (valid) {
             SaveInformation(this.equimentid, this.userform).then(response => {
@@ -4700,16 +4700,16 @@ export default {
         var samplinglocationa = this.qualityForm.sampling_locationa
         var samplinglocationas = parseInt(samplinglocationa)
         this.qualityForm.sampling_locationa = samplinglocationas
-        
+
         //  if(this.qualityForm.pass_examination!=''){
         //    this.qualityForm.pass_examination = parseInt(this.qualityForm.pass_examination)
         //  }
          if(this.qualityForm.modifications!=''){
            this.qualityForm.modifications = parseInt(this.qualityForm.modifications)
          }
-       
+
         console.log("3333333",this.qualityForm)
-       
+
         this.$refs[formName].validate(response => {
           SaveBacteria(this.equimentid, this.qualityForm).then(response => {
             if (response.data.state === 1) {
@@ -4737,7 +4737,7 @@ export default {
         this.qualityForm.detection_result = ''
       },
       SaveLincomycin(formName) {
-       
+
         this.$refs[formName].validate((valid) => {
           if (this.qualityFormTwo.specimenb === '') {
             this.qualityFormTwo.specimenb = 0
@@ -4753,13 +4753,13 @@ export default {
           var sampling = this.qualityFormTwo.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormTwo.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormTwo.modifications!=''){
             this.qualityFormTwo.modifications = parseInt(this.qualityFormTwo.modifications)
           }
-       
-      
+
+
           if (valid) {
             SaveLincomycin(this.equimentid, this.qualityFormTwo).then(response => {
               if (response.data.state === 1) {
@@ -4771,8 +4771,8 @@ export default {
                 this.qualityFormTwo.concentrateb_nod = ''
                 this.qualityFormTwo.sampling_locationb = ''
                 this.qualityFormTwo.detection_resultb = ''
-               
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -4791,11 +4791,11 @@ export default {
       SaveQualityControl(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-             
+
               if(this.qualityFormThree.modifications!=''){
                 this.qualityFormThree.modifications = parseInt(this.qualityFormThree.modifications)
               }
-            
+
             SaveQualityControl(this.equimentid, this.qualityFormThree).then(response => {
               if (response.data.state === 1) {
                 var ion = response.data.data.ion
@@ -5045,7 +5045,7 @@ export default {
             var deviceInformation = response.data.data.deviceInformation
             var timetwo = this.getTimestamp(this.userform.date) - deviceInformation.stime
             var clean = response.data.data.clean
-          
+
           }
         })
       },
@@ -5148,10 +5148,10 @@ export default {
          GetUserTotalCount(bedid).then(response=>{
             if(response.data.state == 1){
               var count =  response.data.data.count
-              var addmacher = response.data.data.addmacher 
+              var addmacher = response.data.data.addmacher
               if(addmacher.user_total == ''){
                   addmacher.user_total = 0
-              }   
+              }
               // this.userform.user_total = count[0].Total + parseInt(addmacher.user_total)
             }
          })
@@ -5174,12 +5174,12 @@ export default {
           var sampling = this.qualityFormFour.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormFour.sampling_locationb = samplings
-           
-        
+
+
           if(this.qualityFormFour.modifications!=''){
             this.qualityFormFour.modifications = parseInt(this.qualityFormFour.modifications)
           }
-       
+
           if (valid) {
             saveOxygenates(this.equimentid, this.qualityFormFour).then(response => {
               if (response.data.state === 1) {
@@ -5190,10 +5190,10 @@ export default {
                 this.qualityFormFour.concentrate_noc = ''
                 this.qualityFormFour.concentrateb_nod = ''
                 this.qualityFormFour.sampling_locationb = ''
-             
+
                 this.qualityFormFour.detection_resultb = ''
-                
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5218,12 +5218,12 @@ export default {
           var sampling = this.qualityFormFive.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormFive.sampling_locationb = samplings
-           
-        
+
+
           if(this.qualityFormFive.modifications!=''){
             this.qualityFormFive.modifications = parseInt(this.qualityFormFive.modifications)
           }
-       
+
           if (valid) {
             saveHardWater(this.equimentid, this.qualityFormFive).then(response => {
               if (response.data.state === 1) {
@@ -5235,8 +5235,8 @@ export default {
                 this.qualityFormFive.concentrateb_nod = ''
                 this.qualityFormFive.sampling_locationb = ''
                 this.qualityFormFive.detection_resultb = ''
-               
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5261,12 +5261,12 @@ export default {
           var sampling = this.qualityFormSix.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormSix.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormSix.modifications!=''){
             this.qualityFormSix.modifications = parseInt(this.qualityFormSix.modifications)
           }
-       
+
           if (valid) {
             saveWater(this.equimentid, this.qualityFormSix).then(response => {
               if (response.data.state === 1) {
@@ -5278,8 +5278,8 @@ export default {
                 this.qualityFormSix.concentrateb_nod = ''
                 this.qualityFormSix.sampling_locationb = ''
                 this.qualityFormSix.detection_resultb = ''
-             
-              
+
+
                 this.$refs.child.getAllQulityInfo()
               }else{
                 this.qualityFormSix.pass_examination = "1"
@@ -5306,12 +5306,12 @@ export default {
           var sampling = this.qualityFormSeven.sampling_locationb
           var samplings = parseInt(sampling)
           this.qualityFormSeven.sampling_locationb = samplings
-           
-       
+
+
           if(this.qualityFormSeven.modifications!=''){
             this.qualityFormSeven.modifications = parseInt(this.qualityFormSeven.modifications)
           }
-       
+
           if (valid) {
             saveDevicePH(this.equimentid, this.qualityFormSeven).then(response => {
               if (response.data.state === 1) {
@@ -5323,8 +5323,8 @@ export default {
                 this.qualityFormSeven.concentrateb_nod = ''
                 this.qualityFormSeven.sampling_locationb = ''
                 this.qualityFormSeven.detection_resultb = ''
-              
-              
+
+
                 this.$refs.mychild.getAllQulityInfo()
               }
             })
@@ -5346,7 +5346,7 @@ export default {
       this.getAllpatient()
       this.getAllMode()
       this.GetUserTotalCount(bedid)
-      
+
 
   }
   }
@@ -5411,6 +5411,9 @@ export default {
        margin-bottom: 10px;
     margin-left: 82%
   }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
 
 </style>
 <style lang="scss">
@@ -5456,9 +5459,7 @@ export default {
   //   width: 130px;
   //   font-size: 14px;
   // }
-  .el-form-item__error {
-    margin-left: 130px;
-  }
+  
 
  .el-upload-list__item-name {
     color: #606266;

src/xt_pages/user/courseOfDisease.vue

@@ -48,7 +48,10 @@
                         :row-class-name="tableRow"
                         @row-click="onRowClick"
               >
-                <el-table-column type="selection" width="40" align="center"></el-table-column>
+                <el-table-column
+                  type="selection"
+                  width="55">
+                </el-table-column>
                 <el-table-column label="病程标题" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.title}}
@@ -69,8 +72,8 @@
             <el-col :span="14">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
-                <div class="content">
-                  <span v-if="current_select_record" v-html="current_select_record.content">{{current_select_record.content }}</span>
+                <div class="content"><!--v-html="current_select_record.content"-->
+                  <span v-if="current_select_record" >{{current_select_record.content }}</span>
                   <span v-else></span>
                 </div>
               </div>

src/xt_pages/user/rescueRecord.vue

@@ -68,11 +68,10 @@
                 @current-change="didChangeCurrentRecord"
                 @selection-change="didSelectionChange"
               >
-                <el-table-column
-                  type="selection"
-                  width="40"
-                  align="center"
-                ></el-table-column>
+              <el-table-column
+                type="selection"
+                width="55">
+              </el-table-column>
                 <el-table-column label="记录时间" align="center">
                   <template slot-scope="scope">
                     {{ recordTime(scope.row.record_time) }}