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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -48,7 +48,8 @@
             <div class="inline_block" style="margin-left: 10px;">
               年龄：
               <div class="under_line" style="width: 30px;text-align: center;">
-                {{ record.patient.age }}
+                <!-- {{ record.patient.age }} -->
+                 {{ getAge(record.patient) }}
               </div>
               岁
             </div>

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -5,8 +5,8 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       药品名称:<span>{{this.$route.query.drug_name}}</span>&nbsp;
-       库存:{{this.$route.query.overPlus}}&nbsp;
+       药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
+       库存:{{this.$route.query.over_plus}}&nbsp;
        规格:<span>{{this.$route.query.unit}}</span>&nbsp;
        厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
       </div>
@@ -181,6 +181,7 @@
         autoCountList:[],
         minCount:[],
         drugOutList:[],
+        drug:{},
       }
     },
     methods:{
@@ -199,6 +200,7 @@
               var total = response.data.data.total
               console.log("total",total)
               this.total = total
+              this.drug =  response.data.data.drug
            }
         })
       },
@@ -348,6 +350,13 @@
           }
        }
        return name
+     },
+    getName(drug_id){
+        var name = ""
+        if(drug_id == this.drug.id){
+           name = this.drug.drug_name
+        }
+        return name
      }
     }
   }

src/xt_pages/stock/drugs/drugInventory.vue

@@ -59,7 +59,7 @@ export default {
       }
     },
     created(){
-      console.log("hhh2333223",localStorage.getItem("second")) 
+      
     },
     mounted() {
     },

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -200,7 +200,7 @@
             {{scope.row.warehousing_count}}{{scope.row.max_unit}}
           </template>
         </el-table-column>
-        <el-table-column label="包装零售价" align="center">
+        <el-table-column label="拆零零售价" align="center">
           <template slot-scope="scope">
             {{scope.row.retail_price}}
           </template>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -147,7 +147,7 @@
 
           <el-table-column align="center" width="140">
             <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-form-item
@@ -157,7 +157,7 @@
               >
                 <el-input
                   style="width:100px"
-                  placeholder="请输入包装零售价"
+                  placeholder="请输入拆零零售价"
                   type="number"
                   v-model="scope.row.retail_price"
                 ></el-input>
@@ -854,7 +854,8 @@
              this.recordInfo.recordData[i].drug_type = val.drug_type
              this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
              this.recordInfo.recordData[i].last_price = val.last_price
-             this.recordInfo.recordData[i].retail_price = val.retail_price
+             
+             this.recordInfo.recordData[i].retail_price = val.min_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number =  val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -170,7 +170,7 @@
           </el-table-column>
           <el-table-column align="center" width="140">
             <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-form-item
@@ -180,7 +180,7 @@
               >
                 <el-input
                   style="width:100px"
-                  placeholder="请输入包装零售价"
+                  placeholder="请输入拆零零售价"
                   type="number"
                   v-model="scope.row.retail_price"
                 ></el-input>
@@ -851,10 +851,10 @@ export default {
              }else{
                this.recordInfo.recordData[i].last_price = val.last_price
              }
-             if(val.retail_price == 0){
+             if(val.min_price == 0){
                this.recordInfo.recordData[i].retail_price = ""
              }else{
-               this.recordInfo.recordData[i].retail_price = val.retail_price
+               this.recordInfo.recordData[i].retail_price = val.min_price
              }
            
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer

src/xt_pages/stock/drugs/inventory.vue

@@ -65,14 +65,14 @@
               <el-table-column prop="name" label="盘点前数量" width="180"  align="center">
                 <template slot-scope="scope">
                     <span><el-input style="width:50px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
-                    <span><el-input style="width:50px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
+                    <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
                   </template> 
               </el-table-column>
 
              <el-table-column prop="name" label="盘点后数量" width="180"  align="center">
                 <template slot-scope="scope">
                   <el-input style="width:50px" v-model="scope.row.last_stock_max_number"></el-input>{{scope.row.max_unit}}
-                  <el-input style="width:50px" v-model="scope.row.last_stock_min_number"></el-input>{{scope.row.min_unit}}
+                 <span v-if="scope.row.XtBaseDrug.max_unit!=scope.row.XtBaseDrug.min_unit"><el-input style="width:50px" v-model="scope.row.last_stock_min_number" :disabled="true"></el-input>{{scope.row.min_unit}}</span> 
                  </template> 
               </el-table-column>
 
@@ -199,6 +199,8 @@ export default {
             inventory_total:0,
             WarehouseList:[],
             showTableOne:false,
+            panShow:true,
+            panOneShow:true,
         }
     },
     methods:{
@@ -282,11 +284,13 @@ export default {
            getDrugWarehouseInfoList(params).then(response=>{
              if(response.data.state == 1){
                 var list =  response.data.data.list
-                console.log("lisrt2332323223322323232323",list)
+               
                 for(let i=0;i<list.length;i++){
                    if(list[i].XtBaseDrug.max_unit == list[i].XtBaseDrug.min_unit){
                       list[i].stock_max_number += list[i].stock_min_number
                       list[i].stock_min_number = 0
+                      this.panShow = false
+                      this.panOneShow = false
                    }
                    list[i].drug_name = list[i].XtBaseDrug.drug_name
                    list[i].specification_name = list[i].XtBaseDrug.dose +list[i].XtBaseDrug.dose_unit + "*"+list[i].XtBaseDrug.min_number +list[i].XtBaseDrug.min_unit+"/"+list[i].XtBaseDrug.max_unit
@@ -305,6 +309,7 @@ export default {
                    }
                    this.WarehouseList.push(list[i])
                 }
+                console.log("lisrt2332323223322323232323",list)
                   let objInfo = {}
                   this.WarehouseList.forEach((item,index)=>{
                     let { drug_id } = item
@@ -855,6 +860,7 @@ export default {
        var params = {
          tableData:arr
        }
+      console.log("paramse32323232",params)
       saveInentoryList(params).then(response=>{
         if(response.data.state == 1){
            var inventory = response.data.data.inventory

src/xt_pages/stock/drugs/query.vue

@@ -552,6 +552,7 @@ import { min } from 'moment'
         
       },
       handleBatch(val){
+        console.log("val322332323232",val)
         var manufacturer_name = ""
         for(let i=0;i<this.manufacturerList.length;i++){
          if(val.manufacturer == this.manufacturerList[i].id){

src/xt_pages/workforce/appointment.vue

@@ -91,8 +91,7 @@
         </div>
     </div>
     <div class="app-container">
-      <!-- <el-row>
-        <el-col :span="24"> -->
+      
       <div style="right:30px;position:fixed;z-index:99">
        <span>导出周次:</span>
         <el-date-picker
@@ -547,10 +546,6 @@
           
           if(this.export_type == 1){
       
-            
-            //  const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '', '周一'+"("+this.days[7]+")" , '', '', '周二'+"("+this.days[8]+")" , '', '', '周三'+"("+this.days[9]+")" , '', '', '周四'+"("+this.days[10]+")" , '', '', '周五'+"("+this.days[11]+")" , '', '', '周六'+"("+this.days[12]+")" , '', '', '周日'+"("+this.days[13]+")", '', '', '周一'+"("+this.days[14]+")", '', '', '周二'+"("+this.days[15]+")", '', '', '周三'+"("+this.days[16]+")", '', '', '周四'+"("+this.days[17]+")", '', '', '周五'+"("+this.days[18]+")", '', '', '周六'+"("+this.days[19]+")", '', '', '周日'+"("+this.days[20]+")", '', '']]
-            //  const header = ['', '', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上', '上午', '下午', '晚上']
-            //  const merges = ['A1:A2', 'B1:B2', 'C1:E1', 'F1:H1', 'I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1', 'U1:W1', 'X1:Z1', 'AA1:AC1', 'AD1:AF1', 'AG1:AI1', 'AJ1:AL1', 'AM1:AO1', 'AP1:AR1', 'AS1:AU1', 'AV1:AX1', 'AY1:BA1', 'BB1:BD1', 'BE1:BG1', 'BH1:BJ1', 'BK1:BM1']
             const multiHeader = [['区号', '机号', '周一'+"("+this.newDay[0]+")" , '', '', '周二'+"("+this.newDay[1]+")", '', '', '周三'+"("+this.newDay[2]+")" , '', '', '周四'+"("+this.newDay[3]+")" , '', '', '周五'+"("+this.newDay[4]+")" , '', '', '周六'+"("+this.newDay[5]+")" , '', '', '周日'+"("+this.newDay[6]+")" , '', '']]
              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']
@@ -2179,12 +2174,11 @@
               partition_id:this.partition_id,
               schedule_type:this.schedule_type
             }
-        console.log("params2222",params)
+          console.log("params32323232323223",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
@@ -2351,16 +2345,16 @@
               var lastWeek = []
               var next_start = this.getNextWeekOne(1)
               var nextstart = this.getTimestamp(next_start) - 28800
-              // console.log("下周开始时间",nextstart)
+          
               var next_end = this.getNextWeek(1)
               var nextend = this.getTimestamp(next_end) - 28800
-              // console.log("下周结束时间",nextend)
+             
               var last_start = this.getNextWeekOne(2)
               var last_end = this.getNextWeek(2)
               var laststart = this.getTimestamp(last_start) - 28800
-              // console.log("下下周数据时间",laststart)
+            
               var lastend = this.getTimestamp(last_end) - 28800
-              // console.log("下下周数据时间",lastend)
+             
                
               if(this.export_type == 0){
                 for(let i = 0;i<scheduleList.length;i++){
@@ -2477,8 +2471,6 @@
               }
              }
 
-            //  console.log("list5555555555",list)
-
              if(nextWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
                 for(let j=0;j<nextWeek.length;j++){
@@ -2580,8 +2572,6 @@
               }
              }
 
-            //  console.log("nextWeek",nextWeek)
-
              if(lastWeek.length > 0 ){
                for(let i=0;i<list.length;i++){
                  for(let j=0;j<lastWeek.length;j++){
@@ -2682,8 +2672,9 @@
                   }
                 }
              }
-             console.log("list23233223232323232323",list)
              this.tableList = list
+             this.start_time = ""
+             this.end_time = ""
            }
          })
        },
@@ -2706,7 +2697,10 @@
        },
 
        changeWeek(val){
-       
+
+         this.start_time = ""
+         this.end_time = ""
+         this.newDay =[]
          var start = this.getTimestamp(val) - 57600
         
          this.start_time = this.getTime(start)