导出

src/api/config.js

@@ -138,14 +138,41 @@ export function postXtHisIsOpen(params) {
 
 
 export function postMonitorIsOpen(params){
-  
+  console.log("params",params)
   return request({
-    url:"./api/monitor/open",
+    url:"/api/monitor/open",
     method:"get",
     params:params
   })
 }
 
 
+export function getMonitorConfig(params){
+  
+  return request({
+    url:"/api/monitor/getmonitorconfig",
+    method:"Get",
+    params:params,
+  })
+}
+
+
+export function addOrderConfig(params){
+  
+  return request({
+    url:"/api/order/addorderconfig",
+    method:"Get",
+    params:params,
+
+  })
+}
 
+export function getOrderConfig(params){
+  
+  return request({
+    url:"/api/order/getorderconfig",
+    method:"get",
+    params:params,
+  })
+}
 

src/api/stock.js

@@ -584,4 +584,13 @@ export function GetOutStockTotalCount(params){
     method:"get",
     params:params
   })
+}
+
+export function postGoodInformation(params){
+  console.log("PARMAS22",params)
+  return request({
+    url:"/api/good/postgoodinformation",
+    method:"Post",
+    data:params,
+  })
 }

src/xt_pages/data/basicConfig.vue

@@ -78,7 +78,7 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen } from '@/api/config'
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,getMonitorConfig,addOrderConfig,getOrderConfig } from '@/api/config'
 
 export default {
   name: "printTemplate",
@@ -147,20 +147,79 @@ export default {
     },
 
     changeFuncTwo(){
-       
+      console.log("3333333",this.is_open_monitor)
+      var is_open = 0
+      if(this.is_open_monitor == true){
+          is_open = 1
+       }
+       if(this.is_open_monitor == false){
+         is_open = 2
+       }
       let params = {
-         is_open:this.is_open_monitor
+         is_open:is_open,
        }
+     console.log("params",params)
       postMonitorIsOpen(params).then(response=>{
          if(response.data.state == 1){
+            var config = response.data.data.config
+            this.$message.success("成功")
+            this.getMonitorConfig()
+         }
+      })
+    },
+    getMonitorConfig(){
+      getMonitorConfig().then(response=>{
+         if(response.data.state == 1){
+           var config =  response.data.data.config
+           console.log("config",config)
+           if (config.is_open == 1) {
+              this.is_open_monitor = true
+           }
+           if (config.is_open == 2) {
+              this.is_open_monitor = false
+           }
+         }
+      })
+    },
 
+    changeFuncThree(){
+      var is_open = 0
+      if(this.is_open_order == true){
+          is_open = 1
+       }
+       if(this.is_open_order == false){
+         is_open = 2
+       }
+      let params = {
+         is_open:is_open,
+       } 
+      addOrderConfig(params).then(response=>{
+         if(response.data.state == 1){
+           var config = response.data.data.config
+           this.$message.success("成功")
+           this.getOrderConfig()
          }
       })
+    },
+    getOrderConfig(){
+      getOrderConfig().then(response=>{
+        if(response.data.state == 1){
+           var config =  response.data.data.config
+          if (config.is_open == 1) {
+              this.is_open_order = true
+           }
+           if (config.is_open == 2) {
+              this.is_open_order = false
+           }
+        }
+      })
     }
 
   },
   created() {
     this.getInitIsOpenConfig()
+    this.getMonitorConfig()
+    this.getOrderConfig()
 
   }
 };

src/xt_pages/data/components/consumables.vue

@@ -4,7 +4,7 @@
       <div class="cell clearfix" style="margin-bottom:0;">
         <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model="keywords"
                   class="filter-item"/>
-        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
+        <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" 
                    @click="searchAction">搜索
         </el-button>
         <label class="title"><span class="name">是否启用</span> : </label>
@@ -59,14 +59,16 @@
       </div>
       <div>
         <el-button type="primary" @click="openForm()">新增</el-button>
-        <!--<el-button type="primary" @click="BatchDelete()">批量备案</el-button>-->
-
-
-        <el-button type="primary" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
-        <el-button type="primary" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
-
       </div>
+     
     </div>
+    
+     <div style="display:flex; align-items:center;margin-bottom:10px;">
+        <el-button type="primary" size="mini" @click="BatchDelete()" v-if="$store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10028">批量备案</el-button>
+        <el-button type="primary" size="mini" v-if="$store.getters.xt_user.org_id != 9504 && $store.getters.xt_user.org_id != 10028" @click="GDYBBatchPutOnRecord">批量备案</el-button>
+        <!-- <el-button size="mini" type="primary">下载模版</el-button>
+        <upload-excel :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel> -->
+      </div>
 
     <el-table
       border style="width: 100%" :row-style="{ color: '#303133' }"
@@ -168,6 +170,19 @@
     ></good-info-dailog>
     <self-payment ref='selfPayment'></self-payment>
 
+
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="40%"
+    >
+      <span>您提交的文档不是系统标准导入模板，请检查您的文档或重新 </span>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="dialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -185,12 +200,15 @@
     GetGoodInfo,
     GetGoodInfoByGoodId,
     getGoodInfoList,
-    modifyGoodInfo
+    modifyGoodInfo,
+    postGoodInformation
   } from '@/api/stock'
+  import UploadExcel from '@/xt_pages/components/UploadExcel'
   export default {
     components: {
       GoodInfoDailog,
-      selfPayment
+      selfPayment,
+      UploadExcel,
     },
     data() {
       return {
@@ -285,7 +303,10 @@
             label: '未备案'
         }],
         is_record:"",
-        manufacturer:""
+        manufacturer:"",
+        dialogVisible:false,
+        goodType:[],
+        dealers:[]
       }
     },
     methods: {
@@ -797,6 +818,7 @@
               this.goodInfo.goodInfoDialog.formValue.dealers.push(
                 response.data.data.dealer[i]
               )
+              this.dealers.push(response.data.data.dealer[i])
             }
           }
         })
@@ -831,9 +853,8 @@
               if (response.data.data.goodType[i].type == 1) {
                 response.data.data.goodType[i].type_name = response.data.data.goodType[i].type_name + '(系统设定)'
               }
-              this.goodInfo.goodInfoDialog.formValue.goodType.push(
-                response.data.data.goodType[i]
-              )
+              this.goodInfo.goodInfoDialog.formValue.goodType.push(response.data.data.goodType[i])
+              this.goodType.push(response.data.data.goodType[i]) 
             }
           }
         })
@@ -1012,7 +1033,276 @@
       changeRecord(){
          this.getList()
       },
-    }, created() {
+      handleSuccess({ results, header }) {
+        console.log("header",header)
+        var goods = []
+        if (header != undefined && header.length > 0) {
+            
+          var isHasMedicalInsuranceLevel = header.includes('*医保等级')
+          // console.log("医保等级",isHasMedicalInsuranceLevel)
+          var isHasGoodUnit = header.includes('*单位')
+          // console.log("单位",isHasGoodUnit)
+          var isHasStockWarnCount = header.includes('*库存警戒')
+          // console.log("库存警戒",isHasStockWarnCount)
+          var isHasManuFacturer =  header.includes('*生产厂商')
+          // console.log("生产厂商",isHasManuFacturer)
+          var isHasDealer =  header.includes('*经销商')
+          // console.log("经销商",isHasDealer)
+          var isHasGoodName = header.includes('*耗材名称')
+          // console.log("耗材名称",isHasGoodName)
+          var isHasGoodKand = header.includes('*耗材种类')
+          // console.log("耗材种类",isHasGoodKand)
+          var isHasSpecificationName = header.includes('*规格型号')
+          // console.log("规格型号",isHasSpecificationName)
+          var isHasBuyPrice = header.includes('*零价')
+          // console.log("零价",isHasBuyPrice)
+         
+          if (!(isHasMedicalInsuranceLevel && isHasGoodUnit && isHasStockWarnCount && isHasManuFacturer && isHasDealer && isHasGoodName && isHasGoodKand && isHasSpecificationName &&  isHasBuyPrice)) {
+            this.dialogVisible = true
+            return
+          }
+        }else {
+          this.dialogVisible = true
+          return
+        }
+       
+       var tableData = []
+       for(let i=0;i<results.length;i++){
+         let obj = {}
+         for (var key in results[i]) {
+
+           if (results[i]['*耗材名称'] === undefined) {
+                obj['good_name'] = ''
+              } else {
+           if (key == '*耗材名称') {
+               obj['good_name'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+           
+           if (results[i]['*耗材种类'] === undefined) {
+                obj['good_kind'] = ''
+              } else {
+           if (key == '*耗材种类') {
+               obj['good_kind'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['*耗材类型'] === undefined) {
+                obj['type_name'] = ''
+              } else {
+           if (key == '*耗材类型') {
+               obj['type_name'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*医保等级'] === undefined) {
+                obj['medical_insurance_level'] = ''
+              } else {
+           if (key == '*医保等级') {
+               obj['medical_insurance_level'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*规格型号'] === undefined) {
+                obj['specification_name'] = ''
+              } else {
+           if (key == '*规格型号') {
+               obj['specification_name'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*生产厂商'] === undefined) {
+                obj['manufacturer'] = ''
+              } else {
+           if (key == '*生产厂商') {
+               obj['manufacturer'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*单位'] === undefined) {
+                obj['good_unit'] = ''
+              } else {
+             if (key == '*单位') {
+               obj['good_unit'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['*零价'] === undefined) {
+                obj['retail_price'] = ''
+              } else {
+             if (key == '*零价') {
+               obj['retail_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+            if (results[i]['*库存警戒'] === undefined) {
+                obj['stock_warn_count'] = ''
+              } else {
+             if (key == '*库存警戒') {
+               obj['stock_warn_count'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['*经销商'] === undefined) {
+                obj['dealer'] = ''
+              } else {
+             if (key == '*经销商') {
+               obj['dealer'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['拼音'] === undefined) {
+                obj['pinyin'] = ''
+              } else {
+             if (key == '拼音') {
+               obj['pinyin'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['五笔'] === undefined) {
+                obj['wubi'] = ''
+              } else {
+             if (key == '五笔') {
+               obj['wubi'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['最新进价'] === undefined) {
+                obj['buy_price'] = ''
+              } else {
+             if (key == '最新进价') {
+               obj['buy_price'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['医保编码'] === undefined) {
+                obj['medical_insurance_number'] = ''
+              } else {
+             if (key == '医保编码') {
+               obj['medical_insurance_number'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['是否特病目录'] === undefined) {
+                obj['is_special_diseases'] = ''
+              } else {
+             if (key == '是否特病目录') {
+               obj['is_special_diseases'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+          
+           if (results[i]['是否备案'] === undefined) {
+                obj['is_record'] = ''
+              } else {
+             if (key == '是否备案') {
+               obj['is_record'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['统计分类'] === undefined) {
+                obj['statistics_category'] = ''
+              } else {
+             if (key == '统计分类') {
+               obj['statistics_category'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+          
+          if (results[i]['状态'] === undefined) {
+                obj['good_status'] = ''
+              } else {
+             if (key == '状态') {
+               obj['good_status'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+           
+
+          if (results[i]['社保目录编码'] === undefined) {
+                obj['social_security_directory_code'] = ''
+              } else {
+             if (key == '社保目录编码') {
+               obj['social_security_directory_code'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+          if (results[i]['生产地类别'] === undefined) {
+                obj['production_type'] = ''
+              } else {
+             if (key == '生产地类别') {
+               obj['production_type'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['特殊医用材料标志'] === undefined) {
+                obj['special_medical'] = ''
+              } else {
+             if (key == '特殊医用材料标志') {
+               obj['special_medical'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+
+           if (results[i]['备注'] === undefined) {
+                obj['is_mark'] = ''
+              } else {
+             if (key == '备注') {
+               obj['is_mark'] = results[i][key].replace(/\s/g,"")
+              }
+           }
+         }
+         tableData.push(obj)
+         console.log("表哥2222",tableData)
+         var goodKind  =  this.getDictionaryDataConfig('system','good_kind')
+         console.log("耗材种类",goodKind)
+         console.log("耗材类型",this.goodType)
+        var medicalInsuranceLevel = this.getDictionaryDataConfig('system','medical_insurance_level')
+        console.log("医保等级",medicalInsuranceLevel)
+        console.log("生产厂商",this.manufacturers)
+        console.log("经销商",this.dealers)
+        var statisticsCategory = getDictionaryDataConfig('system','statistics_category')
+        console.log("统计分类",statisticsCategory)
+        for(let i=0;i<tableData.length;i++){ 
+          for(let j=0;j<goodKind.length;j++){
+             if(tableData[i].good_kind == goodKind[j].name){
+                tableData[i].good_kind_id = goodKind[j].id
+             }    
+          }
+
+       for(let z=0;z<this.goodType.length;z++){
+          if(tableData[i].type_name == this.goodType[z].type_name){
+             tableData[i].good_type_id = this.goodType[z].id
+           }
+        }
+        
+        for(let y=0;y<medicalInsuranceLevel.length;y++){
+           if(tableData[i].medical_insurance_level == medicalInsuranceLevel[y].name){
+               tableData[i].medical_insurance_id = medicalInsuranceLevel[y].id
+           }
+        }
+
+        
+        // for(let a=0;a<this.manufacturers.length;a++){
+
+        // }
+
+
+
+        }
+       }
+       let params = {
+          'goods':tableData 
+        }
+       console.log("params2222",params)
+        return
+       
+        postGoodInformation(params).then(response=>{
+           if(response.data.state == 1){
+             var msg =  response.data.data.msg
+             this.$message.success("导入成功!")
+           }
+        })
+
+      }
+    }, 
+    created() {
       this.getList()
       this.getAllDealer()
       this.getAllManufacturer()

src/xt_pages/data/components/tableson.vue

@@ -405,6 +405,7 @@ export default {
       this.$refs["dataForm"].validate(valid => {
         if (valid) {
           this.temp.field_type = parseInt(this.temp.field_type)
+         
           console.log("2222",this.temp.field_name)
           createChildConfig(this.temp).then(response => {
             if (!response.data) {

src/xt_pages/outpatientCharges/costComparison.vue

@@ -213,7 +213,7 @@
 
           var that = this
 
-          if (this.$store.getters.xt_user.org_id == 9919) {
+          if (this.$store.getters.xt_user.org_id == 9919 || this.$store.getters.xt_user.org_id == 9671) {
             axios.get('http://127.0.0.1:9532/api/checkaccount/get', {
               params: params
             })

src/xt_pages/stock/detail/print.vue

@@ -53,13 +53,21 @@
                 <span v-if="stock.type && stock.type.type_name.length > 0">{{stock.type.type_name}}</span>
               </td> -->
               <td style="line-height: 50px">
-                <span v-if="type == 3">{{getStockCount(stock.id)}}</span>
-                 <span v-else>{{calCount(stock)}}</span> 
+                <span v-if="type == 3">
+                  <span v-if="org_id == 10090">{{getWareOut(stock.id)}}</span>
+                  <span else>{{getStockCount(stock.id)}}</span>
+                </span>
+                <span v-else>{{calCount(stock)}}</span> 
               </td>
               <td style="line-height:50px" v-if="type == 1 && stock.query_warehousing_info.length > 0">{{stock.query_warehousing_info[0].price}}</td>
               <td style="line-height:50px" v-if="type == 3 && stock.query_warehouseout_info.length > 0">{{stock.query_warehouseout_info[0].price}}</td>
               <td style="line-height: 50px" v-if="type == 1">{{calTotal(stock)}}</td>
-              <td style="line-height: 50px" v-if="type == 3">{{(getStockCount(stock.id) * stock.query_warehouseout_info[0].price).toFixed(2)}}</td>
+              <td style="line-height: 50px" v-if="type == 3">
+                
+                  <span v-if="org_id == 10090">{{getPrice(stock.id)}}</span>
+                  <span v-else>{{(getStockCount(stock.id) * stock.query_warehouseout_info[0].price).toFixed(2)}}</span> 
+               
+             </td>
               <td style="line-height: 50px"></td>
             </tr>
             </tbody>
@@ -124,7 +132,9 @@
         type: this.$route.query.type,
         start_time: this.$route.query.start_time,
         end_time: this.$route.query.end_time,
-        stockTotal:[]
+        stockTotal:[],
+        wareOutInfo:[],
+        org_id:0
       }
     },
     methods: {
@@ -172,6 +182,13 @@
             console.log("stocktOTl",stockTotal)
             this.stockTotal = stockTotal
             console.log("导出数据",response.data.data.list)
+            var info = response.data.data.info
+            console.log("infor2222222",info)
+            this.wareOutInfo = info
+            var org_id = response.data.data.orgid
+            console.log("org_id",org_id)
+            this.org_id = org_id
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
               if (this.type == 1) {
                 if (response.data.data.list[i].query_warehousing_info.length > 0) {
@@ -323,6 +340,26 @@
           }
        }
        return count
+     },
+     getWareOut(id){
+      var count = ""
+      for(let i=0;i<this.wareOutInfo.length;i++){
+         if(id == this.wareOutInfo[i].good_id){
+            count = this.wareOutInfo[i].count
+         }
+      }
+      return count
+     },
+     getPrice(id){
+       var sum = ""
+       for(let j=0;j<this.wareOutInfo.length;j++){
+         if(id == this.wareOutInfo[j].good_id){
+            sum += this.wareOutInfo[j].price * this.wareOutInfo[j].count
+         }
+       }
+       
+       return sum
+       
      }
     },
     created() {

src/xt_pages/user/patients.vue

@@ -861,8 +861,6 @@
 
       },
       handleSuccess({ results, header }) {
-        console.log("999999999")
-
         console.log(results)
         if (header != undefined && header.length > 0) {
           var isHasName = header.includes('*姓名')
@@ -888,8 +886,7 @@
           this.dialogVisible = true
           return
         }
-        getMaxDialysisNo().then(
-          response => {
+        getMaxDialysisNo().then(response => {
             if (response.data.state === 1) {
               this.max_dialysis_no = response.data.data.dialysis_no
               if (this.max_dialysis_no == 0) {

src/xt_pages/workforce/appointment.vue

@@ -215,6 +215,7 @@
         clen:7,
         nowYear: new Date().getFullYear(),
         schedule_week:0,
+        newDay:[]
 
       }
     },
@@ -478,6 +479,8 @@
             '区号',
             '机号'
           ]
+        if(this.export_type == 0){
+             
           const multiHeader = [['区号', '机号', '周一'+"("+this.days[0]+")" , '', '', '周二'+"("+this.days[1]+")", '', '', '周三'+"("+this.days[2]+")" , '', '', '周四'+"("+this.days[3]+")" , '', '', '周五'+"("+this.days[4]+")" , '', '', '周六'+"("+this.days[5]+")" , '', '', '周日'+"("+this.days[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
           const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
           const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
@@ -502,13 +505,11 @@
               obj['机号'] = jihaos[b].number.toString()
               list.push(obj)
             }
-
             i++
           }
           console.log("listw22222222",list)
             var data = []
-          // const data = this.formatJson(filterVal, this.tableList)
-        
+
           this.tableList.map(item=>{
             data.push(Object.values(item))
 
@@ -516,6 +517,7 @@
           console.log("data",data)
           
           const filename = '排班模版'
+        
           excel.export_json_to_excel({
             multiHeader,
             header,
@@ -524,6 +526,55 @@
             filename
           })
           this.downloadLoading = false
+          }
+          
+          if(this.export_type == 1){
+            console.log("333333",this.newDay)
+             const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
+             const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
+             const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
+            var list = []
+            let i = 0
+            for (let key  in this.partitions) {
+              var tempValue
+              var jihaos = this.partitions[key].jihaos
+
+              if (i == 0) {
+                let m = 'A3' + ':' + 'A' + (2 + jihaos.length)
+                tempValue = (2 + jihaos.length)
+                merges.push(m)
+              } else {
+                let m = 'A' + (tempValue + 1) + ':' + 'A' + ((tempValue + 1) + jihaos.length - 1)
+                tempValue = ((tempValue + 1) + jihaos.length - 1)
+                merges.push(m)
+              }
+              for (let b = 0; b < jihaos.length; b++) {
+                let obj = {}
+                obj['区号'] = this.partitions[key].name
+                obj['机号'] = jihaos[b].number.toString()
+                list.push(obj)
+              }
+              i++
+            }
+          
+            var data = []
+            this.tableList.map(item=>{
+              data.push(Object.values(item))
+
+            })
+            console.log("data",data)
+            
+            const filename = '排班模版'
+           
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+            this.downloadLoading = false
+          }
         })
       },
       export_fileTwo:function(){
@@ -1115,6 +1166,7 @@
             return false
           }
           this.days = response.data.data.days
+          console.log("日期22222222",this.days)
         })
       },
       getWeekByResultsStr(key) {
@@ -2016,100 +2068,7 @@
                 for (let b = 0; b < jihaos.length; b++) {
                  var obj = {}
 
-                  // obj['区号'] = partitions[key].name
-                  // obj['机号'] = jihaos[b].number.toString()
-
-
-                  // obj['上午'] = ''
-                  // obj['下午'] = ''
-                  // obj['晚上'] = ''
-
-                  // obj['上午1'] = ''
-                  // obj['下午1'] = ''
-                  // obj['晚上1'] = ''
-
-                  // obj['上午2'] = ''
-                  // obj['下午2'] = ''
-                  // obj['晚上2'] = ''
-
-                  // obj['上午3'] = ''
-                  // obj['下午3'] = ''
-                  // obj['晚上3'] = ''
-
-                  // obj['上午4'] = ''
-                  // obj['下午4'] = ''
-                  // obj['晚上4'] = ''
-
-
-                  // obj['上午5'] = ''
-                  // obj['下午5'] = ''
-                  // obj['晚上5'] = ''
-
-                  // obj['上午6'] = ''
-                  // obj['下午6'] = ''
-                  // obj['晚上6'] = ''
-
-                  // obj['上午7'] = ''
-                  // obj['下午7'] = ''
-                  // obj['晚上7'] = ''
-
-                  // obj['上午8'] = ''
-                  // obj['下午8'] = ''
-                  // obj['晚上8'] = ''
-
-                  // obj['上午9'] = ''
-                  // obj['下午9'] = ''
-                  // obj['晚上9'] = ''
-
-                  // obj['上午10'] = ''
-                  // obj['下午10'] = ''
-                  // obj['晚上10'] = ''
-
-                  // obj['上午11'] = ''
-                  // obj['下午11'] = ''
-                  // obj['晚上11'] = ''
-
-
-                  // obj['上午12'] = ''
-                  // obj['下午12'] = ''
-                  // obj['晚上12'] = ''
-
-                  // obj['上午13'] = ''
-                  // obj['下午13'] = ''
-                  // obj['晚上13'] = ''
-
-
-                  // obj['上午14'] = ''
-                  // obj['下午14'] = ''
-                  // obj['晚上14'] = ''
-
-
-                  // obj['上午15'] = ''
-                  // obj['下午15'] = ''
-                  // obj['晚上15'] = ''
-
-                  // obj['上午16'] = ''
-                  // obj['下午16'] = ''
-                  // obj['晚上16'] = ''
-
-                  // obj['上午17'] = ''
-                  // obj['下午17'] = ''
-                  // obj['晚上17'] = ''
-
-                  // obj['上午18'] = ''
-                  // obj['下午18'] = ''
-                  // obj['晚上18'] = ''
-
-                  // obj['上午19'] = ''
-                  // obj['下午19'] = ''
-                  // obj['晚上19'] = ''
-
-
-                  // obj['上午20'] = ''
-                  // obj['下午20'] = ''
-                  // obj['晚上20'] = ''
-
-
+                
                   obj['区号'] = partitions[key].name
                   obj['机号'] = jihaos[b].number.toString()
 
@@ -2233,7 +2192,7 @@
               console.log("下下周数据时间",laststart)
               var lastend = this.getTimestamp(last_end) - 28800
               console.log("下下周数据时间",lastend)
-
+               
               if(this.export_type == 0){
                 for(let i = 0;i<scheduleList.length;i++){
                  if(scheduleList[i].schedule_date >= start && scheduleList[i].schedule_date<=end){
@@ -2246,7 +2205,7 @@
                  if(scheduleList[i].schedule_date>=laststart && scheduleList[i].schedule_date<=lastend){
                    lastWeek.push(scheduleList[i])
                  }
-              }
+               }
               }
 
             if(this.export_type == 1){
@@ -2346,7 +2305,7 @@
                   }
 
                }
-             }
+              }
              }
 
              console.log("list5555555555",list)
@@ -2576,12 +2535,44 @@
        },
 
        changeWeek(val){
-         console.log("Val",val)
+       
          var start = this.getTimestamp(val) - 57600
-         console.log("start",start)
+        //  console.log("第一天时间错",start)
          this.start_time = this.getTime(start)
+        //  console.log("第一天",this.start_time)
+         this.newDay.push(this.start_time)  
+         var next = start + 86400
+         var nest_day = this.getTime(next)
+        //  console.log("第二天",nest_day)
+         this.newDay.push(nest_day)
+         var last_days = start + 172800
+         
+         var last_day = this.getTime(last_days)
+        //  console.log("第三天",last_day)
+         this.newDay.push(last_day)
+         
+         var tuesdays = start + 259200
+        //  console.log("tuesdays",tuesdays)
+         var tuesday =  this.getTime(tuesdays)
+        //  console.log("第四天",tuesday)
+         this.newDay.push(tuesday)
+         var fivdays = start + 345600
+         var fiveday = this.getTime(fivdays)
+        //  console.log("第五天",fiveday)
+         this.newDay.push(fiveday)
+         var sixday =  start + 432000
+         var sixdays = this.getTime(sixday)
+        //  console.log("第六天",sixdays)
+         this.newDay.push(sixdays)
          var end = this.getTimestamp(val) + 460800
+       
          this.end_time = this.getTime(end)
+        //  console.log("第七天",this.end_time)
+         this.newDay.push(this.end_time)
+      
+     
+
+         console.log("33333333",this.newDay)
          this.export_type = 1
          this.getThreeWeekList()
        },