Browse Source

提交修复

master
主管理员 1 month ago
parent
commit
288b80952b
25 changed files with 1514 additions and 312 deletions
  1. +1
    -0
      .idea/compiler.xml
  2. +1
    -1
      admin-pc/.env
  3. +1
    -1
      admin-pc/.env.development
  4. +1
    -1
      admin-pc/.env.production
  5. +301
    -0
      admin-pc/src/views/commonOrder0/CommonOrderList.vue
  6. +189
    -0
      admin-pc/src/views/commonOrder0/modules/CommonOrderForm.vue
  7. +84
    -0
      admin-pc/src/views/commonOrder0/modules/CommonOrderModal.Style#Drawer.vue
  8. +60
    -0
      admin-pc/src/views/commonOrder0/modules/CommonOrderModal.vue
  9. +577
    -239
      admin-pc/src/views/dashboard/Analysis.vue
  10. +37
    -18
      module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java
  11. +7
    -1
      module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java
  12. +71
    -14
      module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java
  13. +17
    -0
      module-common/src/main/java/org/jeecg/modules/commonBanner/bean/CountBean.java
  14. +4
    -0
      module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java
  15. +16
    -0
      module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml
  16. +3
    -1
      module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java
  17. +5
    -0
      module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java
  18. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java
  19. +22
    -5
      module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java
  20. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java
  21. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java
  22. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java
  23. +30
    -10
      module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue
  24. +21
    -6
      module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue
  25. +62
    -11
      module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts

+ 1
- 0
.idea/compiler.xml View File

@ -2,6 +2,7 @@
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />


+ 1
- 1
admin-pc/.env View File

@ -1,4 +1,4 @@
NODE_ENV=production
NODE_ENV=development
VUE_APP_PLATFORM_NAME=陌美人珠宝管理系统
# 开启单点登录
VUE_APP_SSO=false


+ 1
- 1
admin-pc/.env.development View File

@ -1,5 +1,5 @@
NODE_ENV=development
VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/
VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview


+ 1
- 1
admin-pc/.env.production View File

@ -1,4 +1,4 @@
NODE_ENV=production
VUE_APP_API_BASE_URL=http://localhost:8001/jewelry-admin/
VUE_APP_API_BASE_URL=https://admin.momeirenzhubao.com/jewelry-admin/
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

+ 301
- 0
admin-pc/src/views/commonOrder0/CommonOrderList.vue View File

@ -0,0 +1,301 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="送礼订单">
<j-dict-select-tag placeholder="请选择送礼订单" v-model="queryParam.isGive" dictCode="give_state"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="支付状态">
<j-dict-select-tag placeholder="请选择支付状态" v-model="queryParam.state" dictCode="order_state"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('订单信息表')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text,record">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<common-order-modal ref="modalForm" @ok="modalFormOk"></common-order-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CommonOrderModal from './modules/CommonOrderModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'CommonOrderList',
mixins:[JeecgListMixin, mixinDevice],
components: {
CommonOrderModal
},
data () {
return {
description: '订单信息表管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'创建日期',
align:"center",
sorter: true,
dataIndex: 'createTime'
},
{
title:'送礼订单',
align:"center",
dataIndex: 'isGive_dictText'
},
{
title:'标题',
align:"center",
dataIndex: 'title'
},
{
title:'支付状态',
align:"center",
dataIndex: 'state_dictText'
},
{
title:'价格',
align:"center",
dataIndex: 'price'
},
{
title:'数量',
align:"center",
dataIndex: 'num'
},
{
title:'规格',
align:"center",
dataIndex: 'sku'
},
{
title:'姓名',
align:"center",
dataIndex: 'name'
},
{
title:'电话',
align:"center",
dataIndex: 'phone'
},
{
title:'地址',
align:"center",
dataIndex: 'address'
},
{
title:'详细地址',
align:"center",
dataIndex: 'addressDetails'
},
{
title:'用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'商品标识',
align:"center",
dataIndex: 'shopId_dictText'
},
{
title:'快递公司',
align:"center",
dataIndex: 'kuai'
},
{
title:'物流订单',
align:"center",
dataIndex: 'wuliu'
},
{
title:'订单材质',
align:"center",
dataIndex: 'subText'
},
{
title:'支付方式',
align:"center",
dataIndex: 'payType'
},
{
title:'优惠券标识',
align:"center",
dataIndex: 'couponId_dictText'
},
{
title:'优惠价格',
align:"center",
dataIndex: 'couponPrice'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/commonOrder/commonOrder/list",
delete: "/commonOrder/commonOrder/delete",
deleteBatch: "/commonOrder/commonOrder/deleteBatch",
exportXlsUrl: "/commonOrder/commonOrder/exportXls",
importExcelUrl: "commonOrder/commonOrder/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'int',value:'isGive',text:'送礼订单',dictCode:'give_state'})
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'int',value:'state',text:'支付状态',dictCode:'order_state'})
fieldList.push({type:'BigDecimal',value:'price',text:'价格',dictCode:''})
fieldList.push({type:'int',value:'num',text:'数量',dictCode:''})
fieldList.push({type:'string',value:'sku',text:'规格',dictCode:''})
fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
fieldList.push({type:'string',value:'addressDetails',text:'详细地址',dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'sel_search',value:'shopId',text:'商品标识',dictTable:"common_shop", dictText:'title', dictCode:'id'})
fieldList.push({type:'string',value:'kuai',text:'快递公司',dictCode:''})
fieldList.push({type:'string',value:'wuliu',text:'物流订单',dictCode:''})
fieldList.push({type:'string',value:'subText',text:'订单材质',dictCode:''})
fieldList.push({type:'int',value:'payType',text:'支付方式',dictCode:''})
fieldList.push({type:'sel_search',value:'couponId',text:'优惠券标识',dictTable:"common_coupon", dictText:'money', dictCode:'id'})
fieldList.push({type:'BigDecimal',value:'couponPrice',text:'优惠价格',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

+ 189
- 0
admin-pc/src/views/commonOrder0/modules/CommonOrderForm.vue View File

@ -0,0 +1,189 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="送礼订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isGive">
<j-dict-select-tag type="list" v-model="model.isGive" dictCode="give_state" placeholder="请选择送礼订单" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入标题" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="支付状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
<j-dict-select-tag type="list" v-model="model.state" dictCode="order_state" placeholder="请选择支付状态" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
<a-input-number v-model="model.price" placeholder="请输入价格" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
<a-input-number v-model="model.num" placeholder="请输入数量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sku">
<a-input v-model="model.sku" placeholder="请输入规格" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name" placeholder="请输入姓名" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
<a-input v-model="model.phone" placeholder="请输入电话" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-input v-model="model.address" placeholder="请输入地址" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="详细地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressDetails">
<a-input v-model="model.addressDetails" placeholder="请输入详细地址" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商品标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
<j-search-select-tag v-model="model.shopId" dict="common_shop,title,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="快递公司" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kuai">
<a-input v-model="model.kuai" placeholder="请输入快递公司" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="物流订单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="wuliu">
<a-input v-model="model.wuliu" placeholder="请输入物流订单" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="订单材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="subText">
<a-input v-model="model.subText" placeholder="请输入订单材质" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="payType">
<a-input-number v-model="model.payType" placeholder="请输入支付方式" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="优惠券标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="couponId">
<j-search-select-tag v-model="model.couponId" dict="common_coupon,money,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="优惠价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="couponPrice">
<a-input-number v-model="model.couponPrice" placeholder="请输入优惠价格" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'CommonOrderForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/commonOrder/commonOrder/add",
edit: "/commonOrder/commonOrder/edit",
queryById: "/commonOrder/commonOrder/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

+ 84
- 0
admin-pc/src/views/commonOrder0/modules/CommonOrderModal.Style#Drawer.vue View File

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-order-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import CommonOrderForm from './CommonOrderForm'
export default {
name: 'CommonOrderModal',
components: {
CommonOrderForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

+ 60
- 0
admin-pc/src/views/commonOrder0/modules/CommonOrderModal.vue View File

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<common-order-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-order-form>
</j-modal>
</template>
<script>
import CommonOrderForm from './CommonOrderForm'
export default {
name: 'CommonOrderModal',
components: {
CommonOrderForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

+ 577
- 239
admin-pc/src/views/dashboard/Analysis.vue View File

@ -1,292 +1,630 @@
<template>
<div class="page-header-index-wide">
<div>
<!-- <div class="background-card">-->
<a-row :gutter="24">
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<chart-card :loading="loading" title="订单管理统计">
<!-- <template >订单总数<span>{{ todaySll }}</span></template>-->
<!-- <template >产品订单数量<span>{{ todaySll }}</span></template><br/>-->
<!-- <template >未支付<span>{{ todaySll }}</span></template>-->
<!-- <template >待发货<span>{{ todaySll }}</span></template>-->
<!-- <template >待收货<span>{{ todaySll }}</span></template>-->
<!-- <template >已完成<span>{{ todaySll }}</span></template>-->
<!-- <template >已取消<span>{{ todaySll }}</span></template>-->
<template >订单总数<span>1500</span><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></template>
<template >产品订单数量<span>1500</span></template><br/>
<template >未支付<span>500</span><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></template>
<template >待发货<span>400</span></template><br/>
<template >待收货<span>300</span><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></template>
<template >已完成<span>200</span></template><br/>
<template >已取消<span>100</span></template>
</chart-card>
</a-col>
<!-- <a-input v-model="sql" @blur="enter" :readonly="true" placeholder="考虑到统计过于耗费性能,您可以通过点击指定块实时刷新数据!"></a-input>-->
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<chart-card :loading="loading" title="会员管理统计">
<!-- <template >普通会员<span>{{ todaySll }}</span></template>-->
<!-- <template >银卡会员<span>{{ todaySll }}</span></template>-->
<!-- <template >金卡会员<span>{{ todaySll }}</span></template>-->
<!-- <template >钻石会员<span>{{ todaySll }}</span></template>-->
<template >普通会员<span>100</span><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></template>
<template >银卡会员<span>200</span></template><br/>
<template >金卡会员<span>300</span><span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></template>
<template >钻石会员<span>400</span></template>
</chart-card>
</a-col>
<!-- <div class="grid-line">-->
<a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
<chart-card :loading="loading" title="财务管理统计">
<!-- <template >总订单<span>{{ todaySll }}</span></template>-->
<!-- <template >总收入<span>{{ todaySll }}</span></template>-->
<!-- <template >佣金支出<span>{{ todaySll }}</span></template>-->
<template >总订单<span>100</span></template><br/>
<template >总收入<span>200</span></template><br/>
<template >佣金支出<span>300</span></template><br/>
</chart-card>
</a-col>
<!-- <a-card style="width: 560px; min-height: 400px; height: auto; margin: 20px;" title="兼职发布情况" :bordered="false" @click="clickCard3">-->
<!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
<!-- <chart-card :loading="loading" title="注册用户" :total="cardCount.sll | NumberFormat">-->
<!-- <a-tooltip title="注册用户" slot="action">-->
<!-- <a-icon type="info-circle-o" />-->
<!-- </a-tooltip>-->
<!-- <div>-->
<!-- <mini-area :data-source="chartData.sll" v-if="chartData.sll.length"/>-->
<!-- </div>-->
<!-- <template slot="footer">今日注册用户<span>{{ todaySll }}</span></template>-->
<!-- </chart-card>-->
<!-- </a-col>-->
<!-- <a-table :dataSource="clickDataSource3" :columns="clickDolumns3" :pagination="false" />-->
<!-- </a-card>-->
<!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
<!-- <chart-card :loading="loading" title="平台营业额" :total="cardCount.money | NumberFormat">-->
<!-- <a-tooltip title="平台营业额" slot="action">-->
<!-- <a-icon type="info-circle-o" />-->
<!-- </a-tooltip>-->
<!-- <div>-->
<!-- <mini-area :data-source="chartData.moneyData" v-if="chartData.moneyData.length"/>-->
<!-- </div>-->
<!-- <template slot="footer">今日营业额<span>{{ todayMoney }}</span></template>-->
<!-- </chart-card>-->
<!-- </a-col>-->
<!-- <div style="width: 1080px; display: flex; flex-wrap: wrap;">-->
<!-- <a-card class="mini-div" title="兼职点击统计" :bordered="false" @click="clickCard1">-->
<!-- <a-table :dataSource="clickDataSource" :columns="clickDolumns" :pagination="false" />-->
<!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
<!-- <chart-card :loading="loading" title="报名用户数" :total="cardCount.open | NumberFormat">-->
<!-- <a-tooltip title="用户报名用户数" slot="action">-->
<!-- <a-icon type="info-circle-o" />-->
<!-- </a-tooltip>-->
<!-- <div>-->
<!-- <mini-area :data-source="chartData.open" v-if="chartData.open.length"/>-->
<!-- </div>-->
<!-- <template slot="footer">今日报名用户数<span>{{ todayOpen }}</span></template>-->
<!-- </chart-card>-->
<!-- </a-col>-->
<!-- </a-card>-->
<!-- <a-card class="mini-div" title="联系方式点击统计" :bordered="false" @click="clickCard2">-->
<!-- <a-table :dataSource="clickDataSource2" :columns="clickDolumns2" :pagination="false" />-->
<!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
<!-- <chart-card :loading="loading" title="主理人数量" :total="cardCount.adminUser | NumberFormat">-->
<!-- <a-tooltip title="今日主理人数量" slot="action">-->
<!-- <a-icon type="info-circle-o" />-->
<!-- </a-tooltip>-->
<!-- <div>-->
<!-- <mini-area :data-source="chartData.adminUser" v-if="chartData.adminUser.length"/>-->
<!-- </div>-->
<!-- <template slot="footer">今日主理人数量<span>{{ todayAdminUser }}</span></template>-->
<!-- </chart-card>-->
<!-- </a-col>-->
<!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
<!-- <chart-card :loading="loading" title="报名用户数" :total="cardCount.isll | NumberFormat">-->
<!-- <a-tooltip title="报名用户数" slot="action">-->
<!-- <a-icon type="info-circle-o" />-->
<!-- </a-tooltip>-->
<!-- <div>-->
<!-- <mini-bar :datasource="chartData.isll" :height="50"/>-->
<!-- </div>-->
<!-- <template slot="footer">用户报名用户数<span>{{ todayISll }}</span></template>-->
<!-- </chart-card>-->
<!-- </a-col>-->
<!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">-->
<!-- <chart-card :loading="loading" title="主理人数量" :total="cardCount.ibjl | NumberFormat">-->
<!-- <a-tooltip title="主理人数量" slot="action">-->
<!-- <a-icon type="info-circle-o" />-->
<!-- </a-tooltip>-->
<!-- <div>-->
<!-- <mini-bar :datasource="chartData.ibjl" :height="50"/>-->
<!-- </div>-->
<!-- <template slot="footer">今日主理人数量<span>{{ todayIBjl }}</span></template>-->
<!-- </chart-card>-->
<!-- </a-col>-->
</a-row>
<!-- </a-card>-->
<a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
<div class="salesCard">
<a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
<!-- <div class="extra-wrapper" slot="tabBarExtraContent">-->
<!-- <div class="extra-item">-->
<!-- <a>今日</a>-->
<!-- <a>本周</a>-->
<!-- <a>本月</a>-->
<!-- <a>本年</a>-->
<!-- </div>-->
<!-- <a-range-picker :style="{width: '256px'}" />-->
<!-- </div>-->
<!-- <a-card class="mini-div" title="用户统计" :bordered="false" @click="clickCard0">-->
<!-- <a-tab-pane loading="true" tab="注册用户" key="1">-->
<!-- <a-row>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="总用户/实名" :value="cmap.zs" >-->
<!-- <template #suffix>-->
<!-- <span>/ {{cmap.ps}}</span>-->
<!-- </template>-->
<!-- </a-statistic>-->
<!-- </a-col>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="今日" :value="cmap.za" >-->
<!-- <template #suffix>-->
<!-- <span>/ {{cmap.pa}}</span>-->
<!-- </template>-->
<!-- </a-statistic>-->
<!-- </a-col>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="昨日" :value="cmap.zd" >-->
<!-- <template #suffix>-->
<!-- <span>/ {{cmap.pd}}</span>-->
<!-- </template>-->
<!-- </a-statistic>-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="新增注册用户数量" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
<!-- <a-row style="margin-top: 40px;">-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="本周" :value="cmap.zb" >-->
<!-- <template #suffix>-->
<!-- <span>/ {{cmap.pb}}</span>-->
<!-- </template>-->
<!-- </a-statistic>-->
<!-- </a-col>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="本月" :value="cmap.zc" >-->
<!-- <template #suffix>-->
<!-- <span>/ {{cmap.pc}}</span>-->
<!-- </template>-->
<!-- </a-statistic>-->
<!-- <a-tab-pane loading="true" tab="平台营业额" key="2">-->
<!-- <a-row>-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="营业额总数" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
<!-- </a-card>-->
<!-- <a-card class="mini-div" title="公众号概要" :bordered="false" @click="clickCard9">-->
<!-- <a-tab-pane loading="true" tab="报名用户数" key="3">-->
<!-- <a-row>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="双端总用户" :value="cmbp.a" />-->
<!-- </a-col>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="平台用户" :value="cmbp.b" />-->
<!-- </a-col>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="关注公众号" :value="cmbp.c" />-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="新增报名用户数" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
<!-- <a-row style="margin-top: 40px;">-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="未转公众号" :value="cmbp.d" />-->
<!-- </a-col>-->
<!-- <a-col :span="8">-->
<!-- <a-statistic title="未转小程序" :value="cmbp.e" />-->
<!-- <a-tab-pane loading="true" tab="主理人数量" key="4">-->
<!-- <a-row>-->
<!-- <a-col :xl="16" :lg="12" :md="12" :sm="24" :xs="24">-->
<!-- <index-bar title="新增主理人数量" />-->
<!-- </a-col>-->
<!-- </a-row>-->
<!-- </a-tab-pane>-->
<!-- </a-card>-->
</a-tabs>
<!-- </div>-->
</div>
</a-card>
<!-- </div>-->
<!-- </div>-->
</div>
</template>
<script>
import { postAction, getAction } from '@/api/manage'
import CryptoJS from 'crypto-js';
export default {
name: "Analysis",
data() {
return {
sql: '',
cmap: {
zs: 2500,
ps: 300,
za: 40,
pa: 6,
zb: 300,
pb: 20,
zc: 900,
pc: 90,
zd: 9999,
pd: 9999
import ACol from "ant-design-vue/es/grid/Col"
import ATooltip from "ant-design-vue/es/tooltip/Tooltip"
import ChartCard from '@/components/ChartCard'
import MiniBar from '@/components/chart/MiniBar'
import MiniArea from '@/components/chart/MiniArea'
import IndexBar from '@/components/chart/IndexBar'
import BarMultid from '@/components/chart/BarMultid'
import DashChartDemo from '@/components/chart/DashChartDemo'
import dayjs from 'dayjs'
const jhjgData = [
{ type: '房管', '1月': 900, '2月': 1120, '3月': 1380, '4月': 1480, '5月': 1450, '6月': 1100, '7月':1300, '8月':900,'9月':1000 ,'10月':1200 ,'11月':600 ,'12月':900 },
{ type: '税务', '1月':1200, '2月': 1500, '3月': 1980, '4月': 2000, '5月': 1000, '6月': 600, '7月':900, '8月':1100,'9月':1300 ,'10月':2000 ,'11月':900 ,'12月':1100 },
{ type: '不动产', '1月':2000, '2月': 1430, '3月': 1300, '4月': 1400, '5月': 900, '6月': 500, '7月':600, '8月':1000,'9月':600 ,'10月':1000 ,'11月':1500 ,'12月':1200 }
]
const jhjgFields=[
'1月','2月','3月','4月','5月','6月',
'7月','8月','9月','10月','11月','12月'
]
const xljgData = [
{type:'一月',"房管":1.12,"税务":1.55,"不动产":1.2},
{type:'二月',"房管":1.65,"税务":1.32,"不动产":1.42},
{type:'三月',"房管":1.85,"税务":1.1,"不动产":1.5},
{type:'四月',"房管":1.33,"税务":1.63,"不动产":1.4},
{type:'五月',"房管":1.63,"税务":1.8,"不动产":1.7},
{type:'六月',"房管":1.85,"税务":1.98,"不动产":1.8},
{type:'七月',"房管":1.98,"税务":1.5,"不动产":1.76},
{type:'八月',"房管":1.48,"税务":1.2,"不动产":1.3},
{type:'九月',"房管":1.41,"税务":1.9,"不动产":1.6},
{type:'十月',"房管":1.1,"税务":1.1,"不动产":1.4},
{type:'十一月',"房管":1.85,"税务":1.6,"不动产":1.5},
{type:'十二月',"房管":1.5,"税务":1.4,"不动产":1.3}
]
const xljgFields=["房管","税务","不动产"]
const dataCol1 = [{
title: '业务号',
align:"center",
dataIndex: 'reBizCode'
},{
title: '业务类型',
align:"center",
dataIndex: 'type'
},{
title: '受理人',
align:"center",
dataIndex: 'acceptBy'
},{
title: '受理时间',
align:"center",
dataIndex: 'acceptDate'
},{
title: '当前节点',
align:"center",
dataIndex: 'curNode'
},{
title: '办理时长',
align:"center",
dataIndex: 'flowRate',
scopedSlots: { customRender: 'flowRate' }
}];
const dataSource1=[
{reBizCode:"1",type:"转移登记",acceptBy:'张三',acceptDate:"2019-01-22",curNode:"任务分派",flowRate:60},
{reBizCode:"2",type:"抵押登记",acceptBy:'李四',acceptDate:"2019-01-23",curNode:"领导审核",flowRate:30},
{reBizCode:"3",type:"转移登记",acceptBy:'王武',acceptDate:"2019-01-25",curNode:"任务处理",flowRate:20},
{reBizCode:"4",type:"转移登记",acceptBy:'赵楼',acceptDate:"2019-11-22",curNode:"部门审核",flowRate:80},
{reBizCode:"5",type:"转移登记",acceptBy:'钱就',acceptDate:"2019-12-12",curNode:"任务分派",flowRate:90},
{reBizCode:"6",type:"转移登记",acceptBy:'孙吧',acceptDate:"2019-03-06",curNode:"任务处理",flowRate:10},
{reBizCode:"7",type:"抵押登记",acceptBy:'周大',acceptDate:"2019-04-13",curNode:"任务分派",flowRate:100},
{reBizCode:"8",type:"抵押登记",acceptBy:'吴二',acceptDate:"2019-05-09",curNode:"任务上报",flowRate:50},
{reBizCode:"9",type:"抵押登记",acceptBy:'郑爽',acceptDate:"2019-07-12",curNode:"任务处理",flowRate:63},
{reBizCode:"20",type:"抵押登记",acceptBy:'林有',acceptDate:"2019-12-12",curNode:"任务打回",flowRate:59},
{reBizCode:"11",type:"转移登记",acceptBy:'码云',acceptDate:"2019-09-10",curNode:"任务签收",flowRate:87},
]
const dataCol2 = [{
title: '业务号',
align:"center",
dataIndex: 'reBizCode'
},{
title: '受理人',
align:"center",
dataIndex: 'acceptBy'
},{
title: '发起时间',
align:"center",
dataIndex: 'acceptDate'
},{
title: '当前节点',
align:"center",
dataIndex: 'curNode'
},{
title: '超时时间',
align:"center",
dataIndex: 'flowRate',
scopedSlots: { customRender: 'flowRate' }
}];
const dataSource2=[
{reBizCode:"A001",type:"转移登记",acceptBy:'张四',acceptDate:"2019-01-22",curNode:"任务分派",flowRate:12},
{reBizCode:"A002",type:"抵押登记",acceptBy:'李吧',acceptDate:"2019-01-23",curNode:"任务签收",flowRate:3},
{reBizCode:"A003",type:"转移登记",acceptBy:'王三',acceptDate:"2019-01-25",curNode:"任务处理",flowRate:24},
{reBizCode:"A004",type:"转移登记",acceptBy:'赵二',acceptDate:"2019-11-22",curNode:"部门审核",flowRate:10},
{reBizCode:"A005",type:"转移登记",acceptBy:'钱大',acceptDate:"2019-12-12",curNode:"任务签收",flowRate:8},
{reBizCode:"A006",type:"转移登记",acceptBy:'孙就',acceptDate:"2019-03-06",curNode:"任务处理",flowRate:10},
{reBizCode:"A007",type:"抵押登记",acceptBy:'周晕',acceptDate:"2019-04-13",curNode:"部门审核",flowRate:24},
{reBizCode:"A008",type:"抵押登记",acceptBy:'吴有',acceptDate:"2019-05-09",curNode:"部门审核",flowRate:30},
{reBizCode:"A009",type:"抵押登记",acceptBy:'郑武',acceptDate:"2019-07-12",curNode:"任务分派",flowRate:1},
{reBizCode:"A0010",type:"抵押登记",acceptBy:'林爽',acceptDate:"2019-12-12",curNode:"部门审核",flowRate:16},
{reBizCode:"A0011",type:"转移登记",acceptBy:'码楼',acceptDate:"2019-09-10",curNode:"部门审核",flowRate:7},
]
import { getAction,putAction } from '@/api/manage'
export default {
name: "IndexBdc",
components: {
ATooltip,
ACol,
ChartCard,
MiniArea,
MiniBar,
DashChartDemo,
BarMultid,
IndexBar
},
data() {
return {
loading: true,
analysisData : {},
cardCount:{
sll:100,
bjl:87,
isll:15,
ibjl:9,
adminUser : 0,//
money : 0,//
open: 0,//
},
todaySll:0,
todayBjl:54,
todayISll:13,
todayIBjl:7,
todayAdminUser : 0,//
todayMoney : 0,//
todayOpen : 0,//
chartData:{
sll:[],
bjl:[],
isll:[],
ibjl:[],
adminUser : [],//
moneyData : [],// money
open: [],//
},
jhjgFields,
jhjgData,
xljgData,
xljgFields,
diskInfo:[
{name:"C盘",restPPT:7},
{name:"D盘",restPPT:5}
],
registerTypeList:[{
text:"业务受理"
},{
text:"业务管理"
},{
text:"文件管理"
},{
text:"信息查询"
}],
dataSource1:[],
dataSource2:[],
columns:dataCol1,
columns2:dataCol2,
ipagination1:{
current: 1,
pageSize: 5,
pageSizeOptions: ['10', '20', '30'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
},
cmbp: {
a: 9999,
b: 9999,
c: 9999,
d: 9999,
e: 9999,
showQuickJumper: true,
showSizeChanger: true,
total: 0,
},
ipagination2:{
current: 1,
pageSize: 5,
pageSizeOptions: ['10', '20', '30'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 共" + total + "条"
},
showQuickJumper: true,
showSizeChanger: true,
total: 0,
},
indexRegisterType:"转移登记",
indexBottomTab:"1"
clickDataSource: [
{
key: '1',
name: '今日',
a: 0,
b: 0
},
{
key: '2',
name: '本周',
a: 0,
b: 0
},
{
key: '3',
name: '本月',
a: 0,
b: 0
},
{
key: '4',
name: '总计',
a: 0,
b: 0
},
],
clickDolumns: [
{
title: '区域',
dataIndex: 'name',
key: 'name',
},
{
title: '点击次数',
dataIndex: 'a',
key: 'a',
},
{
title: '点击人数',
dataIndex: 'b',
key: 'b',
},
],
clickDataSource2: [
{
key: '1',
name: '今日',
a: 0,
b: 0
},
{
key: '2',
name: '本周',
a: 0,
b: 0
},
{
key: '3',
name: '本月',
a: 0,
b: 0
},
{
key: '4',
name: '总计',
a: 0,
b: 0
},
],
clickDolumns2: [
{
title: '区域',
dataIndex: 'name',
key: 'name',
},
{
title: '点击次数',
dataIndex: 'a',
key: 'a',
},
{
title: '点击人数',
dataIndex: 'b',
key: 'b',
},
],
clickDataSource3: [
{
key: '4',
name: '统计',
a: 0,
b: 0,
c: 0
},
],
clickDolumns3: [
{
title: '区域',
dataIndex: 'name',
key: 'name',
},
{
title: '今日',
dataIndex: 'a',
key: 'a',
},
{
title: '本周',
dataIndex: 'b',
key: 'b',
},
{
title: '本月',
dataIndex: 'c',
key: 'c',
},
],
}
},
methods:{
loadData (){
try {
//
getAction("/sys/annountCement/listByUser").then((res) => {
if (res.success) {
// this.analysisData = res.result
console.log("统计数据", res)
const beginDay = new Date().getTime()
//
this.todayAdminUser = res.result.openIdAdminUserToday
this.cardCount.adminUser = res.result.openIdAdminUserTotal
// this.chartData.adminUser = res.result.openIdAdminUserData
let adminUserData = []
for(let k in res.result.openIdAdminUserData){
adminUserData.push({
x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
y : res.result.openIdAdminUserData[k]
})
}
this.chartData.adminUser = adminUserData
console.log('this.chartData.adminUser', this.chartData.adminUser);
//
this.todaySll = res.result.openIdUserToday
this.cardCount.sll = res.result.openIdUserTotal
// this.chartData.sll = res.result.openIdUserData
for(let k in res.result.openIdUserData){
this.chartData.sll.push({
x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
y : res.result.openIdUserData[k]
})
}
//
this.todayMoney = res.result.openIdMoneyUserToday
this.cardCount.money = res.result.openIdMoneyUserTotal
// this.chartData.money = res.result.openIdMoneyUserData
for(let k in res.result.openIdMoneyData){
this.chartData.moneyData.push({
x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
y : res.result.openIdMoneyData[k]
})
}
// openIdOpenUserToday
this.todayOpen = res.result.openIdOpenUserToday
this.cardCount.open = res.result.openIdOpenUserTotal
// this.chartData.open = res.result.openIdOpenUserData
for(let k in res.result.openIdOpenUserData){
this.chartData.open.push({
x: dayjs(new Date(beginDay + 1000 * 60 * 60 * 24 * 1)).format('YYYY-MM-DD'),
y : res.result.openIdOpenUserData[k]
})
}
}
}).catch(error => {
console.error("统计查询报错",error);//permissionName is undefined
this.stopTimer = true;
console.log("清理timer");
});
} catch (err) {
this.stopTimer = true;
console.error("统计过程报错",err);
}
},
created() {
this.clickCard0()
this.clickCard1()
this.clickCard2()
this.clickCard3()
this.clickCard9()
goPage(){
this.$message.success("根据业务自行处理跳转页面!")
},
changeRegisterType(e){
this.indexRegisterType = e.target.value
if(this.indexBottomTab=="1"){
this.loadDataSource1()
}else{
this.loadDataSource2()
}
},
tableChange1(pagination){
this.ipagination1.current = pagination.current
this.ipagination1.pageSize = pagination.pageSize
this.queryTimeoutInfo()
},
tableChange2(pagination){
this.ipagination2.current = pagination.current
this.ipagination2.pageSize = pagination.pageSize
this.queryNodeTimeoutInfo()
},
getFlowRateNumber(value){
return Number(value)
},
getPercentFormat(value){
if(value==100){
return "超时"
}else{
return value+"%"
}
},
getPercentColor(value){
let p = Number(value)
if(p>=90 && p<100){
return 'rgb(244, 240, 89)'
}else if(p>=100){
return 'red'
}else{
return 'rgb(16, 142, 233)'
}
},
loadDataSource1(){
this.dataSource1 = dataSource1.filter(item=>{
if(!this.indexRegisterType){
return true
}
return item.type==this.indexRegisterType
})
},
loadDataSource2(){
this.dataSource2 = dataSource2.filter(item=>{
if(!this.indexRegisterType){
return true
}
return item.type==this.indexRegisterType
})
}
},
created() {
// this.loadDataSource1()
// this.loadDataSource2()
this.loadData()
setTimeout(() => {
this.loading = !this.loading
}, 1000)
}
}
</script>
<style>
.background-card{
width: 100%; min-height: 780px; height: auto; text-align: right; margin-top: 20px;background-color: #FFF
<style lang="less" scoped>
.extra-wrapper {
line-height: 55px;
padding-right: 24px;
.extra-item {
display: inline-block;
margin-right: 24px;
a {
margin-left: 24px;
}
}
}
.grid-line {
width: 100%;
min-height: 780px;
height: auto;
text-align: center;
color: blue;
box-sizing: border-box;
background: -webkit-linear-gradient(top, transparent 15px, #eee 0), -webkit-linear-gradient(left, transparent 15px, #eee 0);
background-size: 16px 16px;
position: relative;
display: flex;
flex-wrap: wrap;
.item-group {
padding: 20px 0 8px 24px;
font-size: 0;
a {
color: rgba(0, 0, 0, 0.65);
display: inline-block;
font-size: 14px;
margin-bottom: 13px;
width: 25%;
}
}
.mini-div {
width: 480px;
min-height: 400px;
height: auto;
margin: 20px;
.item-group {
.more-btn {
margin-bottom: 13px;
text-align: center;
}
}
.list-content-item {
color: rgba(0, 0, 0, .45);
display: inline-block;
vertical-align: middle;
font-size: 14px;
margin-left: 40px;
}
@media only screen and (min-width: 1600px) {
.list-content-item{
margin-left:60px;
}
}
@media only screen and (max-width: 1300px) {
.list-content-item{
margin-left:20px;
}
.width-hidden4{
display:none
}
}
.list-content-item{
span{line-height: 20px;}
}
.list-content-item{
p{margin-top: 4px;margin-bottom:0;line-height:22px;}
}
.anty-list-cust {
.ant-list-item-meta{flex: 0.3 !important;}
}
.anty-list-cust {
.ant-list-item-content{flex:1 !important; justify-content:flex-start !important;margin-left: 20px;}
}
</style>

+ 37
- 18
module-common/src/main/java/org/jeecg/api/controller/AppletIndexController.java View File

@ -179,8 +179,6 @@ public class AppletIndexController {
//创建订单
@ApiOperation(value="创建订单", notes="创建订单")
@GetMapping(value = "/createOrder")
@ -198,22 +196,23 @@ public class AppletIndexController {
return apiRiceService.createOrderTwo(token,orderId);
}
//
// //商城-加入购物车之后一次下多个订单
// @ApiOperation(value="商城-加入购物车之后一次下多个订单", notes="商城-加入购物车之后一次下多个订单")
// @PostMapping("/createSumOrder")
// public Result<?> createSumOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId){
// return apiRiceService.createSumOrder(token,list,addressId);
// }
//
//
//
// //商城-加入购物车之后一次下多个订单 - 再次下单
// @ApiOperation(value="商城-加入购物车之后一次下多个订单 - 再次下单", notes="商城-加入购物车之后一次下多个订单 - 再次下单")
// @PostMapping("/createSumOrderAgain")
// public Result<?> createSumOrderAgain(@RequestHeader("X-Access-Token") String token,String orderId){
// return apiRiceService.createSumOrderAgain(token,orderId);
// }
//商城-加入购物车之后一次下多个订单
@ApiOperation(value="商城-加入购物车之后一次下多个订单", notes="商城-加入购物车之后一次下多个订单")
@PostMapping("/createSumOrder")
public Result<?> createSumOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId){
return apiRiceService.createSumOrder(token,list,addressId);
}
//商城-加入购物车之后一次下多个订单 - 再次下单
@ApiOperation(value="商城-加入购物车之后一次下多个订单 - 再次下单", notes="商城-加入购物车之后一次下多个订单 - 再次下单")
@PostMapping("/createSumOrderAgain")
public Result<?> createSumOrderAgain(@RequestHeader("X-Access-Token") String token,String orderId){
return apiRiceService.createSumOrderAgain(token,orderId);
}
@ -303,7 +302,27 @@ public class AppletIndexController {
return apiRiceService.getGiveShopLottery(token,orderId,name,phone,address,addressDetails);
}
//获取我的礼品订单
@ApiOperation(value="获取我的礼品订单", notes="获取我的礼品订单")
@GetMapping(value = "/getMyGiftOrder")
public Result<?> getMyGiftOrder(@RequestHeader("X-Access-Token") String token,Integer type,PageBean pageBean){
return apiRiceService.getMyGiftOrder(token,type,pageBean);
}
//获取我的礼品订单详情
@ApiOperation(value="获取我的礼品订单详情", notes="获取我的礼品订单详情")
@GetMapping(value = "/getMyGiftOrderDetail")
public Result<?> getMyGiftOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId){
return apiRiceService.getMyGiftOrderDetail(token,orderId);
}
//获取统计数量信息
@ApiOperation(value="获取统计数量信息", notes="获取统计数量信息")
@GetMapping(value = "/getCountInfo")
public Result<?> getCountInfo(@RequestHeader("X-Access-Token") String token){
return apiRiceService.getCountInfo(token);
}


+ 7
- 1
module-common/src/main/java/org/jeecg/api/service/AppletIndexService.java View File

@ -5,6 +5,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.commonAddress.entity.CommonAddress;
import org.jeecg.modules.commonFack.entity.CommonFack;
import org.jeecg.modules.commonUser.entity.CommonUser;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.RequestHeader;
import java.math.BigDecimal;
@ -175,12 +176,17 @@ public interface AppletIndexService {
Result<?> getGiveShopLottery(String token,String orderId,String name,String phone,String address,String addressDetails);
//获取我的礼品订单
Result<?> getMyGiftOrder(String token,Integer type, PageBean pageBean);
//获取我的礼品订单详情
Result<?> getMyGiftOrderDetail(String token,String orderId);
//获取统计数量信息
public Result<?> getCountInfo(@RequestHeader("X-Access-Token") String token);
}

+ 71
- 14
module-common/src/main/java/org/jeecg/api/service/impl/AppletIndexServiceImpl.java View File

@ -22,6 +22,7 @@ import org.jeecg.common.api.vo.Result;
import org.jeecg.config.shiro.ShiroRealm;
import org.jeecg.modules.commonAddress.entity.CommonAddress;
import org.jeecg.modules.commonAddress.service.ICommonAddressService;
import org.jeecg.modules.commonBanner.bean.CountBean;
import org.jeecg.modules.commonBanner.entity.CommonBanner;
import org.jeecg.modules.commonBanner.service.ICommonBannerService;
import org.jeecg.modules.commonCat.entity.CommonCat;
@ -298,10 +299,10 @@ public class AppletIndexServiceImpl implements AppletIndexService {
if (commonOrder.getState()==1){
return Result.error("订单已支付");
}
//查询订单是否shopState不等于2
if (commonOrder.getShopState()==2){
return Result.error("非首页订单");
}
// //查询订单是否shopState不等于2
// if (commonOrder.getShopState()==2){
// return Result.error("非首页订单");
// }
//
// //根据配置列表查询每人限制数量
// CommonConfig commonConfig = commonConfigService.lambdaQuery()
@ -418,6 +419,8 @@ public class AppletIndexServiceImpl implements AppletIndexService {
}else{
commonOrder.setState(1);
commonOrderService.updateById(commonOrder);
//修改用户余额
return Result.OK(newOrderId);
}
@ -1149,7 +1152,7 @@ public class AppletIndexServiceImpl implements AppletIndexService {
String qrCodeImageUrl = image_go_url.getKeyContent()+this.uploadAliYunOss(mf);
String backgroundImageUrl = qr_code.getKeyContent();
String outputFilePath = "combined_image.png";
String outputFilePath = "combined_image_code";
String s = this.generateAndCombineImagesFromUrl(qrCodeImageUrl, backgroundImageUrl, outputFilePath);
wxCodeVo.setUrl(s);
wxCodeVo.setName("陌美人珠宝欢迎您");
@ -1938,11 +1941,13 @@ public class AppletIndexServiceImpl implements AppletIndexService {
if(list.size()>0){
CommonOrderTitle commonOrderTitle = list.get(new Random().nextInt(list.size()));
map.put("words",commonOrderTitle.getTitle());
return Result.OK(commonOrderTitle.getTitle());
}else{
map.put("words","祝你生日快乐");
return Result.OK("恭喜你收到一条祝福");
}
map.put("list",list);
return Result.OK("反馈成功");
// map.put("list",list);
// return Result.OK(commonOrderTitle.getTitle());
}
@ -1987,7 +1992,10 @@ public class AppletIndexServiceImpl implements AppletIndexService {
Commonordergive commonordergive = new Commonordergive();
commonordergive.setOrderId(orderId);
commonordergive.setUserId(hanHaiMember.getId());
commonordergive.setTitle(commonOrder.getGiveTitle());
commonordergive.setGiveId(commonOrder.getUserId());
commonordergive.setTitle(commonOrder.getTitle());
commonordergive.setMessage(commonOrder.getGiveTitle());
commonordergive.setPrice(commonOrder.getPrice());
commonordergive.setImage(commonOrder.getGiveImage());
commonordergive.setName(commonOrder.getName());
commonordergive.setPhone(commonOrder.getPhone());
@ -2002,9 +2010,13 @@ public class AppletIndexServiceImpl implements AppletIndexService {
//创建送礼记录
Commonordergive commonordergive1 = new Commonordergive();
commonordergive1.setOrderId(orderId);
commonordergive1.setUserId(commonOrder.getUserId());
commonordergive1.setTitle(commonOrder.getTitle());
commonordergive.setImage(commonOrder.getGiveImage());
commonordergive1.setUserId(hanHaiMember.getId());
commonordergive.setGiveId(commonOrder.getUserId());
commonordergive.setTitle(commonOrder.getTitle());
commonordergive.setMessage(commonOrder.getGiveTitle());
commonordergive.setImage(commonOrder.getImage());
commonordergive.setPrice(commonOrder.getPrice());
commonordergive.setName(commonOrder.getName());
commonordergive.setPhone(commonOrder.getPhone());
commonordergive.setAddress(commonOrder.getAddress());
@ -2039,7 +2051,10 @@ public class AppletIndexServiceImpl implements AppletIndexService {
Commonordergive commonordergive = new Commonordergive();
commonordergive.setOrderId(orderId);
commonordergive.setUserId(hanHaiMember.getId());
commonordergive.setTitle(commonOrder.getGiveTitle());
commonordergive.setGiveId(commonOrder.getUserId());
commonordergive.setTitle(commonOrder.getTitle());
commonordergive.setMessage(commonOrder.getGiveTitle());
commonordergive.setPrice(commonOrder.getPrice());
commonordergive.setImage(commonOrder.getGiveImage());
commonordergive.setName(commonOrder.getName());
commonordergive.setPhone(commonOrder.getPhone());
@ -2054,9 +2069,13 @@ public class AppletIndexServiceImpl implements AppletIndexService {
//创建送礼记录
Commonordergive commonordergive1 = new Commonordergive();
commonordergive1.setOrderId(orderId);
commonordergive1.setUserId(commonOrder.getUserId());
commonordergive1.setUserId(hanHaiMember.getId());
commonordergive1.setTitle(commonOrder.getTitle());
commonordergive.setImage(commonOrder.getGiveImage());
commonordergive.setGiveId(commonOrder.getUserId());
commonordergive.setTitle(commonOrder.getTitle());
commonordergive.setMessage(commonOrder.getGiveTitle());
commonordergive.setImage(commonOrder.getImage());
commonordergive.setPrice(commonOrder.getPrice());
commonordergive.setName(commonOrder.getName());
commonordergive.setPhone(commonOrder.getPhone());
commonordergive.setAddress(commonOrder.getAddress());
@ -2071,4 +2090,42 @@ public class AppletIndexServiceImpl implements AppletIndexService {
return Result.error("很遗憾,您没有领取到");
}
}
//获取我的礼品订单
@Override
public Result<?> getMyGiftOrder(String token,Integer type, PageBean pageBean){
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
if (hanHaiMember==null){
return Result.error("用户不存在");
}
//查询列表数据带分页
Page<Commonordergive> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
Page<Commonordergive> page1 = commonordergiveService.lambdaQuery()
.eq(Commonordergive::getUserId, hanHaiMember.getId())
.eq(Commonordergive::getType, type)
.orderByDesc(Commonordergive::getCreateTime)
.page(page);
return Result.OK(page1);
}
//获取我的礼品订单详情
@Override
public Result<?> getMyGiftOrderDetail(String token,String orderId){
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
return Result.OK(commonordergiveService.getById(orderId));
}
//获取统计数量信息
@Override
public Result<?> getCountInfo(String token){
//HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
CountBean countbean = commonBannerService.getCountInfo();
return Result.OK(countbean);
}
}

+ 17
- 0
module-common/src/main/java/org/jeecg/modules/commonBanner/bean/CountBean.java View File

@ -0,0 +1,17 @@
package org.jeecg.modules.commonBanner.bean;
import lombok.Data;
@Data
public class CountBean {
private Integer order0;//订单数量-未支付
private Integer order1;//订单数量-待发货
private Integer order2;//订单数量-待收货
private Integer order3;//订单数量-已完成
private Integer order4;//订单数量-已取消
private Integer role0;//会员等级-普通成员
private Integer role1;//会员等级-银卡会员
private Integer role2;//会员等级-金卡会员
private Integer role3;//会员等级-钻卡会员
}

+ 4
- 0
module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/CommonBannerMapper.java View File

@ -3,6 +3,7 @@ package org.jeecg.modules.commonBanner.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.commonBanner.bean.CountBean;
import org.jeecg.modules.commonBanner.entity.CommonBanner;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -14,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface CommonBannerMapper extends BaseMapper<CommonBanner> {
//获取统计信息
public CountBean getCountInfo();
}

+ 16
- 0
module-common/src/main/java/org/jeecg/modules/commonBanner/mapper/xml/CommonBannerMapper.xml View File

@ -2,4 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.commonBanner.mapper.CommonBannerMapper">
<select id="getCountInfo" resultType="org.jeecg.modules.commonBanner.bean.CountBean">
select
(select count(1) from common_order) `orderAll`,
(select count(1) from common_order where state = '0') `order0`,
(select count(1) from common_order where state = '1') `order1`,
(select count(1) from common_order where state = '2') `order2`,
(select count(1) from common_order where state = '3') `order3`,
(select count(1) from common_order where state = '4') `order4`,
(select count(1) from han_hai_member where role = '0') `role0`,
(select count(1) from han_hai_member where role = '1') `role1`,
(select count(1) from han_hai_member where role = '2') `role2`,
(select count(1) from han_hai_member where role = '3') `role3`
</select>
</mapper>

+ 3
- 1
module-common/src/main/java/org/jeecg/modules/commonBanner/service/ICommonBannerService.java View File

@ -1,5 +1,6 @@
package org.jeecg.modules.commonBanner.service;
import org.jeecg.modules.commonBanner.bean.CountBean;
import org.jeecg.modules.commonBanner.entity.CommonBanner;
import com.baomidou.mybatisplus.extension.service.IService;
@ -10,5 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
* @Version: V1.0
*/
public interface ICommonBannerService extends IService<CommonBanner> {
//获取统计信息
public CountBean getCountInfo();
}

+ 5
- 0
module-common/src/main/java/org/jeecg/modules/commonBanner/service/impl/CommonBannerServiceImpl.java View File

@ -1,5 +1,6 @@
package org.jeecg.modules.commonBanner.service.impl;
import org.jeecg.modules.commonBanner.bean.CountBean;
import org.jeecg.modules.commonBanner.entity.CommonBanner;
import org.jeecg.modules.commonBanner.mapper.CommonBannerMapper;
import org.jeecg.modules.commonBanner.service.ICommonBannerService;
@ -16,4 +17,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class CommonBannerServiceImpl extends ServiceImpl<CommonBannerMapper, CommonBanner> implements ICommonBannerService {
@Override
public CountBean getCountInfo() {
return baseMapper.getCountInfo();
}
}

+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonordergive/controller/CommonordergiveController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 礼品订单
* @Author: jeecg-boot
* @Date: 2025-02-23
* @Date: 2025-02-24
* @Version: V1.0
*/
@Api(tags="礼品订单")


+ 22
- 5
module-common/src/main/java/org/jeecg/modules/commonordergive/entity/Commonordergive.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 礼品订单
* @Author: jeecg-boot
* @Date: 2025-02-23
* @Date: 2025-02-24
* @Version: V1.0
*/
@Data
@ -48,11 +48,13 @@ public class Commonordergive implements Serializable {
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**类型*/
@Excel(name = "类型", width = 15)
@Excel(name = "类型", width = 15, dicCode = "type_give")
@Dict(dicCode = "type_give")
@ApiModelProperty(value = "类型")
private java.lang.Integer type;
/**礼品类型*/
@Excel(name = "礼品类型", width = 15)
@Excel(name = "礼品类型", width = 15, dicCode = "give_state")
@Dict(dicCode = "give_state")
@ApiModelProperty(value = "礼品类型")
private java.lang.Integer isGive;
/**礼品标题*/
@ -64,7 +66,8 @@ public class Commonordergive implements Serializable {
@ApiModelProperty(value = "礼品图片")
private java.lang.String image;
/**关联商品*/
@Excel(name = "关联商品", width = 15)
@Excel(name = "关联商品", width = 15, dictTable = "common_order", dicText = "title", dicCode = "id")
@Dict(dictTable = "common_order", dicText = "title", dicCode = "id")
@ApiModelProperty(value = "关联商品")
private java.lang.String orderId;
/**收货人*/
@ -88,7 +91,21 @@ public class Commonordergive implements Serializable {
@ApiModelProperty(value = "领取状态")
private java.lang.Integer state;
/**领取用户*/
@Excel(name = "领取用户", width = 15)
@Excel(name = "领取用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "领取用户")
private java.lang.String userId;
/**祝福语*/
@Excel(name = "祝福语", width = 15)
@ApiModelProperty(value = "祝福语")
private java.lang.String message;
/**送礼人*/
@Excel(name = "送礼人", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "送礼人")
private java.lang.String giveId;
/**礼品价值*/
@Excel(name = "礼品价值", width = 15)
@ApiModelProperty(value = "礼品价值")
private java.math.BigDecimal price;
}

+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonordergive/mapper/CommonordergiveMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 礼品订单
* @Author: jeecg-boot
* @Date: 2025-02-23
* @Date: 2025-02-24
* @Version: V1.0
*/
public interface CommonordergiveMapper extends BaseMapper<Commonordergive> {


+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonordergive/service/ICommonordergiveService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 礼品订单
* @Author: jeecg-boot
* @Date: 2025-02-23
* @Date: 2025-02-24
* @Version: V1.0
*/
public interface ICommonordergiveService extends IService<Commonordergive> {


+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonordergive/service/impl/CommonordergiveServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 礼品订单
* @Author: jeecg-boot
* @Date: 2025-02-23
* @Date: 2025-02-24
* @Version: V1.0
*/
@Service


+ 30
- 10
module-common/src/main/java/org/jeecg/modules/commonordergive/vue/CommonordergiveList.vue View File

@ -99,6 +99,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CommonordergiveModal from './modules/CommonordergiveModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'CommonordergiveList',
@ -124,12 +125,12 @@
{
title:'类型',
align:"center",
dataIndex: 'type'
dataIndex: 'type_dictText'
},
{
title:'礼品类型',
align:"center",
dataIndex: 'isGive'
dataIndex: 'isGive_dictText'
},
{
title:'礼品标题',
@ -139,12 +140,13 @@
{
title:'礼品图片',
align:"center",
dataIndex: 'image'
dataIndex: 'image',
scopedSlots: {customRender: 'imgSlot'}
},
{
title:'关联商品',
align:"center",
dataIndex: 'orderId'
dataIndex: 'orderId_dictText'
},
{
title:'收货人',
@ -169,12 +171,27 @@
{
title:'领取状态',
align:"center",
dataIndex: 'state'
dataIndex: 'state_dictText'
},
{
title:'领取用户',
align:"center",
dataIndex: 'userId'
dataIndex: 'userId_dictText'
},
{
title:'祝福语',
align:"center",
dataIndex: 'message'
},
{
title:'送礼人',
align:"center",
dataIndex: 'giveId_dictText'
},
{
title:'礼品价值',
align:"center",
dataIndex: 'price'
},
{
title: '操作',
@ -210,17 +227,20 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'int',value:'type',text:'类型',dictCode:''})
fieldList.push({type:'int',value:'isGive',text:'礼品类型',dictCode:''})
fieldList.push({type:'int',value:'type',text:'类型',dictCode:'type_give'})
fieldList.push({type:'int',value:'isGive',text:'礼品类型',dictCode:'give_state'})
fieldList.push({type:'string',value:'title',text:'礼品标题',dictCode:''})
fieldList.push({type:'Text',value:'image',text:'礼品图片',dictCode:''})
fieldList.push({type:'Text',value:'orderId',text:'关联商品',dictCode:''})
fieldList.push({type:'sel_search',value:'orderId',text:'关联商品',dictTable:"common_order", dictText:'title', dictCode:'id'})
fieldList.push({type:'string',value:'name',text:'收货人',dictCode:''})
fieldList.push({type:'string',value:'phone',text:'联系电话',dictCode:''})
fieldList.push({type:'string',value:'address',text:'所在地区',dictCode:''})
fieldList.push({type:'Text',value:'addressDetails',text:'详细地址',dictCode:''})
fieldList.push({type:'int',value:'state',text:'领取状态',dictCode:''})
fieldList.push({type:'string',value:'userId',text:'领取用户',dictCode:''})
fieldList.push({type:'sel_search',value:'userId',text:'领取用户',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'string',value:'message',text:'祝福语',dictCode:''})
fieldList.push({type:'sel_search',value:'giveId',text:'送礼人',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'BigDecimal',value:'price',text:'礼品价值',dictCode:''})
this.superFieldList = fieldList
}
}


+ 21
- 6
module-common/src/main/java/org/jeecg/modules/commonordergive/vue/modules/CommonordergiveForm.vue View File

@ -5,12 +5,12 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<a-input-number v-model="model.type" placeholder="请输入类型" style="width: 100%" />
<j-dict-select-tag type="list" v-model="model.type" dictCode="type_give" placeholder="请选择类型" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="礼品类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isGive">
<a-input-number v-model="model.isGive" placeholder="请输入礼品类型" style="width: 100%" />
<j-dict-select-tag type="list" v-model="model.isGive" dictCode="give_state" placeholder="请选择礼品类型" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -20,12 +20,12 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="礼品图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
<a-input v-model="model.image" placeholder="请输入礼品图片" ></a-input>
<j-image-upload isMultiple v-model="model.image" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="关联商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderId">
<a-input v-model="model.orderId" placeholder="请输入关联商品" ></a-input>
<j-search-select-tag v-model="model.orderId" dict="common_order,title,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -50,12 +50,27 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="领取状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
<a-input-number v-model="model.state" placeholder="请输入领取状态" style="width: 100%" />
<j-dict-select-tag type="list" v-model="model.state" dictCode="" placeholder="请选择领取状态" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="领取用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<a-input v-model="model.userId" placeholder="请输入领取用户" ></a-input>
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="祝福语" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="message">
<a-input v-model="model.message" placeholder="请输入祝福语" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="送礼人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveId">
<j-search-select-tag v-model="model.giveId" dict="han_hai_member,nick_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="礼品价值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
<a-input-number v-model="model.price" placeholder="请输入礼品价值" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>


+ 62
- 11
module-common/src/main/java/org/jeecg/modules/commonordergive/vue3/Commonordergive.data.ts View File

@ -7,12 +7,12 @@ export const columns: BasicColumn[] = [
{
title: '类型',
align:"center",
dataIndex: 'type'
dataIndex: 'type_dictText'
},
{
title: '礼品类型',
align:"center",
dataIndex: 'isGive'
dataIndex: 'isGive_dictText'
},
{
title: '礼品标题',
@ -22,12 +22,13 @@ export const columns: BasicColumn[] = [
{
title: '礼品图片',
align:"center",
dataIndex: 'image'
dataIndex: 'image',
customRender:render.renderAvatar,
},
{
title: '关联商品',
align:"center",
dataIndex: 'orderId'
dataIndex: 'orderId_dictText'
},
{
title: '收货人',
@ -52,12 +53,27 @@ export const columns: BasicColumn[] = [
{
title: '领取状态',
align:"center",
dataIndex: 'state'
dataIndex: 'state_dictText'
},
{
title: '领取用户',
align:"center",
dataIndex: 'userId'
dataIndex: 'userId_dictText'
},
{
title: '祝福语',
align:"center",
dataIndex: 'message'
},
{
title: '送礼人',
align:"center",
dataIndex: 'giveId_dictText'
},
{
title: '礼品价值',
align:"center",
dataIndex: 'price'
},
];
//查询数据
@ -68,12 +84,18 @@ export const formSchema: FormSchema[] = [
{
label: '类型',
field: 'type',
component: 'InputNumber',
component: 'JDictSelectTag',
componentProps:{
dictCode:"type_give"
},
},
{
label: '礼品类型',
field: 'isGive',
component: 'InputNumber',
component: 'JDictSelectTag',
componentProps:{
dictCode:"give_state"
},
},
{
label: '礼品标题',
@ -83,12 +105,17 @@ export const formSchema: FormSchema[] = [
{
label: '礼品图片',
field: 'image',
component: 'Input',
component: 'JImageUpload',
componentProps:{
},
},
{
label: '关联商品',
field: 'orderId',
component: 'Input',
component: 'JSearchSelect',
componentProps:{
dict:"common_order,title,id"
},
},
{
label: '收货人',
@ -113,11 +140,35 @@ export const formSchema: FormSchema[] = [
{
label: '领取状态',
field: 'state',
component: 'InputNumber',
component: 'JDictSelectTag',
componentProps:{
dictCode:""
},
},
{
label: '领取用户',
field: 'userId',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
},
{
label: '祝福语',
field: 'message',
component: 'Input',
},
{
label: '送礼人',
field: 'giveId',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
},
{
label: '礼品价值',
field: 'price',
component: 'InputNumber',
},
];

Loading…
Cancel
Save