Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/device.js

     method:"Get",
     params:params,
   })
+}
+
+export function saveSetAirDisInfect(params){
+ 
+  return request({
+    url:"/api/manage/savesetairdisinfect",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getSetAirDisInfectById(params){
+
+   return request({
+    url:"/api/manage/getsetairinfectbyid",
+    method:"get",
+    params:params
+   })
+}
+
+export function saveNewAirWayDisinfect(data){
+
+  return request({
+    url:"/api/manage/savenewairwaydisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getNewAirWayDisinfectList(params){
+  
+  return request({
+    url:"/api/manage/getnewairwaydisinfectlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getAirDisinfectWayLongTime(department,params){
+ 
+  return request({
+    url:"/api/manage/getairdisinfectwaylongtime?department="+department,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getNewAirWayDisinfectByIdList(id,params){
+
+  return request({
+    url:"/api/manage/getnewairwaydisinfectbyidlist?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function updateNewAirWayDisinfect(data){
+ 
+  return request({
+    url:"/api/manage/updatenewairwaydisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deleteNewAirWayDisInfect(id,params){
+ 
+  return request({
+    url:"/api/manage/deletenewairwaydisinfect?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function setObjectDisinfect(params){
+ 
+  return request({
+    url:"/api/manage/setobjectdisinfect",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getObjectWayDisinfect(params){
+ 
+  return request({
+    url:"/api/manage/getobjectwaydisinfect",
+    method:"get",
+    params:params,
+  })
+}
+
+export function saveObjectWayTableDisinfect(data){
+ 
+  return request({
+    url:"/api/manage/saveobjectwaytabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getObjectTableDisInfectWayList(params){
+  
+  return request({
+    url:"/api/manage/getobjcettabledisinfectwaylist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getObjectTableDisInfectWayByIdList(id,params){
+
+   return request({
+    url:"/api/manage/getobjecttabledisinfectwaybylist?id="+id,
+    method:"get",
+    params:params,
+   })
+}
+
+export function updateObjectWayTableDisinfect(data){
+ 
+  return request({
+    url:"/api/manage/updateobjectwaytabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deleteObjectTableWayDisinfect(id,params){
+
+  return request({
+    url:"/api/manage/deleteobjecttablewaydisinfect?id="+id,
+    method:"get",
+    params:params,
+  })
 }

src/xt_pages/device/airDisinfectTwo.vue

             <el-button type="primary" style="margin-left: 10px;" @click="toSeach">搜索</el-button>
           </div>
           <div style="float:right;margin-bottom:10px;">
-            <el-button type="primary" @click="printCard">打印</el-button>
-            <el-button type="primary" @click="AddCard">新增</el-button>
+            <el-button type="primary" @click="setAirDisInfect">设置</el-button>
+            <el-button type="primary" @click="printCard" v-if="air_way==0||air_way == 1">打印</el-button>
+            <el-button type="primary" @click="printCardOne" v-if="air_way == 2">打印</el-button>
+            <el-button type="primary" @click="AddCard" v-if="air_way==0||air_way == 1">新增</el-button>
+            <el-button type="primary" @click="AddCardOne" v-if="air_way == 2">新增</el-button>
 
           </div>
-          <div class="tab_air">
+          <div class="tab_air" v-if="air_way ==0 ||air_way == 1">
             <el-table  :data="tableData" :fit="true" stripe>
                 <el-table-column prop="year" label="名称" width="150" align="center">
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
           >
 
           </el-pagination>
-         </div>
+          </div>
+
+
+          <div  v-if="air_way == 2">
+            <el-table
+                :data="tableDataOne"
+                style="width: 100%"
+                row-key="id"
+                border
+                lazy
+                :load="load"
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+                <el-table-column  prop="date" label="消毒时间" width="100">
+                    <template slot-scope="scope">
+                        {{getTimes(scope.row.record_date) }}
+                    </template>
+                </el-table-column>
+                <el-table-column  prop="date" label="消毒科室" width="100">
+                    <template slot-scope="scope">
+                      {{ scope.row.department }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="name" label="累计时间" width="100">
+                    <template slot-scope="scope">
+                      {{scope.row.first_total_time?scope.row.first_total_time:"" }}
+                    </template>
+                </el-table-column>
+                <el-table-column prop="address" label="责任人" width="100">
+                    <template slot-scope="scope">
+                        {{getName(scope.row.first_creator)}}
+                    </template> 
+                </el-table-column>
+                <el-table-column prop="name" label="通风" align="center" min-width="80">
+                    <template slot-scope="scope">
+                        {{ getTimeTwo(scope.row.last_start_time)}} - {{ getTimeTwo(scope.row.last_end_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="150">
+                    <template slot-scope="scope">
+                        <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleEditOne(scope.row.id)">编辑</el-button>
+                        <el-button
+                        size="mini"
+                        type="danger"
+                        @click="handleDeleteOne(scope.row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              :total="total"
+              @size-change="handleSizeChangeOne"
+              @current-change="handleCurrentChangeOne"
+          >
+          </el-pagination>
+          </div>
+
 
             <!-- 新增 -->
           <el-dialog
                 </div>
             </div>
          </div>
-      </div>
-    </div>
-  </template>
 
-  <script>
-    import print from "print-js";
-    import BreadCrumb from '@/xt_pages/components/bread-crumb'
-    import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime} from "@/api/device"
-    import { uParseTime } from '@/utils/tools'
-    const moment = require('moment')
-    import { getManageMentDataConfig } from '@/utils/data'
-    export default {
-      name: 'airDisinfect',
-      components: {
-        BreadCrumb
-      },
-      data() {
-        return {
-          crumbs: [
-            { path: false, name: '院感管理' },
-            { path: false, name: '透析室空气消毒记录表' }
-          ],
 
-          dialogFormVisible:false,
-          editDialogFormVisible:false,
-          startvalue:'',
-          endvalue:'',
-          form: {
-            id:0,
-            record_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"), //创建日期
-            first_disinfection_water:"",// 消毒液
-            first_disinfection_methods:"",//消毒方式
-            first_disinfection_time:'',//消毒时长
-            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:"",//修改标志
-            first_creator:this.$store.getters.xt_user.user.id,//第一责任人
+         <div hidden="hiddenShowOne">
+            <div id="print-card-info_one" v-show="hiddenShowOne">
+                <div>
+                    <h1 style="text-align: center;">空气消毒登记</h1>
+                    <div>
+                        <table border="1" style="text-align: center;margin: auto;border-collapse: collapse;">
+                            <tr>
+                                <td>消毒时间</td>
+                                <td>透析室</td>
+                                <td>累计时间</td>
+                                <td>责任人</td>
+                               
+                                <td>通风</td>
+                                <td>负责人</td>
+                            </tr>
+                            <tr v-for="(item,index) in tableDataOne" :key="index">
+                               <td>{{getTimes(item.record_date) }}</td>
+                               <td>{{item.department }}</td>
+                               <td>{{ getTimeTwo(item.first_start_time)}} - {{ getTimeTwo(item.first_end_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>
+                               <td> {{getTimeTwo(item.last_start_time)}} - {{ getTimeTwo(item.last_end_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>
+                    </div>
+                </div>
+            </div>
+         </div>
 
-            sencond_disinfection_water:"",// 消毒液
-            sencond_disinfection_methods:"",//消毒方式
-            sencond_disinfection_time:"",//消毒时长
-            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:"",//修改标志
-            sencond_creator:this.$store.getters.xt_user.user.id,//第一责任人
+<!-- 设置 -->
+         <el-dialog
+            title="请选择版本"
+            :visible.sync="setEditDialog"
+            width="60%">
+            <span>
+                <el-radio v-model="air_way" label="1">版本一</el-radio>
+                <el-radio v-model="air_way" label="2">版本二</el-radio>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="setEditDialog = false">取 消</el-button>
+                <el-button type="primary" @click="saveSetAirDisInfect()">保 存</el-button>
+            </span>
+         </el-dialog>
+
+     <!--版本2新增  -->
+        <el-dialog
+          class="centerDialog"
+          width="1000px"
+          title="新增空气消毒表"
+          :visible.sync="newDialogFormVisible">
+              <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                  <div style="width: 100%;">
+                    <el-form-item label="创建日期" label-width="110px" required prop="record_date">
+                        <el-date-picker
+                        value-format="yyyy-MM-dd"
+                        v-model="form.record_date"
+                        type="date"
+                        placeholder="选择日期时间">
+                        </el-date-picker>
+                    </el-form-item>
 
-            third_disinfection_water:"",// 消毒液
-            third_disinfection_methods:"",//消毒方式
-            third_disinfection_time:'',//消毒时长
-            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,//第一责任人
+                    <el-form-item label="消毒科室" label-width="110px" required prop="department">
+                        <el-select v-model="form.department" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disinfectionOfficeList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                        </el-select>
+                    </el-form-item>
+                  </div>
+                  <div class="form_title">
+                    <span>
+                       {{ form.department }}
+                    </span>
+                 </div>
+                  <el-form-item label="消毒液" label-width="110px">
+                      <!-- <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="消毒方式" label-width="110px">
+                      <!-- <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="消毒时间(h)" label-width="110px">
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
+                  </el-form-item>
+                  <el-form-item label="开始时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_start_time"
+                        @change="firststartime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="结束时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_end_time"
+                        @change="firstendtime"
+                        style="width:100%;"
+                     ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="累计时间(h)" label-width="110px">
+                      <el-input v-model= "form.first_total_time"  ></el-input>
+                  </el-form-item>
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.first_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.first_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px">
+                      <el-select v-model="form.first_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px">
+                      <el-select v-model="form.first_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
 
-            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:"",//修改标志
-            last_creator:this.$store.getters.xt_user.user.id,//第一责任人
-          },
-          docList:[],
-          options:[
-            {id:1,name:"正常"},
-            {id:2,name:"撤销"}
-          ],
-         airRules: {
-          created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
-          start_time:[{required:true,message:"请选择开始时间",trigger:"blur"}],
-          end_time:[{required:true,message:"请选择结束时间",trigger:"blur"}]
-         },
-         limit:10,
-         page:1,
-         total:0,
+                  <div class="form_title"><span >通风</span></div>
+                  <el-form-item label="开始时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        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>
+                  <el-form-item label="结束时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        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>
+                  <el-form-item label="累计时间(h)" label-width="110px">
+                      <el-input v-model= "form.last_total_time"  ></el-input>
+                  </el-form-item>
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.last_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.last_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px"  prop="last_modifications">
+                      <el-select v-model="form.last_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px"  prop="creator">
+                      <el-select v-model="form.last_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                  <el-button @click="newDialogFormVisible = false">取 消</el-button>
+                  <el-button type="primary" @click="saveNewAirWayDisinfect('form')">保 存</el-button>
+              </div>
+        </el-dialog>
+
+
+        <el-dialog
+          class="centerDialog"
+          width="1000px"
+          title="编辑空气消毒表"
+          :visible.sync="newEditDialogFormVisible">
+              <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                  <div style="width: 100%;">
+                    <el-form-item label="创建日期" label-width="110px" required prop="record_date">
+                        <el-date-picker
+                        value-format="yyyy-MM-dd"
+                        v-model="form.record_date"
+                        type="date"
+                        placeholder="选择日期时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="消毒科室" label-width="110px" required prop="department">
+                        <el-select v-model="form.department" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disinfectionOfficeList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                        </el-select>
+                    </el-form-item>
+                  </div>
+                  <div class="form_title">
+                    <span>
+                       {{ form.department }}
+                    </span>
+                 </div>
+                  <el-form-item label="消毒液" label-width="110px">
+                    
+                      <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="消毒方式" label-width="110px">
+                     
+                      <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="消毒时间(h)" label-width="110px">
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
+                  </el-form-item>
+                  <el-form-item label="开始时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_start_time"
+                        @change="firststartime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="结束时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_end_time"
+                        @change="firstendtime"
+                        style="width:100%;"
+                     ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="累计时间(h)" label-width="110px">
+                      <el-input v-model= "form.first_total_time"  ></el-input>
+                  </el-form-item>
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.first_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.first_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px">
+                      <el-select v-model="form.first_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px">
+                      <el-select v-model="form.first_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+
+                  <div class="form_title"><span >通风</span></div>
+                  <el-form-item label="开始时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        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>
+                  <el-form-item label="结束时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        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>
+                  <el-form-item label="累计时间(h)" label-width="110px">
+                      <el-input v-model= "form.last_total_time"  ></el-input>
+                  </el-form-item>
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.last_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.last_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px"  prop="last_modifications">
+                      <el-select v-model="form.last_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px"  prop="creator">
+                      <el-select v-model="form.last_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                  <el-button @click="newEditDialogFormVisible = false">取 消</el-button>
+                  <el-button type="primary" @click="updateNewAirWayDisinfect('form')">保 存</el-button>
+              </div>
+        </el-dialog>  
+
+      </div>
+    </div>
+  </template>
+
+  <script>
+    import print from "print-js";
+    import BreadCrumb from '@/xt_pages/components/bread-crumb'
+    import { getAllDoctorList,saveNewAirDisinfect,getNewAirDisinfectList,getNewAirDisinfectByIdList,updateNewAirDisinfect,deleteNewAirDisInfect,getAirDisinfectLongTime,saveSetAirDisInfect,getSetAirDisInfectById,saveNewAirWayDisinfect,getNewAirWayDisinfectList,getAirDisinfectWayLongTime,getNewAirWayDisinfectByIdList,updateNewAirWayDisinfect,deleteNewAirWayDisInfect} from "@/api/device"
+    import { uParseTime } from '@/utils/tools'
+    const moment = require('moment')
+    import { getManageMentDataConfig } from '@/utils/data'
+    export default {
+      name: 'airDisinfect',
+      components: {
+        BreadCrumb
+      },
+      data() {
+        return {
+          crumbs: [
+            { path: false, name: '院感管理' },
+            { path: false, name: '透析室空气消毒记录表' }
+          ],
+
+          dialogFormVisible:false,
+          editDialogFormVisible:false,
+          newDialogFormVisible:false,
+          newEditDialogFormVisible:false, 
+          setEditDialog:false,
+          startvalue:'',
+          endvalue:'',
+          form: {
+            id:0,
+            record_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"), //创建日期
+            first_disinfection_water:"",// 消毒液
+            first_disinfection_methods:"",//消毒方式
+            first_disinfection_time:'',//消毒时长
+            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:"",//修改标志
+            first_creator:this.$store.getters.xt_user.user.id,//第一责任人
+
+            sencond_disinfection_water:"",// 消毒液
+            sencond_disinfection_methods:"",//消毒方式
+            sencond_disinfection_time:"",//消毒时长
+            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:"",//修改标志
+            sencond_creator:this.$store.getters.xt_user.user.id,//第一责任人
+
+            third_disinfection_water:"",// 消毒液
+            third_disinfection_methods:"",//消毒方式
+            third_disinfection_time:'',//消毒时长
+            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'),//开始时间
+            last_end_time:moment(new Date()).format('YYYY-MM-DD HH:mm'),//结束时间
+            last_disinfection_time:"",//消毒时长
+            last_total_time:"",//累计时间
+            last_is_check:"1",//检验合格
+            last_modifications:"",//修改标志
+            last_creator:this.$store.getters.xt_user.user.id,//第一责任人
+            department:"",
+          },
+          docList:[],
+          options:[
+            {id:1,name:"正常"},
+            {id:2,name:"撤销"}
+          ],
+         airRules: {
+          created_time:[{required:true,message:"请选择创建时间",trigger:"blur"}],
+          start_time:[{required:true,message:"请选择开始时间",trigger:"blur"}],
+          end_time:[{required:true,message:"请选择结束时间",trigger:"blur"}],
+          department:[{required:true,message:"请选择消毒科室",trigger:'blur'}],
+         },
+         limit:10,
+         page:1,
+         total:0,
          tableData: [],
          hiddenShow:false,
+         hiddenShowOne:false,
         //  disInfectionWaterList:[
         //  { id: 1, name: "0.22%季铵盐" },
         //  { id: 2, name: "500mg/l含氯消毒剂" },
          sencond_total_time:0,
          third_total_time:0,
          last_total_time:0,
+         air_way:"2",
+         disinfectionOfficeList:[],
+         tableDataOne:[]
         }
       },
       created(){
         for(let i=0;i<disinfection_methods.length;i++){
           this.DisinfectionMode.push(disinfection_methods[i])
         }
+        var  disinfection_offices = getManageMentDataConfig('management', 'disinfection_office')
+        console.log("disinfection_offices",disinfection_offices)
+        for(let i=0;i<disinfection_offices.length;i++){
+          this.disinfectionOfficeList.push(disinfection_offices[i])
+        }
         this.getAllDoctorList()
         this.getNewAirDisinfectList()
+        this.getNewAirWayDisinfectList()
         var time=moment(this.form.first_start_time).format("HH:mm");
         
 
                  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.dialogFormVisible =  true
+          
+        
          }
         })
       },
+      AddCardOne(){
+        getAirDisinfectWayLongTime(this.form.department).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+           
+           var first_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)
+                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.last_total_time =""
+            this.form.last_total_time = last_total_time
+            this.last_total_time = last_total_time
+            }
+            this.newDialogFormVisible = true
+          }  
+        })  
+       },
       handleSizeChange(val) {
         this.limit = val;
         this.getNewAirDisinfectList()
         this.page = val;
         this.getNewAirDisinfectList()
       },
-        changeStartime(val){
-          this.getNewAirDisinfectList()
-        },
-        changeEndtime(){
-            this.getNewAirDisinfectList()
-        },
+      handleSizeChangeOne(val) {
+        this.limit = val;
+        this.getNewAirWayDisinfectList()
+      },
+      handleCurrentChangeOne(val) {
+        this.page = val;
+        this.getNewAirWayDisinfectList()
+      },
+      changeStartime(val){
+        this.getNewAirDisinfectList()
+        this.getNewAirWayDisinfectList()
+       },
+      changeEndtime(){
+        this.getNewAirDisinfectList()
+        this.getNewAirWayDisinfectList()
+       },
         getAllDoctorList(){
           getAllDoctorList().then(response=>{
             if(response.data.state == 1){
               }
             })
         },
+        getNewAirWayDisinfectList(){
+           var params = {
+            start_time:this.startvalue,
+            end_time:this.endvalue,
+            limit:this.limit,
+            page:this.page,
+           }
+           getNewAirWayDisinfectList(params).then(response=>{
+             if(response.data.state == 1){
+                var list = response.data.data.list
+                this.tableDataOne = list
+                var total = response.data.data.total
+                this.total =total
+             }
+           })
+        },
         getTimes(time) {
          return uParseTime(time, '{y}-{m}-{d}')
        },
             }
          })
        },
+       handleEditOne(id){
+        getNewAirWayDisinfectByIdList(id).then(response=>{
+            if(response.data.state == 1){
+              var list =  response.data.data.list
+              console.log("list",list)
+              this.form.id = list.id
+              this.form.record_date = this.getTimes(list.record_date)
+              this.form.first_disinfection_water = list.first_disinfection_water?list.first_disinfection_water:""
+              this.form.first_disinfection_methods = list.first_disinfection_methods?list.first_disinfection_methods:""
+              this.form.first_disinfection_time = list.first_disinfection_time?list.first_disinfection_time:""
+              this.form.first_start_time = this.getTimeThree(list.first_start_time)
+              this.form.first_end_time = this.getTimeThree(list.first_end_time)
+              this.form.first_total_time = list.first_total_time?list.first_total_time:""
+              this.form.first_is_check = list.first_is_check.toString()
+              this.form.first_modifications = list.first_modifications?list.first_modifications:""
+              this.form.first_creator = list.first_creator
+              this.form.last_start_time = this.getTimeThree(list.last_start_time)
+              this.form.last_end_time = this.getTimeThree(list.last_end_time)
+              this.form.last_total_time = list.last_total_time?list.last_total_time:""
+              this.form.last_is_check = list.last_is_check.toString()
+              this.form.last_modifications = list.last_modifications?list.last_modifications:""
+              this.form.last_creator = list.last_creator
+              this.form.department = list.department
+              this.newEditDialogFormVisible = true
+
+            }
+         })
+       },
        updateAirDisinfect(formName){
 
          this.$refs[formName].validate((valid)=>{
             }
          })
        },
+       handleDeleteOne(id){
+          deleteNewAirWayDisInfect(id).then(response=>{
+            var msg = response.data.data.msg
+              this.$message.success("删除成功!")
+              this.getNewAirWayDisinfectList()
+          })
+       },
 
        printCard() {
             this.hiddenShow = true;
               });
             }, 1);
          },
+         printCardOne() {
+
+            this.hiddenShowOne = true;
+            console.log("hiddenShowOne",this.hiddenShowOne)
+            var ptime = Math.round(new Date().getTime() / 1000);
+            this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
+
+            const style =
+              "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
+
+            setTimeout(() => {
+              printJS({
+                printable: "print-card-info_one",
+                type: "html",
+                style: style,
+                scanStyles: false
+              });
+            }, 1);
+         },
          setAdminUserES(id) {
            
             if (id === 0) {
         },
         toSeach(){
           this.getNewAirDisinfectList()   
+          this,getNewAirWayDisinfectList()
+        },
+        setAirDisInfect(){
+          getSetAirDisInfectById().then(response=>{
+            if(response.data.state == 1){
+              var airset = response.data.data.airset
+              if(airset!=undefined){
+                this.air_way = airset.air_way.toString()
+                this.setEditDialog = true
+              }
+             
+            }
+          })
+        
+        },
+        saveSetAirDisInfect(){
+           var params = {
+            air_way:parseInt(this.air_way)
+           }
+          saveSetAirDisInfect(params).then(response=>{
+             if(response.data.state == 1){
+               var airSetting =  response.data.data.airSetting
+               this.$message.success("保存成功")
+               this.setEditDialog = false
+             }
+          })  
+        },
+       
+        saveNewAirWayDisinfect(formName){
+            this.$refs[formName].validate((valid)=>{
+                if(valid){
+                    if(this.form.first_is_check!=""){
+                 this.form.first_is_check = parseInt(this.form.first_is_check)
+                }else{
+                  this.form.first_is_check = 0
+                }
+
+                if(this.form.last_is_check!=""){
+                  this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                  this.form.last_is_check = 0
+                }
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications)
+                }else{
+                    this.form.first_modifications =0
+                }
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications= 0
+                }
+                this.form.first_total_time = this.form.first_total_time.toString() 
+                this.form.last_total_time = this.form.last_total_time.toString()
+                console.log("this232322323",this.form)
+                  saveNewAirWayDisinfect(this.form).then(response=>{
+                   var disinfect = response.data.data.disinfect
+                   this.$message.success("保存成功！")
+                   this.newDialogFormVisible  = false
+                   this.getNewAirWayDisinfectList()
+                   this.$refs[formName].resetFields();
+                  })
+                }
+            })
+          
+        },
+        updateNewAirWayDisinfect(formName){
+            this.$refs[formName].validate((valid)=>{
+            if(valid){
+                if(this.form.first_is_check!=""){
+                 this.form.first_is_check = parseInt(this.form.first_is_check)
+                }else{
+                  this.form.first_is_check = 0
+                }
+
+                if(this.form.last_is_check!=""){
+                  this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                  this.form.last_is_check = 0
+                }
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications)
+                }else{
+                    this.form.first_modifications =0
+                }
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications= 0
+                }
+
+                if( this.form.first_total_time > 0){
+                  this.form.first_total_time   = this.form.first_total_time.toString()
+                }
+               
+
+                if(this.form.last_total_time >0){
+                    this.form.last_total_time   = this.form.last_total_time.toString()
+                }
+               
+                console.log("form23333333333333333wo",this.form)
+                updateNewAirWayDisinfect(this.form).then(response=>{
+                if(response.data.state == 1){
+                  var disinfect =  response.data.data.disinfect
+                  this.newEditDialogFormVisible = false
+                  this.getNewAirWayDisinfectList()
+                  this.$refs[formName].resetFields()
+                }
+             })
+            }
+
+         })  
         }
 
       },

src/xt_pages/device/objectTableDisinfectTwo.vue

             <el-button type="primary" style="margin-left: 10px;" @click="toSeach">搜索</el-button>
           </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="toSetting">设置</el-button>
+            <el-button type="primary" @click="printCard" v-if="air_way==0 || air_way ==1">打印</el-button>
+            <el-button type="primary" @click="printCardOne" v-if=" air_way ==2">打印</el-button>
+            <el-button type="primary" @click="dialogFormVisible = true" v-if="air_way == 0 || air_way == 1">新增</el-button>
+            <el-button type="primary" @click="newdialogFormVisible = true" v-if="air_way == 2">新增</el-button>
           </div>
-          <div class="tab_air">
+          <div class="tab_air" v-if="air_way == 0 || air_way ==1">
             <el-table  :data="tableData" :fit="true" stripe>
                 <el-table-column prop="year" label="名称" width="150" align="center">
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
           </el-pagination>
          </div>
 
-            <!-- 新增 -->
+         <div  v-if="air_way == 2">
+            <el-table  :data="tableDataOne" :fit="true" stripe   style="width: 100%"
+                row-key="id"
+                border
+                lazy
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+               
+            <el-table-column prop="year" label="消毒日期" align="center" width="150">
+                <template slot-scope="scope">
+                    {{getTimes(scope.row.record_date) }}
+                </template>
+                
+            </el-table-column>
+
+            <el-table-column prop="year" label="消毒物品" align="center" width="150">
+                <template slot-scope="scope">
+                  {{scope.row.department  }} 
+                </template>
+                
+            </el-table-column>
+                   
+             
+                <el-table-column prop="fenopda" :label="'500mg/l含氯制剂'" align="center" min-width="60">
+                    <template slot-scope="scope">
+                        {{ getTimeTwo(scope.row.first_start_time) }} - {{ getTimeTwo(scope.row.first_end_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="city" label="操作" align="center" min-width="100">
+                    <template slot-scope="scope">
+                        <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleEditOne(scope.row.id)">编辑</el-button>
+                        <el-button
+                        size="mini"
+                        type="danger"
+                        @click="handleDeleteOne(scope.row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+              @size-change="handleSizeChangeOne"
+              @current-change="handleCurrentChangeOne"
+          >
+            
+          </el-pagination>
+         </div>
+
+         <!-- 新增 -->
           <el-dialog
           class="centerDialog"
           width="1000px"
                 </div>
             </div>
          </div>
-        
+
+
+         <div hidden="hiddenShowOne">
+            <div id="print-card-info_one" v-show="hiddenShowOne">
+                <div>
+                    <h1 style="text-align: center;">物表消毒登记</h1>
+                    <div>
+                        <table border="1" style="text-align: center;margin: auto;border-collapse: collapse;">
+                            <tr>
+                               <td>消毒时间</td>
+                               <td>消毒物品</td>
+                                <td>500mg/l含氯制剂</td>
+                                <td>负责人</td>
+                            </tr>
+
+                            <tr v-for="(item,index) in tableDataOne" :key="index">
+                                <td>{{getTimes(item.record_date) }}</td>
+                                <td>{{item.department}}</td>
+                                <td>{{getTimeTwo( item.first_start_time)}}- {{getTimeTwo(item.first_end_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>
+                            </tr>
+                         </table>   
+
+                    </div>
+                </div>
+            </div>
+         </div>
+         
+         <el-dialog
+            title="请选择版本"
+            :visible.sync="setEditDialog"
+            width="60%">
+            <span>
+                <el-radio v-model="air_way" label="1">版本一</el-radio>
+                <el-radio v-model="air_way" label="2">版本二</el-radio>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="setEditDialog = false">取 消</el-button>
+                <el-button type="primary" @click="saveSetObjectTable()">保 存</el-button>
+            </span>
+         </el-dialog>
+
+
+         <el-dialog
+          class="centerDialog"
+          width="1000px"
+          title="新增物表消毒表"
+          :visible.sync="newdialogFormVisible">
+              <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                  <div style="width: 100%;">
+                    <el-form-item label="创建日期" label-width="110px" required prop="record_date">
+                        <el-date-picker
+                        value-format="yyyy-MM-dd"
+                        v-model="form.record_date"
+                        type="date"
+                        placeholder="选择日期时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="消毒物品" label-width="110px" required prop="department">
+                        <el-select v-model="form.department" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disinfectionOfficeList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                        </el-select>
+                    </el-form-item>
+                  </div>
+                  <div class="form_title">
+                    <span >
+                     {{ form.department }}
+                   </span>
+                  </div>
+                  <el-form-item label="消毒方式" label-width="110px">
+                      <!-- <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-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>
+                  </el-form-item>
+                  <el-form-item label="开始时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_start_time"
+                        @change="firststartime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="结束时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_end_time"
+                        @change="firstendtime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                 
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.first_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.first_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px" >
+                      <el-select v-model="form.first_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px">
+                      <el-select v-model="form.first_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+    
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                  <el-button @click="newdialogFormVisible = false">取 消</el-button>
+                  <el-button type="primary" @click="saveObjectWayTableDisinfect('form')">保 存</el-button>
+              </div>
+          </el-dialog>
+
+
+        <el-dialog
+          class="centerDialog"
+          width="1000px"
+          title="编辑物表消毒表"
+          :visible.sync="editnewdialogFormVisible">
+              <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                  <div style="width: 100%;">
+                    <el-form-item label="创建日期" label-width="110px" required prop="record_date">
+                        <el-date-picker
+                        value-format="yyyy-MM-dd"
+                        v-model="form.record_date"
+                        type="date"
+                        placeholder="选择日期时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="消毒物品" label-width="110px" required prop="department">
+                        <el-select v-model="form.department" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disinfectionOfficeList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                        </el-select>
+                    </el-form-item>
+                  </div>
+                  <div class="form_title">
+                    <span >
+                     {{ form.department }}
+                   </span>
+                  </div>
+                  <el-form-item label="消毒方式" label-width="110px">
+                      <!-- <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-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>
+                  </el-form-item>
+                  <el-form-item label="开始时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_start_time"
+                        @change="firststartime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="结束时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_end_time"
+                        @change="firstendtime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                 
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.first_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.first_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px" >
+                      <el-select v-model="form.first_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px">
+                      <el-select v-model="form.first_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+    
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                  <el-button @click="editnewdialogFormVisible = false">取 消</el-button>
+                  <el-button type="primary" @click="updateObjectWayTableDisinfect('form')">保 存</el-button>
+              </div>
+          </el-dialog>
       </div>
     </div>
   </template>
         getObjectTableDisInfectList,
         getObjectTableDisInfectByIdList,
         updateObjectTableDisinfect, 
-        deleteObjectTableDisinfect
+        deleteObjectTableDisinfect,
+        setObjectDisinfect,
+        getObjectWayDisinfect,
+        saveObjectWayTableDisinfect,
+        getObjectTableDisInfectWayList,
+        getObjectTableDisInfectWayByIdList,
+        updateObjectWayTableDisinfect,
+        deleteObjectTableWayDisinfect
     } from "@/api/device"
     import { getManageMentDataConfig } from '@/utils/data'
     import { uParseTime } from '@/utils/tools'
         return {
           crumbs: [
             { path: false, name: '院感管理' },
-            { path: false, name: '透析室空气消毒记录表' }
+            { path: false, name: '透析室物表消毒记录表' }
           ],
 
           dialogFormVisible:false,
           editDialogFormVisible:false,
+          newdialogFormVisible:false,
+          editnewdialogFormVisible:false,
+          setEditDialog:false,
           startvalue:'',
           endvalue:'',
           form: {
             last_is_check:"1",//检验合格
             last_modifications:"",//修改标志
             last_creator:this.$store.getters.xt_user.user.id,//第一责任人
-          
+            department:"",
           },
         //   value1:'',
           docList:[],
          ],
          operators: [],
          operatorMaps:{},
-         
+         setEditDialog:false,
+         air_way:"2",
+         disinfectionOfficeList:[],
+         tableDataOne:[],
+         hiddenShowOne:false,
         }
       },
       created(){
         for(let i=0;i<disinfection_methods.length;i++){
           this.DisinfectionMode.push(disinfection_methods[i])
         }
+        var  disinfection_offices = getManageMentDataConfig('management', 'disinfection_object')
+        console.log("disinfection_offices",disinfection_offices)
+        for(let i=0;i<disinfection_offices.length;i++){
+          this.disinfectionOfficeList.push(disinfection_offices[i])
+        }
         this.getAllDoctorList()
         this.getObjectTableDisInfectList()
+        this.getObjectTableDisInfectWayList()
       },
       computed:{
         firstdisinfection_time (){
             });
         }, 1);
        },
+       printCardOne(){
+        this.hiddenShowOne = true;
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
+
+        const style =
+            "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
+
+        setTimeout(() => {
+            printJS({
+            printable: "print-card-info_one",
+            type: "html",
+            style: style,
+            scanStyles: false
+            });
+        }, 1);
+       },
        getTimes(time) {
          return uParseTime(time, '{y}-{m}-{d}')
        },
             }
           })
         },
+        handleEditOne(id){
+            getObjectTableDisInfectWayByIdList(id).then(response=>{
+                var list = response.data.data.list
+              console.log("list",list)
+              this.form.id = list.id
+              this.form.record_date = this.getTimes(list.record_date)
+              this.form.first_disinfection_water = list.first_disinfection_water? list.first_disinfection_water:""
+              this.form.first_disinfection_methods = list.first_disinfection_methods? list.first_disinfection_methods:""
+              this.form.first_disinfection_time = list.first_disinfection_time?list.first_disinfection_time:""
+              this.form.first_start_time = this.getTimeThree(list.first_start_time)
+              this.form.first_end_time = this.getTimeThree(list.first_end_time)
+              this.form.first_total_time = list.first_total_time?list.first_total_time:""
+              this.form.first_is_check = list.first_is_check.toString()
+              this.form.first_modifications = list.first_modifications?list.first_modifications:""
+              this.form.first_creator = list.first_creator
+
+              this.form.last_start_time = this.getTimeThree(list.last_start_time)
+              this.form.last_end_time = this.getTimeThree(list.last_end_time)
+              this.form.last_total_time = list.last_total_time?list.last_total_time:""
+              this.form.last_is_check = list.last_is_check.toString()
+              this.form.last_modifications = list.last_modifications?list.last_modifications:""
+              this.form.last_creator = list.last_creator
+              this.form.last_disinfection_water = list.last_disinfection_water?list.last_disinfection_water:""
+              this.form.last_disinfection_methods = list.last_disinfection_methods?list.last_disinfection_methods:""
+              this.form.last_disinfection_time = list.last_disinfection_time?list.last_disinfection_time:""
+              this.form.department = list.department
+              this.editnewdialogFormVisible = true
+            })
+        },
         updateObjectTableDisinfect(formName){
           this.$refs[formName].validate((valid=>{
             if(valid){
             }
           }))
         },
+        updateObjectWayTableDisinfect(formName){
+          this.$refs[formName].validate((valid=>{
+            if(valid){
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+              
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+               
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
+                console.log("hhahdhfhahdf",this.form)
+                updateObjectWayTableDisinfect(this.form).then(response=>{
+                 if(response.data.state == 1){
+                   var objectDisinfect =  response.data.data.objectDisinfect
+                   this.$message.success("保存成功!")
+                   this.editnewdialogFormVisible = false
+                   this.getObjectTableDisInfectWayList()
+                 }
+              })
+            }
+          }))
+        },
         handleDelete(id){
           deleteObjectTableDisinfect(id).then(response=>{
             if(response.data.state ==1){
             }
           })
         },
+        handleDeleteOne(id){
+          deleteObjectTableWayDisinfect(id).then(response=>{
+            if(response.data.state ==1){
+              var msg = response.data.data.msg
+              this.$message.success("删除成功!")
+              this.getObjectTableDisInfectWayList()
+            }
+          })
+        },
         firststartime(val){
             this.form.first_start_time = val
             this.form.first_disinfection_time = this.firstdisinfection_time
               }
            }
            return user_name
-           // if (id in this.operatorMaps) {
-
-           // return this.operatorMaps[id].url
-
-           // } else {
-           // return ''
-           // }
        },
 
        handleSizeChange(val) {
         this.page = val;
         this.getObjectTableDisInfectList()
       },
+      handleSizeChangeOne(val){
+        this.limit = val;
+        this.getObjectTableDisInfectWayList()
+      },
+      handleCurrentChangeOne(val){
+        this.page = val;
+        this.getObjectTableDisInfectWayList()
+      },
       toSeach(){
         this.getObjectTableDisInfectList()
-      }
+        this.getObjectTableDisInfectWayList()
+      },
+      toSetting(){
+        getObjectWayDisinfect().then(response=>{
+           if(response.data.state==1){
+             var objctSet = response.data.data.objctSet
+             if(objctSet!=undefined){
+                this.air_way = objctSet.air_way.toString()
+             }
+             this.setEditDialog = true
+           }
+        })
+      },
+      saveSetObjectTable(){
+         var params = {
+            air_way:parseInt(this.air_way)
+         }
+        setObjectDisinfect(params).then(response=>{
+           if(response.data.state==1){
+             var objctSet = response.data.data.objctSet
+             this.setEditDialog = false
+           }
+        })
+      },
+      saveObjectWayTableDisinfect(formName){
+        this.$refs[formName].validate((valid)=>{
+            if(valid){
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+              
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
+
+                if(this.form.last_start_time == null){
+                   this.form.last_start_time = ""
+                }
+
+                if(this.form.last_end_time == null){
+                   this.form.last_end_time = ""
+                }
+              
+              saveObjectWayTableDisinfect(this.form).then(response=>{
+                if(response.data.state ==1){
+                    var objectDisinfect =  response.data.data.objectDisinfect
+                   this.$message.success("保存成功!")
+                   this.newdialogFormVisible = false
+                   this.getObjectTableDisInfectWayList()
+                }
+              })
+            }
+        })
+      },
+      getObjectTableDisInfectWayList(){
+        var params = {
+                start_time:this.startvalue,
+                end_time:this.endvalue,
+                limit:this.limit,
+                page:this.page,
+             }
+             getObjectTableDisInfectWayList(params).then(response=>{
+              if(response.data.state == 1){
+                var list = response.data.data.list
+                this.tableDataOne = list
+                this.total = response.data.data.total
+              }
+            })  
+       }
         
       }
     }

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

       <tr>
         <td>床位费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.bed_cost_self_total + info.bedSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total}}</td>
         <td>西成药</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.western_medicine_cost_self_total + info.westernMedicineSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.western_medicine_cost_part_self_total}}</td>
       </tr>
       <tr>
         <td>中成药</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_total}}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.chinese_traditional_medicine_cost_self_total + info.chineseTraditionalSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">
           {{info.chinese_traditional_medicine_cost_part_self_total}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
         <td>检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.check_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.check_cost_self_total + info.checkSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.check_cost_part_self_total}}</td>
       </tr>
       <tr>
         <td>治疗费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.treat_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.treat_cost_self_total + info.treatSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.treat_cost_part_self_total}}</td>
         <td>放射费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
       <tr>
         <td>手术费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.operation_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.operation_cost_self_total + info.operationSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.operation_cost_part_self_total}}</td>
         <td>化验费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.laboratory_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.laboratory_cost_self_total + info.laboratorySelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.laboratory_cost_part_self_total}}</td>
       </tr>
       <tr>
       <tr>
         <td>其他</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.other_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.other_cost_self_total + info.otherSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.other_cost_part_self_total}}</td>
         <td>麻醉费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
       <tr>
         <td>材料费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_total}}</td>
-        <td style="text-align:right;padding-right:10px;">{{info.material_cost_self_total}}</td>
+        <td style="text-align:right;padding-right:10px;">{{(info.material_cost_self_total + info.materialSelfTotal).toFixed(2)}}</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{info.material_cost_part_self_total}}</td>
         <td>特殊检查费</td>
         <td colspan="2" style="text-align:right;padding-right:10px;">0</td>
           parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
           parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
         </td>
-        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+
-          parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
-          parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
-          parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
-          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+        <td style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_self_total )+parseFloat(info.bedSelfTotal)+
+          parseFloat(info.operation_cost_self_total)+parseFloat(info.operationSelfTotal) + parseFloat(info.other_cost_self_total) +parseFloat(info.otherSelfTotal)+
+          parseFloat(info.material_cost_self_total) + parseFloat(info.materialSelfTotal)  + parseFloat(info.western_medicine_cost_self_total) + parseFloat(info.westernMedicineSelfTotal) +
+          parseFloat(info.chinese_traditional_medicine_cost_self_total)  +  parseFloat(info.chineseTraditionalSelfTotal)  + parseFloat(info.check_cost_self_total) + parseFloat(info.checkSelfTotal) +
+          parseFloat(info.laboratory_cost_self_total) + parseFloat(info.laboratorySelfTotal)  + parseFloat(info.treat_cost_self_total) +parseFloat(info.treatSelfTotal) ).toFixed(2)}}
         </td>
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +

src/xt_pages/outpatientCharges/invoicePrint.vue

         type="primary"
       >打印</el-button>
     </template>
-    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 0 && org_id != 10485 && org_id != 10375"><!---->
+    <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 0 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
-            <printOne v-if="org_id != 10088 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
+            <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
+            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
         </div>
     </div>
 
-    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485  || org_id == 0">
+    <div class="app-container" style="padding-top:40px;" v-if="org_id == 10485">
       <div class='dialysisPage'>
         <print-eleven :paramsObj="invoiceParams"></print-eleven>
       </div>

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

             </tr>
         </table>
         <div class="tableBottom">
-            <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
-            <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
-            <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+          <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
+          <div class="tableBottomOne" v-if="$store.getters.xt_user.org.id != 10318">制表日期：{{ getNowTime()}}</div>
+          <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
           <div class="tableBottomOne">基金总额：{{order.fund_pay_sumamt}}元</div>
           <div class="tableBottomOne">统筹支付：{{order.hifp_pay}}元</div>
           <div class="tableBottomOne">医疗救助：{{order.maf_pay}}元</div>
           <div class="tableBottomOne">医保报销：{{order.fund_pay_sumamt}}元</div>
           <div class="tableBottomOne">个人支付：{{order.psn_cash_pay}}元</div>
-
         </div>
         </div>
     </div>

src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue

                 <div style="width: 6.7%;padding: 5px;text-align: center;">{{subItem.count}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.price}}</div>
                 <div style="width: 8.1%;padding: 5px;text-align: center;">{{subItem.total_price}}</div>
-                <!-- <div style="width: 10.1%;padding: 5px;"></div> -->
-                <div style="width: 10.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>
+                 <div style="width: 10.1%;padding: 5px;"></div>
+<!--/*                <div style="width: 10.1%;padding: 5px;text-align: center;">{{subItem.psn_pay}}</div>*/-->
               </div>
             </div>
           </td>

src/xt_pages/outpatientDoctorStation/print.vue

           :prescription_id="prescription_id"
         ></print-ten-one>
 
-        <prinSeven v-if="org_id == 10375 || org_id == 0"
+        <prinSeven v-if="org_id == 10375 "
           v-bind:childResponse="childResponse"
           :advicePrint="advicePrint"
           :ids="ids"

src/xt_pages/outpatientDoctorStation/template/printOne.vue

 
             />
           </p>
-          <p v-if="org_id == 10510 ||org_id == 0">
+          <p v-if="org_id == 10510">
             医师：
             <span
               style="width: 100px; display: inline-block"
 
             />
           </p>
-          <p v-else>
+          <p v-if="org_id!=10217 && org_id!=10510">
             医师： {{ item.doctor ? item.doctor : "" }}
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>

src/xt_pages/outpatientTool/garherinvoice_lingshang.vue

         </div>
         <div style=" width: 608px;min-height: 200px;">
           <div style="display:flex;justify-content: space-around;">
-            
+
             <div style="">西药费</div>
             <div style="">{{getWesternMedicineCostTotal()}}</div>
             <div style="">检查费</div>
           </div>
 
           <div style="display:flex;justify-content: space-around;">
-           
+
             <div style="">床位费</div>
             <div style="">{{getBedCostTotal()}}</div>
             <div style="position:  relative;left: -15px;">中成药</div>
           </div>
         </div>
         <div style="border-top:1px solid black;width: 608px;">
-          
+
           <div style="border-right: 1px solid black;display: inline-block;width: 360px;padding: 5px;">
             <span>合计（大写）:{{smalltoBIG(getAllPice())}}</span>
             <!-- <span>
           <div style="width:140px">兜底支付：</div>
         </div>
         <div style="display:flex;margin-bottom: 3px;">
-          <div style="width:140px">个人自付：</div>
+          <div style="width:140px">个人自付：{{getAllPice()}}</div>
           <div style="width:140px">个账支付：</div>
           <div style="width:140px">个账余额：</div>
         </div>
       </div>
       <div style="width:608px;font-Size:12px">
         <div style="display:flex;margin: 3px 0px;">
-          <div style="width:140px">现金支付：</div>
+          <div style="width:140px">现金支付：{{getAllPice()}}</div>
           <div style="width:140px">预存扣减：</div>
           <div style="width:140px">预存余额：</div>
         </div>
           <div style="width:140px">收款人：{{getAdminRole(admin_user_id)}}</div>
         </div>
       </div>
-      
+
   </div>
       <!-- <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用发票</div>
       <div class="listTitle_1">{{$store.getters.xt_user.org.org_name}}发票联<span>收</span></div>
        <div class="listInfo">
           <div>收费日期：{{this.$route.query.end_time}}</div>
           <div style="width:400px">发票代码：
-           <span>{{orderInfo.fa_piao_code}}</span> 
+           <span>{{orderInfo.fa_piao_code}}</span>
           </div>
       </div>
       <table class="listTable" table border rules=none cellspacing=0 align=center>
         doctorlist:[],
         orderInfo:{},
         his_record_patient:{},
+
+        dabing_cost:0,
+        dabing_cost:0,
+
+
       }
   },
   methods:{
           return false
         } else {
         this.drugTypeList =response.data.data.drugTypeList
-        this.costClassifyList = response.data.data.costClassifyList 
+        this.costClassifyList = response.data.data.costClassifyList
         this.doctorlist = response.data.data.doctorlist
         var list = response.data.data.list
         console.log("listw3232323223",list)
           }
         }
         console.log("order_info222222222222",order_info)
-        
+
         //合并，相同的合并在一起
 
         let dataInfo = {}
           }
           dataInfo[item_id].child.push(item)
         })
-        let arr = Object.values(dataInfo) 
-        
+        let arr = Object.values(dataInfo)
+
         for(let i=0;i<arr.length;i++){
           for(let j=0;j<arr[i].child.length;j++){
              if(arr[i].advice_id >0){
                 arr[i].unit = arr[i].child[0].advice.prescribing_number_unit
                 arr[i].cost_type = arr[i].child[0].advice.drug.drug_type
                 arr[i].medical_insurance_level = arr[i].child[0].advice.drug.medical_insurance_level
-               
-               
+
+
              }
              if(arr[i].project_id > 0){
                 arr[i].record_date = arr[i].child[0].project.record_date
         this.hisDepatment =  response.data.data.hisDepatment
         this.order =  response.data.data.order
         this.his_record_patient = response.data.data.his_record_patient
-        this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList  
+        this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
         this.orderInfo = response.data.data.orderInfo
         if(this.$route.query.id == 1){
            var new_arr = []
            for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].type == 1){
                 new_arr.push(this.tableList[i])
-              }  
+              }
            }
            this.tableList = []
            this.tableList = new_arr
            for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].type == 2){
                 new_arr.push(this.tableList[i])
-              }  
+              }
            }
            this.tableList = []
            this.tableList = new_arr
            for(let i=0;i<this.tableList.length;i++){
               if(this.tableList[i].type == 3){
                 new_arr.push(this.tableList[i])
-              }  
+              }
            }
            this.tableList = []
            this.tableList = new_arr
         }
 
       }
-    
+
       let new_drug_ids = this.unique(drug_ids)
       let new_project_ids = this.unique(project_ids)
-     
+
       let list = []
       if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
         for (let i = 0; i < new_drug_ids.length; i++) {
                obj['name'] = details[a].project.project.project_name
                obj['spec'] = ''
                obj['unit'] = details[a].project.project.unit
-              
+
 
              }else if(details[a].project.type == 3){
                obj['name'] = details[a].project.good_info.good_name
                obj['spec'] = ''
                obj['unit'] = details[a].project.good_info.packing_unit
-             
+
 
              }
               obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
           }
           obj['count'] = count
           list.push(obj)
-        
+
         }
       }
 
           list.push(obj)
 
         }
-       
+
         for (let i = 0; i < new_project_ids.length; i++) {
           let obj = {}
           let count = 0
           }
           obj['count'] = count
           list.push(obj)
-        
+
         }
        }
        console.log("list232332322323332233223232323",list)
       return list
-    }, 
-  
+    },
+
     getMedicineInsuranceType(type) {
       switch (type) {
         case "01":
     return name
   },
    smalltoBIG(n) {
-         
+
       if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
           return "数据非法";  //判断数据是否大于0
       }
           total_price += this.tableList[i].count_number * this.tableList[i].pric
        }
     }
-    
+
     return total_price.toFixed(2)
   },
   getChineseTraditionalMedicineCostTotal(){
     }else{
       return total_price
     }
-   
+
   },
   getAllPiceTwo(arr){
 
     }else{
       return total_price
     }
-   
+
   },
   getAdminRole(id){
     var user_name = ""
   created(){
     this.admin_user_id = this.$store.getters.xt_user.user.id
     console.log("admin_user_id23323232323",this.admin_user_id)
-    this.getGatherDetailList()   
+    this.getGatherDetailList()
     var data = new Date();
     var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();

src/xt_pages/role/admin.vue

            
 
         
-         <el-button
+         <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSendInformaton">发送短信验证码</el-button> 
+          @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
      </div>
               </el-button>
             </span> -->
 
-            <span>
+            <!-- <span>
               <el-button type="primary" size="small" @click="toQianShu(scope.row.user_id,scope.row.user_name)">
                     <span>创建签署人用户</span>
               </el-button>
               <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
                     <span>创建企业印章</span>
               </el-button>
-            </span>
+            </span> -->
             <el-tooltip
               class="item"
               effect="dark"