张雄 3 years ago
parent 7f97fffcc3
commit f9f4b65675

@ -3,7 +3,11 @@
<div class="cardTitle">收费标准</div>
<div class="search-box">
<a-space size="large">
<a-input v-model="form.name" placeholder="请输入模版名称" />
<a-form-model layout="inline">
<a-form-model-item label="模版名称">
<a-input v-model="form.name" placeholder="请输入模版名称" />
</a-form-model-item>
</a-form-model>
<a-button @click="onSearch" type="primary"> </a-button>
<a-button @click="onReset"> </a-button>
</a-space>
@ -11,7 +15,7 @@
<div id="commonTable">
<div style="margin-bottom: 16px">
<a-button @click="handlerAdd" type="primary">
<a-button icon="plus" @click="handlerAdd" type="primary" ghost>
新建收费模版
</a-button>
</div>
@ -99,30 +103,30 @@ export default {
{
title: "模版名称",
dataIndex: "name",
width: "200",
width: 120,
},
{
title: "包含功能模块",
dataIndex: "includeFunctionModelList",
scopedSlots: { customRender: "tags" },
width: "280",
width: 360,
},
{
title: "已购买次数",
dataIndex: "payNum",
width: "200",
width: 120,
},
{
title: "状态",
dataIndex: "status",
scopedSlots: { customRender: "formatter" },
width: "120",
width: 120,
},
{
title: "操作",
dataIndex: "action",
key: "action",
width: "180",
width: 180,
fixed: "right",
scopedSlots: { customRender: "action" },
},

@ -3,17 +3,32 @@
<div class="cardTitle">财务账单</div>
<div class="search-box">
<a-space size="large">
<a-input v-model="form.code" placeholder="请输入订单号" />
<a-input v-model="form.name" placeholder="请输入公司名称" />
<a-date-picker v-model="form.createDateStart" placeholder="请选择订单时间" />
<a-date-picker v-model="form.createDateEnd" placeholder="请选择订单时间" />
<a-date-picker v-model="form.buyingDateStart" placeholder="请选择购买时间" />
<a-date-picker v-model="form.buyingDateEnd" placeholder="请选择购买时间" />
<a-form-model layout="inline">
<a-form-model-item label="订单时间范围">
<a-date-picker v-model="form.createDateStart" placeholder="请选择开始时间" />
<a-date-picker v-model="form.createDateEnd" placeholder="请选择结束时间" />
</a-form-model-item>
<a-form-model-item label="购买时间范围">
<a-date-picker v-model="form.buyingDateStart" placeholder="请选择开始时间" />
<a-date-picker v-model="form.buyingDateEnd" placeholder="请选择结束时间" />
</a-form-model-item>
</a-form-model>
</a-space>
</div>
<div class="search-box">
<a-space size="large">
<a-form-model layout="inline">
<a-form-model-item label="订单号">
<a-input v-model="form.code" placeholder="请输入订单号" />
</a-form-model-item>
<a-form-model-item label="公司名称">
<a-input v-model="form.name" placeholder="请输入公司名称" />
</a-form-model-item>
</a-form-model>
<a-button @click="onSearch" type="primary"> </a-button>
<a-button @click="onReset"> </a-button>
</a-space>
</div>
<div id="commonTable">
<a-table
:scroll="{ x: 1300 }"
@ -64,34 +79,34 @@ export default {
{
title: "订单号",
dataIndex: "code",
width: "200",
width: 150,
},
{
title: "公司名称",
dataIndex: "name",
width: "200",
width: 150,
},
{
title: "付款金额",
dataIndex: "payPrice",
width: "200",
width: 150,
},
{
title: "包含功能模块",
dataIndex: "includeFunctionModelList",
scopedSlots: { customRender: "tags" },
width: "280",
width: 350,
},
{
title: "订单生成时间",
dataIndex: "createDate",
width: "200",
width: 160,
},
{
title: "操作",
dataIndex: "action",
key: "action",
width: "180",
width: 180,
fixed: "right",
scopedSlots: { customRender: "action" },
},

@ -5,39 +5,31 @@
<!-- 搜索 -->
<div class="search-box">
<a-space size="large">
<a-input placeholder="请输入申请人/公司名" v-model="searchForm.name" />
<a-select style="width: 200px" placeholder="选择状态" v-model="searchForm.status">
<a-select-option :value="1">全部数据</a-select-option>
<a-select-option :value="2">已到期</a-select-option>
<a-select-option :value="3">未到期</a-select-option>
<a-select-option :value="4">临近到期</a-select-option>
</a-select>
<a-form-model layout="inline">
<a-form-model-item label="申请人/公司名">
<a-input placeholder="请输入申请人/公司名" v-model="searchForm.name" />
</a-form-model-item>
<a-form-model-item label="状态">
<a-select style="width: 200px" placeholder="选择状态" v-model="searchForm.status">
<a-select-option :value="1">全部数据</a-select-option>
<a-select-option :value="2">已到期</a-select-option>
<a-select-option :value="3">未到期</a-select-option>
<a-select-option :value="4">临近到期</a-select-option>
</a-select>
</a-form-model-item>
</a-form-model>
<a-button type="primary" @click="handlerSearch"> </a-button>
<a-button @click="handlerReset"> </a-button>
</a-space>
</div>
<!-- 表格 -->
<div id="commonTable">
<div style="margin-bottom: 16px">
<a-button type="primary" :disabled="!hasSelected" :loading="loading">
批量操作
</a-button>
<span style="margin-left: 8px">
<template v-if="hasSelected">
{{ `已选择 ${selectedRowKeys.length}` }}
</template>
</span>
</div>
<a-table
:scroll="{ x: 1300 }"
:columns="columns"
:data-source="tableData"
:pagination="pagination"
@change="handleTableChange"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
:row-key="
(record, index) => {
return index;
@ -142,10 +134,6 @@ export default {
}
})
},
onSelectChange(selectedRowKeys) {
console.log("selectedRowKeys changed: ", selectedRowKeys);
this.selectedRowKeys = selectedRowKeys;
},
//
handlerSearch() {
this.getData()

@ -22,14 +22,15 @@
</a-select>
</a-form-model-item>
<a-form-model-item label="选择功能模块">
<a-checkbox-group v-model="form.modelFunctionId" :options="functionType" @change="functionChange" />
</a-form-model-item>
<a-form-model-item label="选择有效时长">
<a-select v-model="form.timeTypeId" @change="timeChange">
<a-select-option :value="item.id" v-for="(item, index) in timeData" :key="index">
{{item.years == 0 ? '' : item.years+'年'}}
<a-select-option :value="item.id" v-for="(item, index) in timeType" :key="index">
<!-- {{item.years == 0 ? '' : item.years+'年'}}
{{item.months == 0 ? '' : item.months+'个月'}}
{{item.days == 0 ? '' : item.days+'天'}}
{{item.days == 0 ? '' : item.days+'天'}} -->
{{item.name}}
</a-select-option>
</a-select>
</a-form-model-item>
@ -56,13 +57,13 @@
<div class="content">
<a-form-model :labelCol="{span: 2}" :wrapperCol="{span: 8}">
<a-form-model-item label="域名">
<a-input style="width: 394px"></a-input>
<a-input v-model="form.domainName" style="width: 394px"></a-input>
</a-form-model-item>
<a-form-model-item label="服务器ip">
<a-input style="width: 394px"></a-input>
<a-input v-model="form.serviceIp" style="width: 394px"></a-input>
</a-form-model-item>
<a-form-model-item label="是否定制">
<a-select style="width: 394px" @change="textareaDisable" v-model="form.isCustomized">
<a-select v-model="form.isCustomized" style="width: 394px" @change="textareaDisable">
<a-select-option :value="0">
不定制
</a-select-option>
@ -87,7 +88,8 @@
<script>
import {getAllRequest,getComById, createOrder, calcAmount} from "@/api/manage";
import {findTimeType, getChargingList, getChargeById} from "@/api/manage";
import {getChargingList, getChargeById} from "@/api/manage";
import {findTimeType, findSuperNavigation} from "@/api/manage";
export default {
name: "addOrder",
data() {
@ -96,7 +98,7 @@ export default {
code: '',
payType: 1,
chargingTemplateId: undefined,
modelFunctionId: [1],
modelFunctionId: [],
timeTypeId: undefined,
payPrice: 0,
companyId: undefined,
@ -109,8 +111,12 @@ export default {
//
companyData: [],
comData: [], //
//
functionType: [], //
allFunctionType: [],
//
timeData: [],
timeType: [],
allTimeType: [],
//
modelData: [],
}
@ -124,15 +130,19 @@ export default {
getAllRequest(obj).then(res => {
let data = res.data.rows
this.companyData = data;
})
findTimeType().then(res => {
let data = res.data;
this.timeData = data
})
});
getChargingList(Object.assign(obj, {name: ''})).then(res => {
let data = res.data.rows;
this.modelData = data
})
findTimeType().then(res => {
let data = res.data;
this.allTimeType = data
})
findSuperNavigation().then(res => {
let data = res.data;
this.allFunctionType = data;
})
},
getPrice() {
if(this.form.chargingTemplateId && this.form.modelFunctionId && this.form.timeTypeId) {
@ -148,14 +158,44 @@ export default {
}
},
modelChange(val) {
this.form.timeTypeId = undefined;
this.form.modelFunctionId = [];
this.form.communityId = undefined;
getChargeById({id: val}).then(res => {
console.log(res)
let data = res.data;
let functionData = [];
data.functionList.forEach(ele => {
this.allFunctionType.forEach(e => {
if(e.id == ele) {
let obj = {label: e.name,value: e.id}
functionData.push(obj);
}
})
})
this.functionType = functionData;
let timeData = [];
data.timeTypeList.forEach(ele => {
this.allTimeType.forEach(e => {
if(e.id == ele) {
let year = e.years == 0 ? '' : e.years+'年';
let month = e.months == 0 ? '' : e.months+'个月';
let day = e.days == 0 ? '' : e.days+'天';
let obj = {name: year+month+day,id: e.id}
timeData.push(obj);
}
})
})
this.timeType = timeData;
});
this.getPrice();
},
timeChange(val) {
this.getPrice();
},
//
functionChange(val) {
// console.log(val)
},
textareaDisable(val) {
if(val == 0) {
this.form.customizedDemand = ''
@ -170,7 +210,8 @@ export default {
},
addConfirm() {
createOrder(this.form).then(res => {
console.log(res)
console.log(res);
this.$router.go(-1);
})
},
cancel() {

@ -3,24 +3,34 @@
<div class="cardTitle">订单管理</div>
<div class="search-box">
<a-space size="large">
<a-input v-model="form.code" placeholder="请输入订单号" />
<a-input v-model="form.name" placeholder="请输入企业名称" />
<a-select v-model="form.isCustomized" style="width: 200px" placeholder="类型">
<a-select-option :value="0">定制</a-select-option>
<a-select-option :value="1">不定制</a-select-option>
</a-select>
<a-select v-model="form.status" style="width: 200px" placeholder="订单状态">
<a-select-option :value="0">待支付</a-select-option>
<a-select-option :value="1">支付超时</a-select-option>
<a-select-option :value="2">已支付</a-select-option>
</a-select>
<a-form-model layout="inline">
<a-form-model-item label="订单号">
<a-input v-model="form.code" placeholder="请输入订单号" />
</a-form-model-item>
<a-form-model-item label="企业名称">
<a-input v-model="form.name" placeholder="请输入企业名称" />
</a-form-model-item>
<a-form-model-item label="定制类型">
<a-select v-model="form.isCustomized" style="width: 200px" placeholder="类型">
<a-select-option :value="0">定制</a-select-option>
<a-select-option :value="1">不定制</a-select-option>
</a-select>
</a-form-model-item>
<a-form-model-item label="订单状态">
<a-select v-model="form.status" style="width: 200px" placeholder="订单状态">
<a-select-option :value="0">待支付</a-select-option>
<a-select-option :value="1">支付超时</a-select-option>
<a-select-option :value="2">已支付</a-select-option>
</a-select>
</a-form-model-item>
</a-form-model>
<a-button type="primary" @click="handlerSearch"> </a-button>
<a-button @click="handlerReset"> </a-button>
</a-space>
</div>
<div id="commonTable">
<div style="margin-bottom: 16px">
<a-button @click="addOrder" type="primary">
<a-button icon="plus" @click="addOrder" type="primary" ghost>
新建订单
</a-button>
</div>
@ -79,36 +89,36 @@ export default {
{
title: "订单号",
dataIndex: "code",
width: "200",
width: 180,
},
{
title: "公司名",
dataIndex: "name",
width: "200",
width: 180,
},
{
title: "类型",
dataIndex: "isCustomized",
scopedSlots: { customRender: "type" },
width: "200",
width: 180,
},
{
title: "包含功能模块",
dataIndex: "includeFunctionModelList",
scopedSlots: { customRender: "tags" },
width: "280",
width: 400,
},
{
title: "状态",
dataIndex: "status",
scopedSlots: { customRender: "formatter" },
width: "120",
width: 120,
},
{
title: "操作",
dataIndex: "action",
key: "action",
width: "180",
width: 180,
fixed: "right",
scopedSlots: { customRender: "action" },
},

@ -5,38 +5,30 @@
<!-- 搜索 -->
<div class="search-box">
<a-space size="large">
<a-input v-model="searchForm.companyName" placeholder="请输入申请人/公司名" />
<a-select v-model="searchForm.status" style="width: 200px" placeholder="选择状态">
<a-select-option :value="1">待确认</a-select-option>
<a-select-option :value="2">审核通过</a-select-option>
<a-select-option :value="3">审核驳回</a-select-option>
</a-select>
<a-form-model layout="inline">
<a-form-model-item label="申请人/公司名">
<a-input v-model="searchForm.companyName" placeholder="请输入申请人/公司名" />
</a-form-model-item>
<a-form-model-item label="审核状态">
<a-select v-model="searchForm.status" style="width: 200px" placeholder="选择状态">
<a-select-option :value="1">待确认</a-select-option>
<a-select-option :value="2">审核通过</a-select-option>
<a-select-option :value="3">审核驳回</a-select-option>
</a-select>
</a-form-model-item>
</a-form-model>
<a-button type="primary" @click="handlerSearch"> </a-button>
<a-button @click="handlerReset"> </a-button>
</a-space>
</div>
<!-- 表格 -->
<div id="commonTable">
<div style="margin-bottom: 16px">
<a-button type="primary" :disabled="!hasSelected" :loading="loading">
批量操作
</a-button>
<span style="margin-left: 8px">
<template v-if="hasSelected">
{{ `已选择 ${selectedRowKeys.length}` }}
</template>
</span>
</div>
<a-table
:scroll="{ x: 1300 }"
:columns="columns"
:data-source="tableData"
:pagination="pagination"
@change="handleTableChange"
:row-selection="{
selectedRowKeys: selectedRowKeys,
onChange: onSelectChange,
}"
:row-key="
(record, index) => {
return index;
@ -141,10 +133,6 @@ export default {
}
)
},
onSelectChange(selectedRowKeys) {
console.log("selectedRowKeys changed: ", selectedRowKeys);
this.selectedRowKeys = selectedRowKeys;
},
//
handlerSearch() {
this.getData()

@ -3,16 +3,22 @@
<div class="cardTitle">小区管理</div>
<div class="search-box">
<a-space size="large">
<a-input v-model="form.communityName" placeholder="请输入小区名" />
<a-form-model layout="inline">
<a-form-model-item label="小区名称">
<a-input v-model="form.communityName" placeholder="请输入小区名称" />
</a-form-model-item>
</a-form-model>
<a-button type="primary" @click="handlerSearch"> </a-button>
<a-button @click="handlerReset"> </a-button>
</a-space>
</div>
<a-button @click="hanlderAdd" style="margin-left: 22px" type="primary">
添加小区
</a-button>
<!-- 表格 -->
<div id="commonTable">
<div style="margin-bottom: 16px">
<a-button icon="plus" @click="hanlderAdd" type="primary" ghost>
添加小区
</a-button>
</div>
<a-table
:scroll="{ x: 1300 }"
:columns="columns"

Loading…
Cancel
Save