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

src/xt_pages/device/airDisinfect.vue

@@ -10,23 +10,24 @@
         </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" >
             <el-table-column type="selection" width="55" align="center"></el-table-column>
-            <el-table-column label="时间" width="120">
+            <!-- <el-table-column label="时间" width="120">
                <template slot-scope="scope">
                    {{getTime(scope.row.start_time)}}
                </template>
-            </el-table-column>
-            <el-table-column label="班次" width="120">
+            </el-table-column> -->
+            <el-table-column label="创建日期" width="120">
                 <template slot-scope="scope">
-                   <span v-if="scope.row.class == 1">上午</span>
-                   <span v-if="scope.row.class == 2">中午</span>
-                   <span v-if="scope.row.class == 3">下午</span>
+                  {{getTime(scope.row.created_time)}}
                 </template>
             </el-table-column>
-            <el-table-column label="创建日期" width="120">
+            <el-table-column label="班次" width="120">
                 <template slot-scope="scope">
-                  {{getTime(scope.row.created_ime)}}
+                   <span v-if="scope.row.class == 1">上午</span>
+                   <span v-if="scope.row.class == 2">下午</span>
+                   <span v-if="scope.row.class == 3">晚上</span>
                 </template>
             </el-table-column>
+         
             <el-table-column label="消毒方式" width="120">
                 <template slot-scope="scope">
                   {{scope.row.disinfection_methods}}
@@ -68,7 +69,7 @@
                    <span v-if="scope.row.modifications == 2">撤消</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180">
+            <el-table-column label="操作" align="center" width="180" fixed="right">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
@@ -99,13 +100,21 @@
         title="新增空气消毒表"
         :visible.sync="dialogFormVisible">
             <el-form :model="form" ref="form" class="airForm" :rules="airRules">
-                <el-form-item label="时间" label-width="110px" required prop="start_time">
+                <!-- <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
                      value-format="yyyy-MM-dd"
                     v-model="form.start_time"
                     type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
+                </el-form-item> -->
+                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
                     <el-select v-model="form.class" placeholder="请选择消毒班次">
@@ -114,14 +123,14 @@
                         <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                <!-- <el-form-item label="创建日期" label-width="110px" required prop="created_time">
                   <el-date-picker
                     value-format="yyyy-MM-dd"
                     v-model="form.created_time"
                     type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="消毒方式" label-width="110px">
                     <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
@@ -190,13 +199,21 @@
         title="编辑空气消毒表"
         :visible.sync="editDialogFormVisible">
             <el-form :model="form" ref="form" class="airForm" :rules="airRules">
-                <el-form-item label="时间" label-width="110px" required prop="start_time">
+                <!-- <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
                      value-format="yyyy-MM-dd"
                     v-model="form.start_time"
                     type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
+                </el-form-item> -->
+                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
                     <el-select v-model="form.class" placeholder="请选择消毒班次">
@@ -205,14 +222,14 @@
                         <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                <!-- <el-form-item label="创建日期" label-width="110px" required prop="created_time">
                   <el-date-picker
                     value-format="yyyy-MM-dd"
                     v-model="form.created_time"
                     type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="消毒方式" label-width="110px">
                     <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
@@ -283,6 +300,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getAllDoctorList,saveAirDisinfect,getAirList,getAirDisinfectDetail,updateAirDisinfect,deleteAirDisinfect } from "@/api/device"
   import { uParseTime } from '@/utils/tools'
+  const moment = require('moment')
   export default {
     name: 'airDisinfect',
     components: {
@@ -300,7 +318,7 @@
         form: {
           id:0,
           start_time:"", 
-          created_time:"",
+          created_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
           class:"",
           disinfection_methods:"",
           disinfection_fluid:"",
@@ -367,7 +385,8 @@
                    check_out:parseInt(this.form.check_out),
                    modifications:parseInt(this.form.modifications),
                  }
-                 console.log("params",params)
+                //  console.log("params",params)
+                
                saveAirDisinfect(params).then(response=>{
                   if(response.data.state == 1){
                      var list = response.data.data.list
@@ -437,11 +456,11 @@
         getAirDisinfectDetail(id).then(response=>{
             if(response.data.state ==1){
                var detail =  response.data.data.detail
-               console.log("detail",detail)
+               console.log("detail",detail.created_time)
                this.form.id = detail.id
-               this.form.start_time = this.getTime(detail.start_time)
+              //  this.form.start_time = this.getTime(detail.start_time)
                this.form.class = detail.class.toString()
-               this.form.created_ime = this.getTime(detail.created_time)
+               this.form.created_time = this.getTime(detail.created_time)
                this.form.disinfection_methods = detail.disinfection_methods
                this.form.disinfection_fluid = detail.disinfection_fluid
                this.form.sort = detail.sort
@@ -532,3 +551,8 @@
     }
 }
 </style>
+<style lang="scss">
+::-webkit-scrollbar{
+  height: 15px;
+}
+</style>

src/xt_pages/device/objectTableDisinfect.vue

@@ -10,23 +10,25 @@
         </div>
         <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" >
             <el-table-column type="selection" width="55" align="center"></el-table-column>
-            <el-table-column label="时间" width="120">
+            <!-- <el-table-column label="时间" width="120">
                <template slot-scope="scope">
                    {{getTime(scope.row.start_time)}}
                </template>
-            </el-table-column>
-            <el-table-column label="班次" width="120">
+            </el-table-column> -->
+            <el-table-column label="创建日期" width="120">
                 <template slot-scope="scope">
-                   <span v-if="scope.row.class == 1">上午</span>
-                   <span v-if="scope.row.class == 2">中午</span>
-                   <span v-if="scope.row.class == 3">下午</span>
+                  <!-- {{getTime(scope.row.created_ime)}} -->
+                 {{getTime(scope.row.created_time)}}
                 </template>
             </el-table-column>
-            <el-table-column label="创建日期" width="120">
+            <el-table-column label="班次" width="120">
                 <template slot-scope="scope">
-                  {{getTime(scope.row.created_ime)}}
+                   <span v-if="scope.row.class == 1">上午</span>
+                   <span v-if="scope.row.class == 2">下午</span>
+                   <span v-if="scope.row.class == 3">晚上</span>
                 </template>
             </el-table-column>
+         
             <el-table-column label="消毒方式" width="120">
                 <template slot-scope="scope">
                   {{scope.row.disinfection_methods}}
@@ -68,7 +70,7 @@
                    <span v-if="scope.row.modifications == 2">撤消</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180">
+            <el-table-column label="操作" align="center" width="180" fixed="right">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
@@ -99,13 +101,21 @@
         title="新增物表消毒表"
         :visible.sync="dialogFormVisible">
             <el-form :model="form" ref="form" class="airForm" :rules="airRules">
-                <el-form-item label="时间" label-width="110px" required prop="start_time">
+                <!-- <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
                      value-format="yyyy-MM-dd"
                     v-model="form.start_time"
                     type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
+                </el-form-item> -->
+               <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
                     <el-select v-model="form.class" placeholder="请选择消毒班次">
@@ -114,14 +124,7 @@
                         <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
-                  <el-date-picker
-                    value-format="yyyy-MM-dd"
-                    v-model="form.created_time"
-                    type="date"
-                    placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
+               
                 <el-form-item label="消毒方式" label-width="110px">
                     <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
@@ -190,13 +193,21 @@
         title="编辑物表消毒表"
         :visible.sync="editDialogFormVisible">
             <el-form :model="form" ref="form" class="airForm" :rules="airRules">
-                <el-form-item label="时间" label-width="110px" required prop="start_time">
+                <!-- <el-form-item label="时间" label-width="110px" required prop="start_time">
                     <el-date-picker
                      value-format="yyyy-MM-dd"
                     v-model="form.start_time"
                     type="date"
                     placeholder="选择日期时间">
                     </el-date-picker>
+                </el-form-item> -->
+               <el-form-item label="创建日期" label-width="110px" required prop="created_time">
+                  <el-date-picker
+                    value-format="yyyy-MM-dd"
+                    v-model="form.created_time"
+                    type="date"
+                    placeholder="选择日期时间">
+                    </el-date-picker>
                 </el-form-item>
                 <el-form-item label="班次" label-width="110px" required prop="class">
                     <el-select v-model="form.class" placeholder="请选择消毒班次">
@@ -205,14 +216,7 @@
                         <el-option label="晚上" value="3"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="创建日期" label-width="110px" required prop="created_time">
-                  <el-date-picker
-                    value-format="yyyy-MM-dd"
-                    v-model="form.created_time"
-                    type="date"
-                    placeholder="选择日期时间">
-                    </el-date-picker>
-                </el-form-item>
+              
                 <el-form-item label="消毒方式" label-width="110px">
                     <el-input v-model="form.disinfection_methods"></el-input>
                 </el-form-item>
@@ -283,6 +287,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getAllDoctorList,saveBodyDisinfect,getBodyList,getBodyDisinfectDetail,updateBodyDisinfect,deleteBodyDisinfect } from "@/api/device"
   import { uParseTime } from '@/utils/tools'
+  const moment = require('moment')
   export default {
     name: 'airDisinfect',
     components: {
@@ -300,7 +305,7 @@
         form: {
           id:0,
           start_time:"", 
-          created_time:"",
+          created_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
           class:"",
           disinfection_methods:"",
           disinfection_fluid:"",
@@ -402,12 +407,13 @@
                var total = response.data.data.total
                this.tableData = list
                this.total = total
-               console.log("list222",list)
+               console.log("物表消毒",list)
                console.log("total",total)
              }
           })
         },
       getTime(val) {
+        console.log('val2222',val)
          if(val == ""){
           return ""
          }else {
@@ -437,11 +443,11 @@
         getBodyDisinfectDetail(id).then(response=>{
             if(response.data.state ==1){
                var detail =  response.data.data.detail
-               console.log("detail",detail)
+               console.log("detail2222",detail)
                this.form.id = detail.id
                this.form.start_time = this.getTime(detail.start_time)
                this.form.class = detail.class.toString()
-               this.form.created_ime = this.getTime(detail.created_time)
+               this.form.created_time = this.getTime(detail.created_time)
                this.form.disinfection_methods = detail.disinfection_methods
                this.form.disinfection_fluid = detail.disinfection_fluid
                this.form.sort = detail.sort
@@ -532,3 +538,9 @@
     }
 }
 </style>
+
+<style lang="scss">
+::-webkit-scrollbar{
+  height: 15px;
+}
+</style>

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -212,9 +212,9 @@
                     （<label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-左')" showValue="左"></label-box>
                         <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '内瘘-右')" showValue="右"></label-box>）
                     &nbsp;
-                    <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-左') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-右')" showValue="中心静脉置管"></label-box>
-                    （<label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-左')" showValue="左"></label-box>
-                        <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-右')" showValue="右"></label-box>）部位
+                    <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-左') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-右') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '临时中心静脉管-左') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '临时中心静脉管-右')" showValue="中心静脉置管"></label-box>
+                    （<label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-左') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '临时中心静脉管-左')" showValue="左"></label-box>
+                        <label-box :isChecked="isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '中心静脉置管-右') || isBbloodAccessParOperaCheck(record.assessment_before_dislysis, '临时中心静脉管-右')" showValue="右"></label-box>）部位
                     &nbsp;
                     <!-- <label-box :isChecked="record.assessment_before_dislysis.blood_access_part_id ? (record.assessment_before_dislysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis', 'vascular_access','颈内')) : false" showValue="颈内"></label-box>
                     &nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -139,9 +139,9 @@
           （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') > -1 ? true : false" showValue="左"></label-box>
               <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-右') > -1 ? true : false" showValue="右"></label-box>）
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="中心静脉置管"></label-box>
-          （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : false" showValue="左"></label-box>
-              <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : false" showValue="右"></label-box>）部位
+          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('临时中心静脉管-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('临时中心静脉管-右') > -1 ? true : false" showValue="中心静脉置管"></label-box>
+          （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('临时中心静脉管-左') > -1 ? true : false" showValue="左"></label-box>
+              <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('临时中心静脉管-右') > -1 ? true : false" showValue="右"></label-box>）部位
           &nbsp;
           <!-- <label-box :isChecked="predialysis.blood_access_part_id > 0 ? (getPartName(predialysis.blood_access_part_id).indexOf('颈内') > -1 ? true : false) : false" showValue="颈内"></label-box>
           &nbsp;

src/xt_pages/management/components/QualityForm.vue

@@ -3562,11 +3562,8 @@ export default {
       });
     },
     queryTable() {
-      queryTable(
-        this.forms.bed,
-        this.forms.start_time,
-        this.forms.end_time
-      ).then(response => {
+     
+      queryTable(this.forms.bed,this.forms.start_time,this.forms.end_time).then(response => {
         if (response.data.state === 1) {
           var cultures = response.data.data.cultures;
           

src/xt_pages/management/home.vue

@@ -1363,6 +1363,7 @@
                       <div v-show="zhiShow">
                        <el-tabs type="border-card" v-model="activeNameSix" @tab-click="handleClick">
                          <el-tab-pane label="新增质量控制" name="first">
+  
                            <span style="margin-bottom: 20px;display: block;">细菌培养</span>
                            <el-form :model="qualityForm" ref="qualityForm" :rules="qualitRules">
                              <el-row>
@@ -1471,9 +1472,9 @@
                                </el-col>
                              </el-row>
                              <el-row>
-                               <el-col :span="24">
+                               <!-- <el-col :span="24">
                                  <span style="color:#FF9900">注:细菌检测应每个月一次，要求细菌数<100cfu/ml</span>
-                               </el-col>
+                               </el-col> -->
                              </el-row>
                              <el-row>
                                 <div class="clearn">
@@ -1596,9 +1597,9 @@
                                 </el-col>
                               </el-row>
                               <el-row>
-                                  <el-col :span="24">
+                                  <!-- <el-col :span="24">
                                     <span style="color:#FF9900">注:内毒素检测应至少每3个月1次，要求内毒素<0.25EU/ml，每台透析机每年至少检测一次</span>
-                                   </el-col>
+                                   </el-col> -->
                               </el-row>
                               <el-row>
                                 <div class="clearn">
@@ -1614,6 +1615,161 @@
                             <el-divider></el-divider>
                            
 
+                          
+                          <div v-if="device_type == 1">
+                           <span style="margin-bottom: 20px;display: block;">透析液离子浓度检测</span>
+                            <el-form ref="qualityFormThree" :model="qualityFormThree" :rules="ruleThree">
+                              <el-row>
+                                <el-col :span="8">
+                                    <el-form-item label="取样日期:">
+                                        <el-date-picker
+                                          v-model="qualityFormThree.dateb"
+                                          prefix-icon="none"
+                                          type="date"
+                                          placeholder="请选择"
+                                          format="yyyy-MM-dd"
+                                          value-format="yyyy-MM-dd"
+                                          style="width:150px">
+                                        </el-date-picker>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                    <el-form-item label="取样者:" required prop="samplerc">
+                                      <el-select style="width:150px"  v-model="qualityFormThree.samplerc">
+                                        <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
+                                      </el-select>
+                                   </el-form-item>
+                                </el-col>
+                                  <el-col :span="8">
+                                   <el-form-item label="检测单位:" required prop="detection_unit">
+                                      <el-input style="width:150px" v-model ="qualityFormThree.detection_unit"></el-input>
+                                   </el-form-item>
+                                </el-col>
+                              </el-row>
+                              <el-row>
+                                 <el-col :span="8">
+                                     <el-form-item label="A浓缩液批号:">
+                                       <el-input style="width:150px" v-model="qualityFormThree.concentrate_nof"></el-input>
+                                     </el-form-item>
+                                  </el-col>
+                                   <el-col :span="8">
+                                     <el-form-item label="B浓缩液批号:">
+                                       <el-input style="width:150px" v-model="qualityFormThree.concentrate_nog"></el-input>
+                                     </el-form-item>
+                                  </el-col>
+                                   <el-col :span="8">
+                                    <el-form-item label="出报告日期:" required prop="date_reportc">
+                                        <el-date-picker
+                                          v-model="qualityFormThree.date_reportc"
+                                          prefix-icon="none"
+                                          type="date"
+                                          placeholder="请选择"
+                                          format="yyyy-MM-dd"
+                                          value-format="yyyy-MM-dd"
+                                          style="width:150px">
+                                        </el-date-picker>
+                                    </el-form-item>
+                                </el-col>
+                                
+                              </el-row>
+                            
+                              <el-row>
+                                <el-col :span="8">
+                                  <!-- <span>Na<sup>+</sup></span> -->
+                                   <el-form-item class="newItem" label="实际Na⁺(mmol/L):" label-width="100">
+                                        <el-input style="width:123px" v-model="qualityFormThree.actual_na"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                 <el-col :span="8">
+                                    <el-form-item class="newItem" label="配方Na⁺(mmol/L):" label-width="100">
+                                        <el-input style="width:123px" v-model="qualityFormThree.actual_pna"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                 <el-col :span="8">
+                                    <el-form-item label="K⁺(mmol/L):">
+                                        <el-input style="width:150px" v-model="qualityFormThree.actual_k"></el-input>
+                                    </el-form-item>
+                                </el-col>
+
+                              </el-row>
+                               <el-row>
+                                <el-col :span="8">
+                                    <el-form-item label="Ca2⁺(mmol/L):">
+                                        <el-input style="width:150px" v-model="qualityFormThree.actual_ca"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                 <el-col :span="8">
+                                    <el-form-item label="CI¯(mmol/L):">
+                                        <el-input style="width:150px" v-model="qualityFormThree.actual_ci"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                 <el-col :span="8">
+                                    <el-form-item label="HCO3¯(mmol/L):">
+                                        <el-input style="width:150px" v-model="qualityFormThree.actual_hco"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                              </el-row>
+                              <el-row>
+                                 <el-col :span="8">
+                                    <el-form-item label="Mg2⁺(mmol/L):">
+                                        <el-input style="width:150px" v-model="qualityFormThree.actual_mg"></el-input>
+                                    </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                  <el-form-item label="PH:">
+                                     <el-input style="width:150px" v-model="qualityFormThree.actual_ph"></el-input>
+                                  </el-form-item>
+                                </el-col>
+                                <el-col :span="8">
+                                  <el-form-item label="顺序号:" required prop="sort">
+                                    <el-input v-model="qualityFormThree.sort" style="width:150px"></el-input>
+                                  </el-form-item>
+                                </el-col>
+                              </el-row>
+                              <el-row>
+                                <div></div>
+                              </el-row>
+                               <el-row>
+                                  <el-col :span="8">
+                                      <el-form-item label="检测合格:" required prop="pass_examination">
+                                        <el-radio v-model="qualityFormThree.pass_examination" label="1">是</el-radio>
+                                        <el-radio v-model="qualityFormThree.pass_examination" label="2">否</el-radio>
+                                      </el-form-item>
+                                  </el-col>
+                                  <el-col :span="8">
+                                      <el-form-item label="修改标志:" required prop="modifications">
+                                        <el-select style="width:150px"  v-model="qualityFormThree.modifications">
+                                          <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                        </el-select>
+                                      </el-form-item>
+                                  </el-col>
+                             </el-row>
+                              <el-row>
+                                <el-col :span="24">
+                                  <el-form-item label="备注:">
+                                     <el-input
+                                        type="textarea"
+                                        :rows="2"
+                                         placeholder="请输入内容"
+                                         style="width:500px"
+                                         v-model="qualityFormThree.remakes"
+                                         >
+                                      </el-input>
+                                  </el-form-item>
+                                </el-col>
+                              </el-row>
+                              <el-row>
+                                <div class="clearn">
+                                  <el-col :span="4">
+                                    <el-button @click="cleanQuality">取消</el-button>
+                                  </el-col>
+                                   <el-col :span="4">
+                                    <el-button type="primary" @click="SaveQualityControl('qualityFormThree')">保存</el-button>
+                                  </el-col>
+                                </div>
+                              </el-row>
+                            </el-form>
+
 
 
                             <span style="margin-bottom: 20px;display: block;">有毒化合物检测</span>
@@ -1723,9 +1879,9 @@
                                 </el-col>
                               </el-row>
                               <el-row>
-                                  <el-col :span="24">
+                                  <!-- <el-col :span="24">
                                     <span style="color:#FF9900">注:有毒化合物检测应至少每3个月1次,每台透析机每年至少检测一次</span>
-                                   </el-col>
+                                   </el-col> -->
                               </el-row>
                               <el-row>
                                 <div class="clearn">
@@ -1739,9 +1895,14 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
+                         </div>     
+                             
+
                              
 
 
+
+
                             <span style="margin-bottom: 20px;display: block;">水硬度检测</span>
                             <el-form ref="qualityFormFive" :model="qualityFormFive" :rules="diaRules">
                               <el-row>
@@ -1848,11 +2009,11 @@
                                   </el-form-item>
                                 </el-col>
                               </el-row>
-                              <el-row>
+                              <!-- <el-row>
                                   <el-col :span="24">
                                     <span style="color:#FF9900">注:水硬度检测应至少每3个月1次,每台透析机每年至少检测一次</span>
                                    </el-col>
-                              </el-row>
+                              </el-row> -->
                               <el-row>
                                 <div class="clearn">
                                   <el-col :span="4">
@@ -1975,11 +2136,11 @@
                                   </el-form-item>
                                 </el-col>
                               </el-row>
-                              <el-row>
+                              <!-- <el-row>
                                   <el-col :span="24">
                                     <span style="color:#FF9900">注:水游离氯检测应至少每3个月1次,每台透析机每年至少检测一次</span>
                                    </el-col>
-                              </el-row>
+                              </el-row> -->
                               <el-row>
                                 <div class="clearn">
                                   <el-col :span="4">
@@ -2101,11 +2262,11 @@
                                   </el-form-item>
                                 </el-col>
                               </el-row>
-                              <el-row>
+                              <!-- <el-row>
                                   <el-col :span="24">
                                     <span style="color:#FF9900">注:PH值检测检测应至少每3个月1次,每台透析机每年至少检测一次</span>
                                    </el-col>
-                              </el-row>
+                              </el-row> -->
                               <el-row>
                                 <div class="clearn">
                                   <el-col :span="4">
@@ -2121,158 +2282,7 @@
 
 
 
-                            <span style="margin-bottom: 20px;display: block;">透析液离子浓度检测</span>
-                            <el-form ref="qualityFormThree" :model="qualityFormThree" :rules="ruleThree">
-                              <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="取样日期:">
-                                        <el-date-picker
-                                          v-model="qualityFormThree.dateb"
-                                          prefix-icon="none"
-                                          type="date"
-                                          placeholder="请选择"
-                                          format="yyyy-MM-dd"
-                                          value-format="yyyy-MM-dd"
-                                          style="width:150px">
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                    <el-form-item label="取样者:" required prop="samplerc">
-                                      <el-select style="width:150px"  v-model="qualityFormThree.samplerc">
-                                        <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
-                                      </el-select>
-                                   </el-form-item>
-                                </el-col>
-                                  <el-col :span="8">
-                                   <el-form-item label="检测单位:" required prop="detection_unit">
-                                      <el-input style="width:150px" v-model ="qualityFormThree.detection_unit"></el-input>
-                                   </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
-                                 <el-col :span="8">
-                                     <el-form-item label="A浓缩液批号:">
-                                       <el-input style="width:150px" v-model="qualityFormThree.concentrate_nof"></el-input>
-                                     </el-form-item>
-                                  </el-col>
-                                   <el-col :span="8">
-                                     <el-form-item label="B浓缩液批号:">
-                                       <el-input style="width:150px" v-model="qualityFormThree.concentrate_nog"></el-input>
-                                     </el-form-item>
-                                  </el-col>
-                                   <el-col :span="8">
-                                    <el-form-item label="出报告日期:" required prop="date_reportc">
-                                        <el-date-picker
-                                          v-model="qualityFormThree.date_reportc"
-                                          prefix-icon="none"
-                                          type="date"
-                                          placeholder="请选择"
-                                          format="yyyy-MM-dd"
-                                          value-format="yyyy-MM-dd"
-                                          style="width:150px">
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                                
-                              </el-row>
-                            
-                              <el-row>
-                                <el-col :span="8">
-                                  <!-- <span>Na<sup>+</sup></span> -->
-                                   <el-form-item class="newItem" label="实际Na⁺(mmol/L):" label-width="100">
-                                        <el-input style="width:123px" v-model="qualityFormThree.actual_na"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                 <el-col :span="8">
-                                    <el-form-item class="newItem" label="配方Na⁺(mmol/L):" label-width="100">
-                                        <el-input style="width:123px" v-model="qualityFormThree.actual_pna"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                 <el-col :span="8">
-                                    <el-form-item label="K⁺(mmol/L):">
-                                        <el-input style="width:150px" v-model="qualityFormThree.actual_k"></el-input>
-                                    </el-form-item>
-                                </el-col>
-
-                              </el-row>
-                               <el-row>
-                                <el-col :span="8">
-                                    <el-form-item label="Ca2⁺(mmol/L):">
-                                        <el-input style="width:150px" v-model="qualityFormThree.actual_ca"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                 <el-col :span="8">
-                                    <el-form-item label="CI¯(mmol/L):">
-                                        <el-input style="width:150px" v-model="qualityFormThree.actual_ci"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                 <el-col :span="8">
-                                    <el-form-item label="HCO3¯(mmol/L):">
-                                        <el-input style="width:150px" v-model="qualityFormThree.actual_hco"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
-                                 <el-col :span="8">
-                                    <el-form-item label="Mg2⁺(mmol/L):">
-                                        <el-input style="width:150px" v-model="qualityFormThree.actual_mg"></el-input>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                  <el-form-item label="PH:">
-                                     <el-input style="width:150px" v-model="qualityFormThree.actual_ph"></el-input>
-                                  </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                  <el-form-item label="顺序号:" required prop="sort">
-                                    <el-input v-model="qualityFormThree.sort" style="width:150px"></el-input>
-                                  </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
-                                <div></div>
-                              </el-row>
-                               <el-row>
-                                  <el-col :span="8">
-                                      <el-form-item label="检测合格:" required prop="pass_examination">
-                                        <el-radio v-model="qualityFormThree.pass_examination" label="1">是</el-radio>
-                                        <el-radio v-model="qualityFormThree.pass_examination" label="2">否</el-radio>
-                                      </el-form-item>
-                                  </el-col>
-                                  <el-col :span="8">
-                                      <el-form-item label="修改标志:" required prop="modifications">
-                                        <el-select style="width:150px"  v-model="qualityFormThree.modifications">
-                                          <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                        </el-select>
-                                      </el-form-item>
-                                  </el-col>
-                             </el-row>
-                              <el-row>
-                                <el-col :span="24">
-                                  <el-form-item label="备注:">
-                                     <el-input
-                                        type="textarea"
-                                        :rows="2"
-                                         placeholder="请输入内容"
-                                         style="width:500px"
-                                         v-model="qualityFormThree.remakes"
-                                         >
-                                      </el-input>
-                                  </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
-                                <div class="clearn">
-                                  <el-col :span="4">
-                                    <el-button @click="cleanQuality">取消</el-button>
-                                  </el-col>
-                                   <el-col :span="4">
-                                    <el-button type="primary" @click="SaveQualityControl('qualityFormThree')">保存</el-button>
-                                  </el-col>
-                                </div>
-                              </el-row>
-                               </el-form>
+                          
 
                          </el-tab-pane>
 
@@ -3204,7 +3214,8 @@ export default {
         modifications:[
           {id:1,name:"正常"},
           {id:2,name:"撤销"}
-        ]
+        ],
+        device_type:""
       }
     },
     methods: {
@@ -3332,6 +3343,8 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
+        console.log("Val222222222",val)
+        this.device_type = val.device_type
         this.unitType = val.unit_type
         this.currentRow = val
         this.$forceUpdate()

src/xt_pages/stock/cancelStockOrder.vue

@@ -199,13 +199,26 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -201,13 +201,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+   
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugSalesReturnOrder.vue

@@ -197,13 +197,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetSalesReturn();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -315,14 +315,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
     
-   
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -379,12 +379,26 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+       var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetWarehouseOut();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/salesReturnOrder.vue

@@ -198,13 +198,27 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
+    
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
 
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
     this.GetSalesReturn();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();

src/xt_pages/stock/stockInOrder.vue

@@ -589,16 +589,28 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
      
+  
+    var date1 = new Date();
+    var date2 = new Date(date1);
 
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
 
-     
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
 
       // this.warehousing_time =
       //   nowYear +
@@ -741,6 +753,7 @@ export default {
         end_time: this.end_time,
         type: this.type
       };
+      console.log("parasm22222",Params)
       this.Warehouse.warehouseDate = [];
       getWarehouseList(Params).then(response => {
         if (response.data.state == 0) {

src/xt_pages/stock/stockOutOrder.vue

@@ -551,12 +551,29 @@ export default {
     nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
-    this.start_time =
-      nowYear +
-      "-" +
-      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-      "-" +
-      (nowDay < 10 ? "0" + nowDay : nowDay);
+
+
+      
+    var date1 = new Date();
+    var date2 = new Date(date1);
+
+    //-30为30天前，+30可以获得30天后的日期
+    date2.setDate(date1.getDate() - 30);
+
+    //30天前（月份判断是否小于10，小于10的前面+0）
+    var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
+      
+    //当前日期
+    var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
+
+     this.start_time = agoDay
+     console.log("333333332222",this.start_time)
+    // this.start_time =
+    //   nowYear +
+    //   "-" +
+    //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+    //   "-" +
+    //   (nowDay < 10 ? "0" + nowDay : nowDay);
     this.GetConfigInfo();
     this.GetWarehouseOut();
    

src/xt_pages/user/patients.vue

@@ -1470,7 +1470,8 @@
       },
 
       jump(id) {
-        this.$router.replace({ path: "/patients/inspection?id=" + id });
+          // this.$router.replace({ path: "/patients/inspection?id=" + id });
+          this.$router.replace({path:"/patients/patients/"+id +"/inspectionInfectious"})
       },
       dateCompare(date) {
         var date1 = Date.parse(new Date()) / 1000;

src/xt_pages/workforce/appointment.vue

@@ -69,12 +69,13 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <div style="display:flex;align-items:center">
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' ></schedule-upload-excel>
-          <!-- <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
-            导出模版
-          </el-button> -->
-          <el-button v-if="isShow()" type="primary" size="small" @click="export_fileTwo()" :loading="downloadLoading">
+          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
             导出模版
           </el-button>
+          <!-- <el-button v-if="isShow()" type="primary" size="small" @click="export_fileTwo()" :loading="downloadLoading">
+            导出模版
+          </el-button> -->
+         
           <el-button
             @click="generateLog()"
             class="filter-item"
@@ -504,10 +505,16 @@
 
             i++
           }
+          console.log("listw22222222",list)
+            var data = []
+          // const data = this.formatJson(filterVal, this.tableList)
+        
+          this.tableList.map(item=>{
+            data.push(Object.values(item))
 
-          const data = this.formatJson(filterVal, list)
-          // console.log("data",data)
-
+          })
+          console.log("data",data)
+          
           const filename = '排班模版'
           excel.export_json_to_excel({
             multiHeader,
@@ -532,7 +539,7 @@
 
           var data = []
           console.log("33333",this.tableList)
-
+         
          this.tableList.map(item=>{
            data.push(Object.values(item))
 
@@ -549,8 +556,24 @@
 
         })
       },
+      // formatJson(filterVal, jsonData) {
+      //  return jsonData.map(v => filterVal.map(j => v[j]))
+      // },
+
       formatJson(filterVal, jsonData) {
-       return jsonData.map(v => filterVal.map(j => v[j]))
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            console.log(v)
+            console.log(j)
+            console.log(v[j])
+
+            if (j === 'timestamp') {
+              return parseTime(v[j])
+            } else {
+              return v[j]
+            }
+          })
+        )
       },