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/template/DialysisPrintOrderFortyOne.vue

         for (let index = 0; index < this.monitors.length; index++) {
           const monitor = this.monitors[index]
           this.monitors[index].end = ''
-          if (Object.keys(monitor).length > 0 && index > 1) {
+          if (Object.keys(monitor).length > 0 && index >= 1) {
             if (this.dialysisOrder && monitor.operate_time == this.dialysisOrder.end_time) {
               if(this.org_id != 10233){
                 this.monitors[index].end = '【结束透析】回血100ml/min'
             }
           }
         }
+        
+        console.log('this.monitors',this.monitors)
 
         this.jilurow = this.monitors.length + 1
 

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].retail_price.toString()
-              response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date)
-              response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date)
+              response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,'{y}-{m}-{d}')
+              response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,'{y}-{m}-{d}')
               response.data.data.list[i].drug_name = response.data.data.list[i].drug.drug_name
               response.data.data.list[i].name =  response.data.data.list[i].drug.dose +''+response.data.data.list[i].drug.dose_unit+"*"+response.data.data.list[i].drug.min_number+response.data.data.list[i].drug.min_unit+"/"+response.data.data.list[i].drug.max_unit
 

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

        const tHeader = ['序号','单据编号', '药品类型', '药品名称','规格型号','操作时间','制单人','出货价','数量','总价']
        const filterVal = ['index','warehouse_out_order_number', 'drugtype', 'drug_name','specification_name','time','user_name','price','count','total_price']
        for(let i=0;i<this.tableData.length;i++){
-         this.tableData[i].index = i+1
-   
-        this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
-        this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
-        this.tableData[i].time = this.getTime(this.tableData[i].ctime)
-        this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
-        if(this.org_id == 9671 || this.org_id == 9919){
-          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
-          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
-        }else{
-          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
-          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
-        }
+         if(this.tableData[i].is_total == 0){
+            this.tableData[i].index = i+1
       
-       
-       }
-       let obj = {'index':'合计','total_price':0.00}
-       for(let i=0;i<this.tableData.length;i++){
-         obj.total_price += this.tableData[i].total
-       }
-       
-       this.tableData.push(obj)
-       for(let j=0;j<this.tableData.length;j++){
-          this.tableData[j].total_price = this.tableData[j].total_price.toFixed(2)
+            this.tableData[i].drugtype = this.getTypeList(this.tableData[i].drugtype)
+            this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
+            this.tableData[i].time = this.getTime(this.tableData[i].ctime)
+            this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
+            if(this.org_id == 9671 || this.org_id == 9919){
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
+              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
+            }else{
+              this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+              this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+            }
+         }
        }
        const data = this.formatJson(filterVal, this.tableData)
        console.log("data",data)
-       
+     
        excel.export_json_to_excel({
            header: tHeader,
            data,

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

                 <span>{{item.count_unit}}</span>
               </td>
               <td style="line-height:50px">
-                  {{item.last_price}}
+                  {{item.price}}
               </td>
              <td  style="line-height:50px">
-                {{(item.count * item.last_price).toFixed(2)}}
+                {{(item.count * item.price).toFixed(2)}}
              </td>
              <td>{{item.batch_number}}</td>
              <td>{{(getTime(item.product_date))}}</td>
-             <td>{{(getTime(item.expiry_date))}}</td>
+             <td>{{(getTime(item.expire_date))}}</td>
             </tr>
              <tr>
                <td style="line-height:50px">合计</td>
             var warehousing = response.data.data.warehousing
             console.log("ware2232",warehousing)
             this.warehouseList = warehousing
+          
             for(let i=0;i<info.length;i++){
                info[i].child = []
               for(let j=0;j<warehousing.length;j++){
         var count = 0
         for(let i=0;i<this.warehouseList.length;i++){
           if(id == this.warehouseList[i].warehouse_out_id){
-             count +=this.warehouseList[i].count * this.warehouseList[i].last_price
+             count +=this.warehouseList[i].count * this.warehouseList[i].price
           }
         }
         return count

src/xt_pages/stock/stockDamaged.vue

         </el-table-column>
         <el-table-column prop="date" label="总报损金额"  align="center">
           <template  slot-scope="scope">
-            {{scope.row.count}}
+            {{getAllDamageCount(scope.row.good_id,scope.row.buy_price)}}
             </template>    
         </el-table-column>
         <el-table-column prop="name" label="操作"  align="center">
        getReportStockList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-     
+            console.log("报损金额22222",list)
             this.total = response.data.data.total
             this.tableList = list
            var doctorlist = response.data.data.doctorlist
         }
         return count
       },
+      getAllDamageCount(good_id,price){
+        var count = 0
+        for(let i=0;i<this.damageList.length;i++){
+          if(good_id == this.damageList[i].good_id){
+             count = this.damageList[i].count
+          }
+        }
+        return (count * price).toFixed(2)
+      },
       changeReason(val){
         this.form.type = val
         this.toDamagedDetail(this.good_id)

src/xt_pages/user/hospitalSummaryPrint.vue

 <template>
 <div>
-  <div style="float:right">
+  <div style="float:right;margin-right:10px">
     <el-button type="primary" size="small" @click="printThisPage">打印</el-button> 
   </div>
   <div id="dialysis-print-box">
       <div>
         <table class="print-table" border="1" style="margin-top: 10px;">
           <tr>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:200px" colspan="1">
               姓名:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:200px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{patient.name}}
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:200px" colspan="1">
               性别:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:200px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 <span v-if="patient.gender == 1">男</span>
                 <span v-if="patient.gender == 2">女</span>
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               年龄:
             </td>
             <td style="text-align:center;width:50px" colspan="1">
                  {{getNewAge(patient.id_card_no)}}
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               婚姻:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
-                 <span v-if="patient.marital_status == 0">未婚</span>
-                 <span v-if="patient.marital_status == 1">已婚</span>
-                 <span v-if="patient.marital_status == 2">未婚</span>
+                 <span v-if="patient.marital_status == 0"></span>
+                 <span v-if="patient.marital_status == 1">未婚</span>
+                 <span v-if="patient.marital_status == 2">已婚</span>
                  <span v-if="patient.marital_status == 3">离异</span>
                  <span v-if="patient.marital_status == 4">丧偶</span>
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:200px" colspan="1">
               职业: 
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                {{getProfession(patient.profession)?getProfession(patient.profession):''}}
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:300px" colspan="1">
               电话:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.phone}}
               </span>
           </tr>
 
           <tr>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:100px" colspan="1">
               住址:
             </td>   
-            <td style="text-align:center;" colspan="11">
+            <td style="text-align:center;width:500px" colspan="12">
             
               <span style="display:inline-block;margin-left:10px;">
                 {{patient.home_address}}
             </td>   
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               入院时间:
             </td>
-            <td style="text-align:center;width:170px" colspan="2">
+            <td style="text-align:center;width:200px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.admission_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px" colspan="2">
+            <td style="text-align:center;width:250px" colspan="1">
               出院时间:
             </td>
-            <td style="text-align:center;width:100px" colspan="2">
+            <td style="text-align:center;width:250px" colspan="3">
               <span style="display:inline-block;margin-left:10px;">
                 {{getTime(hosDetail.discharge_time)}}
               </span>
             </td>
-            <td style="text-align:center;width:100px"  colspan="1">
+            <td style="text-align:center;width:100px"  colspan="2">
               住院天数:
             </td>
             <td style="text-align:center;width:50px" colspan="1">
                
               </span>
             </td>
-            <td style="text-align:center;width:50px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               转归:
-            
             </td>
             <td style="text-align:center;width:50px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
             <td style="text-align:center;width:50px" colspan="1">
               检查号:
             </td>
-            <td style="text-align:center;width:50px" colspan="2">
+            <td style="text-align:center;width:50px" colspan="1">
               X线:
             </td>
-            <td style="text-align:center;width:50px" colspan="1">
+            <td style="text-align:center;width:50px" colspan="2">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.xray}}
               </span>
                 {{hosDetail.nuclear_magnetic_resonance}}
               </span>
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               超声:
             </td>
-             <td style="text-align:center;width:50px" colspan="1">
+             <td style="text-align:center;width:100px" colspan="1">
               <span style="display:inline-block;margin-left:10px;">
                 {{hosDetail.ultrasound}}
               </span>
             </td>
           </tr>
           <tr>
-            <td style="text-align:center;" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               入院诊断:
               <span style="display:inline-block;margin-left:10px;">
                
             </td>   
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               出院诊断:
             </td>
              <td style="text-align:center;width:170px" colspan="11">
             
           </tr>
            <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               入院时病情:
             </td>
            <td style="text-align:center;width:170px" colspan="11">
           </tr>
         
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               诊断经过:
            
             </td>
             
           </tr>
           <tr>
-            <td style="text-align:center;width:170px" colspan="1">
+            <td style="text-align:center;width:300px" colspan="1">
               出院医嘱:
             </td>
             <td style="text-align:center;width:170px" colspan="11">
       var name = ""
       for(let i=0;i<this.educationOptions.length;i++){
           if(id == this.educationOptions[i].id){
-              name = this.educationOptions[i].name
+           name = this.educationOptions[i].name
           }
       }
       return name
   },
  
   created() {
-    this.educationOptions = getDataConfig("patient", "education_types");
+    this.educationOptions = getDataConfig("patient", "profession_options");
     var xtuser = this.$store.getters.xt_user
     this.orgname = xtuser.org.org_name
     var id = this.$route.query.id

src/xt_pages/workforce/next_remind_print.vue

         </el-col>
       </el-row>
     </div>
-    <div class="app-container" style="background-color: white;">
+    <div class="app-container" style="background-color: white;"  v-loading="loading"
+      element-loading-text="加载中">
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
         now_time:0,
         zone:"",
         pre_status:0,
-        printObj:{}
+        printObj:{},
+        loading: false,
       }
     },
     components: {
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
+      this.loading = true;
       const params = {
           week_type:this.week_type,
           week_time:this.week_time,
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
+        this.loading = false
          var scheduleData = resp.data.schedule
 
           if(this.pre_status == 0){
             var arr =   newList.sort(this.compare('sort'))
             console.log("打印",arr)
             this.scheduleData = arr
+           
           }
         } else {
           this.$message.error(resp.msg)