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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.5"
+  "version": "1.0.6"
 }

src/api/device.js

@@ -265,7 +265,7 @@ export function updateNewAirDisinfect(data){
   
   return request({
     url:"/api/manage/updatenewairdisinfect",
-    method:post,
+    method:"post",
     data:data,
   })
 }
@@ -322,4 +322,22 @@ export function deleteObjectTableDisinfect(id,params){
     method:"get",
     params:params
   })
+}
+
+export function getAirDisinfectLongTime(params){
+  
+  return request({
+    url:"/api/manage/getairdisinfectionlongtime",
+    method:"get",
+    params:params
+  })
+}
+
+export function getObjectTableDisinfectLongTime(params){
+  
+  return request({
+    url:"/api/manage/getobjcttabledisinfectlongtime",
+    method:"get",
+    params:params,
+  })
 }

src/store/modules/globalConfig.js

@@ -886,6 +886,36 @@ const global_config = {
         zongliang_unit: 'mg',
         gaimingcheng_unit: '',
         gaijiliang_unit: ''
+      },
+      14: {
+        id: 14,
+        name: '肝素钙注射液',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
+      },
+      15: {
+        id: 15,
+        name: '甲磺酸萘莫司他',
+        type: 1,
+        shouji: 1,
+        weichi: 1,
+        zongliang: 1,
+        gaimingcheng: -1,
+        gaijiliang: -1,
+        shouji_unit: 'mg',
+        weichi_unit: 'mg/h',
+        zongliang_unit: 'mg',
+        gaimingcheng_unit: '',
+        gaijiliang_unit: ''
       }
     },
     anticoagulants_set: {

src/xt_pages/device/airDisinfectTwo.vue

@@ -28,7 +28,7 @@
           </div>
           <div style="float:right;margin-bottom:10px;">
             <el-button type="primary" @click="printCard">打印</el-button>
-            <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
+            <el-button type="primary" @click="AddCard">新增</el-button>
 
           </div>
           <div class="tab_air">
@@ -54,12 +54,7 @@
                 </el-table-column>
                 <el-table-column prop="date" label="责任人" align="center" min-width="50">
                     <template slot-scope="scope">
-                     <span v-if="setAdminUserES(scope.row.first_creator?scope.row.first_creator:scope.row.first_creator) == ''">
                         {{getName(scope.row.first_creator)}}
-                     </span>
-                    <span v-else>
-                        <img style="height:30px;" :src="setAdminUserES(scope.row.first_creator?scope.row.first_creator:scope.row.first_creator)" alt="" srcset="">
-                    </span>
 
                     </template>
                 </el-table-column>
@@ -76,13 +71,8 @@
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
                     <template slot-scope="scope">
-                        <!-- {{getName(scope.row.first_creator)}} -->
-                        <span v-if="setAdminUserES(scope.row.sencond_creator?scope.row.sencond_creator:scope.row.sencond_creator) == ''">
                         {{getName(scope.row.sencond_creator)}}
-                     </span>
-                    <span v-else>
-                        <img style="height:30px;" :src="setAdminUserES(scope.row.sencond_creator?scope.row.sencond_creator:scope.row.sencond_creator)" alt="" srcset="">
-                    </span>
+                   
                    </template>
                 </el-table-column>
 
@@ -98,13 +88,8 @@
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="50">
                     <template slot-scope="scope">
-                        <!-- {{getName(scope.row.sencond_creator)}} -->
-                    <span v-if="setAdminUserES(scope.row.third_creator?scope.row.third_creator:scope.row.third_creator) == ''">
                         {{getName(scope.row.third_creator)}}
-                     </span>
-                    <span v-else>
-                        <img style="height:30px;" :src="setAdminUserES(scope.row.third_creator?scope.row.third_creator:scope.row.third_creator)" alt="" srcset="">
-                    </span>
+                    
                     </template>
                 </el-table-column>
 
@@ -115,13 +100,8 @@
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
-                        <!-- {{getName(scope.row.third_creator)}} -->
-                        <span v-if="setAdminUserES(scope.row.last_creator?scope.row.last_creator:scope.row.last_creator) == ''">
-                            {{getName(scope.row.third_creator)}}
-                        </span>
-                        <span v-else>
-                            <img style="height:30px;" :src="setAdminUserES(scope.row.last_creator?scope.row.last_creator:scope.row.last_creator)" alt="" srcset="">
-                        </span>
+                        {{getName(scope.row.last_creator)}}
+                        
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="操作" align="center" min-width="150">
@@ -275,7 +255,7 @@
                   <el-form-item label="开始时间" label-width="110px">
                     <el-date-picker
                         type="datetime"
-                        format="yyyy-MM-dd HH:mm"
+                        format="yyyy-MM-dd HH:mm:ss"
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.sencond_start_time"
@@ -412,6 +392,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_start_time"
+                        @change="laststarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -422,6 +403,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_end_time"
+                        @change="lastendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -719,6 +701,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_start_time"
+                        @change="laststarttime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -729,6 +712,7 @@
                         value-format="yyyy-MM-dd HH:mm"
                         placeholder="选择时间"
                         v-model="form.last_end_time"
+                        @change="lastendtime"
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
@@ -806,15 +790,43 @@
                                <td>{{getTimes(item.record_date) }}</td>
                                <td>{{ getTimeTwo(item.first_start_time)}} - {{ getTimeTwo(item.first_end_time) }}</td>
                                <td>{{item.first_total_time }}</td>
-                               <td>{{getName(item.first_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">
+                                   {{getName(item.first_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
+                                </span>
+                               </td>
                                <td>{{ getTimeTwo(item.sencond_start_time)}} - {{ getTimeTwo(item.sencond_end_time) }}</td>
                                <td>{{item.sencond_total_time }}</td>
-                               <td>{{getName(item.sencond_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator) == ''">
+                                   {{getName(item.sencond_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator)" alt="" srcset="">
+                                </span>
+                               </td>
                                <td>{{getTimeTwo(item.last_start_time)}} - {{ getTimeTwo(item.last_end_time) }}</td>
                                <td>{{item.third_total_time }}</td>
-                               <td>{{getName(item.third_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.third_creator?item.third_creator:item.third_creator) == ''">
+                                   {{getName(item.third_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.third_creator?item.third_creator:item.third_creator)" alt="" srcset="">
+                                </span>
+                              </td>
                                <td> {{getTimeTwo(item.last_start_time)}} - {{ getTimeTwo(item.last_end_time) }}</td>
-                               <td>{{getName(item.last_creator)}}</td>
+                               <td>
+                                <span v-if="setAdminUserES(item.last_creator?item.last_creator:item.last_creator) == ''">
+                                   {{getName(item.last_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
+                                </span>
+                               </td>
                             </tr>
                         </table>
                     </div>
@@ -828,7 +840,7 @@
   <script>
     import print from "print-js";
     import BreadCrumb from '@/xt_pages/components/bread-crumb'
-    import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateAirDisinfect,deleteNewAirDisInfect} from "@/api/device"
+    import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime} from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
     export default {
@@ -853,8 +865,8 @@
             first_disinfection_water:"",// 消毒液
             first_disinfection_methods:"",//消毒方式
             first_disinfection_time:'',//消毒时长
-            first_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            first_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            first_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            first_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             first_total_time:"",//累计时间
             first_is_check:"1",//检验合格
             first_modifications:"",//修改标志
@@ -863,8 +875,8 @@
             sencond_disinfection_water:"",// 消毒液
             sencond_disinfection_methods:"",//消毒方式
             sencond_disinfection_time:"",//消毒时长
-            sencond_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            sencond_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            sencond_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            sencond_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             sencond_total_time:"",//累计时间
             sencond_is_check:"1",//检验合格
             sencond_modifications:"",//修改标志
@@ -873,15 +885,16 @@
             third_disinfection_water:"",// 消毒液
             third_disinfection_methods:"",//消毒方式
             third_disinfection_time:'',//消毒时长
-            third_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            third_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            third_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            third_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             third_total_time:"",//累计时间
             third_is_check:"1",//检验合格
             third_modifications:"",//修改标志
             third_creator:this.$store.getters.xt_user.user.id,//第一责任人
 
-            last_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            last_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            last_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            last_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
+            last_disinfection_time:"",//消毒时长
             last_total_time:"",//累计时间
             last_is_check:"1",//检验合格
             last_modifications:"",//修改标志
@@ -907,17 +920,26 @@
          { id: 2, name: "500mg/l含氯消毒剂" },
          { id: 3, name: "1000mg/l含氯消毒剂" },
          { id: 4, name: "1500mg/l含氯消毒剂" },
-         { id: 5, name: "消毒湿巾" }
+         { id: 5, name: "消毒湿巾" },
+         { id:6, name:"75%酒精"}
          ],
          DisinfectionMode: [
-            { id: 1, name: "化学消毒" },
-            { id: 2, name: "热消毒" },
-            { id: 3, name: "化学消毒+热消毒" }
+            { id: 1, name: "紫外线" },
+            { id: 2, name: "等离子" },
+            { id: 3, name: "臭氧" },
+            {id:4,name:"含氯剂喷洒500mg/L"},
+            {id:5,name:"含氯剂喷洒1000mg/L"},
+            {id:6,name:"通风"}
          ],
          operators: [],
          operatorMaps:{},
          firststart:'',
          firstend:'',
+
+         first_total_time:0,
+         sencond_total_time:0,
+         third_total_time:0,
+         last_total_time:0,
         }
       },
       created(){
@@ -955,9 +977,54 @@
             const time_interval = ((thirdend - thirdstart)/(60*60*1000)).toFixed(1)
             console.log('结束时间',time_interval);
             return time_interval
+        },
+        lastdisinfection_time(){
+            const lasttart= Date.parse(new Date(this.form.last_start_time))
+            console.log('开始时间',lasttart);
+            const lastend= Date.parse(new Date(this.form.last_end_time))
+            console.log('结束时间',lastend);
+            const time_interval = ((lastend - lasttart)/(60*60*1000)).toFixed(1)
+            console.log('结束时间',time_interval);
+            return time_interval    
         }
       },
       methods:{
+      AddCard(){
+        getAirDisinfectLongTime().then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("累计2323322323我",list)
+            var first_total_time = 0
+            var sencond_total_time = 0
+            var third_total_time = 0
+            var last_total_time = 0
+            if(list!=null && list.length>0){
+               for(let i=0;i<list.length;i++){
+                 first_total_time += parseFloat(list[i].first_total_time)
+                 sencond_total_time +=parseFloat(list[i].sencond_total_time)
+                 third_total_time +=parseFloat(list[i].third_total_time)
+                 last_total_time +=parseFloat(list[i].last_total_time)
+               }
+            
+           
+            this.form.first_total_time = ""
+            this.form.first_total_time = first_total_time
+            this.first_total_time = first_total_time
+            this.form.sencond_total_time = ""
+            this.form.sencond_total_time = sencond_total_time
+            this.sencond_total_time = sencond_total_time
+            this.form.third_total_time =""
+            this.form.third_total_time = third_total_time
+            this.third_total_time = third_total_time
+            this.form.last_total_time =""
+            this.form.last_total_time = last_total_time
+            this.last_total_time = last_total_time
+           
+          }
+          this.dialogFormVisible =  true
+         }
+        })
+      },
       handleSizeChange(val) {
         this.limit = val;
         this.getNewAirDisinfectList()
@@ -1041,6 +1108,11 @@
                 }else{
                     this.form.last_modifications= 0
                 }
+
+                this.form.first_total_time = this.form.first_total_time.toString()
+                this.form.sencond_total_time =this.form.sencond_total_time.toString()
+                this.form.third_total_time = this.form.third_total_time.toString()
+                this.form.last_total_time = this.form.last_total_time.toString()
               console.log("this232322323",this.form)
               saveNewAirDisinfect(this.form).then(response=>{
                  if(response.data.state == 1 ){
@@ -1187,7 +1259,7 @@
                     this.form.last_modifications= 0
                 }
 
-              updateAirDisinfect(this.form).then(response=>{
+                updateNewAirDisinfect(this.form).then(response=>{
                 if(response.data.state == 1){
                   var disinfect =  response.data.data.disinfect
                   this.editDialogFormVisible = false
@@ -1228,26 +1300,37 @@
             }, 1);
          },
          setAdminUserES(id) {
+           
             if (id === 0) {
             return ''
             }
-            if (id in this.operatorMaps) {
+            var user_name = ""
+            for(let i=0;i<this.operators.length;i++){
+               if(id == this.operators[i].admin_user_id){
+                  user_name = this.operators[i].url
+               }
+            }
+            return user_name
+            // if (id in this.operatorMaps) {
 
-            return this.operatorMaps[id].url
+            // return this.operatorMaps[id].url
 
-            } else {
-            return ''
-            }
+            // } else {
+            // return ''
+            // }
         },
       
         
         firststartime(val){
             this.form.first_start_time = val
             this.form.first_disinfection_time = this.firstdisinfection_time
+           
         },
         firstendtime(val){
             this.form.first_disinfection_time = this.firstdisinfection_time
             this.form.first_end_time = val
+           
+            this.form.first_total_time = parseFloat(this.first_total_time ) + parseFloat(this.form.first_disinfection_time)
         },
         sencondstarttime(val){
             this.form.sencond_start_time = val
@@ -1256,15 +1339,31 @@
          sencondendtime(val){
             this.form.sencond_end_time = val
             this.form.sencond_disinfection_time = this.senconddisinfection_time
+
+            this.form.sencond_total_time = parseFloat(this.sencond_total_time ) + parseFloat(this.form.sencond_disinfection_time)
         },
         thirdstarttime(val){
             this.form.third_start_time = val
             this.form.third_disinfection_time = this.thirddisinfection_time
+
+          
         },
         thirdendtime(val){
             this.form.third_end_time = val
             this.form.third_disinfection_time = this.thirddisinfection_time
+            this.form.third_total_time = parseFloat(this.third_total_time ) + parseFloat(this.form.third_disinfection_time)
         },
+        laststarttime(val){
+          this.form.last_start_time = val
+          this.form.last_disinfection_time = this.lastdisinfection_time
+        },
+        lastendtime(val){
+          this.form.last_end_time = val
+          this.form.last_disinfection_time = this.lastdisinfection_time   
+
+          this.form.last_total_time = parseFloat(this.last_total_time ) + parseFloat(this.form.last_disinfection_time)
+        }
+
       },
 
     }

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -39,56 +39,70 @@
                 </el-table-column>
                 <el-table-column prop="fenopda" :label="'湿化瓶'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.first_total_time?scope.row.first_total_time:""}}
+                        <!-- {{scope.row.first_total_time?scope.row.first_total_time:""}} -->
+                        {{ scope.row.first_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.first_creator)}}
+
+                     
                     </template>
                 </el-table-column>
 
                 <el-table-column prop="date" :label="'止血带'+'\n'+'500mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.sencond_total_time?scope.row.sencond_total_time:""}}
+                        <!-- {{scope.row.sencond_total_time?scope.row.sencond_total_time:""}} -->
+                        {{ scope.row.sencond_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="责任人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.sencond_creator)}}
+                       
                     </template>
                 </el-table-column>
 
                 <el-table-column prop="province" :label="'医疗垃圾桶'+'\n'+'1000mg/l含氯制剂'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.third_total_time?scope.row.third_total_time:""}}
+                        <!-- {{scope.row.third_total_time?scope.row.third_total_time:""}} -->
+                        {{ scope.row.third_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.third_creator)}}
+
+                   
                     </template>
                 </el-table-column>
 
                 <el-table-column prop="name" :label="'体温计'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
+                        <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
+                        {{ scope.row.fourth_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.fourth_creator)}}
+                    
+                  
                     </template>
                 </el-table-column>
 
                 <el-table-column prop="city" :label="'体温枪'+'\n'+'75%酒精擦拭'" align="center" min-width="60">
                     <template slot-scope="scope">
-                        {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}}
+                        <!-- {{scope.row.fourth_total_time?scope.row.fourth_total_time:""}} -->
+                        {{ scope.row.last_disinfection_time }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.last_creator)}}
+
+                    
                     </template>
                 </el-table-column>
                 <el-table-column prop="city" label="操作" align="center" min-width="100">
@@ -136,10 +150,26 @@
                   </div>
                   <div class="form_title"><span >湿化瓶</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.first_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.first_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
@@ -166,9 +196,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.first_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.first_is_check" label="1">是</el-radio>
@@ -198,10 +228,26 @@
 
                   <div class="form_title"><span >止血带</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_water"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
@@ -228,9 +274,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.sencond_total_time"></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.sencond_is_check" label="1">是</el-radio>
@@ -260,10 +306,26 @@
 
                   <div class="form_title"><span >医疗垃圾桶</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.third_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.third_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.third_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_water"></el-input> -->
+                      <el-select v-model="form.third_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
@@ -290,9 +352,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.third_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px" >
                       <div>
                           <el-radio v-model="form.third_is_check" label="1">是</el-radio>
@@ -322,10 +384,26 @@
 
                   <div class="form_title"><span >体温计</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.fourth_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.fourth_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.fourth_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.fourth_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.fourth_disinfection_water"></el-input> -->
+                      <el-select v-model="form.fourth_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.fourth_disinfection_time " :disabled="true"></el-input>
@@ -352,9 +430,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.fourth_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.fourth_is_check" label="1">是</el-radio>
@@ -384,10 +462,26 @@
 
                   <div class="form_title"><span >体温枪</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.last_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.last_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.last_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.last_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.last_disinfection_water"></el-input> -->
+                      <el-select v-model="form.last_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.last_disinfection_time " :disabled="true"></el-input>
@@ -414,9 +508,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.last_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.last_is_check" label="1">是</el-radio>
@@ -469,10 +563,26 @@
                   </div>
                   <div class="form_title"><span >湿化瓶</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.first_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.first_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
@@ -499,9 +609,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.first_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.first_is_check" label="1">是</el-radio>
@@ -531,10 +641,26 @@
 
                   <div class="form_title"><span >止血带</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.sencond_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.sencond_disinfection_water"></el-input> -->
+                      <el-select v-model="form.sencond_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.sencond_disinfection_time " :disabled="true"></el-input>
@@ -561,9 +687,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.sencond_total_time"></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.sencond_is_check" label="1">是</el-radio>
@@ -593,10 +719,26 @@
 
                   <div class="form_title"><span >医疗垃圾桶</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.third_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.third_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.third_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.third_disinfection_water"></el-input> -->
+                      <el-select v-model="form.third_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.third_disinfection_time " :disabled="true"></el-input>
@@ -623,9 +765,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.third_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px" >
                       <div>
                           <el-radio v-model="form.third_is_check" label="1">是</el-radio>
@@ -655,10 +797,26 @@
 
                   <div class="form_title"><span >体温计</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.fourth_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.fourth_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.fourth_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.fourth_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.fourth_disinfection_water"></el-input> -->
+                      <el-select v-model="form.fourth_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.fourth_disinfection_time " :disabled="true"></el-input>
@@ -685,9 +843,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.fourth_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.fourth_is_check" label="1">是</el-radio>
@@ -717,10 +875,26 @@
 
                   <div class="form_title"><span >体温枪</span></div>
                   <el-form-item label="消毒方式" label-width="110px">
-                      <el-input v-model="form.last_disinfection_methods"></el-input>
+                      <!-- <el-input v-model="form.last_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.last_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒液" label-width="110px">
-                      <el-input v-model="form.last_disinfection_water"></el-input>
+                      <!-- <el-input v-model="form.last_disinfection_water"></el-input> -->
+                      <el-select v-model="form.last_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="消毒时间(h)" label-width="110px">
                       <el-input v-model="form.last_disinfection_time " :disabled="true"></el-input>
@@ -747,9 +921,9 @@
                         style="width:100%;"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item label="累计时间(h)" label-width="110px">
+                  <!-- <el-form-item label="累计时间(h)" label-width="110px">
                       <el-input v-model= "form.last_total_time"  ></el-input>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="检测合格" label-width="110px">
                       <div>
                           <el-radio v-model="form.last_is_check" label="1">是</el-radio>
@@ -820,16 +994,51 @@
 
                             <tr v-for="(item,index) in tableData" :key="index">
                                 <td>{{getTimes(item.record_date) }}</td>
-                                <td>{{item.first_total_time}}</td>
-                                <td>{{getName(item.first_creator)}}</td>
-                                <td>{{item.sencond_total_time}}</td>
-                                <td>{{getName(item.sencond_creator)}}</td>
-                                <td>{{getTimes(item.third_total_time) }}</td>
-                                <td>{{getName(item.third_creator) }}</td>
-                                <td>{{ getTimes(item.fourth_total_time) }}</td>
-                                <td>{{getName(item.fourth_creator) }}</td>
-                                <td>{{ getTimes(item.last_total_time) }}</td>
-                                <td>{{ getName(item.last_creator) }}</td>
+                                <td>{{item.first_disinfection_time}}</td>
+                                <td>
+                                <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">
+                                   {{getName(item.first_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
+                                </span>   
+                                </td>
+                                <td>{{item.sencond_disinfection_time}}</td>
+                                <td>
+                                 <span v-if="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator) == ''">
+                                   {{getName(item.sencond_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.sencond_creator?item.sencond_creator:item.sencond_creator)" alt="" srcset="">
+                                </span>   
+                                </td>
+                                <td>{{item.third_disinfection_time }}</td>
+                                <td>
+                                    <span v-if="setAdminUserES(item.third_creator?item.third_creator:item.third_creator) == ''">
+                                   {{getName(item.third_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.third_creator?item.third_creator:item.third_creator)" alt="" srcset="">
+                                </span>   
+                                </td>
+                                <td>{{ item.fourth_disinfection_time }}</td>
+                                <td>
+                                    <span v-if="setAdminUserES(item.fourth_creator?item.fourth_creator:item.fourth_creator) == ''">
+                                   {{getName(item.fourth_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.fourth_creator?item.fourth_creator:item.fourth_creator)" alt="" srcset="">
+                                </span>   
+                                </td>
+                                <td>{{ item.last_disinfection_time}}</td>
+                                <td>
+                                    <span v-if="setAdminUserES(item.last_creator?item.last_creator:item.last_creator) == ''">
+                                   {{getName(item.last_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
+                                </span>   
+                                </td>
                               
                             </tr>
                          </table>   
@@ -877,8 +1086,8 @@
             first_disinfection_water:"",// 消毒液
             first_disinfection_methods:"",//消毒方式
             first_disinfection_time:"",//消毒时长
-            first_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            first_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            first_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            first_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             first_total_time:"",//累计时间
             first_is_check:"1",//检验合格
             first_modifications:"",//修改标志
@@ -887,8 +1096,8 @@
             sencond_disinfection_water:"",// 消毒液
             sencond_disinfection_methods:"",//消毒方式
             sencond_disinfection_time:"",//消毒时长
-            sencond_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            sencond_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            sencond_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            sencond_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             sencond_total_time:"",//累计时间
             sencond_is_check:"1",//检验合格
             sencond_modifications:"",//修改标志
@@ -897,8 +1106,8 @@
             third_disinfection_water:"",// 消毒液
             third_disinfection_methods:"",//消毒方式
             third_disinfection_time:"",//消毒时长
-            third_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            third_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            third_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            third_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             third_total_time:"",//累计时间
             third_is_check:"1",//检验合格
             third_modifications:"",//修改标志
@@ -907,8 +1116,8 @@
             fourth_disinfection_water:"",// 消毒液
             fourth_disinfection_methods:"",//消毒方式
             fourth_disinfection_time:"",//消毒时长
-            fourth_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            fourth_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            fourth_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            fourth_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             fourth_total_time:"",//累计时间
             fourth_is_check:"1",//检验合格
             fourth_modifications:"",//修改标志
@@ -917,8 +1126,8 @@
             last_disinfection_water:"",// 消毒液
             last_disinfection_methods:"",//消毒方式
             last_disinfection_time:"",//消毒时长
-            last_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//开始时间
-            last_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),//结束时间
+            last_start_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//开始时间
+            last_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
             last_total_time:"",//累计时间
             last_is_check:"1",//检验合格
             last_modifications:"",//修改标志
@@ -941,6 +1150,22 @@
          total:0,
          tableData: [],
          hiddenShow:false,
+         disInfectionWaterList:[
+         { id: 1, name: "0.22%季铵盐" },
+         { id: 2, name: "500mg/l含氯消毒剂" },
+         { id: 3, name: "1000mg/l含氯消毒剂" },
+         { id: 4, name: "1500mg/l含氯消毒剂" },
+         { id: 5, name: "消毒湿巾" },
+         {  id:6, name:"75%酒精"}
+         ],
+         DisinfectionMode: [
+            { id: 1, name: "擦拭" },
+            { id: 2, name: "浸泡" },
+            { id: 3, name: "喷洒" }
+         ],
+         operators: [],
+         operatorMaps:{},
+         
         }
       },
       created(){
@@ -1024,6 +1249,7 @@
                var list = response.data.data.list
                console.log("list222222",list)
                this.docList = list
+               this.operators = response.data.data.operators
             }
           })  
         },
@@ -1156,7 +1382,7 @@
 
               this.form.fourth_disinfection_water = list.third_disinfection_water?list.third_disinfection_water:""
               this.form.fourth_disinfection_methods = list.third_disinfection_methods?list.third_disinfection_methods:""
-              this.form.fourth_disinfection_time = list.third_disinfection_time?list.third_disinfection_time:""
+              this.form.fourth_disinfection_time = list.fourth_disinfection_time?list.fourth_disinfection_time:""
               this.form.fourth_start_time  =this.getTimeThree(list.third_start_time)
               this.form.fourth_end_time = this.getTimeThree(list.third_end_time)
               this.form.fourth_total_time = list.third_total_time? list.third_total_time:""
@@ -1300,7 +1526,27 @@
         lastendtime(val){
             this.form.last_end_time = val
             this.form.last_disinfection_time = this.lastdisinfection_time
-        }
+        },
+        setAdminUserES(id) {
+           
+           if (id === 0) {
+           return ''
+           }
+           var user_name = ""
+           for(let i=0;i<this.operators.length;i++){
+              if(id == this.operators[i].admin_user_id){
+                 user_name = this.operators[i].url
+              }
+           }
+           return user_name
+           // if (id in this.operatorMaps) {
+
+           // return this.operatorMaps[id].url
+
+           // } else {
+           // return ''
+           // }
+       },
         
       }
     }

src/xt_pages/dialysis/PatientBox.vue

@@ -136,6 +136,8 @@
                 <span v-if="schedule.prescription.anticoagulant == 11">那屈肝素</span>
                 <span v-if="schedule.prescription.anticoagulant == 12">无抗凝剂</span>
                 <span v-if="schedule.prescription.anticoagulant == 13">那屈肝素钙</span>
+                <span v-if="schedule.prescription.anticoagulant == 14">肝素钙注射液</span>
+                <span v-if="schedule.prescription.anticoagulant == 15">甲磺酸萘莫司他</span>
              </span>
           </span>
         </p>

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -2973,15 +2973,33 @@
           return record[key] == target_value;
         }
       },
+      // getAge: function (val) {
+      //   if (val.age == 0) {
+      //     if (val.birthday == 0) {
+      //       return "";
+      //     }
+      //     return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
+      //   } else {
+      //     return val.age;
+      //   }
+      // },
       getAge: function (val) {
-        if (val.age == 0) {
-          if (val.birthday == 0) {
-            return "";
-          }
-          return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
-        } else {
-          return val.age;
-        }
+            var thisLen = val.id_card_no.length;
+            var birth = "";
+            if (thisLen == 15) {
+                birth = "19" + val.id_card_no.substr(6, 6);
+            } else {
+                birth = val.id_card_no.substr(6, 8);
+            }
+            var birthtwo =
+                birth.substr(0, 4) +
+                "-" +
+                birth.substr(4, 2) +
+                "-" +
+                birth.substr(6, 2);
+
+            var age = jsGetAge(birthtwo, "-");
+            return age;
       },
       newAdviceGroupObject: function () {
         return Object.assign(

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree.vue

@@ -1546,16 +1546,34 @@ export default {
         return record[key] == target_value;
       }
     },
+    // getAge: function (val) {
+    //   if (val.age == 0) {
+    //     if (val.birthday == 0) {
+    //       return "";
+    //     }
+    //     return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
+    //   } else {
+    //     return val.age;
+    //   }
+    // },
     getAge: function (val) {
-      if (val.age == 0) {
-        if (val.birthday == 0) {
-          return "";
-        }
-        return jsGetAge(uParseTime(val.birthday, "{y}-{m}-{d}"), "-");
-      } else {
-        return val.age;
-      }
-    },
+            var thisLen = val.id_card_no.length;
+            var birth = "";
+            if (thisLen == 15) {
+                birth = "19" + val.id_card_no.substr(6, 6);
+            } else {
+                birth = val.id_card_no.substr(6, 8);
+            }
+            var birthtwo =
+                birth.substr(0, 4) +
+                "-" +
+                birth.substr(4, 2) +
+                "-" +
+                birth.substr(6, 2);
+
+            var age = jsGetAge(birthtwo, "-");
+            return age;
+      },
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -27,7 +27,7 @@
       <el-button size="small" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
     <div class="cell clearfix" style="justify-content: space-between;">
-      <div style="display:flex;">
+      <!-- <div style="display:flex;">
         <label class="title"> <span class="name">分区</span> : </label>
         <div class="time">
           <ul class>
@@ -41,7 +41,16 @@
             </li>
           </ul>
         </div>
-      </div>
+      </div> -->
+      <label class="title"><span class="name">分区</span> : </label>
+      <el-select v-model="partition_id" multiple  placeholder="请选择分区" style="margin-left:-400px"  @change="selectPartitionType">
+        <el-option
+          v-for="item in partitionArrOne"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+        </el-option>
+      </el-select>
       <div>
         <el-button size="small" icon="el-icon-printer" @click="toDialog" type="primary">设置</el-button>
         <el-button size="small" icon="el-icon-printer" @click="toSign" type="primary">标签打印</el-button>
@@ -81,6 +90,37 @@
             {{scope.row.patient.name}}
            </template>
         </el-table-column>
+        <el-table-column align="center" label="透析模式" v-if="dialysisSett.name==1">
+           <template slot-scope="scope">
+            <span v-if="scope.row.mode_id == 1">HD</span>
+            <span v-if="scope.row.mode_id == 2">HDF</span>
+            <span v-if="scope.row.mode_id == 3">HD+HP</span>
+            <span v-if="scope.row.mode_id == 4">HP</span>
+            <span v-if="scope.row.mode_id == 5">HF</span>
+            <span v-if="scope.row.mode_id == 6">SCUF</span>
+            <span v-if="scope.row.mode_id == 7">IUF</span>
+            <span v-if="scope.row.mode_id == 8">HFHD</span>
+            <span v-if="scope.row.mode_id == 9">HFHD+HP</span>
+            <span v-if="scope.row.mode_id == 10">PHF</span>
+            <span v-if="scope.row.mode_id == 11">HFR</span>
+            <span v-if="scope.row.mode_id == 12">HDF+HP</span>
+            <span v-if="scope.row.mode_id == 13">CRRT</span>
+            <span v-if="scope.row.mode_id == 19">IUF+HD</span>
+            <span v-if="scope.row.mode_id == 20">UF</span>
+            <span v-if="scope.row.mode_id == 21">HD+</span>
+            <span v-if="scope.row.mode_id == 22">血浆胆红素吸附+HDF</span>
+            <span v-if="scope.row.mode_id == 23">血浆胆红素吸附</span>
+            <span v-if="scope.row.mode_id == 24">I-HDF</span>
+            <span v-if="scope.row.mode_id == 25">HD高通F</span>
+            <span v-if="scope.row.mode_id == 26">CVVH</span>
+            <span v-if="scope.row.mode_id == 27">CVVHD</span>
+            <span v-if="scope.row.mode_id == 28">CVVHDF</span>
+            <span v-if="scope.row.mode_id == 29">PE</span>
+            <span v-if="scope.row.mode_id == 30">血浆胆红素吸附+HP</span>
+            <span v-if="scope.row.mode_id == 31">HPD</span>
+            <span v-if="scope.row.mode_id == 32">HDP</span>
+           </template>
+        </el-table-column>
         <el-table-column align="center" label="透析号" v-if="dialysisSett.dialysis_no==1">
            <template slot-scope="scope">
             {{scope.row.patient.dialysis_no}}
@@ -489,7 +529,7 @@
         partion_type:0,
         tableList:[],
         dialysisSett:{},
-
+        partitionArrOne:[],
         dialogVisibleOne: false,
         prescription_status: false,
         week: false,
@@ -526,6 +566,8 @@
             return v.getTime() < new Date().getTime() - 86400000;
           },
         },
+        partition_id:0,
+        zoneList:[],
       }
     },
     open(){
@@ -534,7 +576,7 @@
     created() {
        this.blood_access_option  = getDataConfig('hemodialysis', 'vascular_access_desc')
        this.displace_liqui_part_option = this.$store.getters.displace_liqui
-       console.log("志愿液",this.displace_liqui_part_option)
+    
        var filedList = store.getters.xt_user.fileds
        var newArr = [
         {value:999999,filed_name_cn:"姓名"},
@@ -550,8 +592,6 @@
         }
         this.predialysisConditionOptions = newArr
        }
-     
-      this.getAllZone()
       let date = uParseTime(new Date(), "{y}-{m}-{d}")
       var newDate = new Date();
       var y = newDate.getFullYear();
@@ -565,14 +605,40 @@
       this.query.schedule_type = 0
       this.query.partition_id = 0
       this.query.page = 1
-      this.getlist()
+      this.getAllZone()
+     
+     
      
     },
     methods: {
       getlist(){
+      
+        
+        var str = ""
+         if(this.partition_id==0){
+            console.log("进阿里232332")
+            console.log("wowoowowow",this.zoneList.join(","))
+            str = this.zoneList.join(",")
+         }
+
+         if(this.partition_id!=0){
+           str = this.partition_id.join(",")
+         }
+         this.query.partition_id = ""
+         this.query.partition_id = str 
+      
         getDialysisParameter(this.query).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
+              
+              if(list!=null &&list.length>0){
+                for(let i=0;i<list.length;i++){
+                  list[i].sort = 0
+                  list[i].sort = list[i].device_number.sort
+                }
+      
+              }
+              list.sort(this.compare('sort'))
               this.list = list
               this.total = response.data.data.total
               this.dialysisSett = response.data.data.dialysisSett
@@ -580,6 +646,13 @@
             }
         }) 
       },
+      compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+      },
       handleSizeChange(val) {
         this.query.limit = val;
         this.getlist();
@@ -636,7 +709,7 @@
 
       },
       selectPartitionType(partitionType) {
-        this.partitionType = partitionType
+        // this.partitionType = partitionType
         this.query.partition_id = partitionType
         this.query.page = 1
 
@@ -654,16 +727,27 @@
             this.$message.error(response.data.msg)
             return false
           } else {
+           
+
+            for(let i=0;i<response.data.data.zone.length;i++){
+               this.partitionArrOne.push(response.data.data.zone[i])
+               this.zoneList.push(response.data.data.zone[i].id)
+            }
             this.partitionArr = response.data.data.zone
+           
+            console.log("全部中",this.partitionArrOne)
             this.partitionArr.unshift({ id: 0, name: '全部' })
+            this.getlist()
+            
           }
         })
       },
       statistics() {
          this.tableList = []
+       
          var params = {
           schedule_type:this.schedule_type,
-          partion_type:this.partion_type,
+          partion_type:this.partitionType,
           selected_date:this.query.schedule_date,
         }
         getDialysisParameterGoodList(params).then(response=>{

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -28,6 +28,7 @@
                 <td width="50">序号</td>
                 <td width="100"  v-if="dialysisSett.device_number==1">透析机号</td>
                 <td width="100"  v-if="dialysisSett.name==1">姓名</td>
+                <td width="100"  v-if="dialysisSett.name==1">透析模式</td>
                 <td width="100" v-if="dialysisSett.dialysis_no==1">透析号</td>
                 <td width="100" v-if="dialysisSett.admission_number==1">住院(门诊)号</td>
                 <td width="100"  v-if="dialysisSett.weight_befor==1">透前体重</td>
@@ -61,6 +62,36 @@
                 <td width="100"  v-if="dialysisSett.name==1">
                    {{item.patient.name}}
                 </td>
+                <td width="100">
+                  <span v-if="item.mode_id == 1">HD</span>
+                  <span v-if="item.mode_id == 2">HDF</span>
+                  <span v-if="item.mode_id == 3">HD+HP</span>
+                  <span v-if="item.mode_id == 4">HP</span>
+                  <span v-if="item.mode_id == 5">HF</span>
+                  <span v-if="item.mode_id == 6">SCUF</span>
+                  <span v-if="item.mode_id == 7">IUF</span>
+                  <span v-if="item.mode_id == 8">HFHD</span>
+                  <span v-if="item.mode_id == 9">HFHD+HP</span>
+                  <span v-if="item.mode_id == 10">PHF</span>
+                  <span v-if="item.mode_id == 11">HFR</span>
+                  <span v-if="item.mode_id == 12">HDF+HP</span>
+                  <span v-if="item.mode_id == 13">CRRT</span>
+                  <span v-if="item.mode_id == 19">IUF+HD</span>
+                  <span v-if="item.mode_id == 20">UF</span>
+                  <span v-if="item.mode_id == 21">HD+</span>
+                  <span v-if="item.mode_id == 22">血浆胆红素吸附+HDF</span>
+                  <span v-if="item.mode_id == 23">血浆胆红素吸附</span>
+                  <span v-if="item.mode_id == 24">I-HDF</span>
+                  <span v-if="item.mode_id == 25">HD高通F</span>
+                  <span v-if="item.mode_id == 26">CVVH</span>
+                  <span v-if="item.mode_id == 27">CVVHD</span>
+                  <span v-if="item.mode_id == 28">CVVHDF</span>
+                  <span v-if="item.mode_id == 29">PE</span>
+                  <span v-if="item.mode_id == 30">血浆胆红素吸附+HP</span>
+                  <span v-if="item.mode_id == 31">HPD</span>
+                  <span v-if="item.mode_id == 32">HDP</span>
+                 
+                </td>
                 <td width="100" v-if="dialysisSett.dialysis_no==1">
                    {{item.patient.dialysis_no}}
                 </td>
@@ -199,7 +230,7 @@
        var params = {
          schedule_date:this.$route.query.schedule_date,
          schedule_type:this.$route.query.schedule_type,
-         partion_id:this.$route.query.partion_id,
+         partition_id:this.$route.query.partion_id,
          page:this.$route.query.page,
          limit:this.$route.query.limit,
          ids:this.$route.query.ids,
@@ -208,6 +239,14 @@
       getDialysisParameter(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
+            if(list!=null &&list.length>0){
+                for(let i=0;i<list.length;i++){
+                  list[i].sort = 0
+                  list[i].sort = list[i].device_number.sort
+                }
+      
+              }
+              list.sort(this.compare('sort'))
             this.list = list
             this.dialysisSett = response.data.data.dialysisSett
             console.log("设置",this.dialysisSett)
@@ -292,7 +331,14 @@
          }
        }
        return name
-     }
+     },
+     compare(p) { //这是比较函数
+        return function (m, n) {
+          var a = m[p];
+          var b = n[p];
+          return a - b; //升序
+        }
+      },
     
     }
   }

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -9,7 +9,7 @@
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo">{{ patient.name }}</el-button>
-            <span style="position: absolute;left: 22%;top: 3%">
+            <!-- <span style="position: absolute;left: 22%;top: 3%">
               透前体重： --kg
             </span>
             <span style="position: absolute;left: 35%;top: 3%">
@@ -17,7 +17,7 @@
             </span>
             <span style="position: absolute;left: 48%;top: 3%">
               衣物重：--kg
-            </span>
+            </span> -->
             <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
             <el-form
                     ref="dialysisPrescription"
@@ -50,7 +50,7 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8" v-if="isShows('透析时长')">
-                        <el-form-item label="透析时长(min)： " prop="dialysis_duration_minute" :rules="isCheckmust('透析时长')">
+                        <el-form-item label="透析时长(min)： " prop="dialysis_duration_minute">
                             <el-input
                                     type="number"
                                     v-model="dialysisPrescription.dialysis_duration_minute"
@@ -2626,7 +2626,7 @@ mu
         if(moment().weekday() == 6){
            total_day ="周六"
         }
-        if(moment().weekday() == 7){
+        if(moment().weekday() == 0){
            total_day ="周日"
         }
         console.log("---------",this.targetAdvices)

src/xt_pages/dialysis/signPrint.vue

@@ -28,7 +28,7 @@
                             规格:{{getSpecialName(it.drug_id)}} 
                             
                             </div>  
-                            <div v-if="(org_id ==0 || org_id==10440) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                            <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{it.execution_frequency}}</div>  
                             <div v-if="org_id!=10278">给药途径:{{it.delivery_way}}</div>  
                              
@@ -45,7 +45,7 @@
                             规格:{{getSpecialName(its.drug_id)}} 
                             
                             </div>  
-                            <div v-if=" org_id ==0 || org_id==10440">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
+                            <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
                             <div v-if="org_id!=0 && org_id!=10278 && org_id!=10138">执行频率:{{its.execution_frequency}}</div>  
                             <div>给药途径:{{its.delivery_way}}</div>  
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -3582,20 +3582,39 @@ export default {
       }
       return "";
     },
+    // getAge: function (val) {
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, "-");
+    //   }
+    // },
     getAge: function (val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
-        } else {
-          return val.age;
-        }
-      } else {
-        return jsGetAge(val.birth, "-");
-      }
-    },
+            var thisLen = val.id_card_no.length;
+            var birth = "";
+            if (thisLen == 15) {
+                birth = "19" + val.id_card_no.substr(6, 6);
+            } else {
+                birth = val.id_card_no.substr(6, 8);
+            }
+            var birthtwo =
+                birth.substr(0, 4) +
+                "-" +
+                birth.substr(4, 2) +
+                "-" +
+                birth.substr(6, 2);
+
+            var age = jsGetAge(birthtwo, "-");
+            return age;
+      },
+  
     newAdviceGroupObject: function () {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1244,7 +1244,7 @@
                       <div>
                         性别：{{ patientInfo_gender_1 == true ? "男" : "女" }}
                       </div>
-                      <div>年龄：{{ getoldAge() }}</div>
+                      <div>年龄：{{ getAge(patientInfo) }}</div>
                       <div>透析机号:&nbsp;{{ getNumber() }}</div>
                     </div>
                   </td>
@@ -1621,33 +1621,53 @@ export default {
       },
     };
   },
-  methods: {
+  methods: {   
+    getAge: function (val) {
+            var thisLen = val.id_card_no.length;
+            var birth = "";
+            if (thisLen == 15) {
+                birth = "19" + val.id_card_no.substr(6, 6);
+            } else {
+                birth = val.id_card_no.substr(6, 8);
+            }
+            var birthtwo =
+                birth.substr(0, 4) +
+                "-" +
+                birth.substr(4, 2) +
+                "-" +
+                birth.substr(6, 2);
+
+            var age = jsGetAge(birthtwo, "-");
+            return age;
+      },
+
+
     // 获取当前年份，用于年龄计算
-    getoldAge() {
-      let date = new Date();
-      let year = date.getFullYear();
-      let year_d =
-        this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
-      let year_m = this.xtdate.split("-")[1];
-      let birth_m = this.patientInfo.birth.split("-")[1];
-      let year_date = this.xtdate.split("-")[2];
-      let birth_date = this.patientInfo.birth.split("-")[2];
-      // console.log(year,'今年年月')
-      // console.log(this.xtdate.split('-'),'病人就诊年月')
-      console.log(this.patientInfo.birth, "病人生日");
-      // console.log(year_d,'year_d')
-      if (year_m < birth_m) {
-        return year_d - 1;
-      } else if (year_m == birth_m) {
-        if (year_date < birth_date) {
-          return year_d - 1;
-        } else {
-          return year_d;
-        }
-      } else {
-        return year_d;
-      }
-    },
+    // getoldAge() {
+      // let date = new Date();
+      // let year = date.getFullYear();
+      // let year_d =
+      //   this.xtdate.split("-")[0] - this.patientInfo.birth.split("-")[0];
+      // let year_m = this.xtdate.split("-")[1];
+      // let birth_m = this.patientInfo.birth.split("-")[1];
+      // let year_date = this.xtdate.split("-")[2];
+      // let birth_date = this.patientInfo.birth.split("-")[2];
+      // // console.log(year,'今年年月')
+      // // console.log(this.xtdate.split('-'),'病人就诊年月')
+      // console.log(this.patientInfo.birth, "病人生日");
+      // // console.log(year_d,'year_d')
+      // if (year_m < birth_m) {
+      //   return year_d - 1;
+      // } else if (year_m == birth_m) {
+      //   if (year_date < birth_date) {
+      //     return year_d - 1;
+      //   } else {
+      //     return year_d;
+      //   }
+      // } else {
+      //   return year_d;
+      // }
+    // },
     getAdminUser(id) {
       if (id == 0) {
         return "";

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -1275,16 +1275,23 @@
                 var preTime = ''
 
                 if (prescription.pre_time == 0) {
-                  if (this.schedule.schedule_type == 1) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
-                  } else if (this.schedule.schedule_type == 2) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
-                  } else if (this.schedule.schedule_type == 3) {
-                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                  if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
+                    if (this.schedule.schedule_type == 1) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
+                    } else if (this.schedule.schedule_type == 2) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
+                    } else if (this.schedule.schedule_type == 3) {
+                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
+                    }
+                  }else{
+                    preTime = ""
                   }
-                  // preTime = nowTime
                 } else {
-                  preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                  if (this.$store.getters.xt_user.org.id != 10210  || this.$store.getters.xt_user.org.id != 0){
+                    preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
+                  }else{
+                    preTime = ""
+                  }
                 }
 
                 let index = i + 1

src/xt_pages/management/components/UserForm.vue

@@ -684,7 +684,7 @@
               >桶
             </el-form-item>
             <span style="color:red" v-show="showone"
-              >您已三个月未更换,请注意检测</span
+              >您已一个月未更换,请注意检测</span
             >
           </el-col>
         </el-row>
@@ -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>

src/xt_pages/management/home.vue

@@ -1157,7 +1157,7 @@
                                     <el-form-item style="visibility: hidden;" label="①机表"></el-form-item>
                                   </el-col>
                                   <el-col :span="10">
-                                     <el-form-item label="消毒状态:" required prop="disinfection">
+                                     <el-form-item label="消毒状态:">
                                         <el-select v-model="userform.disinfection" placeholder="请选择" >
                                            <el-option
                                             v-for="item in disinfection"
@@ -1213,7 +1213,7 @@
                                     <el-form-item style="visibility: hidden;" label="①机表"></el-form-item>
                                   </el-col>
                                    <el-col :span="10">
-                                     <el-form-item label="消毒状态:" required prop="disinfection_status">
+                                     <el-form-item label="消毒状态:">
                                         <el-select v-model="userform.disinfection_status" placeholder="请选择" >
                                            <el-option
                                             v-for="item in disinfection"
@@ -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>
@@ -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">
@@ -4529,6 +4529,13 @@ export default {
         if (this.userform.user_total == ""){
           this.userform.user_total = 0
         }
+
+        if(this.userform.disinfection == ""){
+          this.userform.disinfection  = 0
+        }
+        if(this.userform.disinfection_status == ""){
+           this.userform.disinfection_status = 0
+        }
         this.userform.user_total = parseInt(this.userform.user_total)
 
         console.log("user_form",this.userform)

src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

@@ -63,8 +63,8 @@
         <div style="display:flex;justify-content: space-between;">
             <div style="position: absolute;top:190px;left:50px"></div>
             <div style="position: absolute;top:190px;left:130px"></div>
-            <div style="position: absolute;top:190px;left:180px"></div>
-            <div style="position: absolute;top:190px;left:260px"></div>
+            <div style="position: absolute;top:190px;left:180px">诊察费</div>
+            <div style="position: absolute;top:190px;left:260px">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
             <div style="position: absolute;top:190px;left:340px">材料费</div>
             <div style="position: absolute;top:190px;left:420px">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
             <div style="position: absolute;top:190px;left:480px"></div>
@@ -182,7 +182,7 @@ export default {
                 console.log('res',res)
                 this.list = res.data.data
                 this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal + this.list.zhenChaCostTotal
                 if(this.totalPrice == 0){
 
                   this.totalPrice = this.list.medfee_sumamt

src/xt_pages/outpatientCharges/summary.vue

@@ -116,7 +116,7 @@
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
           <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载3</el-button>
 
-          <!--          <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
+<!--                    <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
 
 
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
@@ -124,13 +124,12 @@
           <!--          </el-button-->
           <!--          >-->
 
-                              <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
-          <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
-          <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-<!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
-<!--          <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
-
-          <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
+<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+          <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
+          <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
 
         </div>
@@ -1215,7 +1214,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "03",
+                month: "04",
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,

src/xt_pages/stock/detail/print.vue

@@ -51,10 +51,13 @@
               <td style="line-height: 50px">
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
                 <span v-if="type == 2">
-                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583">{{getStockCount(item.good_id) }}</span>
+                  <span  v-if="org_id == 3907 || org_id == 9919 || org_id == 9583 || org_id == 0">
+                    <!-- {{getStockCount(item.good_id) }} -->
+                    {{getMySelfCount(item.good_id) }}
+                  </span>
                    <span  v-if="org_id == 10265 || org_id == 10215">{{getMySelfCount(item.good_id) }}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{getWarehouseOut(item.good_id)}}</span>
-                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191">{{getStockCount(item.good_id) }}</span>
+                  <span v-if="org_id!=3907&&org_id!=10265 &&org_id!=9919&&org_id!=10285&&org_id!=9583&&org_id!=10215&&org_id!=10210&&org_id!=9671 &&org_id!=9679 &&org_id!=9675 && org_id!=10188&& org_id!=10217&& org_id!=9956&& org_id!=10191 && org_id!=0">{{getStockCount(item.good_id) }}</span>
                 </span>
 
                 <span v-if="type == 4"> {{ item.count }}</span>
@@ -75,8 +78,10 @@
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919">
-                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}}
+                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 0">
+                    <!-- {{(getStockCount(item.good_id) * item.buy_price).toFixed(2)}} -->
+                     {{(getMySelfCount(item.good_id) * item.buy_price).toFixed(2)}}
+                     
                   </span>
                   <span v-if="org_id == 10265 || org_id == 10215  ">{{(getMySelfCount(item.good_id)*item.packing_price).toFixed(2)}}</span>
                    <span v-if="org_id == 10210 || org_id == 9671 || org_id == 9675 || org_id == 9679 || org_id == 10188 || org_id == 10217 || org_id == 9956 || org_id == 10191">{{(getWarehouseOut(item.good_id)*item.packing_price).toFixed(2)}}</span>
@@ -380,6 +385,7 @@
            var list = response.data.data.list
            console.log("新的",list)
            this.stockDatas = list
+           //自动出库数据
            var stockTotal = response.data.data.stockTotal
           this.stockTotal = stockTotal
 

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -834,7 +834,7 @@ export default {
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
 
-        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671){
+        if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 0){
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
@@ -842,7 +842,7 @@ export default {
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919){
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

src/xt_pages/user/Physicalexamination.vue

@@ -124,7 +124,7 @@
                     <el-row   >
                       <el-col :span="5" style="margin-left: 10px;">
                         <el-form-item label="贫血容貌：">
-                          <el-select disabled v-model="form.pinxuerongmao" placeholder="请选择" style="width: 40%;">
+                          <el-select disabled v-model="form.pinxuerongmao" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in pinxuerongmao_options"
                               :key="item.value"
@@ -137,7 +137,7 @@
                       </el-col>
                       <el-col :span="5" >
                         <el-form-item label="体位：">
-                          <el-select disabled v-model="form.tiwei" placeholder="请选择" style="width: 40%;">
+                          <el-select disabled v-model="form.tiwei" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in tiwei_options"
                               :key="item.value"
@@ -149,7 +149,7 @@
                       </el-col>
                       <el-col :span="5" >
                         <el-form-item label="浮肿：">
-                          <el-select disabled v-model="form.fuzhong" placeholder="请选择" style="width: 40%;">
+                          <el-select disabled v-model="form.fuzhong" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in fuzhong_options"
                               :key="item.value"
@@ -162,7 +162,7 @@
                       </el-col>
                       <el-col :span="7" >
                         <el-form-item label="出血点/瘀斑/血肿：">
-                          <el-select disabled v-model="form.chuxuedian" placeholder="请选择" style="width: 40%;">
+                          <el-select disabled v-model="form.chuxuedian" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in chuxuedian_options"
                               :key="item.value"
@@ -178,7 +178,7 @@
                     <el-row >
                       <el-col :span="6" style="margin-left: 10px;">
                         <el-form-item label="发育：">
-                          <el-select disabled v-model="form.fayu" placeholder="请选择" style="width: 40%;">
+                          <el-select disabled v-model="form.fayu" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in fayu_options"
                               :key="item.value"
@@ -191,7 +191,7 @@
                       </el-col>
                       <el-col :span="6" >
                         <el-form-item label="营养：">
-                          <el-select disabled v-model="form.yinyang" placeholder="请选择" style="width: 40%;">
+                          <el-select disabled v-model="form.yinyang" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in yinyang_options"
                               :key="item.value"
@@ -203,7 +203,7 @@
                       </el-col>
                       <el-col :span="6" >
                         <el-form-item label="神志：">
-                          <el-select disabled v-model="form.shenzhi" placeholder="请选择" style="width: 40%;">
+                          <el-select disabled v-model="form.shenzhi" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in shenzhi_options"
                               :key="item.value"
@@ -226,7 +226,7 @@
                     <el-row >
                       <el-col :span="6" style="margin-left: 10px;">
                         <el-form-item label="皮肤黏膜：">
-                          <el-select disabled v-model="form.pifunianmo" placeholder="请选择" style="width: 45%;">
+                          <el-select disabled v-model="form.pifunianmo" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in pifunianmo_options"
                               :key="item.value"
@@ -239,18 +239,18 @@
                       </el-col>
                       <el-col :span="5" >
                         <el-form-item label="部位：">
-                          <el-input disabled v-model="form.buwei" placeholder="请输入内容" style="width: 45%;"></el-input>
+                          <el-input disabled v-model="form.buwei" placeholder="请输入内容" style="width: 50%;"></el-input>
                         </el-form-item>
                       </el-col>
                       <el-col :span="5" >
                         <el-form-item label="程度：">
-                          <el-input disabled v-model="form.chengdu" placeholder="请输入内容" style="width: 45%;"></el-input>
+                          <el-input disabled v-model="form.chengdu" placeholder="请输入内容" style="width: 50%;"></el-input>
                         </el-form-item>
 
                       </el-col>
                       <el-col :span="7" >
                         <el-form-item label="皮下出血：">
-                          <el-select disabled v-model="form.pixiachuxue" placeholder="请选择" style="width: 45%;">
+                          <el-select disabled v-model="form.pixiachuxue" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in pixiachuxue_options"
                               :key="item.value"
@@ -265,7 +265,7 @@
                     <el-row >
                       <el-col :span="6" style="margin-left: 10px;">
                         <el-form-item label="紫癜：">
-                          <el-select disabled v-model="form.zidian" placeholder="请选择" style="width: 45%;">
+                          <el-select disabled v-model="form.zidian" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in zidian_options"
                               :key="item.value"
@@ -278,7 +278,7 @@
                       </el-col>
                       <el-col :span="6" >
                         <el-form-item label="皮肤温度：">
-                          <el-select disabled v-model="form.pifuwendu" placeholder="请选择" style="width: 45%;">
+                          <el-select disabled v-model="form.pifuwendu" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in pifuwendu_options"
                               :key="item.value"
@@ -306,7 +306,7 @@
                     <el-row >
                       <el-col :span="8"  style="margin-left: 10px;">
                         <el-form-item label="浅表淋巴肿大：">
-                          <el-select disabled v-model="form.linbazhongda" placeholder="请选择" style="width: 45%;">
+                          <el-select disabled v-model="form.linbazhongda" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in linbazhongda_options"
                               :key="item.value"
@@ -334,7 +334,7 @@
                     <el-row >
                       <el-col :span="6" style="margin-left: 10px;">
                         <el-form-item label="眼睑：">
-                          <el-select disabled v-model="form.yanlian" placeholder="请选择" style="width: 45%;">
+                          <el-select disabled v-model="form.yanlian" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in yanlian_options"
                               :key="item.value"
@@ -347,7 +347,7 @@
                       </el-col>
                       <el-col :span="6" >
                         <el-form-item label="瞳孔(等大等圆)：">
-                          <el-select disabled v-model="form.tongkong" placeholder="请选择" style="width: 45%;">
+                          <el-select disabled v-model="form.tongkong" placeholder="请选择" style="width: 50%;">
                             <el-option
                               v-for="item in tongkong_options"
                               :key="item.value"
@@ -360,13 +360,13 @@
                       </el-col>
                       <el-col :span="5" >
                         <el-form-item label="左(mm)：">
-                          <el-input disabled v-model="form.zuo" placeholder="请输入内容" style="width: 45%;"></el-input>
+                          <el-input disabled v-model="form.zuo" placeholder="请输入内容" style="width: 50%;"></el-input>
                         </el-form-item>
 
                       </el-col>
                       <el-col :span="5" >
                         <el-form-item label="右(mm)：">
-                          <el-input disabled v-model="form.you" placeholder="请输入内容" style="width: 45%;"></el-input>
+                          <el-input disabled v-model="form.you" placeholder="请输入内容" style="width: 50%;"></el-input>
                         </el-form-item>
                       </el-col>
                     </el-row>
@@ -3087,7 +3087,7 @@
     }
 
     }
-    
+
   </style>
   <style>
   /* .el-input--medium .el-input__inner {

src/xt_pages/user/courseOfDisease.vue

@@ -72,7 +72,7 @@
             <el-col :span="15">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
-                
+
                 <div class="content" style='word-break: break-all;word-wrap: break-word'>
                   <span v-if="current_select_record" v-html="current_select_record.content"></span>
                   <span v-else></span>
@@ -776,6 +776,7 @@
 <script>
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
+  const moment = require('moment')
 
   import {
     createCourseOfDiseaseRecord,
@@ -802,7 +803,7 @@
         date: [],
         start_time: '',
         end_time: '',
-        course_of_disease_time: '',
+        course_of_disease_time: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         records: [],
         doctors: [],
         current_select_record: null,

src/xt_pages/user/firstDisease.vue

@@ -16,7 +16,7 @@
                       <el-button size="small"  type="danger" @click="deleteAction">删除</el-button>
                     </span>
         </div>
-      
+
         <div class="cell clearfix">
           <label class="title"><span class="name">日期查询</span> : </label>
           <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
@@ -59,29 +59,29 @@
             </el-col>
             <el-col :span="14">
               <div class="record_content_panel">
-                <div style="background-color:rgb(245, 247, 250)" class="title">出院小结内容</div>
+                <div style="background-color:rgb(245, 247, 250)" class="title">首次病程内容</div>
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;word-break: break-all;word-wrap: break-word">标题:
                    {{hosDetail.title}}
                 </div>
-            
-                
-                <div 
+
+
+                <div
                 style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;
                 word-break: break-all;word-wrap: break-word">
                 记录医师:
                    {{getDoctor(hosDetail.doctor)}}
                 </div>
-                
-                 
-                
+
+
+
                  <div style="padding:10px;
                  border-bottom:1px solid #DCDFE6;line-height:20px;
                  word-break: break-all;word-wrap: break-word">主诉内容:
-                   <span v-html="hosDetail.main_content"></span> 
+                   <span v-html="hosDetail.main_content"></span>
                  </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;
                  word-break: break-all;word-wrap: break-word">病例特点:
-                   <span v-html="hosDetail.patient_case"></span> 
+                   <span v-html="hosDetail.patient_case"></span>
                    <div>
                     <div v-for="item in hosDetail.template_inspection_content">
                     <p style="font-weight: bold;margin: 10px 0;">{{ item.project_name }} 检查日期:{{getTime(item.arr[0].inspect_date)}}</p>
@@ -116,15 +116,15 @@
                  word-break: break-all;word-wrap: break-word">诊疗计划:
                     <span v-html="hosDetail.treatment_plan"></span>
                  </div>
-               
+
               </div>
             </el-col>
           </el-row>
         </div>
       </div>
 
-  
-     
+
+
       <el-dialog title="新增首次病程记录" width="60%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
@@ -141,25 +141,25 @@
                   :value="item.admin_user_id">
                   </el-option>
               </el-select>
-            
+
               <label class="title"><span class="name">记录日期</span> : </label>
               <el-date-picker v-model="form.record_date"
-                    prefix-icon="el-icon-date" 
+                    prefix-icon="el-icon-date"
                     style="width: 200px;"
                     type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
                     value-format="yyyy-MM-dd HH:mm">
-              </el-date-picker>   
+              </el-date-picker>
             </div>
-           
-        
-      
+
+
+
             <div class="cell clearfix" style="margin-top:10px">
               <label class="title"><span class="name">主诉内容</span> : </label>
                 <el-select v-model="form.main_content_id" placeholder="可选择病程模板" @change="changeMainContent">
                   <el-option v-for="(option, index) in mainContentList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editor"
@@ -177,7 +177,7 @@
                 </el-select>
 
                 <el-button type="primary" @click="toInspection">选择检验检查</el-button>
-               
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorOne"
@@ -211,7 +211,7 @@
                   <el-option v-for="(option, index) in tentativeDiagnosisList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTwo"
@@ -227,7 +227,7 @@
                   <el-option v-for="(option, index) in diagnosticBasisList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorThree"
@@ -243,7 +243,7 @@
                   <el-option v-for="(option, index) in differentialDiagnosisList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorFour"
@@ -259,7 +259,7 @@
                   <el-option v-for="(option, index) in treateMentList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorFive"
@@ -271,7 +271,7 @@
                 </div>
             </div>
 
-    
+
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
               <el-button @click="show_dialog = false">取消</el-button>
               <el-button type="primary"
@@ -281,7 +281,7 @@
           </div>
         </div>
       </el-dialog>
-      
+
       <el-dialog title="编辑首次病程记录" width="60%" top="5vh" :visible.sync="edit_show_dialog">
         <div>
           <div class="new_record_form">
@@ -298,16 +298,16 @@
                   :value="item.admin_user_id">
                   </el-option>
               </el-select>
-            
+
               <label class="title"><span class="name">记录日期</span> : </label>
               <el-date-picker v-model="form.record_date"
-                    prefix-icon="el-icon-date" 
+                    prefix-icon="el-icon-date"
                     style="width: 200px;"
                     type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
                     value-format="yyyy-MM-dd HH:mm">
-              </el-date-picker>   
+              </el-date-picker>
+
 
-              
             </div>
 
              <div class="cell clearfix" style="margin-top:10px">
@@ -316,7 +316,7 @@
                   <el-option v-for="(option, index) in mainContentList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTen"
@@ -366,7 +366,7 @@
                   <el-option v-for="(option, index) in tentativeDiagnosisList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTenTwo"
@@ -382,7 +382,7 @@
                   <el-option v-for="(option, index) in diagnosticBasisList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTenThree"
@@ -398,7 +398,7 @@
                   <el-option v-for="(option, index) in differentialDiagnosisList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTenFour"
@@ -414,7 +414,7 @@
                   <el-option v-for="(option, index) in treateMentList" :key="index" :label="option.title"
                             :value="option.content"></el-option>
                 </el-select>
-                
+
                  <div class="textarea_panel">
                     <keep-alive>
                       <editor ref="editorTenFive"
@@ -477,7 +477,7 @@
                       value-format="yyyy-MM">
                     </el-date-picker>
                  </el-form-item>
-              
+
                 </div>
               </el-form-item>
             </el-row>
@@ -497,7 +497,7 @@
                         @current-change="changeCurrentRecord"
                         @selection-change="selectionChangeOne"
                         :row-class-name="tableRow"
-                       
+
                       >
                         <el-table-column type="selection" width="60" align="center"></el-table-column>
                         <el-table-column label="检验项目" align="center">
@@ -514,7 +514,7 @@
                           color: '#606266'
                         }"
                         :row-style="{ color: '#303133' }" :data="tableData"
-                                border highlight-current-row 
+                                border highlight-current-row
                                 :row-class-name="tableRow"
 
                       >
@@ -677,10 +677,10 @@
       }
     },
     created() {
-     
+
       this.patient_id = this.$route.params && this.$route.params.id
-     
-     
+
+
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
@@ -706,7 +706,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       this.other_start_time = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' + (nowDay < 10 ? '0' + nowDay : nowDay)
-      
+
      this.getAllDoctorList()
      this.getlist()
      this.getInspectionMajor()
@@ -730,7 +730,7 @@
       },
 
       startTimeChange(val){
-       
+
        this.start_time = val
        this.getlist()
       },
@@ -745,10 +745,10 @@
 
        },
       changeCurrentRecordTwo(row){
-       
+
         this.form.id = 0
         if(row!=null){
-          this.form.id = row.id 
+          this.form.id = row.id
           this.getFirstDetail(row.id)
         }
       },
@@ -776,7 +776,7 @@
        var ids = arr.join(",")
        this.ids = ids
       },
-     
+
       changeMainContent(content){
        this.form.main_content = content
       },
@@ -795,9 +795,9 @@
       changeTreateMentContent(content){
         this.form.treatment_plan = content
       },
-      
+
       createAction(){
-       
+
          if(this.form.doctor == ""){
             this.form.doctor = 0
          }
@@ -820,17 +820,17 @@
           doctor:this.form.doctor,
           project_id:this.projectStr,
           inspect_date:this.projectIndate,
-         
+
          }
          if(params.project_id == undefined){
             params.project_id = ""
          }
          console.log("params",params)
-        
+
          createFirstDisease(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.firstDisease
-             
+
               this.$message.success("保存成功!")
               this.show_dialog = false
               this.getlist()
@@ -884,7 +884,7 @@
              var inspectlist = response.data.data.inspectlist
              let arr = this.unique(inspectlist,'project_name')
              this.hosDetail.template_inspection_content = arr
-            
+
              console.log("内容233323232323223",this.hosDetail)
            }
         })
@@ -921,7 +921,7 @@
         this.getHospitalSummaryDetailOne(this.form.id)
       },
       updateAction(){
-    
+
         if(this.form.doctor == ""){
             this.form.doctor = 0
          }
@@ -957,7 +957,7 @@
          if(this.$refs.editorTenTwo.content == ""){
             tentative_diagnosis = this.hosDetail.tentative_diagnosis
          }else{
-            tentative_diagnosis = this.$refs.editorTenTwo.content 
+            tentative_diagnosis = this.$refs.editorTenTwo.content
          }
 
          if(this.$refs.editorTenThree.content == ""){
@@ -977,7 +977,7 @@
          }else{
              treatment_plan = this.$refs.editorTenFive.content
          }
-      
+
          var params = {
           id:this.form.detai_id,
           patient_id:parseInt(this.patient_id),
@@ -1004,7 +1004,7 @@
             // this.$refs.monthlyPlanTable.setCurrentRow(detail)
             this.getlist()
           }
-        }) 
+        })
       },
       deleteAction(){
           if(this.ids.length == 0){
@@ -1029,7 +1029,7 @@
               }
             })
           }).catch(() => {
-          }) 
+          })
       },
       addAction(){
         this.form.title = ""
@@ -1039,7 +1039,7 @@
         this.form.diagnostic_basis = ""
         this.form.differential_diagnosis = ""
         this.form.treatment_plan = ""
-        
+
         this.show_dialog = true
       },
       toInspection(){
@@ -1135,7 +1135,7 @@
         }
         getInitDataList(params).then(response=>{
           if(response.data.state == 1){
-           
+
              var modelist = response.data.data.modelist
              console.log("modelist",modelist)
              var docList = response.data.data.docList
@@ -1191,10 +1191,10 @@
           if(response.data.state == 1){
             var list = response.data.data.list
            let arr = this.unique(list,'project_name')
-         
+
            this.form.patient_case_one = arr
            this.dialogVisibleInspection = false
-          
+
            console.log("2323232owowowowowow",this.form.id)
           }
         })
@@ -1232,8 +1232,8 @@
         })
       }
     },
-  
-    
+
+
   }
 </script>
 

src/xt_pages/user/inspectionCheck.vue

@@ -112,7 +112,7 @@
                       <img  :src="item.value" alt="">
                     </el-row>
                     <el-row>
-                      <div>{{item.item_name}}</div>
+                      <div style="word-break: break-all;word-wrap: break-word">{{item.item_name}}</div>
                     </el-row>
                   </div>
                 </el-col>

src/xt_pages/user/ktv.vue

@@ -162,6 +162,9 @@
               <el-form-item
                 :label="item.item_name"
                 :key="item.item_id"
+                :rules="item.item_name != 'URR(%)'?[
+                { required: true, message: '请输入数值', trigger: 'blur' }
+              ]:[]"
                 :prop="'formItem.' + index + '.value'"
               >
                 <el-input
@@ -614,39 +617,24 @@ export default {
     calURR(items, value){
       let valueOne = 0
       let valueTwo = 0
-      let valueThree = 0
-      let valueFour = 0
-      let valueSix = 0
 
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "透析前尿素氮"){
-
           valueOne = items[i].value
         }
         if(items[i].item_name == "透析后尿素氮"){
           valueTwo = items[i].value
         }
-        if(items[i].item_name == "透析时间"){
-
-          valueThree = items[i].value
-
-        }
-        if(items[i].item_name == "实际超滤量"){
-          valueFour = items[i].value
-
-        }
-        if(items[i].item_name == "透后体重"){
-          valueSix = items[i].value
-        }
-
       }
-      console.log(valueOne)
-      console.log(valueTwo)
-      console.log(valueThree)
-      console.log(valueFour)
-      console.log(valueSix)
-
-      value = ((valueOne - valueTwo) / valueOne) * 100
+      if(valueOne.length == 0){
+        this.$message.error("透析前尿素氮不能为空")
+        return
+      }
+      if(valueTwo.length == 0){
+        this.$message.error("透析后尿素氮不能为空")
+        return
+      }
+      value = (((valueOne - valueTwo) / valueOne) * 100).toFixed(2)
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "URR(%)"){
           items[i].value = value
@@ -658,7 +646,6 @@ export default {
       let valueTwo = 0
       let valueThree = 0
       let valueFour = 0
-      let valueFive = 0
       let valueSix = 0
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "透析前尿素氮"){
@@ -676,18 +663,37 @@ export default {
           valueFour = items[i].value
 
         }
-        if(items[i].item_name == "透前体重"){
-          valueFive = items[i].value
-        }
+
 
         if(items[i].item_name == "透后体重"){
           valueSix = items[i].value
         }
 
       }
-      value = ((valueTwo/valueOne - (0.008 * valueThree)) + (4 - (3.5 * (valueTwo / valueOne)))  * ((valueSix - valueFive) / valueSix)).toFixed(2)
 
 
+      if(valueOne.length == 0){
+        this.$message.error("透析前尿素氮不能为空")
+        return
+      }
+      if(valueTwo.length == 0){
+        this.$message.error("透析后尿素氮不能为空")
+        return
+      }
+      if(valueThree.length == 0){
+        this.$message.error("透析时间不能为空")
+        return
+      }
+      if(valueFour.length == 0){
+        this.$message.error("实际超滤量不能为空")
+        return
+      }
+
+      if(valueSix.length == 0){
+        this.$message.error("透后体重不能为空")
+        return
+      }
+      value = ((-Math.log((valueTwo /valueOne - (0.008 * valueThree)))) +  (4-3.5*(valueTwo/valueOne)) * valueFour/valueSix).toFixed(5)
 
       for(let i = 0; i < items.length; i++){
         if(items[i].item_name == "KT/V"){
@@ -777,6 +783,9 @@ export default {
       })
     },
     submitNew(formName) {
+
+
+
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.formLoading = true