Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/expend/expendMx.vue

@@ -19,6 +19,17 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="医院名称">
+                <el-input
+                  v-model.trim="params.custName"
+                  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.custCode"
@@ -30,6 +41,17 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="供应商名称">
+                <el-input
+                  v-model.trim="params.supplierName"
+                  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"
@@ -93,6 +115,17 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="汇总单据号">
+                <el-input
+                  v-model.trim="params.sumCode"
+                  size="mini"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label="是否带量">
               <el-select style="width: 200px" size="mini" clearable v-model="params.isWhether" placeholder="请选择">
                 <el-option
@@ -183,12 +216,15 @@ export default {
       options1: [{value: '0', label: '否'}, {value: '1', label: '是'}],
       params: {
         code: '',
+        custName: '',
         custCode: '',
+        supplierName: '',
         supplierCode: '',
         startDate: '',
         endDate: '',
         settleNo: '',
         isSum: '',
+        sumCode: '',
         isWhether: ''
       },
       pageInfo: {
@@ -215,6 +251,7 @@ export default {
           is: 'el-dict-tag',
           dictName: "sys_number_yes_no",
         } },
+        { item: { key: "sumCode", title: "汇总单据号"}, attr: {} },
         { item: { key: "isWhether", title: "是否带量" }, attr: {
           is: 'el-dict-tag',
           dictName: "carry_or_not",
@@ -247,11 +284,14 @@ export default {
     resetList() {
       this.params = {
         code: '',
+        custName: '',
         custCode: '',
+        supplierName: '',
         supplierCode: '',
         startDate: '',
         endDate: '',
         settleNo: '',
+        sumCode:''
       }
       this.useQuery(this.params, this.pageInfo)
     },
@@ -303,23 +343,6 @@ export default {
         this.download('/pu/doc/pullToCcd', {...map}, `汇总明细_${new Date().getTime()}.xlsx`)
       }
     },
-    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
       this.page = 'check'

src/views/expend/expendMxDetail.vue

@@ -106,6 +106,13 @@
           </el-col>
 
           <el-col :span="1.5">
+            <el-form-item label="汇总单据号" prop="sumCode">
+              <el-input style="width: 200px" disabled size="mini" v-model="basicForm.sumCode">
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="1.5">
             <el-form-item label="是否带量" prop="isWhether">
               <el-select style="width: 200px" size="mini" :disabled="sonDisable" clearable v-model="basicForm.isWhether" placeholder="请选择">
                 <el-option
@@ -227,6 +234,7 @@ export default {
         endDate: '',
         totalAmount: '',
         isSum: '',
+        sumCode: '',
         isWhether: '',
         remark: '',
         itemList: []