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

src/router/modules/device.js

@@ -88,16 +88,18 @@ export default {
 
       }
     },
-    // {
-    //   path: '/device/waterformprint',
-    //   component: () => import('@/xt_pages/management/components/waterFormPrint'),
-    //   name: 'waterFormPrint',
-    //   meta: {
-    //     title: 'waterFormPrint',
-    //     noCache: true,
-
-    //   }
-    // }
+    {
+      path: '/device/waterformprint',
+      component: () => import('@/xt_pages/management/components/waterFormPrint'),
+      name: 'waterFormPrint',
+      is_menu: false,
+      hidden: true,
+      meta: {
+        title: 'waterFormPrint',
+        noCache: true,
+        
+      }
+    }
 
   ]
 }

src/xt_pages/management/components/RepairForm.vue

@@ -49,10 +49,10 @@
       </el-col>
       <span>&nbsp;&nbsp;</span>
       <el-col :span="6">
-          <el-button type="primary" size="small" @click="printCard">打印</el-button>
+          <el-button type="primary" @click="printCard">打印</el-button>
       </el-col>
     </el-row>
-   
+
       <el-table
         ref="multipleTable"
         @selection-change="handleSelectionChange"
@@ -80,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>
 
@@ -135,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
@@ -536,6 +536,153 @@
         >
       </span>
     </el-dialog>
+
+
+    <div hidden="hidden">
+      <div id="print-card-info-one" v-show="hiddenShow">
+        <div>
+          <div class="print_main_content-one">
+            <div class="order_title" style="text-align: center;">医疗器械保养维护、维修登记表</div>
+          </div>
+          <div>
+            <div class="printClass">打印日期:{{ nowTime }}</div>
+            <table
+              border="1"
+              style="width:100%"
+              cellspacing="0"
+              cellpadding="0"
+              class="tableClass"
+            >
+              <tr>
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                  设备名称
+                </td>
+
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                  型号
+                </td>
+
+                <td
+                  :colspan="2"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                 保养维护内容
+                </td>
+
+                <td
+                  :colspan="3"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                  维修记录
+                </td>
+
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                 维修者
+                </td>
+
+                <td
+                  :rowspan="2"
+                  style="text-align:center;width:120px;font-size:15px;"
+                >
+                 日期
+                </td>
+
+                <td
+                 :rowspan="2"
+                  style="text-align:center;width:60px;font-size:15px;"
+                >
+                 备注
+                </td>
+
+
+
+
+              </tr>
+              <tr>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  功能及附件检查
+                </td>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  其他
+                </td>
+
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  故障现象
+                </td>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  维修内容
+                </td>
+
+                <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">
+                  {{ getDeviceName(item.equitment_id) }}
+                </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>
+                </td>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  {{item.function_accessories_inspection }}
+                </td>
+
+                <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>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                    {{item.treatment_process}}
+                </td>
+
+
+                <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>
+
+                <td style="text-align:center;font-size:15px;height:30px">
+                  {{item.reason }}
+                </td>
+
+              </tr>
+            </table>
+          </div>
+        </div>
+      </div>
+      </div>
   </div>
 </template>
 
@@ -551,6 +698,7 @@ import {
 } from "@/api/manage";
 import { uParseTime } from "@/utils/tools";
 import { getFileExtension } from "@/utils/tools";
+const moment = require('moment')
 export default {
   name: "RepairForm",
   data() {

src/xt_pages/management/components/UserForm.vue

@@ -362,7 +362,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.start_time"
-                
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -633,7 +633,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.starttime"
-                
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -645,7 +645,7 @@
                 value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择时间"
                 v-model="userform.endtime"
-                
+
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -684,7 +684,7 @@
               >桶
             </el-form-item>
             <span style="color:red" v-show="showone"
-              >您已一个月未更换,请注意检测</span
+              >您已三个月未更换,请注意检测</span
             >
           </el-col>
         </el-row>
@@ -711,7 +711,7 @@
             >
               <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
               <span style="color:red" v-show="showone"
-                >您已一个月未更换,请注意检测</span
+                >您已三个月未更换,请注意检测</span
               >
             </el-form-item>
           </el-col>
@@ -750,7 +750,7 @@
             >
               <el-checkbox v-model="userform.clean">清洁:</el-checkbox>
               <span style="color:red" v-show="showone"
-                >您已一个月未清洁,请检查</span
+                >您已三个月未清洁,请检查</span
               >
             </el-form-item>
           </el-col>
@@ -851,18 +851,6 @@
                 >
                   液路消毒
                 </td>
-                <td :rowspan="2" 
-                style="text-align:center;min-width:40px;font-size:15px">
-                透析机消毒液<br/>(更换)
-                </td>
-                <td :rowspan="2" 
-                  style="text-align:center;min-width:40px;font-size:15px">
-                  细菌过滤器<br/>(更换)
-                </td>
-                <td :rowspan="2" 
-                    style="text-align:center;min-width:40px;font-size:15px">
-                    空气滤网
-                </td>
                 <td
                   :rowspan="2"
                   style="text-align:center;min-width:40px;font-size:15px"
@@ -1223,11 +1211,14 @@ export default {
           this.zones = zone;
 
           var numbers = response.data.data.numbers;
+
           var number = [{ id: 0, number: "全部" }];
           for (let index = 0; index < numbers.length; index++) {
             const item = numbers[index];
             number.push({ id: item.id, number: item.number });
           }
+          this.bedNumberTwo = []
+          this.bedNumberTwo  = number
           this.bedNumber = number;
         }
       });
@@ -2450,7 +2441,10 @@ export default {
             const item = number[i];
             bed.push({ id: item.id, number: item.number });
           }
+          this.bedNumberTwo = []
           this.bedNumberTwo = bed;
+
+          console.log("this233232322323233232",this.bedNumberTwo)
         }
       });
     },
@@ -2510,8 +2504,14 @@ export default {
 
           if (bed.length !== 0) {
             this.form.bed = "";
+            this.bedNumberTwo = []
             this.bedNumberTwo = bed;
+          }else{
+            this.form.bed = ""
+            this.bedNumberTwo = []
+
           }
+
         }
       });
     },
@@ -2583,32 +2583,6 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
     },
-    exportList: function() {
-      console.log('123245354');
-      // for(let i=0;i<this.tableList.length;i++){
-      //     this.tableList[i].index = i+1
-      //   }
-      //   import('@/vendor/Export2Excel').then(excel => {
-      //     const multiHeader = [['序号', '日期','  药品类型','药品名称','规格&单位','生产产商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-      //     const header = ['', '','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-      //     const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:I1', 'J1:L1', 'M1:O1', 'P1:R1']
-      //     const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
-
-      //     const data = this.formatJson(filterVal, this.tableList)
-
-      //     const filename = '药品进销存查询'
-
-
-      //       excel.export_json_to_excel({
-      //         multiHeader,
-      //         header,
-      //         merges,
-      //         data,
-      //         filename
-      //       })
-      //   })
-    },
-  
   created() {
     this.getAllSubregion();
     // this.getInformationData();
@@ -2616,6 +2590,7 @@ export default {
   },
   watch: {
     userdata(newvalue, oldvalue) {
+      console.log("newVlaue233333333333333333333",newvalue)
       this.getUserForm(newvalue);
       this.getBedForm(newvalue);
       this.value = newvalue;

src/xt_pages/management/components/WaterForm.vue

@@ -359,8 +359,14 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
     methods:{
         saveWater(formName){
         // console.log("form",this.form,this.equimentid)
-        this.form.force_pump_status = parseInt(this.form.force_pump_status)
-        this.form.machine_status = parseInt(this.form.machine_status)
+        if(this.form.force_pump_status!=""){
+          this.form.force_pump_status = parseInt(this.form.force_pump_status)
+        }
+        if(this.form.machine_status!=""){
+          this.form.machine_status = parseInt(this.form.machine_status)
+        }
+      
+       
         if(this.form.reverse_osmosis_membrane_disinfection == true){
            this.form.reverse_osmosis_membrane_disinfection = 1
         }
@@ -373,38 +379,189 @@ import {getAllDoctorList,saveWaterList} from "@/api/manage";
         if(this.form.disinfection_of_water_pipeline == false){
           this.form.disinfection_of_water_pipeline = 2
         }
+        if(this.form.water_conductivity!=""){
+          this.form.water_conductivity = parseFloat(this.form.water_conductivity)== NaN ? 0:parseFloat(this.form.water_conductivity)
+        }else{
+           this.form.water_conductivity = 0 
+        }
+        
+        if(this.form.water_pressure!=""){
+          this.form.water_pressure = parseFloat(this.form.water_pressure) == NaN ? 0:parseFloat(this.form.water_pressure)
+        }else{
+            this.form.water_pressure=  0
+        }
+
+        if(this.form.temperature!=""){
+          this.form.temperature = parseFloat(this.form.temperature)== NaN ? 0:parseFloat(this.form.temperature)
+        }else{
+          this.form.temperature = 0    
+        }
+        
+        if(this.form.force_pump_status!=""){
+          this.form.force_pump_status = parseFloat(this.form.force_pump_status) ==  NaN ? 0: parseFloat(this.form.force_pump_status)
+        }else{
+            this.form.force_pump_status = 0
+        }
+        
+        if(this.form.first_ro_membrane_water!=""){
+          this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water) == NaN?0:parseFloat(this.form.first_ro_membrane_water)
+        }else{
+          this.form.first_ro_membrane_water = 0
+        }
+
+        if(this.form.first_ro_film_thick_water!=""){
+          this.form.first_ro_film_thick_water = parseFloat(this.form.first_ro_film_thick_water) ==NaN?0:parseFloat(this.form.first_ro_film_thick_water)
+        }else{
+          this.form.first_ro_film_thick_water = 0
+        }
+        
+        if(this.form.first_ro_membrane_effluent!=""){
+          this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent) == NaN?0:parseFloat(this.form.first_ro_membrane_effluent) 
+        }else{
+           this.form.first_ro_membrane_effluent = 0 
+        }
+
+        if(this.form.first_production_of_water_conductivity!=""){
+          this.form.first_production_of_water_conductivity = parseFloat(this.form.first_production_of_water_conductivity) == NaN?0: parseFloat(this.form.first_production_of_water_conductivity)
+        }else{
+          this.form.first_production_of_water_conductivity = 0
+        }
+        
+        if(this.form.first_water_yield !=""){
+           this.form.first_water_yield = parseFloat(this.form.first_water_yield) == NaN?0:parseFloat(this.form.first_water_yield)  
+        }else{
+            this.form.first_water_yield =0
+        }
+       
+        if(this.form.last_ro_membrane_water!=""){
+          this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water) ==NaN?0:parseFloat(this.form.last_ro_membrane_water)  
+        }else{
+          this.form.last_ro_membrane_water = 0
+        }
+      
+        if(this.form.last_ro_membrane_effluent!=""){
+          this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent) == NaN?0:parseFloat(this.form.last_ro_membrane_effluent)
+        }else{
+          this.form.last_ro_membrane_effluent = 0
+        }
+      
+        if(this.form.last_ro_film_thick_water!=""){
+            this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water) == NaN?0:parseFloat(this.form.last_ro_film_thick_water)
+        }else{
+          this.form.last_ro_film_thick_water = 0
+        }
+   
+        if( this.form.last_production_of_water_conductivity!=""){
+            this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity) == NaN?0:parseFloat(this.form.last_production_of_water_conductivity)
+        }else{
+            this.form.last_production_of_water_conductivity =0
+        }
+       
+        if(this.form.last_water_yield!=""){
+            this.form.last_water_yield = parseFloat(this.form.last_water_yield)==NaN?0: parseFloat(this.form.last_water_yield)
+        }else{
+            this.form.last_water_yield = 0
+        }
 
-        this.form.water_conductivity = parseFloat(this.form.water_conductivity)
-        this.form.water_pressure = parseFloat(this.form.water_pressure)
-        this.form.temperature = parseFloat(this.form.temperature)
-        this.form.force_pump_status = parseFloat(this.form.force_pump_status)
-        this.form.first_ro_membrane_water = parseFloat(this.form.first_ro_membrane_water)
-        this.form.first_ro_film_thick_water = parseFloat(this.form.first_ro_film_thick_water)
-        this.form.first_ro_membrane_effluent =parseFloat(this.form.first_ro_membrane_effluent)
-        this.form.first_production_of_water_conductivity = parseFloat(this.form.first_production_of_water_conductivity)
-        this.form.first_water_yield = parseFloat(this.form.first_water_yield)
-        this.form.last_ro_membrane_water = parseFloat(this.form.last_ro_membrane_water)
-        this.form.last_ro_membrane_effluent = parseFloat(this.form.last_ro_membrane_effluent)
-        this.form.last_ro_film_thick_water = parseFloat(this.form.last_ro_film_thick_water)
-        this.form.last_production_of_water_conductivity = parseFloat(this.form.last_production_of_water_conductivity)
-        this.form.last_water_yield = parseFloat(this.form.last_water_yield)
-        this.form.carbon_tank = parseFloat(this.form.carbon_tank)
-        this.form.snd_tank = parseFloat(this.form.snd_tank)
-        this.form.resin_tank= parseFloat(this.form.resin_tank)
-        this.form.ultrafilter = parseFloat(this.form.ultrafilter)
-        this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring)
-        this.form.total_chlorine_detection = parseFloat(this.form.total_chlorine_detection)
-        this.form.ph_detection = parseFloat(this.form.ph_detection)
-        this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid)
-        this.form.reverse_osmosis_membrane_disinfection= parseFloat(this.form.reverse_osmosis_membrane_disinfection)
-        this.form.first_disinfection_method = parseFloat(this.form.first_disinfection_method)
-        this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method)
-        this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time)
-        this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time)
-        this.form.filter_replacement = parseFloat(this.form.filter_replacement)
-        this.form.admin_user_id = parseFloat(this.form.admin_user_id)
-        this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline)
-        console.log("fomr=================",this.form)
+        if(this.form.carbon_tank!=""){
+            this.form.carbon_tank = parseFloat(this.form.carbon_tank) == NaN?0:parseFloat(this.form.carbon_tank)
+        }else{
+            this.form.carbon_tank = 0
+        }
+        
+        if( this.form.snd_tank!=""){
+            this.form.snd_tank = parseFloat(this.form.snd_tank) == NaN?0:parseFloat(this.form.snd_tank)
+        }else{
+            this.form.snd_tank = 0
+        }
+         
+        if(this.form.resin_tank!=""){
+            this.form.resin_tank= parseFloat(this.form.resin_tank) ==NaN?0:parseFloat(this.form.resin_tank)
+        }else{
+            this.form.resin_tank= 0
+        }
+      
+        if( this.form.ultrafilter!=""){
+            this.form.ultrafilter = parseFloat(this.form.ultrafilter)== NaN?0:parseFloat(this.form.ultrafilter)
+        }else{
+          this.form.ultrafilter = 0
+        }
+        
+        if(this.form.hardness_monitoring !=""){
+            this.form.hardness_monitoring = parseFloat(this.form.hardness_monitoring) ==NaN?0: parseFloat(this.form.hardness_monitoring)
+        }else{
+           this.form.hardness_monitoring= 0
+        }
+
+        if( this.form.total_chlorine_detection!=""){
+            this.form.total_chlorine_detection = parseFloat(this.form.total_chlorine_detection)==NaN?0: parseFloat(this.form.total_chlorine_detection)
+        }else{
+            this.form.total_chlorine_detection = 0
+        }
+        
+        if( this.form.ph_detection!=""){
+            this.form.ph_detection = parseFloat(this.form.ph_detection) == NaN?0:parseFloat(this.form.ph_detection)
+        }else{
+            this.form.ph_detection = 0
+        }
+
+        if(this.form.concentration_of_peroxyacetic_acid!="" ){
+            this.form.concentration_of_peroxyacetic_acid = parseFloat(this.form.concentration_of_peroxyacetic_acid) == NaN?0: parseFloat(this.form.concentration_of_peroxyacetic_acid)   
+        }else{
+            this.form.concentration_of_peroxyacetic_acid = 0
+        }
+
+        if( this.form.reverse_osmosis_membrane_disinfection!=""){
+            this.form.reverse_osmosis_membrane_disinfection= parseFloat(this.form.reverse_osmosis_membrane_disinfection) == NaN?0:parseFloat(this.form.reverse_osmosis_membrane_disinfection)
+        }else{
+            this.form.reverse_osmosis_membrane_disinfection=  0
+        }
+
+        if(this.form.first_disinfection_method !=""){
+            this.form.first_disinfection_method = parseFloat(this.form.first_disinfection_method) == NaN?0:parseFloat(this.form.first_disinfection_method)
+        }else{
+            this.form.first_disinfection_method = 0
+        }
+      
+       
+        if(this.form.last_disinfection_method !=""){
+           this.form.last_disinfection_method = parseFloat(this.form.last_disinfection_method) == NaN?0:parseFloat(this.form.last_disinfection_method)
+        }else{
+            this.form.last_disinfection_method = 0
+        }
+       
+        if(this.form.first_disinfection_time !=""){
+          this.form.first_disinfection_time = parseFloat(this.form.first_disinfection_time) == NaN?0:parseFloat(this.form.first_disinfection_time)
+        }else{
+            this.form.first_disinfection_time = 0
+        }
+        
+        if( this.form.last_disinfection_time!=""){
+            this.form.last_disinfection_time = parseFloat(this.form.last_disinfection_time) == NaN?0:parseFloat(this.form.last_disinfection_time)
+        }else{
+            this.form.last_disinfection_time = 0  
+        }
+      
+        if(this.form.filter_replacement!=""){
+            this.form.filter_replacement = parseFloat(this.form.filter_replacement) == NaN?0:parseFloat(this.form.filter_replacement)
+        }else{
+            this.form.filter_replacement= 0
+        }
+
+        if( this.form.admin_user_id != ""){
+            this.form.admin_user_id = parseFloat(this.form.admin_user_id) == NaN?0:parseFloat(this.form.admin_user_id)
+        }else{
+            this.form.admin_user_id =0
+        }
+        
+        if(this.form.disinfection_of_water_pipeline !=""){
+            this.form.disinfection_of_water_pipeline = parseFloat(this.form.disinfection_of_water_pipeline) == NaN?0:parseFloat(this.form.disinfection_of_water_pipeline)
+        }else{
+            this.form.disinfection_of_water_pipeline =0
+        }
+      
+       
+        console.log("233223232323",this.form)
          this.$refs[formName].validate((valid) => {
           if (valid) {
             saveWaterList(this.equimentid,this.form).then(response=>{

src/xt_pages/management/components/WaterFormList.vue

@@ -76,17 +76,17 @@
           <el-table-column label="原水参数" align="center" min-width="110px">
             <el-table-column label="原水电导度" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.water_conductivity }}
+                {{ scope.row.water_conductivity?scope.row.water_conductivity:"" }}
               </template>
             </el-table-column>
             <el-table-column label="原水压力" align="center" min-width="110px">
               <template slot-scope="scope">
-                 {{scope.row.water_pressure}}
+                 {{scope.row.water_pressure?scope.row.water_pressure:""}}
               </template>
             </el-table-column>
             <el-table-column label="温度" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{scope.row.temperature }}
+                {{scope.row.temperature?scope.row.temperature:"" }}
              </template>
             </el-table-column>
             <el-table-column label="加压泵" align="center" min-width="110px">
@@ -100,12 +100,12 @@
           <el-table-column label="一级反渗" align="center" min-width="110px">
             <el-table-column label="产水电导度" align="center" min-width="110px">
               <template slot-scope="scope">
-                 {{scope.row.first_production_of_water_conductivity }}
+                 {{scope.row.first_production_of_water_conductivity?scope.row.first_production_of_water_conductivity:"" }}
               </template>
             </el-table-column>
             <el-table-column label="产水量" align="center" min-width="110px">
               <template slot-scope="scope">
-                 {{scope.row.first_water_yield }}
+                 {{scope.row.first_water_yield?scope.row.first_water_yield:"" }}
               </template>
             </el-table-column>
           </el-table-column>
@@ -113,59 +113,59 @@
           <el-table-column label="二级反渗" align="center" min-width="110px">
             <el-table-column label="产水电导度" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.last_production_of_water_conductivity }}
+                {{ scope.row.last_production_of_water_conductivity?scope.row.last_production_of_water_conductivity:"" }}
               </template>
             </el-table-column>
             <el-table-column label="产水量" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.last_water_yield }}
+                {{ scope.row.last_water_yield?scope.row.last_water_yield:"" }}
               </template>
             </el-table-column>
           </el-table-column>
 
           <el-table-column label="碳罐(MPa)" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{scope.row.carbon_tank }}
+                {{scope.row.carbon_tank?scope.row.carbon_tank:"" }}
               </template>
          </el-table-column>
 
          <el-table-column label="砂罐(MPa)" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.snd_tank }}
+                {{ scope.row.snd_tank?scope.row.snd_tank:"" }}
               </template>
          </el-table-column>
 
          <el-table-column label="树脂罐(MPa)" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.resin_tank }}
+                {{ scope.row.resin_tank?scope.row.resin_tank:"" }}
               </template>
          </el-table-column>
 
          <el-table-column label="静谧过滤器(MPa)" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.ultrafilter }}
+                {{ scope.row.ultrafilter?scope.row.ultrafilter:"" }}
               </template>
          </el-table-column>
 
           <el-table-column label="水质监测" align="center" min-width="110px">
             <el-table-column label="硬度" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.hardness_monitoring }}
+                {{ scope.row.hardness_monitoring?scope.row.hardness_monitoring:"" }}
               </template>
             </el-table-column>
             <el-table-column label="总氯" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.total_chlorine_detection }}
+                {{ scope.row.total_chlorine_detection?scope.row.total_chlorine_detection:"" }}
               </template>
             </el-table-column>
             <el-table-column label="PH值" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.ph_detection }}
+                {{ scope.row.ph_detection?scope.row.ph_detection:"" }}
               </template>
             </el-table-column>
             <el-table-column label="过氧乙酸(mg/h)" align="center" min-width="110px">
               <template slot-scope="scope">
-                {{ scope.row.concentration_of_peroxyacetic_acid }}
+                {{ scope.row.concentration_of_peroxyacetic_acid?scope.row.concentration_of_peroxyacetic_acid:"" }}
               </template>
             </el-table-column>
           </el-table-column>
@@ -188,7 +188,7 @@
 
             <el-table-column label="过滤器更换" align="center" min-width="110px">
               <template slot-scope="scope">
-                 {{scope.row.filter_replacement}}
+                 {{scope.row.filter_replacement?scope.row.filter_replacement:""}}
               </template>
             </el-table-column>
             <el-table-column label="记录人" align="center" min-width="110px">
@@ -794,6 +794,8 @@
   </template>
   <script>
   import { uParseTime } from "@/utils/tools";
+  import print from "print-js";
+  const moment = require("moment");
   import {getWaterFormList,DeleteWater,getDialysisWaterDetail,UpdateDilaysisWater,DeleteBatchDialyisWater} from "@/api/manage";
     export default {
       name: "WaterFormList",
@@ -802,6 +804,7 @@
       },
       data(){
         return {
+          nowTime: moment(new Date()).format("YYYY-MM-DD HH:MM:SS"),
           tableData:[],
           total:0,
           adminRole:[],
@@ -1153,7 +1156,7 @@
 
               const filename = '水处理机使用登记'
 
-              console.log("rwwwwwwwwwww",this.tableData)
+              // console.log("rwwwwwwwwwww",this.tableData)
 
               excel.export_json_to_excel({
                 multiHeader,

src/xt_pages/management/components/waterFormPrint.vue

@@ -1,157 +1,294 @@
 <template>
-    <div hidden="hidden">
-      <div id="print-card-info" v-show="hiddenShow">
-        <div>
-          <div class="print_main_content">
-            <div class="order_title">设备使用记录清单</div>
-          </div>
-          <div>
-            <div class="printClass">打印日期:{{ nowTime }}</div>
-            <table
-              border="1"
-              style="width:100%"
-              cellspacing="0"
-              cellpadding="0"
-              class="tableClass"
-            >
-              <tr>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px;"
-                >
-                  机号
-                </td>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:100px;font-size:15px"
-                >
-                  日期
-                </td>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:50px;font-size:15px"
-                >
-                  班次
-                </td>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:70px;font-size:15px"
-                >
-                  患者
-                </td>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                  透析方式
-                </td>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                  运行
-                </td>
-                <td
-                  :colspan="4"
-                  style="text-align:center;width:60px;font-size:15px"
-                >
-                  机表消毒
-                </td>
-                <td
-                  :colspan="5"
-                  style="text-align:center;width:80px;font-size:15px"
-                >
-                  液路消毒
-                </td>
-                <td
-                  :rowspan="2"
-                  style="text-align:center;width:80px;font-size:15px"
-                >
-                  签名
-                </td>
-              </tr>
-              <tr>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  消毒方式
-                </td>
-                <td style="text-align:center;width:50px;font-size:15px">
-                  消毒液
-                </td>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  消毒状态
-                </td>
-                <td style="text-align:center;width:95px;font-size:15px">
-                  消毒液浓度
-                </td>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  消毒方式
-                </td>
-                <td style="text-align:center;width:50px;font-size:15px">
-                  消毒液
-                </td>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  消毒时长/min
-                </td>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  消毒状态
-                </td>
-                <td style="text-align:center;width:70px;font-size:15px">
-                  消毒液残留
-                </td>
-              </tr>
-              <tr v-for="item in this.tableData" :key="item.id">
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                  
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button  size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
+          <div style="font-size:22px;font-weight:bold;text-align:center;margin-top:40px"></div>
+          <div class="order-title" style="font-size:18px;padding-top:0;">药品入库登记表</div>
+          <div style="float: right;margin-bottom: 1px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td width="80">药品名称</td>
+              <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
+              <td style="line-height:18px;" width="100">规格<br>型号</td>
+              <td style="line-height:18px;" width="80">生产<br>厂商</td>
+              <td style="line-height:18px;" width="80">经销商</td>
+              <td style="line-height:18px;" width="80">进货价</td>
+              <td style="line-height:18px;" width="80">入库<br>数量</td>
+              <td style="line-height:18px;" width="80">单位</td>
+              <td style="line-height:18px;" width="60">总价</td>
+              <td style="line-height:18px;" width="80">批号</td>
+              <td style="line-height:18px;" width="120">生产日期</td>
+              <td style="line-height:18px;" width="120">有效日期</td>
+              <td style="line-height:18px;" width="120">入库日期</td>
+              <td style="line-height:18px;" width="60">质检<br>意见</td>
+              <td style="line-height:18px;" width="60">验收<br>结论</td>
+            </tr>
+
+            <tr v-for="(item,i) in it.child" :key="i">
+              <td style="line-height: 18px">
                  
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
+              </td>
+              <td style="line-height: 18px"></td>
+              <td style="line-height: 18px">
                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                  
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                 
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
-                  
-                </td>
-                <td style="text-align:center;font-size:15px;height:30px">
+              </td>
+              <td style="line-height: 18px"></td>
+              <td style="line-height: 18px"></td>
+              <td style="line-height:18px">
                  
-                </td>
-              </tr>
-            </table>
+              </td>
+              <td style="line-height: 18px">
+                   <span></span>
+              </td>
+              <td style="line-height: 18px">
+                <span></span>
+              </td>
+              <td style="line-height:18px">
+                  <span></span>
+              </td>
+              <td style="line-height:18px"></td>
+              <td style="line-height:18px"></td>
+              <td style="line-height:18px"></td>
+              <td style="line-height:18px"></td>
+              <td style="line-height:18px"></td>
+              <td style="line-height:18px"></td>
+            </tr>
+            <tr>
+              <td>合计</td>
+              <td colspan="7" style="text-align:center"></td>
+              <td style="text-align:center">{{getAllPrince(it.id).toFixed(2)}}</td>
+              <td colspan="6" style="text-align:center"></td>
+            </tr>
+            </tbody>
+          </table>
+
+          <div style="display:flex;margin-top:1px;float:right;" v-if="orgId == 10024">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"><span v-if='orgId == 10024'>徐立琼</span></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
+          </div>
+          <div style="display:flex;margin-top:1px;float:right;" v-if="orgId !=10024">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;">{{ getXuserName(it.creater) }}</div>
           </div>
         </div>
+
       </div>
+
     </div>
-</template>
+  </div>
+
+</template>
+
+<script>
+  import { GetAllConfig,getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import {getDrugWarehouseInfoList,getDrugOrderInPrint} from "@/api/drug/drug_stock";
+  import {getBaseDrugLibList} from '@/api/data'
+
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '维修列表' },
+          { path: false, name: '打印单' }
+        ],
+        tableList:[]
+      }
+    },
+    methods: {
+       getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+         }
+      },
+      printThisPage(){
+        
+      }
+    },
+    created() {
+          
+   
+
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/management/home.vue

@@ -964,12 +964,12 @@
                                      <el-form-item label="班次:" required prop="classtype" class="st">
                                        <el-select v-model="userform.classtype" placeholder="请选择" style="width:150px">
                                            <el-option
-                                            v-for="item in classType"
-                                           :key="item.id"
-                                           :label="item.name"
-                                           :value="item.id"
-                                           style="width:90px">
-                                       </el-option>
+                                              v-for="item in classType"
+                                              :key="item.id"
+                                              :label="item.name"
+                                              :value="item.id"
+                                              style="width:90px">
+                                           </el-option>
                                         </el-select>
                                      </el-form-item>
                                   </el-col>
@@ -1290,7 +1290,7 @@
                                       <el-form-item label="规格:">
                                           <el-input style="width:100px" v-model="userform.norms"></el-input><span style="color:#606266;">桶</span>
                                       </el-form-item>
-                                       <span class="warn" v-show="warnShow">您已一个月未更换,请注意检测</span>
+                                       <span class="warn" v-show="warnShow">您已三个月未更换,请注意检测</span>
                                    </el-col>
                                 </el-row>
                                 <el-row>
@@ -1307,7 +1307,7 @@
                                    <el-col :span="8">
                                      <el-form-item label="细菌过滤器:">
                                        <el-checkbox v-model="userform.germ_checked">更换</el-checkbox>
-                                       <span class="warn" v-show="warnShowTwo">您已一个月未更换,请注意检测</span>
+                                       <span class="warn" v-show="warnShowTwo">您已三个月未更换,请注意检测</span>
                                      </el-form-item>
 
                                      </el-col>
@@ -1334,7 +1334,7 @@
                                    <el-col :span="8">
                                       <el-form-item label="空气滤网清洁:">
                                         <el-checkbox v-model="userform.clean">清洁</el-checkbox>
-                                      <span class="warn" v-show="warnShowThree">您已一个月未清洁,请检查</span>
+                                      <span class="warn" v-show="warnShowThree">您已三个月未清洁,请检查</span>
                                       </el-form-item>
                                      </el-col>
                                    <el-col :span="8">
@@ -2889,8 +2889,8 @@ export default {
           fluid_path: [{ required: true, message: '请填写消毒方式' }],
           disinfectant: [{ required: true, message: '请填写消毒液' }],
           disinfection_status: [{ required: true, message: '消毒状态' }],
-          sign_name: [{ required: true, message: '请填写签名', trigger: ['change'] }],
-          classtype: [{ required: true, message: '请填写班次' }],
+          sign_name: [{ required: true, message: '请填写签名', trigger: ['blur','change'] }],
+          classtype: [{ required: true, message: '请填写班次', trigger: ['blur','change']  }],
           reporting_date:[{required:true,message:"请填写出报告日期"}]
         },
         planRules: {
@@ -2953,7 +2953,7 @@ export default {
           { id: 7, name: '周日' }
         ],
         classType: [
-          { id: 0, name: '请选择' },
+          // { id: 0, name: '请选择' },
           { id: 1, name: '上午' },
           { id: 2, name: '下午' },
           { id: 3, name: '晚上' }
@@ -4402,13 +4402,17 @@ export default {
       },
 
       SaveInformation(formName) {
-        if (this.userform.classtype === '') {
-          this.userform.classtype = 0
+        // if (this.userform.classtype === '') {
+        //   this.userform.classtype = 0
+        // }
+        console.log("form233232322323",this.userform.classtype)
+        if(this.userform.classtype!=""){
+          var classtypes = this.userform.classtype
+          var classtype = parseInt(classtypes)
+          this.userform.classtype = classtype
         }
-        var classtypes = this.userform.classtype
-        var classtype = parseInt(classtypes)
-        this.userform.classtype = classtype
-
+     
+        
         var zone = this.userform.zone
         var zones = parseInt(zone)
         this.userform.zone = zones
@@ -4528,7 +4532,7 @@ export default {
                 this.userform.starttime = ''
                 this.userform.endtime = ''
                 this.userform.date = ''
-                this.userform.classtype = ''
+                // this.userform.classtype = ''
                 this.userform.zone = ''
                 this.userform.patient_name = ''
                 this.userform.sign_name = ''
@@ -4569,8 +4573,8 @@ export default {
             } else {
               this.userform.date = uParseTime(information.date, '{y}-{m}-{d}')
             }
-
-            this.userform.classtype = information.class
+            
+            this.userform.classtype = information.class?information.class:""
             this.userform.zone = information.zone
             this.userform.bed_number = information.bed_number
             this.userform.patient_name = information.name