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

src/xt_pages/data/components/project.vue

@@ -107,7 +107,7 @@ export default {
               {value:2,label:'否'}
             ],
             value: '',
-            limit:20,
+            limit:10,
             page:1,
             total:0,
             tableData: [],
@@ -177,6 +177,7 @@ export default {
                console.log('projectlist',projecList)
                this.tableData = projecList
                var total = response.data.data.total
+               console.log("total-----",total)
                this.total = total
              }
           })  

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -589,8 +589,8 @@
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
               &nbsp;
-              <span v-if="setAdminUserES(summary==null? 0 : (summary.modifier?summary.modifier:summary.creater)) == ''"> {{ getAdminUser(summary==null?0:(summary.modifier?summary.modifier:summary.creater)) }} </span>
-              <img style="height:30px;" :src="setAdminUserES(summary==null?0:(summary.modifier?summary.modifier:summary.creater))" alt="" srcset="" v-else />
+              <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+              <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
               <!-- <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
                 <img class="es-img" style="height:30px;" :src="doctorForm.url" />

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -342,7 +342,7 @@
               <tbody>
               <tr>
                 <td width="70">血管通路:</td>
-                <td width="600">
+                <td width="620">
                   <div>
                     <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') > -1 ? true : false" showValue="自体内瘘"></label-box>
                     &nbsp;
@@ -599,7 +599,7 @@
                 <td width='30'>A液:</td>
                 <td width="10">钙</td>
                 <td width="10">(</td>
-                <td width="200">
+                <td width="210">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.25mmol/L"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="1.5mmol/L"></label-box>
@@ -608,7 +608,7 @@
                 <td width="10">)</td>
                 <td width="10">钾</td>
                 <td width="10">(</td>
-                <td width="200">
+                <td width="210">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(2.0mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(2.0mmol/L)') > -1 ? true : false" showValue="2.0mmol/L"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('A液：钙(1.25mmol/L)钾(3.5mmol/L)') > -1 ? true : prescription.dialysate_formulation_name.indexOf('A液：钙(1.5mmol/L)钾(3.5mmol/L)') > -1 ? true : false" showValue="3.5mmol/L"></label-box>
@@ -776,7 +776,7 @@
             透析监测
           </td>
 
-          <td width="100">时间</td>
+          <td width="60">时间</td>
           <td width="40" style="line-height:20px">T<br />℃</td>
           <td width="80" style="line-height:20px">Bp<br />mmHg</td>
           <td width="40" style="line-height:20px">P<br />次/分</td>
@@ -795,7 +795,7 @@
         </tr>
 
         <tr v-for="monitor in monitors" :key="monitor.id">
-          <td style="height:30px;">
+          <td style="height:20px;">
             &nbsp;
             <!-- <template>
               <span v-if="monitor.monitoring_date">
@@ -862,17 +862,17 @@
           <td :rowspan="doctor_advices.length + 1" width="30" class="title-box">
             医嘱内容
           </td>
-          <td style="font-size: 16px" width="10%">时间</td>
+          <td style="font-size: 16px" width="8%">时间</td>
           <td style="font-size: 16px" colspan="2">医嘱内容</td>
           <td style="font-size: 16px" width="10%">医生签名</td>
           <td style="font-size: 16px" width="10%">执行人签名</td>
           <td style="font-size: 16px" width="10%">核对人签名</td>
-          <td style="font-size: 16px" width="10%">时间</td>
+          <td style="font-size: 16px" width="8%">时间</td>
         </tr>
         <!-- <template v-for="group in doctor_advices" > -->
 
         <tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index">
-          <td height="35px">
+          <td height="30px">
               <span v-if="advice.start_time">
                 {{ getTime(advice.start_time, "{h}:{i}") }}
               </span>
@@ -2013,8 +2013,8 @@ export default {
             if (this.org_template_info.org_id == 9535) {
               this.isShowZero = true
             }
-            if (this.monitors.length < 13) {
-              var nl = 13 - this.monitors.length
+            if (this.monitors.length < 9) {
+              var nl = 9 - this.monitors.length
               for (let index = 0; index < nl; index++) {
                 this.monitors.push([])
               }

src/xt_pages/medicalScheduling/index.vue

@@ -7,6 +7,7 @@
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
+                <el-button type="primary" icon="el-icon-printer" @click="toPrint">导出</el-button>
             </div>
         </div>
         <div class="app-container">

src/xt_pages/stock/drugs/query.vue

@@ -11,6 +11,14 @@
       >设置
       </el-button
       >
+     <!-- <el-button
+        size="small"
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="exportStock"
+      >导出
+      </el-button> -->
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
@@ -167,7 +175,8 @@
         WarehouseInfo: {
           loading: false,
           warehouseInfoDate: []
-        }
+        },
+        tableData:[]
       }
     },
     methods: {
@@ -234,12 +243,17 @@
           } else {
             this.WarehouseInfo.loading = false
             this.total = response.data.data.total
+            var arr = []
             for (let i = 0; i < response.data.data.list.length; i++) {
-
               this.WarehouseInfo.warehouseInfoDate.push(
                 response.data.data.list[i]
               )
+              arr.push(response.data.data.list[i])
             }
+            console.log("数据源头",arr)
+            // for(let i=0;i<arr.length;i++){
+            //    arr[i].stockInCount = 
+            // }
             this.handleSpanTempArr()
           }
         })
@@ -325,7 +339,29 @@
         this.GetAllDrugStockQueryList()
       }, setting: function() {
         this.$refs.dialog.show()
-      }
+      },
+      //  exportStock(){
+      //    import('@/vendor/Export2Excel').then(excel => {
+      //    const tHeader = ['药品名称', '规格名称', '入库数量','入库退货','实际入库','出库数量','出库退货','实际出库','剩余库存']
+      //    const filterVal = ['index', 'dialysis_no', 'name','drug_name','drug_spec','Total','Count','margin','margin']
+      //   //  for(let i=0;i<this.tableData.length;i++){
+      //   //     this.tableData[i].margin = (this.tableData[i].Total?this.tableData[i].Total:0) - this.tableData[i].Count
+      //   //  }
+        
+      //    const data = this.formatJson(filterVal, this.tableData)
+      
+      //    excel.export_json_to_excel({
+      //      header: tHeader,
+      //      data,
+      //      filename: '自备药查询'
+      //    })
+      //     this.downloadLoading = false
+      //   })
+      //  },
+      //  formatJson(filterVal, jsonData) {
+      //   return jsonData.map(v => filterVal.map(j => v[j]));
+      // },
+
     }
   }
 </script>