vue2-client 1.4.53 → 1.4.55

package/src/mock/goods/index.js

@@ -1,108 +1,108 @@
-import Mock from 'mockjs'
-import '@vue2-client/mock/extend'
-import { parseUrlParams } from '@vue2-client/utils/request'
-
-const current = new Date().getTime()
-
-const goodsList = Mock.mock({
-  'list|100': [{
-    'id|+1': 0,
-    'name': '@GOODS',
-    'orderId': `${current}-@integer(1,100)`,
-    'status|1-4': 1,
-    'send': '@BOOLEAN',
-    'sendTime': '@DATETIME',
-    'orderDate': '@DATE',
-    'auditTime': '@TIME'
-  }]
-})
-
-Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
-  const params = parseUrlParams(decodeURI(url))
-  let { page, pageSize } = params
-  // eslint-disable-next-line no-eval
-  page = eval(page) - 1 || 0
-  // eslint-disable-next-line no-eval
-  pageSize = eval(pageSize) || 10
-  delete params.page
-  delete params.pageSize
-  let result = goodsList.list.filter(item => {
-    for (const [key, value] of Object.entries(params)) {
-      if (item[key] !== value) {
-        return false
-      }
-    }
-    return true
-  })
-  const total = result.length
-  if ((page) * pageSize > total) {
-    result = []
-  } else {
-    result = result.slice(page * pageSize, (page + 1) * pageSize)
-  }
-  return {
-    code: 0,
-    message: 'success',
-    data: {
-      page: page + 1,
-      pageSize,
-      total,
-      list: result
-    }
-  }
-})
-
-const columnsConfig = [
-  {
-    title: '商品名称',
-    dataIndex: 'name',
-    searchAble: true
-  },
-  {
-    title: '订单号',
-    dataIndex: 'orderId'
-  },
-  {
-    searchAble: true,
-    dataIndex: 'status',
-    dataType: 'select',
-    slots: { title: 'statusTitle' },
-    scopedSlots: { customRender: 'status' },
-    search: {
-      selectOptions: [
-        { title: '已下单', value: 1 },
-        { title: '已付款', value: 2 },
-        { title: '已审核', value: 3 }
-        // {title: '已发货', value: 4}
-      ]
-    }
-  },
-  {
-    title: '发货',
-    searchAble: true,
-    dataIndex: 'send',
-    dataType: 'boolean',
-    scopedSlots: { customRender: 'send' }
-  },
-  {
-    title: '发货时间',
-    dataIndex: 'sendTime',
-    dataType: 'datetime'
-  },
-  {
-    title: '下单日期',
-    searchAble: true,
-    dataIndex: 'orderDate',
-    dataType: 'date',
-    visible: false
-  },
-  {
-    title: '审核时间',
-    dataIndex: 'auditTime',
-    dataType: 'time'
-  }
-]
-
-Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
-  return columnsConfig
-})
+import Mock from 'mockjs'
+import '@vue2-client/mock/extend'
+import { parseUrlParams } from '@vue2-client/utils/request'
+
+const current = new Date().getTime()
+
+const goodsList = Mock.mock({
+  'list|100': [{
+    'id|+1': 0,
+    'name': '@GOODS',
+    'orderId': `${current}-@integer(1,100)`,
+    'status|1-4': 1,
+    'send': '@BOOLEAN',
+    'sendTime': '@DATETIME',
+    'orderDate': '@DATE',
+    'auditTime': '@TIME'
+  }]
+})
+
+Mock.mock(RegExp(`${process.env.VUE_APP_API_BASE_URL}/goods` + '.*'), 'get', ({ url }) => {
+  const params = parseUrlParams(decodeURI(url))
+  let { page, pageSize } = params
+  // eslint-disable-next-line no-eval
+  page = eval(page) - 1 || 0
+  // eslint-disable-next-line no-eval
+  pageSize = eval(pageSize) || 10
+  delete params.page
+  delete params.pageSize
+  let result = goodsList.list.filter(item => {
+    for (const [key, value] of Object.entries(params)) {
+      if (item[key] !== value) {
+        return false
+      }
+    }
+    return true
+  })
+  const total = result.length
+  if ((page) * pageSize > total) {
+    result = []
+  } else {
+    result = result.slice(page * pageSize, (page + 1) * pageSize)
+  }
+  return {
+    code: 0,
+    message: 'success',
+    data: {
+      page: page + 1,
+      pageSize,
+      total,
+      list: result
+    }
+  }
+})
+
+const columnsConfig = [
+  {
+    title: '商品名称',
+    dataIndex: 'name',
+    searchAble: true
+  },
+  {
+    title: '订单号',
+    dataIndex: 'orderId'
+  },
+  {
+    searchAble: true,
+    dataIndex: 'status',
+    dataType: 'select',
+    slots: { title: 'statusTitle' },
+    scopedSlots: { customRender: 'status' },
+    search: {
+      selectOptions: [
+        { title: '已下单', value: 1 },
+        { title: '已付款', value: 2 },
+        { title: '已审核', value: 3 }
+        // {title: '已发货', value: 4}
+      ]
+    }
+  },
+  {
+    title: '发货',
+    searchAble: true,
+    dataIndex: 'send',
+    dataType: 'boolean',
+    scopedSlots: { customRender: 'send' }
+  },
+  {
+    title: '发货时间',
+    dataIndex: 'sendTime',
+    dataType: 'datetime'
+  },
+  {
+    title: '下单日期',
+    searchAble: true,
+    dataIndex: 'orderDate',
+    dataType: 'date',
+    visible: false
+  },
+  {
+    title: '审核时间',
+    dataIndex: 'auditTime',
+    dataType: 'time'
+  }
+]
+
+Mock.mock(`${process.env.VUE_APP_API_BASE_URL}/columns`, 'get', () => {
+  return columnsConfig
+})

package/src/pages/CreateQueryPage.vue

@@ -8,8 +8,12 @@
       :visible.sync="createSimpleFormVisible"
       @saveSimpleFormQueryParams="saveSimpleFormQueryParams"
     />
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具</a-button>
-    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">打开基础表单配置生成工具</a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showDrawer">打开完整查询配置生成工具
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="showSimpleFormQueryParamsDrawer">
+      打开基础表单配置生成工具
+    </a-button>
+    <a-button style="margin-top: 10px;margin-left: 10px;" type="primary" @click="searchReport">请求数据</a-button>
     <!--    <webmeter-analysis-view/>-->
   </div>
 </template>
@@ -38,6 +42,21 @@ export default {
     showSimpleFormQueryParamsDrawer () {
       this.createSimpleFormVisible = true
     },
+    // 查询report
+    searchReport (source) {
+      return post('/rs/report/saleMonthReport', {
+        'data': {
+          'condition': ' 1=1 ',
+          'startDate': '2022-11-21 00:00:00',
+          'endDate': '2022-11-21 23:59:59',
+          'f_orgid': 'f_orgid in (21142)'
+        }
+      }).then(res => {
+        this.$message.success(res)
+      }, err => {
+        console.error(err)
+      })
+    },
     // 存储查询配置信息
     saveQueryParams (source) {
       return post('/api/af-system/logic/addOrEditQueryParams', {

package/src/pages/ReportView.vue

@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <div id="reportContent">
+      <table style="margin: 0px auto" v-html="model"> </table>
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api/restTools'
+
+export default {
+  name: 'ReportView',
+  data () {
+    return {
+      model: ''
+    }
+  },
+  props: ['data'],
+  methods: {
+    // 查询report
+    searchReport (source) {
+      return post('/rs/report/saleMonthReport', {
+        // data: this.data.data
+        data: this.data['data']
+      }).then(res => {
+        this.model = res
+      }).catch(err => {
+        console.error(err)
+      })
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+#reportContent {
+  margin-top: 5px;
+}
+</style>
+<style>
+#reportContent .report-primary{
+  background-color: #dfedfb;
+  border: 1px solid #d8d7d7;
+  border-collapse: collapse;
+}
+#reportContent .report-success{
+  border: 1px solid #d8d7d7;
+  border-collapse: collapse;
+}
+</style>