Skip to content

S
shops
提交 2c731736 authored 作者: 赵明's avatar 赵明
浏览文件
操作

联调更新

上级 ec807fc5
显示空白字符变更
内嵌 并排
正在显示 包含 113 行增加 和 56 行删除
.env.development
浏览文件 @ 2c731736
NODE_ENV=development NODE_ENV=development
# VUE_APP_API_BASE_URL='http://192.168.0.119:9999' #VUE_APP_API_BASE_URL='http://192.168.0.119:9999'
# VUE_APP_API_BASE_URL='http://192.168.0.100:9999' #VUE_APP_API_BASE_URL='http://192.168.0.100:9999'
VUE_APP_API_BASE_URL='http://220.203.25.212:9999' VUE_APP_API_BASE_URL='http://220.203.25.212:9998'
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
......
.env.production
浏览文件 @ 2c731736
NODE_ENV=production NODE_ENV=production
VUE_APP_API_BASE_URL=http://220.203.25.212:9999 VUE_APP_API_BASE_URL=http://220.203.25.212:9998
VUE_APP_CAS_BASE_URL=http://localhost:8888/cas VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
\ No newline at end of file
src/api/manage.js
浏览文件 @ 2c731736
...@@ -161,7 +161,11 @@ export function downloadFile(url, fileName, parameter) { ...@@ -161,7 +161,11 @@ export function downloadFile(url, fileName, parameter) {
if (typeof window.navigator.msSaveBlob !== 'undefined') { if (typeof window.navigator.msSaveBlob !== 'undefined') {
window.navigator.msSaveBlob(new Blob([data]), fileName) window.navigator.msSaveBlob(new Blob([data]), fileName)
} else { } else {
let url = window.URL.createObjectURL(new Blob([data])) let blob = new Blob([data], {
type:
'image/png,image/jpeg,image/jpg,image/gif,image/bmp,image/x-icon',
})
let url = window.URL.createObjectURL(blob)
let link = document.createElement('a') let link = document.createElement('a')
link.style.display = 'none' link.style.display = 'none'
link.href = url link.href = url
......
src/assets/static.js
浏览文件 @ 2c731736
...@@ -73,6 +73,7 @@ export const PAYTYPE = [ ...@@ -73,6 +73,7 @@ export const PAYTYPE = [
export const PAYMENT_METOD = [ export const PAYMENT_METOD = [
{label: '未支付', value: null}, {label: '未支付', value: null},
{label: '微信', value: 'wechat'}, {label: '微信', value: 'wechat'},
{label: '扫码支付', value: 'scanQrCodePay'},
{label: '小程序', value: 'miniapp'}, {label: '小程序', value: 'miniapp'},
] ]
//对账状态 //对账状态
......
src/components/tools/Logo.vue
浏览文件 @ 2c731736
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
props: { props: {
title: { title: {
type: String, type: String,
default: '汉星科技', default: '商铺管理后台',
required: false required: false
}, },
showTitle: { showTitle: {
......
src/components/tools/UserMenu.vue
浏览文件 @ 2c731736
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
...mapActions(["Logout"]), ...mapActions(["Logout"]),
...mapGetters(["nickname", "avatar","userInfo"]), ...mapGetters(["nickname", "avatar","userInfo"]),
getAvatar(){ getAvatar(){
return getFileAccessHttpUrl(this.avatar()) return getFileAccessHttpUrl(this.avatar())
}, },
handleLogout() { handleLogout() {
......
src/mixins/JeecgListMixin.js
浏览文件 @ 2c731736
...@@ -12,6 +12,7 @@ import store from '@/store' ...@@ -12,6 +12,7 @@ import store from '@/store'
export const JeecgListMixin = { export const JeecgListMixin = {
data(){ data(){
return { return {
createTimeValue: [],
/* 查询条件-请不要在queryParam中声明非字符串值的属性 */ /* 查询条件-请不要在queryParam中声明非字符串值的属性 */
queryParam: {}, queryParam: {},
/* 数据源 */ /* 数据源 */
...@@ -151,7 +152,9 @@ export const JeecgListMixin = { ...@@ -151,7 +152,9 @@ export const JeecgListMixin = {
this.$refs.superQueryModal.show(); this.$refs.superQueryModal.show();
}, },
searchReset() { searchReset() {
this.createTimeValue = []
this.queryParam = {} this.queryParam = {}
this.initPageParams(this.queryParam);
this.loadData(1); this.loadData(1);
}, },
batchDel: function () { batchDel: function () {
......
src/views/community/CommunityLlist.vue
浏览文件 @ 2c731736
...@@ -14,18 +14,17 @@ ...@@ -14,18 +14,17 @@
<j-input placeholder="请输入单号" v-model="queryParam.balanceNum"></j-input> <j-input placeholder="请输入单号" v-model="queryParam.balanceNum"></j-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="订单时间："> <a-form-item label="订单时间：">
<a-date-picker placeholder="订单时间" valueFormat="YYYY-MM-DD 00:00:00" v-model="queryParam.balanceDate"></a-date-picker> <a-range-picker @change="onChangeData" :value='createTimeValue'/>
</a-form-item> </a-form-item>
<span slot="balanceStatus" slot-scope="text, record">
<a-tag v-if="record.balanceStatus === 1">未对账</a-tag>
<a-tag v-else-if="record.balanceStatus === 2">对账待审核</a-tag>
<a-tag v-else-if="record.balanceStatus === 3">已对账</a-tag>
<a-tag v-else-if="record.balanceStatus === 4">对账驳回</a-tag>
</span>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="5" :sm="24">
<a-button type="primary" @click="searchQuery">查询</a-button>
<a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
</a-col>
</span>
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
...@@ -35,6 +34,14 @@ ...@@ -35,6 +34,14 @@
<a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns" <a-table ref="table" size="middle" :scroll="{x:true}" bordered rowKey="id" :columns="columns"
:dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap"
@change="handleTableChange"> @change="handleTableChange">
<span slot="balanceStatus" slot-scope="text, record">
<a-tag color="orange" v-if="record.balanceStatus === 1">未结算</a-tag>
<a-tag color="blue" v-else-if="record.balanceStatus === 3">已结算</a-tag>
</span>
<span slot="action" slot-scope="text, record">
<a type="primary" @click="propertyDetails(2,record.id)">详情</a>
</span>
</a-table> </a-table>
</div> </div>
</a-card> </a-card>
...@@ -49,11 +56,6 @@ export default { ...@@ -49,11 +56,6 @@ export default {
data() { data() {
return { return {
columns: [ columns: [
{
title: '序号',
align: 'center',
dataIndex: 'num',
},
{ {
title: '结算单号', title: '结算单号',
align: 'center', align: 'center',
...@@ -62,7 +64,7 @@ export default { ...@@ -62,7 +64,7 @@ export default {
{ {
title: '提交时间', title: '提交时间',
align: 'center', align: 'center',
dataIndex: 'balanceDate', dataIndex: 'createTime',
}, },
{ {
title: '提交人', title: '提交人',
...@@ -91,14 +93,41 @@ export default { ...@@ -91,14 +93,41 @@ export default {
dataIndex: 'remarks', dataIndex: 'remarks',
align: 'center', align: 'center',
}, },
{
title: '操作',
dataIndex: 'action',
scopedSlots: { customRender: 'action' },
align: 'center',
fixed: 'right',
width: 150,
},
], ],
dataSource: [], dataSource: [],
url: { url: {
list: '/property-central/partners/shareBalance/list?balanceStatus=3', list: '/property-central/partners/shareBalance/list?balanceStatus=3&platformType=shop',
}, },
} }
}, },
methods: {}, methods: {
onChangeData(date, dateString) {
if (dateString.length > 0) {
this.createTimeValue = date
this.queryParam.createTime_begin = dateString[0]
this.queryParam.createTime_end = dateString[1]
}
},
propertyDetails(type, id) {
if (type == 1) {
this.$router.push({
path: '/settlement/SettlementDetails?type=add',
})
}else if (type == 2) {
this.$router.push({
path: '/settlement/SettlementDetails?type=detail&id=' + id,
})
}
},
},
} }
</script> </script>
<style scoped> <style scoped>
......
src/views/dashboard/Analysis.vue
浏览文件 @ 2c731736
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="icon" style="background-color:#ffaa00;"><a-icon type="bar-chart" /></div> <div class="icon" style="background-color:#ffaa00;"><a-icon type="bar-chart" /></div>
<div> <div>
<p style="color:#666;margin-bottom:5px;">待对账金额</p> <p style="color:#666;margin-bottom:5px;">待对账金额</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">¥{{pageForm.notBalance}}</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">¥{{pageForm.notBenefit}}</p>
</div> </div>
</div> </div>
</a-col> </a-col>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<div class="icon" style="background-color:#52c41a;"><a-icon type="pay-circle" /></div> <div class="icon" style="background-color:#52c41a;"><a-icon type="pay-circle" /></div>
<div> <div>
<p style="color:#666;margin-bottom:5px;">待结算金额</p> <p style="color:#666;margin-bottom:5px;">待结算金额</p>
<p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">¥{{pageForm.notBenefit}}</p> <p style="margin-bottom:0;color:#333;font-size:28px;line-height:1;">¥{{pageForm.notBalance}}</p>
</div> </div>
</div> </div>
</a-col> </a-col>
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
handleOk (){ handleOk (){
downloadFile('/property-central/shop/shopInfo/getQrCode','商铺二维码.png') downloadFile('/property-central/shop/shopInfo/getQrCode?shopCode=shop&platformType=shop','商铺二维码.png')
this.visible=false this.visible=false
this.$message.success('下载成功') this.$message.success('下载成功')
}, },
......
src/views/paymentorder/payment/payment.vue
浏览文件 @ 2c731736
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="7" :sm="10"> <a-col :md="7" :sm="10">
<a-form-item label="提交时间"> <a-form-item label="提交时间：">
<a-date-picker @change="onChangeData" /> <a-range-picker @change="onChangeData" :value="createTimeValue"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -153,13 +153,17 @@ export default { ...@@ -153,13 +153,17 @@ export default {
}, },
created() {}, created() {},
methods: { methods: {
onChangeData(date, dateString) {
if (dateString.length > 0) {
this.createTimeValue = date
this.queryParam.createTime_begin = dateString[0]
this.queryParam.createTime_end = dateString[1]
}
},
onDetail(id,type) { onDetail(id,type) {
this.$router.push({ this.$router.push({
path: `/paymentorder/paymentDetail?id=${id}&type=${type}`, path: `/paymentorder/paymentDetail?id=${id}&type=${type}`,
}) })
},
onChangeData(date, dateString) {
console.log(date, dateString);
} }
} }
} }
......
src/views/paymentorder/payment/paymentDetail.vue
浏览文件 @ 2c731736
...@@ -71,14 +71,14 @@ const columns = [ ...@@ -71,14 +71,14 @@ const columns = [
}, },
{ {
title: '业主名称', title: '业主名称',
dataIndex: 'partnersName', dataIndex: 'ownerName',
key: 'partnersName', key: 'ownerName',
align: 'center', align: 'center',
}, },
{ {
title: '用户账号', title: '用户账号',
dataIndex: 'ownerName', dataIndex: 'ownerPhone',
key: 'ownerName', key: 'ownerPhone',
align: 'center', align: 'center',
}, },
{ {
...@@ -103,8 +103,8 @@ const columns = [ ...@@ -103,8 +103,8 @@ const columns = [
const columns2 = [ const columns2 = [
{ {
title: '操作者', title: '操作者',
dataIndex: 'propertyName', dataIndex: 'shopName',
key: 'propertyName', key: 'shopName',
align: 'center', align: 'center',
}, },
{ {
......
src/views/settlement/reconciliation/ReconciliationDetails.vue
浏览文件 @ 2c731736
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-model-item label="支付方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input v-model="model.payWay" placeholder="支付方式" /> <a-input v-model="model.payWayName" placeholder="支付方式" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
...@@ -82,10 +82,10 @@ ...@@ -82,10 +82,10 @@
<template v-if="record"></template>已付款 <template v-if="record"></template>已付款
</span> </span>
<span slot="reconciliationStatus" slot-scope="text, record"> <span slot="reconciliationStatus" slot-scope="text, record">
<a-tag v-if="record.reconciliationStatus === 1">未对账</a-tag> <a-tag color="orange" v-if="record.reconciliationStatus === 1">未对账</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 2">对账待审核</a-tag> <a-tag color="blue" v-else-if="record.reconciliationStatus === 2">对账待审核</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 3">已对账</a-tag> <a-tag color="green" v-else-if="record.reconciliationStatus === 3">已对账</a-tag>
<a-tag v-else-if="record.reconciliationStatus === 4">对账驳回</a-tag> <a-tag color="red" v-else-if="record.reconciliationStatus === 4">对账驳回</a-tag>
</span> </span>
</a-table> </a-table>
</a-card> </a-card>
...@@ -160,6 +160,15 @@ export default { ...@@ -160,6 +160,15 @@ export default {
if (this.model.orderSource == 'miniapp') { if (this.model.orderSource == 'miniapp') {
this.model.orderSourceName = '小程序' this.model.orderSourceName = '小程序'
} }
if (this.model.payWay == 'miniapp') {
this.model.payWayName = '小程序'
}else if (this.model.payWay == 'scanQrCodePay') {
this.model.payWayName = '扫码支付'
}else if (this.model.payWay == 'wechat') {
this.model.payWayName = '微信'
}else if (this.model.payWay == 'alipay') {
this.model.payWayName = '支付宝'
}
if (this.model.reconciliationStatus == 1) { if (this.model.reconciliationStatus == 1) {
this.model.reconciliationStatusName = '未对账' this.model.reconciliationStatusName = '未对账'
} else if (this.model.reconciliationStatus == 2) { } else if (this.model.reconciliationStatus == 2) {
......
src/views/settlement/reconciliation/reconciliationList.vue
浏览文件 @ 2c731736
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<a-col :md="7" :sm="10"> <a-col :md="7" :sm="10">
<a-form-item label="订单时间："> <a-form-item label="订单时间：">
<a-date-picker placeholder="订单时间" valueFormat="YYYY-MM-DD 00:00:00" v-model="queryParam.createTime"></a-date-picker> <a-range-picker @change="onChangeData" :value='createTimeValue'/>
</a-form-item> </a-form-item>
</a-col> </a-col>
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
@change="handleTableChange"> @change="handleTableChange">
<span slot="orderSource" slot-scope="text, record"> <span slot="orderSource" slot-scope="text, record">
<template v-if="record.orderSource === 'miniapp'">小程序</template> <template v-if="record.orderSource === 'miniapp'">小程序</template>
<template v-if="record.orderSource === 'scanQrCodePay'">扫码支付</template>
<template v-if="record.orderSource === 'wechat'">微信</template>
</span> </span>
<span slot="reconciliationStatus" slot-scope="text, record"> <span slot="reconciliationStatus" slot-scope="text, record">
<a-tag color="orange" v-if="record.reconciliationStatus === 1">未对账</a-tag> <a-tag color="orange" v-if="record.reconciliationStatus === 1">未对账</a-tag>
...@@ -55,7 +57,7 @@ ...@@ -55,7 +57,7 @@
</span> </span>
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a type="primary" @click="toDetails(record.id)">详情</a> <a type="primary" @click="toDetails(record.id)">详情</a>
<a type="primary" @click="toReconciliation(record)" v-if="record.reconciliationStatus === 1&&record.isShow=='1'" <a type="primary" @click="toReconciliation(record)" v-if="(record.reconciliationStatus === 4||record.reconciliationStatus === 1)&&record.isShow=='1'"
style="margin-left: 15px;">申请对账</a> style="margin-left: 15px;">申请对账</a>
</span> </span>
</a-table> </a-table>
...@@ -91,6 +93,7 @@ ...@@ -91,6 +93,7 @@
<script> <script>
import { httpAction } from '@/api/manage' import { httpAction } from '@/api/manage'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { filterDictTextByStatic, PAYMENT_METOD } from '@assets/static'
const columns = [ const columns = [
{ {
...@@ -128,6 +131,9 @@ const columns = [ ...@@ -128,6 +131,9 @@ const columns = [
dataIndex: 'payWay', dataIndex: 'payWay',
key: 'payWay', key: 'payWay',
align: 'center', align: 'center',
customRender: function(text) {
return filterDictTextByStatic(PAYMENT_METOD, text);
}
}, },
{ {
title: '订单来源', title: '订单来源',
...@@ -172,7 +178,7 @@ export default { ...@@ -172,7 +178,7 @@ export default {
data() { data() {
return { return {
queryParam:{ queryParam:{
platformType:'shop'
}, },
info: {}, info: {},
model: {}, model: {},
...@@ -193,7 +199,7 @@ export default { ...@@ -193,7 +199,7 @@ export default {
columns: columns, columns: columns,
loading: false, loading: false,
url: { url: {
list: '/property-central/partners/shareBenefit/list', list: '/property-central/partners/shareBenefit/list?platformType=shop',
reconciliation: '/property-central/partners/shareBenefit/reconciliation', reconciliation: '/property-central/partners/shareBenefit/reconciliation',
show:'/property-central/sharerule/settlementSet/queryById?id=1', show:'/property-central/sharerule/settlementSet/queryById?id=1',
}, },
...@@ -210,11 +216,9 @@ export default { ...@@ -210,11 +216,9 @@ export default {
methods: { methods: {
onChangeData(date, dateString) { onChangeData(date, dateString) {
if (dateString.length > 0) { if (dateString.length > 0) {
this.createTimeValue = date
this.queryParam.createTime_begin = dateString[0] this.queryParam.createTime_begin = dateString[0]
this.queryParam.createTime_end = dateString[1] this.queryParam.createTime_end = dateString[1]
} else {
this.queryParam.createTime_begin = ''
this.queryParam.createTime_end = ''
} }
}, },
onIsshow() { onIsshow() {
......
src/views/settlement/settlements/settlementList.vue
浏览文件 @ 2c731736
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<a-col :md="7" :sm="10"> <a-col :md="7" :sm="10">
<a-form-item label="订单时间："> <a-form-item label="订单时间：">
<a-date-picker placeholder="订单时间" valueFormat="YYYY-MM-DD 00:00:00" v-model="queryParam.createTime"></a-date-picker> <a-range-picker @change="onChangeData" :value="createTimeValue"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
...@@ -145,13 +145,12 @@ export default { ...@@ -145,13 +145,12 @@ export default {
methods: { methods: {
onChangeData(date, dateString) { onChangeData(date, dateString) {
if (dateString.length > 0) { if (dateString.length > 0) {
this.createTimeValue = date
this.queryParam.createTime_begin = dateString[0] this.queryParam.createTime_begin = dateString[0]
this.queryParam.createTime_end = dateString[1] this.queryParam.createTime_end = dateString[1]
} else {
this.queryParam.createTime_begin = ''
this.queryParam.createTime_end = ''
} }
}, },
onChange(date, dateString) { onChange(date, dateString) {
this.queryParam.createTime = dateString this.queryParam.createTime = dateString
}, },
......
src/views/statistical/IndexChart.vue
浏览文件 @ 2c731736
...@@ -43,12 +43,13 @@ ...@@ -43,12 +43,13 @@
<div class="order"> <div class="order">
<div class="order-title"><span <div class="order-title"><span
style="width: 30%;">订单编号</span><span>提交时间</span><span>用户账号</span><span>订单金额</span></div> style="width: 30%;">订单编号</span><span>提交时间</span><span>用户账号</span><span>订单金额</span></div>
<vue-seamless-scroll :data="detail.shareOrder" class="seamless-warp" :class-option="defineScroll"> <vue-seamless-scroll v-if="detail.shareOrder && detail.shareOrder.length > 0" :data="detail.shareOrder" class="seamless-warp" :class-option="defineScroll">
<div v-for="(item, index) in detail.shareOrder" :key="index" class="item"> <div v-for="(item, index) in detail.shareOrder" :key="index" class="item">
<span <span
style="width: 30%;">{{ item.order_num }}</span><span>{{ item.create_time }}</span><span>{{ item.buyer_name }}</span><span>{{ item.share_money }}</span> style="width: 30%;">{{ item.order_num }}</span><span>{{ item.create_time }}</span><span>{{ item.buyer_name }}</span><span>{{ item.share_money }}</span>
</div> </div>
</vue-seamless-scroll> </vue-seamless-scroll>
<a-empty v-else style="margin-top: 26px; margin-bottom: 26px;"/>
</div> </div>
</div> </div>
</a-col> </a-col>
...@@ -195,16 +196,17 @@ export default { ...@@ -195,16 +196,17 @@ export default {
} }
.order { .order {
margin: 0 10px; margin: 0 10px;
border: 1px solid #e8e8e8;
.order-title { .order-title {
background: #fafafa; background: #fafafa;
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
display: flex; display: flex;
border-left: 1px solid #e8e8e8;
span { span {
width: 25%; width: 25%;
border-right: 1px solid #e8e8e8; border-right: 1px solid #e8e8e8;
border-top: 1px solid #e8e8e8;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论