linwenxin преди 3 месеца
родител
ревизия
b96522742c
променени са 2 файла, в които са добавени 46 реда и са изтрити 4 реда
  1. 16 0
      src/api/masterElectronicPaymentQuiry.js
  2. 30 4
      src/views/userManagement/masterElectronicPaymentQuiry/index.vue

+ 16 - 0
src/api/masterElectronicPaymentQuiry.js

@@ -15,3 +15,19 @@ export function settlementOrderNewPageV3Export(data, name) {
     name
   })
 }
+
+export function settlementOrderNewListPageV4(data) {
+  return request({
+    url: `/settlementOrderNew/list/pageV4?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+export function settlementOrderNewPageV4Export(data, name) {
+  return postBlob({
+    url: '/settlementOrderNew/pageV4Export',
+    data,
+    name
+  })
+}

+ 30 - 4
src/views/userManagement/masterElectronicPaymentQuiry/index.vue

@@ -12,6 +12,23 @@
   >
     <div slot="moreSearch">
       <div style="margin-bottom: 10px">
+        <!-- <span
+          style="
+            font-size: 12px;
+            font-weight: 400;
+            text-align: left;
+            color: #666;
+            line-height: 28px;
+            margin-right: 10px;
+          "
+          ></span
+        > -->
+        <el-radio-group v-model="radio1" size="mini">
+          <el-radio-button :label="0">销售辅材汇总</el-radio-button>
+          <el-radio-button :label="1">销售辅材明细</el-radio-button>
+        </el-radio-group>
+      </div>
+      <div style="margin-bottom: 10px">
         <span
           style="
             font-size: 12px;
@@ -45,7 +62,12 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import { settlementOrderNewListPageV3, settlementOrderNewPageV3Export } from '@/api/masterElectronicPaymentQuiry.js'
+import {
+  settlementOrderNewListPageV3,
+  settlementOrderNewPageV3Export,
+  settlementOrderNewListPageV4,
+  settlementOrderNewPageV4Export
+} from '@/api/masterElectronicPaymentQuiry.js'
 export default {
   components: { TemplatePage },
   mixins: [import_mixin, operation_mixin],
@@ -97,7 +119,8 @@ export default {
         }
       },
       pickerMinDate: null,
-      showTableBool: true
+      showTableBool: true,
+      radio1: 0
     }
   },
   watch: {
@@ -105,6 +128,9 @@ export default {
       if (!this.value1) {
         this.pickerMinDate = null
       }
+      this.$refs.pageRef.refreshList()
+    },
+    radio1() {
       this.showTableBool = false
       this.$nextTick(() => {
         this.showTableBool = true
@@ -135,13 +161,13 @@ export default {
           pam.params.push({ param: 'a.worker_order_id', compare: '=', value: 'XXXXXXXX' })
         }
         cb && cb(pam)
-        return settlementOrderNewListPageV3(pam)
+        return [settlementOrderNewListPageV4, settlementOrderNewListPageV3][this.radio1](pam)
       } catch (err) {}
     },
     // 列表导出函数
     exportList(...p) {
       if (this.value1) {
-        return settlementOrderNewPageV3Export(...p)
+        return [settlementOrderNewPageV4Export, settlementOrderNewPageV3Export][this.radio1](...p)
       }
     },
     // 表格列解析渲染数据更改