新分支

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/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:"",//修改标志
@@ -910,14 +923,22 @@
          { id: 5, name: "消毒湿巾" }
          ],
          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 +976,53 @@
             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 +1106,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 +1257,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 +1298,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 +1337,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

@@ -22,7 +22,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="Add">新增</el-button>
 
           </div>
           <div class="tab_air">
@@ -45,6 +45,8 @@
                 <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.first_creator)}}
+
+                     
                     </template>
                 </el-table-column>
 
@@ -56,6 +58,7 @@
                 <el-table-column prop="name" label="责任人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.sencond_creator)}}
+                       
                     </template>
                 </el-table-column>
 
@@ -67,6 +70,8 @@
                 <el-table-column prop="city" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.third_creator)}}
+
+                   
                     </template>
                 </el-table-column>
 
@@ -78,6 +83,8 @@
                 <el-table-column prop="province" label="负责人" align="center" min-width="60">
                     <template slot-scope="scope">
                         {{getName(scope.row.fourth_creator)}}
+                    
+                  
                     </template>
                 </el-table-column>
 
@@ -89,6 +96,8 @@
                 <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 +145,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 +191,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 +223,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 +269,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 +301,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 +347,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 +379,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 +425,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 +457,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 +503,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 +558,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 +604,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 +636,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 +682,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 +714,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 +760,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 +792,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 +838,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 +870,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 +916,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>
@@ -821,15 +990,50 @@
                             <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>
+                                <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_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>{{getTimes(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>{{ getTimes(item.fourth_total_time) }}</td>
-                                <td>{{getName(item.fourth_creator) }}</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>{{ getTimes(item.last_total_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>   
@@ -851,7 +1055,8 @@
         getObjectTableDisInfectList,
         getObjectTableDisInfectByIdList,
         updateObjectTableDisinfect, 
-        deleteObjectTableDisinfect
+        deleteObjectTableDisinfect,
+        getObjectTableDisinfectLongTime
     } from "@/api/device"
     import { uParseTime } from '@/utils/tools'
     const moment = require('moment')
@@ -877,8 +1082,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 +1092,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 +1102,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 +1112,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 +1122,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 +1146,26 @@
          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: "消毒湿巾" }
+         ],
+         DisinfectionMode: [
+            { id: 1, name: "擦拭" },
+            { id: 2, name: "浸泡" },
+            { id: 3, name: "喷洒" }
+         ],
+         operators: [],
+         operatorMaps:{},
+         first_total_time:0,
+         sencond_total_time:0,
+         third_total_time:0,
+         fourth_total_time:0,
+         last_total_time:0,
+         
         }
       },
       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,8 +1526,34 @@
         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 ''
+           // }
+       },
+       Add(){
+        getObjectTableDisinfectLongTime().then(response=>{
+           if(response.data.state == 1){
+              this.dialogFormVisible = true
+           }
+        })
+       }  
       }
     }
   </script>

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">

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -126,7 +126,7 @@
           </div>
           <div style="text-align: center">(以下空白)</div>
         </div>
-        <div class="doctorBox" v-if="org_id != 10188">
+        <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">
           <p v-if="org_id == 10217 || org_id == 0">
             医师：
             <span
@@ -154,15 +154,17 @@
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
-        <div class="doctorBoxtwo" v-if="org_id == 10188">
-          <p >审核、调配：</p>
-          <p style="margin-right: 43px">药师：</p>
-        </div>
-        <div class="doctorBox" v-if="org_id == 10188">
-          <p >核对、发药：</p>
+        
+        <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">
           <p>医师：{{ item.doctor ? item.doctor : "" }}</p>
         </div>
-        <div class="actionBar" v-if="org_id != 10188">
+        <!-- <div class="doctorBoxtwo" v-if="org_id == 10188 || org_id == 0">
+          <p >审核、调配：</p>
+          <p >核对、发药：</p>
+          <p style="margin-right: 43px">药师：</p>
+        </div> -->
+
+        <div class="actionBar" v-if="org_id != 10188 && org_id != 0">
           <!-- <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
@@ -183,8 +185,9 @@
           <!--            <p>药费：466.2元</p>-->
         </div>
         <div class="actionBar" v-else>
-
-          <p>
+          <p >审核、调配：</p>
+          <p >核对、发药：</p>
+          <p >
             药费：{{
               getTotalOne(item.id).toFixed(2)
                 ? getTotalOne(item.id).toFixed(2)
@@ -525,15 +528,25 @@ export default {
 .doctorBox {
   display: flex;
   justify-content: space-between;
+  // justify-self: end;
   padding: 0 10px;
   line-height: 24px;
   border-bottom: 2px solid #000;
 }
+.doctorBoxs{
+  width: 100%;
+  margin-right: 30px;
+  text-align: right;
+  padding: 0 10px;
+  line-height: 24px;
+  
+}
 .doctorBoxtwo {
   display: flex;
   justify-content: space-between;
   padding: 0 10px;
   line-height: 24px;
+
 }
 .actionBar {
   display: flex;

src/xt_pages/outpatientTool/detailPrint.vue

@@ -18,7 +18,7 @@
           <tr>
             <td>患者姓名：{{ patient.name }}</td>
             <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
-            <td>性别：{{patient.id_card_no}}</td>
+            <td>身份证：{{patient.id_card_no}}</td>
 
             <TD>年龄：{{ getAge(patient.id_card_no)?getAge(patient.id_card_no)+'岁':''}}</TD>
             <td>结算类别：