打印单

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse,change_nurse) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -58,8 +58,10 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     lood_drawing: lood_drawing,
     schedual_type: schedual_type,
     mode: mode,
-    washpipe_nurse:washpipe_nurse
+    washpipe_nurse:washpipe_nurse,
+    change_nurse:change_nurse
   }
+  console.log("params",params)
   return request({
     url: '/api/dialysis/start_record',
     method: 'post',

src/router/modules/stock.js

@@ -201,5 +201,38 @@ export default {
         noCache: true
       }
     },
+    {
+      path:"/stock/drugcancelprint",
+      component:()=>import('@/xt_pages/stock/drugs/drugCancelOurderPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    },
+    {
+      path:"/stock/drugoutorderprint",
+      component:()=>import('@/xt_pages/stock/drugs/drugOutOrderPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '出库打印',
+        noCache: true
+      }
+    },
+    {
+      path:"/stock/drugcanceldetaiprint",
+      component:()=>import('@/xt_pages/stock/drugs/drugCancelDetailPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print',
+      meta: {
+        title: '出库打印',
+        noCache: true
+      }
+    }
   ]
 }

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -40,6 +40,12 @@
           <span class="content">{{ anticoagulant }}</span>
         </li>
 
+        <li v-if="isShow('抗凝剂商品名称')">
+          <label>抗凝剂商品名称 : </label>
+          <span class="content">{{ antioxidant_commodity_name }}</span>
+        </li>
+
+
         <li v-if=" isShow('总量') && getValueStr('anticoagulant', 'anticoagulant') != 5 " >
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
@@ -550,6 +556,9 @@ export default {
     target_ktv: function() {
       var v = this.getValueStr('target_ktv', 'target_ktv')
       return v.length == 0 ? '0' : v
+    },
+    antioxidant_commodity_name:function(){
+      return this.getValueStr('antioxidant_commodity_name','antioxidant_commodity_name')
     }
   },
   created() {

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

@@ -23,14 +23,23 @@
         </el-form-item>
         <el-form-item label="穿刺者"  v-if="isShowFiled('穿刺者')">
           <el-select v-model="form.puncture_nurse_id" placeholder="请选择穿刺护士">
-            <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
+            <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
+          </el-select>
+        </el-form-item>
+        
+        <el-form-item label="换药护士"  v-if="isShowFiled('换药护士')">
+          <el-select v-model="form.change_nurse" placeholder="换药护士">
+            <el-option v-for="(admin, index) in adminRoles" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
+
         <el-form-item label="冲管护士"  v-if="isShowFiled('冲管护士')">
           <el-select v-model="form.washpipe_nurse" placeholder="请选择冲管护士">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
+
+     
         <el-form-item label="引血(ml/min)" v-if="template_id == 6">
           <el-input type="number" v-model="form.blood_drawing" style="width:200px;"></el-input>
         </el-form-item>
@@ -88,7 +97,8 @@
           nurse_id: '',
           start_time: '',
           puncture_nurse_id: '',
-          blood_drawing: 100
+          blood_drawing: 100,
+          change_nurse:""
         },
         schedual_type: 0,
         schedules_type: [
@@ -96,7 +106,8 @@
           { id: 2, name: '下午' },
           { id: 3, name: '晚上' }
         ], // 该排班的区里的床位
-        isPremission: false
+        isPremission: false,
+        adminRoles:[{id:0,name:"请选择"}]
       }
     },
     props: {
@@ -126,7 +137,8 @@
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
       this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
       this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
-
+      
+     
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
@@ -141,7 +153,7 @@
         this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
         this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
         this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
-
+        this.form.change_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.change_nurse
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -157,6 +169,15 @@
           (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (nowHours < 10 ? '0' + nowHours : nowHours) + ':' + (nowMinutes < 10 ? '0' + nowMinutes : nowMinutes)
         this.form.start_time = this.dialysis_order.id == 0 ? time : this.getTime(this.dialysis_order.start_time, '{y}-{m}-{d} {h}:{i}')
 
+      },
+      admins:function(){
+        console.log("admins",this.admins)
+        if(this.admins.length > 0 ){
+          for(let i=0;i<this.admins.length;i++){
+            this.adminRoles.push(this.admins[i])
+          } 
+        }
+        console.log("人员",this.adminRoles)
       }
     },
     computed: {},
@@ -304,7 +325,7 @@
         this.loading = true
         let mode = '1'
 
-        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse).then(rs => {
+        startDialysis(this.patient_id, parseTime(this.schedule_date, '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -334,7 +355,7 @@
         ParamsQuery['start_time'] = this.form.start_time
         ParamsQuery['puncture_nurse'] = this.form.puncture_nurse_id
         ParamsQuery['washpipe_nurse'] = this.form.washpipe_nurse
-
+        ParamsQuery['change_nurse'] = this.form.change_nurse
 
         ParamsQuery['mode'] = "2"
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {

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

@@ -139,6 +139,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+          
+
+         <el-col :span="8" v-if="isShows('抗凝剂商品名称')">
+            <el-form-item label="抗凝剂商品名称：">
+               <el-input
+                v-model="dialysisPrescription.antioxidant_commodity_name"
+              ></el-input>
+            </el-form-item>
+          </el-col>
 
 
           <el-col :span="8" v-if="isShows('肝素钠') && dialysisPrescription.anticoagulant ==10">
@@ -1262,7 +1271,8 @@
           nucleoprotamine:"",//鱼精蛋白
           no_heparin_remarks:"",
           blood:"",
-          irrigation:""
+          irrigation:"",
+          antioxidant_commodity_name:"",
         },
 
         anticoagulant: {

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -25,6 +25,11 @@
           <label>冲管护士 : </label>
           <span class="content">{{ washpipe_nurse }}</span>
         </li>
+
+        <li v-if="isShow('换药护士')">
+          <label>换药护士 : </label>
+          <span class="content">{{ change_nurse }}</span>
+        </li>
         <li>
           <label>状态 : </label>
           <span class="content">{{ stage }}</span>
@@ -124,11 +129,18 @@
           return '-'
         }
         return this.admin_map[this.record.puncture_nurse] == null ? '' : this.admin_map[this.record.puncture_nurse].name
-      }, washpipe_nurse: function() {
+      },
+       washpipe_nurse: function() {
         if (this.record.id == 0) {
           return '-'
         }
         return this.admin_map[this.record.washpipe_nurse] == null ? '' : this.admin_map[this.record.washpipe_nurse].name
+      },
+      change_nurse:function(){
+         if (this.record.id == 0) {
+          return '-'
+        }
+        return this.admin_map[this.record.change_nurse] == null ? '' : this.admin_map[this.record.change_nurse].name
       }
     },
     methods: {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -82,14 +82,14 @@
           >结算单
           </el-button>
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"-->
-          <!--&gt;退号-->
-          <!--</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"-->
+          &gt;退号
+          </el-button>
 
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
-                     <!--size="small" @click="open(11)" type="primary"-->
-          <!--&gt;撤销明细-->
-          <!--</el-button>-->
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
+                     size="small" @click="open(11)" type="primary"
+          &gt;撤销明细>
+          </el-button>
 
 
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <!-- <el-button
+    <el-button
       style="float: right"
       size="small"
       icon="el-icon-printer"
       @click="PrintAction"
       type="primary"
       >打印
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -241,15 +241,8 @@ export default {
     };
   },
   methods: {
-    PrintAction: function() {
-      this.$router.push({
-        path: "/stock/print",
-        query: {
-          type: 4,
-          start_time: this.start_time,
-          end_time: this.end_time
-        }
-      });
+    PrintAction() {
+        this.$router.push("/stock/drugcanceldetaiprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     changeType: function(val) {
       this.order_type = val;

src/xt_pages/stock/drugs/components/drugCancelOrder.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <!-- <el-button
+    <el-button
       style="float: right"
       size="small"
       icon="el-icon-printer"
       @click="PrintAction"
       type="primary"
       >打印
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -292,7 +292,7 @@ export default {
     },
   
     PrintAction: function() {
-    
+       this.$router.push("/stock/drugcancelprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
   
     getXuserName(id) {

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -1,13 +1,13 @@
 <template>
   <div>
-    <!-- <el-button
+    <el-button
       style="float: right"
       size="small"
       icon="el-icon-printer"
       @click="PrintAction"
       type="primary"
       >打印
-    </el-button> -->
+    </el-button>
     <div class="cell clearfix">
       <el-input
         size="small"
@@ -362,7 +362,7 @@ export default {
       }
     },
     PrintAction: function() {
-      
+       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     getlist(){
       var params = {

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -0,0 +1,332 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+         <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title">退库单</div>
+        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">药品名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height: 50px" width="">备 注</td>
+            </tr>
+
+            <tr v-for="(item,index) in cancelStockDate" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_spec}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.min_unit}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+             
+              <td style="line-height: 50px">
+                 {{item.remark}}
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1" >
+            <tbody>
+            <tr>
+              <td width="633" style="line-height: 50px">合计</td>
+              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td></td>
+            </tr>
+
+            </tbody>
+          </table>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import { getDrugCancelDetail} from "@/api/drug/drug_stock"
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',   
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+        order_type:this.$route.query.order_type,
+        manufacturer_id:this.$route.query.manufacturer_id,
+        keyword:this.$route.query.keyword,
+        limit:this.$route.query.limit,
+        page:this.$route.query.page,
+        cancelStockDate:[],
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+      getlist(){
+        var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+        manufacturer_id:this.manufacturer_id,
+        keyword:this.searchKey,
+        limit:this.limit,
+        page:this.page,
+       }
+      getDrugCancelDetail(params).then(response=>{
+        if(response.data.state == 1){
+          var drugInOrder = response.data.data.order
+          console.log("drug3434444",drugInOrder)
+          this.cancelStockDate = drugInOrder
+        }
+      })  
+      },
+      getTotal(){
+         var total = 0
+         for(let i=0;i<this.cancelStockDate.length;i++){
+            total += this.cancelStockDate[i].price
+         }
+         return total
+      }
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.getlist()
+
+      
+
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/drugCancelOurderPrint.vue

@@ -0,0 +1,331 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+         <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title">退货单</div>
+        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">药品名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80">单价</td>
+              <td style="line-height: 50px" width="">备 注</td>
+            </tr>
+
+            <tr v-for="(item,index) in cancelStockDate" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_spec}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.min_unit}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+              <td style="line-height: 50px">
+                 {{item.remark}}
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1" >
+            <tbody>
+            <tr>
+              <td width="633" style="line-height: 50px">合计</td>
+              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td></td>
+            </tr>
+
+            </tbody>
+          </table>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import { getDrugCancelOrder} from "@/api/drug/drug_stock"
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',   
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+        order_type:this.$route.query.order_type,
+        manufacturer_id:this.$route.query.manufacturer_id,
+        keyword:this.$route.query.keyword,
+        limit:this.$route.query.limit,
+        page:this.$route.query.page,
+        cancelStockDate:[],
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+      getlist(){
+        var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+        manufacturer_id:this.manufacturer_id,
+        keyword:this.searchKey,
+        limit:this.limit,
+        page:this.page,
+       }
+      getDrugCancelOrder(params).then(response=>{
+        if(response.data.state == 1){
+          var drugInOrder = response.data.data.order
+          console.log("drug3434444",drugInOrder)
+          this.cancelStockDate = drugInOrder
+        }
+      })  
+      },
+      getTotal(){
+         var total = 0
+         for(let i=0;i<this.cancelStockDate.length;i++){
+            total += this.cancelStockDate[i].price
+         }
+         return total
+      }
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.getlist()
+
+      
+
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -0,0 +1,339 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+         <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title">出库单</div>
+        <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="250">药品名称</td>
+              <td style="line-height: 50px" width="250">规格型号</td>
+              <td style="line-height: 50px" width="50">单位</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height:50px" width="80">单价</td>
+               <td style="line-height: 50px" width="80">出货价</td>
+              <td style="line-height:50px" width="80">总价</td>
+              <td style="line-height: 50px" width="">备 注</td>
+            </tr>
+
+            <tr v-for="(item,index) in cancelStockDate" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_name}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.drug_spec}}</span>
+              </td>
+              <td style="line-height: 50px">
+                <span>{{item.min_unit}}</span>
+              </td>
+            
+              <td style="line-height: 50px">
+                  {{item.count}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.price}}
+              </td>
+              <td style="line-height:50px">
+                  {{item.total_price}}
+              </td>
+              <td style="line-height: 50px">
+                 {{item.remark}}
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1" >
+            <tbody>
+            <tr>
+              <td width="633" style="line-height: 50px">合计</td>
+              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
+              <td></td>
+            </tr>
+
+            </tbody>
+          </table>
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getPrintStockGood } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+  import { getDrugOutDetail} from "@/api/drug/drug_stock"
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',   
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+        order_type:this.$route.query.order_type,
+        manufacturer_id:this.$route.query.manufacturer_id,
+        keyword:this.$route.query.keyword,
+        limit:this.$route.query.limit,
+        page:this.$route.query.page,
+        cancelStockDate:[],
+      }
+    },
+    methods: {
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+   
+      getUnit(id){
+        var name = ""
+        for(let i=0;i<this.goodUnit.length;i++){
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
+        }
+        return name
+      },
+      getlist(){
+        var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+        manufacturer_id:this.manufacturer_id,
+        keyword:this.searchKey,
+        limit:this.limit,
+        page:this.page,
+       }
+      getDrugOutDetail(params).then(response=>{
+        if(response.data.state == 1){
+          var drugInOrder = response.data.data.order
+          console.log("drug3434444",drugInOrder)
+          this.cancelStockDate = drugInOrder
+        }
+      })  
+      },
+      getTotal(){
+         var total = 0
+         for(let i=0;i<this.cancelStockDate.length;i++){
+            total += this.cancelStockDate[i].total_price
+         }
+         return total
+      }
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.getlist()
+
+      
+
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/drugs/drugPrint.vue

@@ -8,6 +8,8 @@
     <div class="app-container ">
       <div id="dialysis-print-box">
         <div class="dialysis-print-order">
+         <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title">入库单</div>
         <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
 
           <table class="print-table" border="1">
@@ -48,11 +50,11 @@
             </tr>
             </tbody>
           </table>
-          <table class="print-table" border="1" v-if="type == 1 || type == 3">
+          <table class="print-table" border="1">
             <tbody>
             <tr>
               <td width="633" style="line-height: 50px">合计</td>
-              <td width="80" style="line-height: 50px">{{calTotalPrice()}}</td>
+              <td width="80" style="line-height: 50px">{{getTotal()}}</td>
               <td></td>
             </tr>
 
@@ -104,7 +106,7 @@
     methods: {
       getDateTwo(){
         var ptime = Math.round(new Date().getTime() / 1000)
-        return "印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
       },
       getTime(value, temp) {
         if (value == 0) {
@@ -155,6 +157,14 @@
           this.total = total
         }
       })  
+      },
+
+      getTotal(){
+        var total = 0
+        for(let i=0;i<this.cancelStockDate.length;i++){
+           total += this.cancelStockDate[i].price
+        }
+        return total
       }
     },
     created() {

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -120,6 +120,31 @@
             </template>
           </el-table-column>
 
+
+           <el-table-column align="center" width="180">
+            <template slot="header" slot-scope="scope">
+              <span>单位<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+             
+              <el-form-item
+                :prop="'recordData.' + scope.$index + '.min_units'"
+                :rules="tableRules.min_unit"
+                style="padding-top: 17px"
+              >
+               <el-select v-model="scope.row.min_unit" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+              </el-form-item>
+            </template>
+          </el-table-column>
+
+
           <el-table-column align="center" width="180">
             <template slot="header" slot-scope="scope">
               <span>入库数量<span style="color: red">*</span></span>
@@ -262,7 +287,7 @@
   } from "@/api/drug/drug_stock";
   import BreadCrumb from '../../components/bread-crumb'
   import DrugsStockDialog from './drugsStockDialog/index'
-
+  import {getDataConfig } from "@/utils/data";
   export default {
     components: { DrugsStockDialog, BreadCrumb },
     name: 'stockIn',
@@ -308,6 +333,10 @@
 
           good_id: [
             { validator: checkGoodId, trigger: 'blur' }
+          ],
+
+          min_unit:[
+            {required:true,message:'单位不能为空',trigger:'blur'}
           ]
 
         },
@@ -400,7 +429,7 @@
               this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
               this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
               this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-
+              this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit
             } else {
               const tempForm = {}
               tempForm["id"] = 0;
@@ -414,6 +443,7 @@
               tempForm['remark'] = ''
               tempForm['dealer'] = ''
               tempForm['manufacturer'] = ''
+              tempForm['min_unit']=''
               this.recordInfo.recordData.splice(this.currentIndex + 1, 0, tempForm)
             }
           }
@@ -533,6 +563,7 @@
           dealer_id: this.form.dealer
         }
         GetAllDrugInfoByID(params).then(response => {
+          
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
@@ -540,7 +571,7 @@
 
             } else {
               loading.close()
-
+               console.log("3333333",response.data.data.drugs)
               if (response.data.data.drugs.length <= 0) {
                 this.$message.error('该厂商或经销商没有药品信息')
                 return
@@ -640,9 +671,13 @@
       ,
       changeManufacturer(val) {
 
-      }, changeDealer(val) {
+      }, 
+      changeDealer(val) {
 
-      }
+      },
+      getDataConfig(module, filed_name){
+        return getDataConfig(module, filed_name)
+      },
     }
     ,
     created() {
@@ -667,7 +702,7 @@
       tempObj['remark'] = ''
       tempObj['dealer'] = ''
       tempObj['manufacturer'] = ''
-
+      tempObj['min_unit'] = ''
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -136,12 +136,12 @@
             </template>
           </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column width="100" align="center">
             <template slot="header" slot-scope="scope">
-              <span>进价<span style="color: red">*</span></span>
+              <span>出库价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-              <!--<el-input type="number" v-model="scope.row.price"  @blur="handleBlur(scope.$index, scope.row)"></el-input>-->
+            
               <el-form-item
                 :prop="'recordData.' + scope.$index + '.price'"
                 :rules="tableRules.price"
@@ -156,7 +156,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column min-width="23" align="center">
+          <el-table-column width="100" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
             </template>
@@ -174,8 +174,28 @@
               </el-form-item>
             </template>
           </el-table-column>
+         
+          
+          <el-table-column width="80" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单位<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.min_unit" style="width:100px;" placeholder="请选择">
+                <el-option
+                  v-for="(item,index) in getDataConfig('hemodialysis','units')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.name">
+                </el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+         
 
-          <el-table-column label="进价总价" min-width="20" align="center">
+          
+
+          <el-table-column label="进价总价" width="100" align="center">
             <template slot-scope="scope">
               {{ calculate(scope.row.price * scope.row.count) }}
             </template>
@@ -195,13 +215,13 @@
           </el-table-column>
 
 
-          <el-table-column label="备注" min-width="20" align="center">
+          <el-table-column label="备注" width="80" align="center">
             <template slot-scope="scope">
               <el-input v-model="scope.row.remark"></el-input>
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column label="操作" align="center" width="150">
             <template slot-scope="scope">
               <el-tooltip
                 class="item"
@@ -245,7 +265,7 @@ import {  postDrugWarehouseOut,GetAllConfig,GetAllDrugInfoByID } from "@/api/dru
 
 import BreadCrumb from "../../components/bread-crumb";
 import DrugsStockDialog from './drugsStockDialog/index'
-
+import { getDataConfig } from "@/utils/data";
 export default {
   components: { DrugsStockDialog,   BreadCrumb },
   name: "salesReturnOrderAdd",
@@ -271,7 +291,8 @@ export default {
       },
       tableRules: {
         price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
-        count: [{ required: true, message: "数量不能为空", trigge: "blur" }]
+        count: [{ required: true, message: "数量不能为空", trigge: "blur" }],
+        min_unit:[{required:true,message:"单位不能为空",trigge:"blur"}]
       },
       ruleForm: {
         manufacturer: [
@@ -312,7 +333,7 @@ export default {
             this.recordInfo.recordData[this.currentIndex].drug_id = val.selectedGoodInfo[i].id
             this.recordInfo.recordData[this.currentIndex].price = val.selectedGoodInfo[i].last_price.toString()
             this.recordInfo.recordData[this.currentIndex].retail_price = val.selectedGoodInfo[i].retail_price.toString()
-
+            this.recordInfo.recordData[this.currentIndex].min_unit = val.selectedGoodInfo[i].min_unit.toString()
           } else {
             const tempForm = {}
             tempForm['drug_id'] = val.selectedGoodInfo[i].id
@@ -552,7 +573,10 @@ export default {
     },
     changeDealer(val) {
       this.propForm.dealer = val;
-    }
+    },
+    getDataConfig(module, filed_name){
+     return getDataConfig(module, filed_name)
+    },
   },
   created() {
     var nowDate = new Date();

src/xt_pages/user/patients.vue

@@ -344,19 +344,19 @@
         <el-table-column
           type="index"
           label="序号"
-          width="60px"
+          width="40px"
           align="center"
         ></el-table-column>
         <el-table-column
           label="透析号"
-          min-width="80"
+          min-width="70"
           property="dialysis_no"
           align="center"
           style="color:red"
         ></el-table-column>
         <el-table-column
           label="住院号"
-          min-width="80"
+          min-width="70"
           property="admission_number"
           align="center"
         >
@@ -364,7 +364,7 @@
         <el-table-column
           property="name"
           label="姓名"
-          min-width="80"
+          min-width="70"
           align="center"
         >
           <template slot-scope="scope">
@@ -376,21 +376,21 @@
             >
           </template>
         </el-table-column>
-        <el-table-column label="性别" min-width="80" align="center">
+        <el-table-column label="性别" min-width="60" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.gender == 1">男</span>
             <span v-else-if="scope.row.gender == 2">女</span>
             <span v-else>未知</span>
           </template>
         </el-table-column>
-        <el-table-column label="来源" min-width="80" align="center">
+        <el-table-column label="来源" min-width="60" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.source == 1">门诊</span>
             <span v-else-if="scope.row.source == 2">住院</span>
             <span v-else>未知</span>
           </template>
         </el-table-column>
-        <el-table-column label="透析次数" min-width="94" align="center">
+        <el-table-column label="透析次数" min-width="84" align="center">
           <template slot-scope="scope">
             <span>{{ getCount(scope.row) }}</span>
           </template>
@@ -401,7 +401,7 @@
           <a style="color:#409eff"  v-else @click="openWechatBindDialog">生成</a>
         </template>
       </el-table-column> -->
-        <el-table-column label="日期" min-width="144" align="center">
+        <el-table-column label="登记日期" min-width="120" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.created_time | parseTime('{y}-{m}-{d}') }}</span>
           </template>
@@ -411,7 +411,12 @@
             <span>{{ LapsetoInfo(scope.row) }}</span>
           </template>
         </el-table-column>
-         <el-table-column label="转出原因" align="center">
+        <el-table-column label="转出(死亡)时间" min-width="134" align="center">
+          <template slot-scope="scope">
+            <span>{{getTime(scope.row.death_time)}}</span>
+          </template>
+        </el-table-column>
+         <el-table-column label="转出(死亡)原因" align="center" min-width="150">
           <template slot-scope="scope">
             <span>{{scope.row.out_reason}}</span>
           </template>
@@ -486,7 +491,7 @@
           ref="lapsetoForm"
           label-width="140px"
         >
-          <!-- <el-form-item label="治疗状态（转归）:" prop="lapseto_type" required>
+          <el-form-item label="治疗状态（转归）:" prop="lapseto_type" required>
             <el-radio-group v-model="lapsetoForm.lapseto_type">
               <el-radio
                 v-for="item in lapsetoOptions"
@@ -497,11 +502,13 @@
               </el-radio
               >
             </el-radio-group>
-          </el-form-item> -->
-          <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
-              <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">{{lapeseto}}</el-radio>
           </el-form-item>
-          <el-form-item label="转归时间 :" prop="lapseto_time" required>
+          <!-- <el-form-item label="治疗状态(转归):" prop="lapseto_type" required>
+              <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">转出</el-radio>
+              <el-radio v-model="lapsetoForm.lapseto_type" :label="lapsetoForm.lapseto_type">死亡</el-radio>
+              
+          </el-form-item> -->
+          <el-form-item label="转归(死亡)时间 :" prop="lapseto_time" required>
             <el-date-picker
               v-model="lapsetoForm.lapseto_time"
               type="datetime"
@@ -512,7 +519,7 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="转出原因:" v-if="lapsetoForm.lapseto_type == 1">
+          <el-form-item label="转出(死亡)原因:" v-if="lapsetoForm.lapseto_type == 2 || lapsetoForm.lapseto_type == 3">
               <el-input v-model="lapsetoForm.out_reason"></el-input>
           </el-form-item>
         </el-form>
@@ -661,7 +668,8 @@
         ],
         lapsetoOptions: [
           { value: 1, label: '留治' },
-          { value: 2, label: '转出' }
+          { value: 2, label: '转出' },
+          { value: 3,  label: "死亡" },
         ],
         systemType: 0,
         systemArr: [
@@ -682,7 +690,8 @@
         lapsetoArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           { value: 1, label: '转出', source: 0, lapseto: 2 },
-          { value: 2, label: '留治', source: 0, lapseto: 1 }
+          { value: 2, label: '留治', source: 0, lapseto: 1 },
+          { value: 3, label: '死亡', source:0,  lapseto: 3 },
           // { value: 3, label: "门诊", source: 1, lapseto: 1 },
           // { value: 4, label: "住院", source: 2, lapseto: 1 }
         ],
@@ -1175,12 +1184,16 @@
           this.$message.error('请选择时间')
           return
         }
-         if(this.lapeseto == "留治"){
-           this.lapsetoForm.lapseto_type = 1
-         }
-         if(this.lapeseto == "转出"){
-           this.lapsetoForm.lapseto_type = 2
-         }
+        //  if(this.lapeseto == "留治"){
+        //    this.lapsetoForm.lapseto_type = 1
+        //  }
+        //  if(this.lapeseto == "转出"){
+        //    this.lapsetoForm.lapseto_type = 2
+        //  }
+        //  if(this.lapeseto == "死亡"){
+        //   this.lapsetoForm.lapseto_type = 3
+        //  }
+     
         EditLapseto(this.lapsetoForm.patient_id, this.lapsetoForm).then(
           response => {
             if (response.data.state === 1) {
@@ -1201,12 +1214,15 @@
         )
       },
       OpenSetLapseto(row, index) {
-        if(row.lapseto == 1){
-          this.lapeseto = "转出"
-        }
-        if(row.lapseto == 2){
-          this.lapeseto = "留治"
-        }
+        // if(row.lapseto == 1){
+        //   this.lapeseto = "转出"
+        // }
+        // if(row.lapseto == 2){
+        //   this.lapeseto = "留治"
+        // }
+        // if(row.lapeseto == 3){
+        //   this.lapeseto = "死亡"
+        // }
         this.patient = row
         this.currentIndex = index
         this.lapsetoForm.lapseto_time = ''
@@ -1216,15 +1232,15 @@
         this.LapsetoDialogVisible = true
       },
       LapsetoInfo(row) {
-        if (
-          typeof row.lapseto === 'undefined' ||
-          (row.lapseto !== 1 && row.lapseto !== 2)
-        ) {
+        console.log("row",row)
+        if (typeof row.lapseto === 'undefined' ||(row.lapseto !== 1 && row.lapseto !== 2 && row.lapseto !==3)) {
           return '未设置'
         } else if (row.lapseto === 1) {
           return '留治'
-        } else {
+        } else if(row.lapseto === 2) {
           return '转出'
+        }else if(row.lapseto === 3){
+          return '死亡'
         }
       },
       openWechatBindDialog() {
@@ -1316,7 +1332,7 @@
             return false
           } else {
             this.tableData = response.data.data.patients
-          //  console.log('病人是', this.tableData)
+            console.log('病人是', this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
           }
@@ -1468,6 +1484,14 @@
         this.page = val;
         this.GetRemindPatientList();
       },
+      getTime(val) {
+        if(val == ""){
+         return ""
+        }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+       
+      },
     }
   }
   Vue.prototype.$QRCode = function() {

src/xt_pages/workforce/appointment.vue

@@ -69,10 +69,12 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
         <div style="display:flex;align-items:center">
           <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' :before-upload="beforeUpload"></schedule-upload-excel>
-          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :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"
@@ -89,6 +91,18 @@
     <div class="app-container">
       <!-- <el-row>
         <el-col :span="24"> -->
+      <div style="margin-left:832px;position:fixed;z-index:99">
+       <span>导出周次:</span>
+        <el-date-picker
+          v-model="weekTime"
+          type="week"
+          format="yyyy 第 WW 周"
+          placeholder="选择周"
+          :picker-options="{'firstDayOfWeek': 1}"
+          @change="changeWeek"
+          >
+        </el-date-picker>
+      </div>
       <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs">
         <el-tab-pane name="lastWeek">
           <span slot="label"><i class="el-icon-date"></i> 上周 ({{theWeek.lastWeek}})</span>
@@ -107,20 +121,21 @@
     </el-row> -->
 
       <table-data :week-time="activeName" :partitions-prop="partitions" :schedule-zone-row-prop="scheduleZoneRow"
-                  :schedule-zone-prop="scheduleZone" title=""></table-data>
+                  :schedule-zone-prop="scheduleZone" title="" @event1="changePartition" @event2="changeSchedule"></table-data>
     </div>
   </div>
 </template>
 
 <script>
+  import moment from 'moment'
   import { parseTime } from '@/utils'
   import tableData from './components/tableData'
-  import { exportSchedule, getWeekPanels, initDate } from '@/api/schedule'
+  import { exportSchedule, getWeekPanels, initDate,getThreeWeekList } from '@/api/schedule'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import UploadExcel from '@/xt_pages/components/UploadExcel'
   import ScheduleUploadExcel from './components/scheduleUploadExcel/index'
   import { generateLog } from '@/api/config'
-
+  import { uParseTime } from '@/utils/tools'
   export default {
     name: 'appointment',
     data() {
@@ -147,7 +162,14 @@
           thisWeek: 0,
           nextWeek: 0,
           nextTwoWeek: 0
-        }
+        },
+        tableList:[],
+        weekTime:"",
+        schedule_type:0,
+        partition_id:0,
+        start_time:"",
+        end_time:"",
+        export_type:0
       }
     },
     components: {
@@ -217,8 +239,8 @@
             return false
           }
           var partitions = response.data.data.partitions
-          this.theWeek.thisWeek = response.data.data.theWeek
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
+          this.theWeek.thisWeek = response.data.data.theWeek
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
           // 在控制变量改变的时候进行 强制渲染更新
@@ -399,7 +421,8 @@
       },
       setScheduleTemplateAction: function() {
         this.$router.push({ path: '/workforce/template' })
-      }, export_file: function() {
+      },
+       export_file: function() {
         this.downloadLoading = true
         import('@/vendor/Export2Excel').then(excel => {
           const filterVal = [
@@ -408,7 +431,6 @@
           ]
           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']
           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
@@ -434,11 +456,11 @@
 
             i++
           }
-          console.log(list)
+         
           const data = this.formatJson(filterVal, list)
-          console.log("data",data)
+          // console.log("data",data)
+        
           const filename = '排班模版'
-         
           excel.export_json_to_excel({
             multiHeader,
             header,
@@ -448,22 +470,53 @@
           })
           this.downloadLoading = false
         })
-     
-      }, formatJson(filterVal, jsonData) {
-        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]
-            }
+      },
+      export_fileTwo:function(){
+        
+        import('@/vendor/Export2Excel').then(excel => {
+          const filterVal = [
+            '区号',
+            '机号'
+          ]
+          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']
+      
+          var data = []
+         this.tableList.map(item=>{
+           data.push(Object.values(item))
+           
+         })
+
+          const filename = '排班模版'
+          excel.export_json_to_excel({
+            multiHeader,
+            header,
+            merges,
+            data,
+            filename
           })
-        )
+          
+        })
       },
+      formatJson(filterVal, jsonData) {
+       return jsonData.map(v => filterVal.map(j => v[j]))
+      },
+  
+      //  formatJson(filterVal, jsonData) {
+      //    console.log("jsonData",jsonData)
+      //   return jsonData.map(v =>
+      //     filterVal.map(j => {
+      //       console.log("v",j)
+      //       console.log("8888888",v[j])
+      //       if (j === 'timestamp') {
+      //         return parseTime(v[j])
+      //       } else {
+      //         return v[j]
+      //       }
+      //     })
+      //   )
+      // },
       printScheduleAction: function() {
         var date = new Date().getTime()
         if (this.activeName == 'lastWeek') {
@@ -493,11 +546,9 @@
           }
         }
         return isShow
-      }, handleSuccess({ results, header }) {
-        console.log(header)
-        console.log(results)
-
-
+      },
+       handleSuccess({ results, header }) {
+     
         let headers = []
         for (let key in results[0]) {
           headers.push(key)
@@ -722,13 +773,13 @@
             isHas_56 && isHas_57 && isHas_58 && isHas_59 && isHas_60 &&
             isHas_61 && isHas_62 && isHas_63 && isHas_64 && isHas_65)) {
 
-            console.log("222222222")
+           
 
             this.dialogVisible = true
             return
           }
         } else {
-          console.log("11111111")
+          
 
           this.dialogVisible = true
           return
@@ -783,12 +834,14 @@
             is_system_zone = false
           }
         }
-
-
+        
+        console.log("totalzones",total_zones)
+        
+        
         console.log("number:")
-        console.log(total_device_number)
+        console.log("total",total_device_number)
         console.log("23121212:")
-        console.log(deviceNumber)
+        console.log("devicenumber",deviceNumber)
 
 
         for (let i = 0; i < deviceNumber.length; i++) {
@@ -808,14 +861,22 @@
 
         let datas = []
         let failed_datas = []
+       
+
+       
+
+        console.log("结果22222222222",results)
 
         for (let i = 0; i < results.length; i++) {
+          
           for (let key in results[i + 1]) {
             let tempObjTwo = { partition_name: '', device_number_name: '' }
 
-            if (key != '区号' && key != '机号') {
+            if (key != '区号' && key != '机号' && results[i+1][key]!="") {
               let obj = {}
+             
               obj['name'] = results[i + 1][key].replace(/\s/g, '')
+              console.log("88888888",obj['name'])
               if (tempObj[key] == '上午') {
                 obj['schedule_type'] = 1
               } else if (tempObj[key] == '下午') {
@@ -823,7 +884,6 @@
               } else if (tempObj[key] == '晚上') {
                 obj['schedule_type'] = 3
               } else {
-
                 obj['schedule_type'] = 0
 
               }
@@ -832,8 +892,11 @@
               obj['row'] = this.getRow(key)
 
               tempObjTwo = obj
-            }
 
+              console.log("objtwo000000000000000000000",tempObjTwo)
+            }
+            
+           
             tempObjTwo['partition_name'] = results[i + 1]['区号']
             tempObjTwo['device_number_name'] = results[i + 1]['机号']
             tempObjTwo['index'] = i + 3
@@ -855,7 +918,7 @@
 
         }
 
-        console.log(datas)
+        console.log("datas",datas)
 
 
         let date_arr = []
@@ -866,16 +929,13 @@
           }
 
           if (datas[i].device_number_name == undefined) {
-            console.log(datas[i].name)
-            console.log("number:222222")
-
             is_device_number = false
 
           }
 
           if (datas[i].partition_name == undefined) {
+            
             is_system_zone = false
-
           }
 
           if (datas[i].schedule_date === '0') {
@@ -895,7 +955,7 @@
         }
 
 
-
+        console.log("date_arr",date_arr)
         //校验文档中同一天同个人是否存在多个排班
         let is_exist_repeat = false
         const obj3 = {}
@@ -918,7 +978,7 @@
           obj[key] = value
           tempObjArr.push(obj)
         }
-
+        
         for (let i = 0; i < tempObjArr.length; i++) {
           for (let key in tempObjArr[i]) {
             let arr = tempObjArr[i][key]
@@ -927,7 +987,9 @@
               obj[next] ? '' : obj[next] = true && cur.push(next)
               return cur
             }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-
+            
+            console.log("长度11111111111",tempObjArr[i][key].length)
+            console.log("长度22222222222",arr.length)
             if (tempObjArr[i][key].length > arr.length) {    //比对原数组和去重后的原数组总数，不同的话则存在重复元素
               is_exist_repeat = true
             }
@@ -936,13 +998,14 @@
 
         console.log(is_system_zone)
         console.log(is_device_number)
-        console.log(headers.length)
+        console.log("表头长度",headers.length)
 
 
         if (headers.length > 65 || !is_system_zone || !is_device_number) {
           this.dialogVisible = true
           return
         } else {
+          
           if (is_exist_repeat) {
             this.isExistRepeatVisible = true
             return
@@ -969,6 +1032,9 @@
             var month = day2.getMonth() + 1 < 10 ? '0' + (day2.getMonth() + 1).toString() : (day2.getMonth() + 1).toString()
             var day = day2.getDate() < 10 ? '0' + (day2.getDate()).toString() : (day2.getMonth() + 1).toString()
             var date = day2.getFullYear() + '-' + month + '-' + day
+
+            console.log("params",params)
+            console.log("datae",date)
             exportSchedule(params, date).then(response => {
               if (response.data.state == 0) {
                 return false
@@ -1208,7 +1274,8 @@
 
         }
 
-      }, getRow(key) {
+      }, 
+      getRow(key) {
         switch (key) {
           case '周一'+"("+this.days[0]+")" : //本周一
 
@@ -1836,12 +1903,551 @@
 
         }
 
-      }
+      },
+
+       getNextWeek(i) {
+        let weekOfDay = parseInt(moment().format('E'));//计算今天是这周第几天
+        let next_monday = moment().add((7 - weekOfDay) + 7 * (i - 1) + 1, 'days').format('YYYY-MM-DD');//周一日期
+        let next_sunday = moment().add((7 - weekOfDay) + 7 * i, 'days').format('YYYY-MM-DD');//周日日期
+        return next_sunday
+       },
+       
+      getNextWeekOne(i) {
+        let weekOfDay = parseInt(moment().format('E'));//计算今天是这周第几天
+        let next_monday = moment().add((7 - weekOfDay) + 7 * (i - 1) + 1, 'days').format('YYYY-MM-DD');//周一日期
+        
+        return next_monday
+       },
+       
+       
+       getThreeWeekList(){
+          var params ={
+              start_time:this.start_time,
+              end_time:this.end_time,
+              partition_id:this.partition_id,
+              schedule_type:this.schedule_type
+            }
+           console.log("params2222",params)
+         getThreeWeekList(params).then(response=>{
+           if(response.data.state == 1){
+             var partitions =  response.data.data.partitions
+             console.log("数据22222",this.partitions)
+             
+             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 partitions) {
+                var tempValue
+                var jihaos = 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)
+                }
+                console.log("jihaos",jihaos)
+                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'] = ''
+
+                  list.push(obj)
+                
+                }
+                i++
+              }
+              console.log("list2021444444x",list)  
+              for(let i=0;i<list.length;i++){
+                console.log("list9999999999",list[i])
+              }
+               const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
+               var start = this.getTimestamp(start_time)
+               console.log("start",start)
+              const end_time = moment().weekday(7).format('YYYY-MM-DD');
+              var end = this.getTimestamp(end_time)
+
+              
+              console.log("end",end)
+              var scheduleList = response.data.data.list
+              console.log("排班列表22222",scheduleList)
+              var week= []
+              var nextWeek = []
+              var lastWeek = []
+              var next_start = this.getNextWeekOne(1)
+              var nextstart = this.getTimestamp(next_start)
+              // console.log("下周开始时间",nextstart)
+              var next_end = this.getNextWeek(1)
+              var nextend = this.getTimestamp(next_end)
+              // console.log("下周结束时间",nextend)
+              var last_start = this.getNextWeekOne(2)
+              var last_end = this.getNextWeek(2)
+              var laststart = this.getTimestamp(last_start)
+              // console.log("下下周数据时间",laststart)
+              var lastend = this.getTimestamp(last_end)
+              // 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){
+                   week.push(scheduleList[i])
+                 }
+                 if(scheduleList[i].schedule_date>=nextstart && scheduleList[i].schedule_date<=nextend){
+                   nextWeek.push(scheduleList[i])
+                 }
+
+                 if(scheduleList[i].schedule_date>=laststart && scheduleList[i].schedule_date<=lastend){
+                   lastWeek.push(scheduleList[i])
+                 }
+              }
+              }
+            
+            if(this.export_type == 1){
+                week = scheduleList
+             }
+             console.log("week88888888888",week)
+             if(week.length > 0){
+              for(let i=0;i<list.length;i++){
+               for(let j=0;j<week.length;j++){
+                  if(list[i].机号 == week[j].number){
+                    //  周一上午
+                    if( week[j].schedule_week == 1 && week[j].schedule_type == 1){
+                        list[i].上午 = week[j].name
+                    }
+                    // 周一下午
+                    if( week[j].schedule_week == 1 && week[j].schedule_type == 2){
+                        list[i].下午 = week[j].name
+                    }
+                   // 周一晚上
+                    if( week[j].schedule_week == 1 && week[j].schedule_type == 3){
+                        list[i].晚上 = week[j].name
+                    }
+                    
+                   //周二上午
+                    if( week[j].schedule_week == 2 && week[j].schedule_type == 1){
+                        list[i].上午1 = week[j].name
+                    }
+                   //周二下午
+                    if( week[j].schedule_week == 2 && week[j].schedule_type == 2){
+                        list[i].下午1 = week[j].name
+                    }
+                   //周二晚上
+                    if( week[j].schedule_week == 2 && week[j].schedule_type == 3){
+                        list[i].晚上1 = week[j].name
+                    }
+
+                   //周三上午
+                   if( week[j].schedule_week == 3 && week[j].schedule_type == 1){
+                        list[i].上午2 = week[j].name
+                    }
+                   //周三下午
+                    if( week[j].schedule_week == 3 && week[j].schedule_type == 2){
+                        list[i].下午2 = week[j].name
+                    }
+                   //周三晚上
+                    if( week[j].schedule_week == 3 && week[j].schedule_type == 3){
+                        list[i].晚上2 = week[j].name
+                    }
+                   //周四上午
+                    if( week[j].schedule_week == 4&& week[j].schedule_type == 1){
+                        list[i].上午3 = week[j].name
+                    }
+                   //周四下午
+                    if( week[j].schedule_week == 4 && week[j].schedule_type == 2){
+                        list[i].下午3 = week[j].name
+                    }
+                   //周四晚上
+                    if( week[j].schedule_week == 4 && week[j].schedule_type == 3){
+                        list[i].晚上3 = week[j].name
+                    }
+                   //周五上午
+                    if( week[j].schedule_week == 5&& week[j].schedule_type == 1){
+                        list[i].上午4 = week[j].name
+                    }
+                   //周五下午
+                    if( week[j].schedule_week ==5 && week[j].schedule_type == 2){
+                        list[i].下午4 = week[j].name
+                    }
+                   //周五晚上
+                    if( week[j].schedule_week == 5 && week[j].schedule_type == 3){
+                        list[i].晚上4 = week[j].name
+                    }
+                   //周六上午
+                    if( week[j].schedule_week == 6&& week[j].schedule_type == 1){
+                        list[i].上午5 = week[j].name
+                    }
+                   //周六下午
+                   if( week[j].schedule_week ==6 && week[j].schedule_type == 2){
+                        list[i].下午5 = week[j].name
+                    }
+                   //周六晚上 
+                   if( week[j].schedule_week == 6 && week[j].schedule_type == 3){
+                        list[i].晚上5 = week[j].name
+                    }
+                   //周日上午
+                    if( week[j].schedule_week ==7&& week[j].schedule_type == 1){
+                        list[i].上午6 = week[j].name
+                    }
+                   //周日下午
+                    if( week[j].schedule_week ==7 && week[j].schedule_type == 2){
+                        list[i].下午6 = week[j].name
+                    }
+                   //周日晚上
+                   if( week[j].schedule_week == 7 && week[j].schedule_type == 3){
+                        list[i].晚上6 = week[j].name
+                    }
+                  }
+                
+               }
+             }
+             }
+             
+             console.log("list5555555555",list)
+             
+             if(nextWeek.length > 0 ){
+               for(let i=0;i<list.length;i++){
+                for(let j=0;j<nextWeek.length;j++){
+                 if(list[i].机号 == nextWeek[j].number ){
+                  //周一   
+                   if( nextWeek[j].schedule_week ==1&& nextWeek[j].schedule_type == 1){
+                        list[i].上午7 = nextWeek[j].name
+                    }
+                   //周一下午
+                    if( nextWeek[j].schedule_week ==1 && nextWeek[j].schedule_type == 2){
+                        list[i].下午7 = nextWeek[j].name
+                    }
+                   //周一晚上
+                   if( nextWeek[j].schedule_week == 1 && nextWeek[j].schedule_type == 3){
+                        list[i].晚上7 = nextWeek[j].name
+                    }
+                  
+
+                   //周二上午  
+                   if( nextWeek[j].schedule_week ==2&& nextWeek[j].schedule_type == 1){
+                        list[i].上午8 = nextWeek[j].name
+                    }
+                   //周二下午
+                    if( nextWeek[j].schedule_week ==2 && nextWeek[j].schedule_type == 2){
+                        list[i].下午8 = nextWeek[j].name
+                    }
+                   //周二晚上
+                   if( nextWeek[j].schedule_week == 2 && nextWeek[j].schedule_type == 3){
+                        list[i].晚上8  = nextWeek[j].name
+                    }
+
+                  //周三上午  
+                   if( nextWeek[j].schedule_week ==3&& nextWeek[j].schedule_type == 1){
+                        list[i].上午9 = nextWeek[j].name
+                    }
+                   //周三下午
+                    if( nextWeek[j].schedule_week ==3 && nextWeek[j].schedule_type == 2){
+                        list[i].下午9 = nextWeek[j].name
+                    }
+                   //周三晚上
+                   if( nextWeek[j].schedule_week == 3 && nextWeek[j].schedule_type == 3){
+                        list[i].晚上9  = nextWeek[j].name
+                    }
+
+                   //周四上午  
+                   if( nextWeek[j].schedule_week ==4&& nextWeek[j].schedule_type == 1){
+                        list[i].上午10 = nextWeek[j].name
+                    }
+                   //周四下午
+                    if( nextWeek[j].schedule_week ==4 && nextWeek[j].schedule_type == 2){
+                        list[i].下午10 = nextWeek[j].name
+                    }
+                   //周四晚上
+                   if( nextWeek[j].schedule_week == 4 && nextWeek[j].schedule_type == 3){
+                        list[i].晚上10  = nextWeek[j].name
+                    }
+                    
+                    //周五上午  
+                   if( nextWeek[j].schedule_week ==5&& nextWeek[j].schedule_type == 1){
+                        list[i].上午11 = nextWeek[j].name
+                    }
+                   //周五下午
+                    if( nextWeek[j].schedule_week ==5 && nextWeek[j].schedule_type == 2){
+                        list[i].下午11 = nextWeek[j].name
+                    }
+                   //周五晚上
+                   if( nextWeek[j].schedule_week == 5 && nextWeek[j].schedule_type == 3){
+                        list[i].晚上11  = nextWeek[j].name
+                    }
+
+                  //周六上午  
+                   if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
+                        list[i].上午12 = nextWeek[j].name
+                    }
+                   //周六下午
+                    if( nextWeek[j].schedule_week ==6 && nextWeek[j].schedule_type == 2){
+                        list[i].下午12 = nextWeek[j].name
+                    }
+                   //周六晚上
+                   if( nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3){
+                        list[i].晚上12  = nextWeek[j].name
+                    }
+
+                  //周日上午  
+                   if( nextWeek[j].schedule_week ==6&& nextWeek[j].schedule_type == 1){
+                        list[i].上午13 = nextWeek[j].name
+                    }
+                   //周日下午
+                    if( nextWeek[j].schedule_week ==6 && nextWeek[j].schedule_type == 2){
+                        list[i].下午13 = nextWeek[j].name
+                    }
+                   //周日晚上
+                   if( nextWeek[j].schedule_week == 6 && nextWeek[j].schedule_type == 3){
+                        list[i].晚上13  = nextWeek[j].name
+                    }
+                  }
+
+               }
+              }
+             }
+              
+             console.log("lastWeek",lastWeek)
+
+             if(lastWeek.length > 0 ){ 
+               for(let i=0;i<list.length;i++){
+                 for(let j=0;j<lastWeek.length;j++){
+                   if(list[i].机号 == lastWeek[j].number ){ 
+                     //周一   
+                    if( lastWeek[j].schedule_week ==1&& lastWeek[j].schedule_type == 1){
+                          list[i].上午14 = lastWeek[j].name
+                      }
+                    //周一下午
+                      if( lastWeek[j].schedule_week ==1 && lastWeek[j].schedule_type == 2){
+                          list[i].下午14 = lastWeek[j].name
+                      }
+                    //周一晚上
+                    if( lastWeek[j].schedule_week == 1 && lastWeek[j].schedule_type == 3){
+                          list[i].晚上14 = lastWeek[j].name
+                     }
+
+                    //周二
+                    if( lastWeek[j].schedule_week ==2&& lastWeek[j].schedule_type == 1){
+                          list[i].上午15 = lastWeek[j].name
+                      }
+                    //周二下午
+                      if( lastWeek[j].schedule_week ==2 && lastWeek[j].schedule_type == 2){
+                          list[i].下午15 = lastWeek[j].name
+                      }
+                    //周二晚上
+                    if( lastWeek[j].schedule_week == 2 && lastWeek[j].schedule_type == 3){
+                          list[i].晚上15 = lastWeek[j].name
+                      }
+
+                    //周三
+                    if( lastWeek[j].schedule_week ==3&& lastWeek[j].schedule_type == 1){
+                          list[i].上午16 = lastWeek[j].name
+                      }
+                    //周三下午
+                      if( lastWeek[j].schedule_week ==3 && lastWeek[j].schedule_type == 2){
+                          list[i].下午16 = lastWeek[j].name
+                      }
+                    //周三晚上
+                    if( lastWeek[j].schedule_week == 3 && lastWeek[j].schedule_type == 3){
+                          list[i].晚上16 = lastWeek[j].name
+                     }
+
+                    
+                     //周四
+                    if( lastWeek[j].schedule_week ==4&& lastWeek[j].schedule_type == 1){
+                          list[i].上午17 = lastWeek[j].name
+                      }
+                    //周四下午
+                      if( lastWeek[j].schedule_week ==4 && lastWeek[j].schedule_type == 2){
+                          list[i].下午17 = lastWeek[j].name
+                      }
+                    //周四晚上
+                    if( lastWeek[j].schedule_week == 4 && lastWeek[j].schedule_type == 3){
+                          list[i].晚上17 = lastWeek[j].name
+                     }
+
+                    //周五
+                    if( lastWeek[j].schedule_week ==5&& lastWeek[j].schedule_type == 1){
+                          list[i].上午18 = lastWeek[j].name
+                      }
+                    //周五下午
+                      if( lastWeek[j].schedule_week ==5 && lastWeek[j].schedule_type == 2){
+                          list[i].下午18 = lastWeek[j].name
+                      }
+                    //周五晚上
+                    if( lastWeek[j].schedule_week == 5 && lastWeek[j].schedule_type == 3){
+                          list[i].晚上18 = lastWeek[j].name
+                     }
+
+                    //周六
+                    if( lastWeek[j].schedule_week ==6&& lastWeek[j].schedule_type == 1){
+                          list[i].上午19 = lastWeek[j].name
+                      }
+                    //周六下午
+                      if( lastWeek[j].schedule_week ==6 && lastWeek[j].schedule_type == 2){
+                          list[i].下午19 = lastWeek[j].name
+                      }
+                    //周六晚上
+                    if( lastWeek[j].schedule_week == 6 && lastWeek[j].schedule_type == 3){
+                          list[i].晚上19 = lastWeek[j].name
+                     }
+
+                     //周日
+                    if( lastWeek[j].schedule_week ==7&& lastWeek[j].schedule_type == 1){
+                          list[i].上午20 = lastWeek[j].name
+                      }
+                    //周日下午
+                      if( lastWeek[j].schedule_week ==7 && lastWeek[j].schedule_type == 2){
+                          list[i].下午20 = lastWeek[j].name
+                      }
+                    //周日晚上
+                    if( lastWeek[j].schedule_week == 7 && lastWeek[j].schedule_type == 3){
+                          list[i].晚上20 = lastWeek[j].name
+                     }
+                   }  
+
+                  }
+                }
+             } 
+             this.tableList = list
+           }
+         })
+       },
+
+       getTimestamp(time) { //把时间日期转成时间戳
+          return (new Date(time)).getTime() / 1000 - 28800
+       },
+
+       changePartition(val){
+         this.partition_id = val
+         this.getThreeWeekList()
+       },
+
+       changeSchedule(val){
+         this.schedule_type = val
+         this.getThreeWeekList()
+       },
+
+       changeWeek(val){
+         console.log("Val",val)
+         var start = this.getTimestamp(val) - 57600
+         console.log("start",start)
+         this.start_time = this.getTime(start)
+         var end = this.getTimestamp(val) + 460800
+         this.end_time = this.getTime(end)
+         this.export_type = 1
+         this.getThreeWeekList()
+       },
+
+      getTime(val) {
+        return uParseTime(val, '{y}-{m}-{d}')
+      },
+       
 
     },
     created() {
+     var start_time = moment().weekday(1).format('YYYY-MM-DD');
+     this.start_time = start_time
+     var end_time = this.getNextWeek(2)
+     this.end_time = end_time
       this.getWeekPanels()
       this.getInitDate()
+
+      //获取三周排班数据
+      this.getThreeWeekList()
     }
   }
 </script>

src/xt_pages/workforce/components/tableData.vue

@@ -1,9 +1,30 @@
 <template>
   <div id="table_data">
+    <!-- <div style="margin-bottom:-30px">
+      <span>分区：</span>
+       <el-select v-model="partition_id" placeholder="请选择" @change="changePartiton">
+        <el-option
+          v-for="item in this.zones"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+         </el-option>
+        </el-select>
+       <span style="margin-left:100px">班次：</span>
+       <el-select v-model="schedule_type" placeholder="请选择" @change="changeSchedule_type">
+        <el-option
+          v-for="item in options"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+         </el-option>
+       </el-select>
+    </div> -->
+   
     <div class="cell clearfix" v-if="weekTime == 'thisWeek' || weekTime == 'nextWeek'  || weekTime == 'nextTwoWeek' ">
       <el-input
         size="small"
-        style="width: 400px;"
+        style="width: 200px;"
         class="filter-item"
         v-model.trim="keywords"
         placeholder="病人名称/透析号"
@@ -15,9 +36,12 @@
         type="primary"
         icon="el-icon-search"
         @click="search"
+       
         >搜索</el-button
       >
     </div>
+    
+    
 
     <el-dialog :visible.sync="searchTableVisible" width="80%">
       <el-table
@@ -602,7 +626,8 @@ import {
   getSchedules,
   getSearchResult,
   getUrgentScheduleInitData,
-  getWeekPanels
+  getWeekPanels,
+  getAllZones,
 } from "@/api/schedule";
 import ScheduleItem from "./ScheduleItem";
 
@@ -726,7 +751,16 @@ export default {
       zone_name: "",
       current_devices: [],
       zone_names: [],
-      zone_device_options: []
+      zone_device_options: [],
+      options:[
+        {id:0,name:"全部"},
+        {id:1,name:"上午"},
+        {id:2,name:"下午"},
+        {id:3,name:"晚上"},
+      ],
+      partition_id:"",
+      schedule_type:"",
+      zones:[{id:0,name:"全部"}]
     };
   },
 
@@ -868,6 +902,7 @@ export default {
       this.currentData.patient_id = 0;
     },
     getSchedules(weekType) {
+      
       getSchedules(weekType).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
@@ -1462,7 +1497,7 @@ export default {
 
             this.zone_names = Object.keys(this.zone_device_map);
             // console.log('8989898989898989',this.zone_names)
-
+            
             // console.log(this.current_devices);
 
             if (this.zone_names.length > 0) {
@@ -1945,6 +1980,23 @@ export default {
       }else {
         return 'table-row-new-class schedule-table-row backPurple'
       }
+    },
+    getAllZones(){
+      getAllZones().then(response=>{
+         if(response.data.state == 1){
+           var zones = response.data.data.zones
+           this.zones.push(...zones)
+           
+         }
+      })
+    },
+    changePartiton(val){
+     this.$emit('event1', val)
+      this.partition_id = val
+    },
+    changeSchedule_type(val){
+     this.$emit('event2', val)
+     this.schedule_type = val
     }
   },
   components: {
@@ -1976,11 +2028,10 @@ export default {
     this.changeScheduleType(1)
     rowNumber = 0;
     this.modeOptions = this.$store.getters.treatment_mode;
-
+ 
     this.partitions = this.partitionsProp;
 
-    console.log(this.partitions);
-
+    
     var contagions = this.$store.getters.contagions;
     if (contagions.length > 0) {
       var that = this;
@@ -1991,12 +2042,13 @@ export default {
       });
     }
     this.scheduleZoneRow = this.scheduleZoneRowProp;
-    console.log(this.scheduleZoneRow);
+    
 
     this.weekday = new Date().getDay();
     if (this.weekday == 0) {
       this.weekday = 7;
     }
+  //  this.getAllZones()
   }
 };
 </script>