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

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -1,5 +1,11 @@
 <template>
   <div class="prescriptionTable">
+<!--    <el-button-->
+<!--        size="small"-->
+<!--        type="primary"-->
+<!--        icon="el-icon-download"-->
+<!--        @click="exportData"-->
+<!--    >导出</el-button>-->
     <el-table
       v-if="prescription.type == 1"
       :data="prescription.advices"
@@ -119,7 +125,8 @@
       </el-table-column>
     </el-table>
     <el-table
-      v-if="prescription.type == 2"
+        id="out-table"
+        v-if="prescription.type == 2"
       :data="prescription.project"
       border
       style="width: 99%"
@@ -305,6 +312,7 @@ export default {
     };
   },
   mounted() {
+
     getInitData().then((response) => {
       if (response.data.state == 0) {
         this.$message.error(response.data.msg);
@@ -316,6 +324,31 @@ export default {
     });
   },
   methods: {
+    exportData(){
+        let excelName = '导出表格名称.xlsx';
+        var xlsxParam = { raw: true };//转换成excel时，使用原始的格式
+        // 克隆节点
+        let tables = document.getElementById("out-table").cloneNode(true);
+        // 判断是否为固定列，解决（为固定列时，会重复生成表格）
+        if (tables.querySelector('.el-table__fixed') !== null) {
+          tables.removeChild(tables.querySelector('.el-table__fixed'))
+        }
+        let table_book = this.$XLSX.utils.table_to_book(tables, xlsxParam);
+        var table_write = this.$XLSX.write(table_book, {
+          bookType: "xlsx",
+          bookSST: true,
+          type: "array"
+        });
+        try {
+          this.$FileSaver.saveAs(
+              new Blob([table_write], { type: "application/octet-stream" }),
+              excelName
+          );
+        } catch (e) {
+          if (typeof console !== "undefined") console.log(e, table_write);
+        }
+        return table_write;
+    },
     changColor({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
         // 变颜色的条件

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

@@ -27,7 +27,8 @@
           <td style="width:5%">序号</td>
           <td style="width:15%">处方日期</td>
           <td style="width:10%">费用编号</td>
-          <td style="width:40%">费用名称/规格</td>
+          <td style="width:30%">费用名称</td>
+          <td style="width:10%">规格</td>
           <td style="width:5%">单位</td>
           <td style="width:5%">数量</td>
           <td style="width:10%">单价</td>
@@ -38,7 +39,8 @@
             <td style="width:5%">{{index + 1}}</td>
             <td style="width:15%">{{item.p_time}}</td>
             <td style="width:10%">{{item.feedetl_sn.split("-")[2]}}</td>
-            <td style="width:40%">{{item.name}}/{{item.spec}}</td>
+            <td style="width:30%">{{item.name}}</td>
+            <td style="width:10%">{{item.spec}}</td>
             <td style="width:5%">{{item.unit}}</td>
             <td style="width:5%">{{ item.count }}</td>
             <td style="width:10%">{{ item.price }}</td>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -85,20 +85,20 @@
 
 
           <div>
-<!--            <el-button size="small"-->
-<!--                       @click="openZb(1)"-->
-<!--                       type="primary">登记-->
-<!--            </el-button>-->
-
-<!--            <el-button  size="small"-->
-<!--                       @click="openZb(2)"-->
-<!--                       type="primary">记账-->
-<!--            </el-button>-->
-
-<!--            <el-button   size="small"-->
-<!--                       @click="openZb(3)"-->
-<!--                       type="primary">撤销记账-->
-<!--            </el-button>-->
+            <el-button size="small"
+                       @click="openZb(1)"
+                       type="primary">登记
+            </el-button>
+
+            <el-button  size="small"
+                       @click="openZb(2)"
+                       type="primary">记账
+            </el-button>
+
+            <el-button   size="small"
+                       @click="openZb(3)"
+                       type="primary">撤销记账
+            </el-button>
 
 
             <el-button v-loading="loadingone" size="small"