消耗单明细新增需求

src/api/expend/expendMx.js

@@ -46,4 +46,12 @@ export function toOAs(data) {
     method: 'post',
     data: data
   })
+}
+// 导出
+export function exportMx(data) {
+  return request({
+    url: `/pu/doc/pullToCcd`,
+    method: 'post',
+    data: data
+  })
 }

src/views/expend/expendMx.vue

@@ -19,6 +19,29 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="医院编码">
+                <el-input
+                  v-model.trim="params.custCode"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
+            <el-form-item label="供应商编码">
+                <el-input
+                  v-model.trim="params.supplierCode"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+
+          <el-col :span="1.5">
             <el-form-item label="结算开始日期">
               <el-date-picker
                 v-model="params.startDate"
@@ -57,6 +80,19 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="是否汇总">
+              <el-select style="width: 200px" size="mini" clearable v-model="params.isSum" placeholder="请选择">
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label-width="80px">
               <el-button type="primary" size="mini" icon="el-icon-search" @click="searchList">搜索</el-button>
               <el-button size="mini" plain icon="el-icon-refresh" @click="resetList">重置</el-button>
@@ -113,9 +149,9 @@
 </template>
 
 <script>
-import { mxList, pullMx, huizongMX } from '@/api/expend/expendMx.js'
+import { mxList, pullMx, huizongMX, exportMx } from '@/api/expend/expendMx.js'
 export default {
-  dicts: ['sys_status'],
+  dicts: ['sys_status', 'sys_number_yes_no'],
   components: {
     Add: () => import("./expendMxDetail.vue"),
     ElSuperUxTable: () => import("@/components/super-ux-table/index.vue"),
@@ -130,8 +166,11 @@ export default {
       rowDetail: {},
       size: "mini",
       loading: false,
+      options: [{value: '0', label: '是'}, {value: '2', label: '否'}],
       params: {
         code: '',
+        custCode: '',
+        supplierCode: '',
         startDate: '',
         endDate: '',
         settleNo: '',
@@ -145,28 +184,26 @@ export default {
       selectData: [],
       // SearchColumns: SearchColumns,
       TableColumns: [
+        { item: { key: "code", title: "编码"}, attr: {} },
+        { item: { key: "verifyState", title: "单据状态"}, attr: {
+          is: "el-dict-tag",
+          dictName: "sys_status",
+          } 
+        },
         { item: { key: "serviceFee", title: "服务费合计" }, attr: {} },
+        { item: { key: "custName", title: "医院名称" }, attr: {} },
         { item: { key: "custCode", title: "医院编码" }, attr: {} },
         { item: { key: "supplierCode", title: "供应商编码" }, attr: {} },
         { item: { key: "supplierName", title: "供应商名称" }, attr: {} },
         { item: { key: "isSum", title: "是否汇总" }, attr: {
-          formatter: (prop) => {
-              return prop.isSum == '0' ? '是' : '否'
-            },
+          is: 'el-dict-tag',
+          dictName: "sys_number_yes_no",
         } },
         { item: { key: "settleNo", title: "结算单号"}, attr: {} },
         { item: { key: "startDate", title: "结算开始日期" }, attr: {} },
         { item: { key: "endDate", title: "结算截止日期" }, attr: {} },
         { item: { key: "totalAmount", title: "合计金额" }, attr: {} },
-        // { item: { key: "isProjectOrFactoryEmpower", title: "是否项目/厂家年度授权" }, attr: {is: "el-dict-tag", dictName: "sys_equipment_type"} },
-        // { item: { key: "parameters", title: "参数" }, attr: {} },
         { item: { key: "remark", title: "备注"}, attr: {} },
-        { item: { key: "code", title: "编码"}, attr: {} },
-        { item: { key: "verifyState", title: "单据状态"}, attr: {
-          is: "el-dict-tag",
-          dictName: "sys_status",
-          } 
-        },
       ].map(({ item, attr }) => ({
       attr,
       item: {
@@ -190,6 +227,8 @@ export default {
     resetList() {
       this.params = {
         code: '',
+        custCode: '',
+        supplierCode: '',
         startDate: '',
         endDate: '',
         settleNo: '',
@@ -240,10 +279,27 @@ export default {
         huizongMX(this.ids).then(res => {
           if(res.code === 200) {
             this.$modal.notifySuccess(res.msg);
+            this.huizongDC(this.ids)
           }
        })
       }
-      // huizongMX()
+    },
+    huizongDC(arr) {
+      this.download('/pu/doc/pullToCcd', arr, `汇总明细_${new Date().getTime()}.xlsx`)
+      // exportMx(arr).then(res => {
+      //   console.log('111',res)
+      //   const blob = new Blob([res], {
+      //     type: "application/vnd.ms-excel;charset=UTF-8",
+      //   }); // 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
+      //   const downloadElement = document.createElement("a"); //创建a标签
+      //   const href = window.URL.createObjectURL(blob); // 创建下载的链接
+      //   downloadElement.href = href; //下载地址
+      //   downloadElement.download = '消耗单明细'; // 下载后文件名
+      //   document.body.appendChild(downloadElement);
+      //   downloadElement.click(); // 点击下载
+      //   document.body.removeChild(downloadElement); // 下载完成移除元素
+      //   window.URL.revokeObjectURL(href); // 释放blob对象
+      // })
     },
     check(row) {
       this.isList = false

src/views/expend/expendMxDetail.vue

@@ -278,9 +278,11 @@ export default {
     hangStatus(row) {
       switch (row.row.isWhether) {
         case "0":
-          return "是";
-        case "2":
           return "否";
+        case "":
+          return "否";
+        case "1":
+          return "是";
       }
     },
   }