Merge branch 'feature/two-bug' into feat-two

src/api/supply/salesReturnOrder.js

@@ -0,0 +1,58 @@
+import request, { postBlob, handleImport, getBlob } from '@/utils/request'
+
+// 销售政策退订单-列表
+export function refundRetailListV2(data) {
+  return request({
+    url: `/v2/refund/retail/list?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+//销售政策退订单-导出
+export function refundRetailListV2Export(data, name) {
+  return postBlob({
+    url: '/v2/refund/retail/list/export',
+    method: 'post',
+    data,
+    name
+  })
+}
+
+// 零售退订单-列表
+export function refundOtherListV2(data) {
+  return request({
+    url: `/v2/refund/other/list?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+//零售退订单-导出
+export function refundOtherListV2Export(data, name) {
+  return postBlob({
+    url: '/v2/refund/other/list/export',
+    method: 'post',
+    data,
+    name
+  })
+}
+
+// 商用工程退订单-列表
+export function refundTradeListV2(data) {
+  return request({
+    url: `/v2/refund/trade-e/list?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+//商用工程退订单-导出
+export function refundTradeListV2Export(data, name) {
+  return postBlob({
+    url: '/v2/refund/trade-e/list/export',
+    method: 'post',
+    data,
+    name
+  })
+}

src/views/supply/salesReturnOrder/commercial.vue

@@ -0,0 +1,102 @@
+<template>
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :export-list="exportList"
+    :operation="operation()"
+    :options-evens-group="optionsEvensGroup"
+    :column-parsing="columnParsing"
+  >
+    <popu v-if="visible">
+      <el-page-header slot="head" content="订单信息" @back="handleClose" />
+      <sales-return-order-detail />
+    </popu>
+  </template-page>
+</template>
+
+<script>
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import add_callback_mixin from '@/components/template/add_callback_mixin.js'
+import Popu from '@/components/template/popu.vue'
+import SalesReturnOrderDetail from './salesReturnOrderDetail.vue'
+import { refundTradeListV2, refundTradeListV2Export } from '@/api/supply/salesReturnOrder'
+export default {
+  components: { TemplatePage, Popu, SalesReturnOrderDetail },
+  mixins: [import_mixin, add_callback_mixin],
+  data() {
+    return {
+      visible: false,
+      // 事件组合
+      optionsEvensGroup: [
+        // [
+        //   [
+        //     {
+        //       name: '新增',
+        //       click: this.addOn(() => {
+        //         this.visible = true
+        //       })
+        //       // isRole: this.$checkBtnRole('add', this.$route.meta.roles)
+        //     }
+        //   ]
+        // ]
+      ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
+      }, // 关闭新增弹窗
+
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      recordSelected: [],
+
+      detailsId: ''
+    }
+  },
+  methods: {
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return refundTradeListV2(...p)
+    },
+    // 列表导出函数
+    exportList: refundTradeListV2Export,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    operation() {
+      return (h, { row, index, column }) => {
+        return (
+          <div class="operation-btns">
+            <el-button
+              size="mini"
+              type="text"
+              onClick={() => {
+                this.visible = true
+                this.detailsId = row.id
+              }}
+            >
+              查看
+            </el-button>
+          </div>
+        )
+      }
+    },
+    handleClose() {
+      this.addOff(() => {
+        this.visible = false
+      })()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/supply/salesReturnOrder/policy.vue

@@ -0,0 +1,102 @@
+<template>
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :export-list="exportList"
+    :operation="operation()"
+    :options-evens-group="optionsEvensGroup"
+    :column-parsing="columnParsing"
+  >
+    <popu v-if="visible">
+      <el-page-header slot="head" content="订单信息" @back="handleClose" />
+      <sales-return-order-detail />
+    </popu>
+  </template-page>
+</template>
+
+<script>
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import add_callback_mixin from '@/components/template/add_callback_mixin.js'
+import Popu from '@/components/template/popu.vue'
+import SalesReturnOrderDetail from './salesReturnOrderDetail.vue'
+import { refundRetailListV2, refundRetailListV2Export } from '@/api/supply/salesReturnOrder'
+export default {
+  components: { TemplatePage, Popu, SalesReturnOrderDetail },
+  mixins: [import_mixin, add_callback_mixin],
+  data() {
+    return {
+      visible: false,
+      // 事件组合
+      optionsEvensGroup: [
+        // [
+        //   [
+        //     {
+        //       name: '新增',
+        //       click: this.addOn(() => {
+        //         this.visible = true
+        //       })
+        //       // isRole: this.$checkBtnRole('add', this.$route.meta.roles)
+        //     }
+        //   ]
+        // ]
+      ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
+      }, // 关闭新增弹窗
+
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      recordSelected: [],
+
+      detailsId: ''
+    }
+  },
+  methods: {
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return refundRetailListV2(...p)
+    },
+    // 列表导出函数
+    exportList: refundRetailListV2Export,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    operation() {
+      return (h, { row, index, column }) => {
+        return (
+          <div class="operation-btns">
+            <el-button
+              size="mini"
+              type="text"
+              onClick={() => {
+                this.visible = true
+                this.detailsId = row.id
+              }}
+            >
+              查看
+            </el-button>
+          </div>
+        )
+      }
+    },
+    handleClose() {
+      this.addOff(() => {
+        this.visible = false
+      })()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/supply/salesReturnOrder/retail.vue

@@ -0,0 +1,102 @@
+<template>
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :export-list="exportList"
+    :operation="operation()"
+    :options-evens-group="optionsEvensGroup"
+    :column-parsing="columnParsing"
+  >
+    <popu v-if="visible">
+      <el-page-header slot="head" content="订单信息" @back="handleClose" />
+      <sales-return-order-detail />
+    </popu>
+  </template-page>
+</template>
+
+<script>
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import add_callback_mixin from '@/components/template/add_callback_mixin.js'
+import Popu from '@/components/template/popu.vue'
+import SalesReturnOrderDetail from './salesReturnOrderDetail.vue'
+import { refundOtherListV2, refundOtherListV2Export } from '@/api/supply/salesReturnOrder'
+export default {
+  components: { TemplatePage, Popu, SalesReturnOrderDetail },
+  mixins: [import_mixin, add_callback_mixin],
+  data() {
+    return {
+      visible: false,
+      // 事件组合
+      optionsEvensGroup: [
+        // [
+        //   [
+        //     {
+        //       name: '新增',
+        //       click: this.addOn(() => {
+        //         this.visible = true
+        //       })
+        //       // isRole: this.$checkBtnRole('add', this.$route.meta.roles)
+        //     }
+        //   ]
+        // ]
+      ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
+      }, // 关闭新增弹窗
+
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      recordSelected: [],
+
+      detailsId: ''
+    }
+  },
+  methods: {
+    // 列表请求函数
+    getList(...p) {
+      this.recordSelected = []
+      return refundOtherListV2(...p)
+    },
+    // 列表导出函数
+    exportList: refundOtherListV2Export,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    operation() {
+      return (h, { row, index, column }) => {
+        return (
+          <div class="operation-btns">
+            <el-button
+              size="mini"
+              type="text"
+              onClick={() => {
+                this.visible = true
+                this.detailsId = row.id
+              }}
+            >
+              查看
+            </el-button>
+          </div>
+        )
+      }
+    },
+    handleClose() {
+      this.addOff(() => {
+        this.visible = false
+      })()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>