cxc/cas_cloud_admin
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
ailanyin
2023-07-03 17:32:08 +08:00
parent 8aa883ecc2
commit fe7324eb40
10 changed files with 400 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Caddyfile
View File

@ -5,7 +5,7 @@
:4173 {
handle_path /api/* {
reverse_proxy 192.168.0.201:1618
reverse_proxy http://101.34.131.16:1618
}
handle {
root * "/Volumes/iMac Doc/WebstormProjects/cas_cloud_admin/dist"

4
src/components/ImageUpload/index.vue
View File

@ -190,8 +190,8 @@ function listToString(list, separator) {
separator = separator || ",";
for (let i in list) {
if (undefined !== list[i].url && list[i].url.indexOf("blob:") !== 0) {
strs += list[i].url.replace(baseUrl, "") + separator;
// strs += list[i].url + separator;
// strs += list[i].url.replace(baseUrl, "") + separator;
strs += list[i].url + separator;
}
}
return strs != "" ? strs.substr(0, strs.length - 1) : "";

6
src/constant/dict.js
View File

@ -2,17 +2,17 @@
export const auditStatusDict = [
{
value: "0",
label: "审核中",
label: "待审核",
elTagType: "primary",
},
{
value: "1",
label: "审核通过",
label: "已通过",
elTagType: "success",
},
{
value: "2",
label: "审核拒绝",
label: "已驳回",
elTagType: "danger",
},
];

266
src/song.json Normal file
View File

@ -0,0 +1,266 @@
[
{
"id": 1,
"title": "Shake It Off",
"artist": "Taylor Swift",
"album": "1989",
"genre": "Pop",
"releaseDate": "2014-08-18",
"price": 1.29,
"duration": 219,
"cover": "https://upload.wikimedia.org/wikipedia/en/f/f6/Taylor_Swift_-_1989.png",
"rating": 4.5
},
{
"id": 2,
"title": "Blank Space",
"artist": "Taylor Swift",
"album": "1989",
"genre": "Pop",
"releaseDate": "2014-11-10",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/f/f6/Taylor_Swift_-_1989.png",
"rating": 4.5
},
{
"id": 3,
"title": "Style",
"artist": "Taylor Swift",
"album": "1989",
"genre": "Pop",
"releaseDate": "2015-02-09",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/f/f6/Taylor_Swift_-_1989.png",
"rating": 4.5
},
{
"id": 4,
"title": "Bad Blood",
"artist": "Taylor Swift",
"album": "1989",
"genre": "Pop",
"releaseDate": "2015-05-17",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/f/f6/Taylor_Swift_-_1989.png",
"rating": 4.5
},
{
"id": 5,
"title": "Wildest Dreams",
"artist": "Taylor Swift",
"album": "1989",
"genre": "Pop",
"releaseDate": "2015-08-31",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/f/f6/Taylor_Swift_-_1989.png",
"rating": 4.5
},
{
"id": 6,
"title": "Out of the Woods",
"artist": "Taylor Swift",
"album": "1989",
"genre": "Pop",
"releaseDate": "2015-10-14",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/f/f6/Taylor_Swift_-_1989.png",
"rating": 4.5
},
{
"id": 7,
"title": "New Romantics",
"artist": "Taylor Swift",
"album": "1989",
"genre": "Pop",
"releaseDate": "2016-02-23",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/f/f6/Taylor_Swift_-_1989.png",
"rating": 4.5
},
{
"id": 8,
"title": "Look What You Made Me Do",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2017-08-24",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 9,
"title": "Ready For It",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2017-09-03",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 10,
"title": "End Game",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2017-11-14",
"price": 1.29,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 11,
"title": "Delicate",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-03-12",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 12,
"title": "Gorgeous",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-10-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 13,
"title": "Getaway Car",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-11-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 14,
"title": "Call It What You Want",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 15,
"title": "King of My Heart",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 16,
"title": "Dancing With Our Hands Tied",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 17,
"title": "Dress",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 18,
"title": "This Is Why We Can't Have Nice Things",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 19,
"title": "So It Goes...",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 20,
"title": "Getaway Car",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2018-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/5/5f/Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 21,
"title": "Getaway Car",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2019-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/thumb/5/5f/Taylor_Swift_-_Reputation.png/220px-Taylor_Swift_-_Reputation.png",
"rating": 4.5
},
{
"id": 22,
"title": "Getaway Car",
"artist": "Taylor Swift",
"album": "Reputation",
"genre": "Pop",
"releaseDate": "2020-12-20",
"price": 1,
"duration": 231,
"cover": "https://upload.wikimedia.org/wikipedia/en/thumb/5/5f/Taylor_Swift_-_Reputation.png/220px-Taylor_Swift_-_Reputation.png",
"rating": 4.5
}
]

9
src/views/dataAuditList/demand/index.vue
View File

@ -199,6 +199,7 @@ const getList = async () => {
dataList.value = resp.rows;
total.value = resp.total;
};
const approval = (row) => {
demandForm.value = cloneDeep(row);
if (!row.kinds) {
@ -207,9 +208,6 @@ const approval = (row) => {
if (!row.wants) {
demandForm.value.wants = row.want?.split(",") ?? [];
}
// if (!row.industrys) {
// demandForm.value.industrys = row.;
// }
isShow.value = true;
};
@ -283,6 +281,11 @@ const handleAppointBroker = (row) => {
showAppointBroker.value = true;
};
/**
* 指派经纪人
* @param value
* @return {Promise<void>}
*/
const handleConfirmAppointBroker = async (value) => {
await dataReviewAppointBroker(
appointDemandId.value,

4
src/views/dataList/agent/index.vue
View File

@ -54,7 +54,7 @@
<el-table v-loading="loading" :data="dataList">
<el-table-column align="center" label="姓名" prop="name" />
<el-table-column align="center" label="手机号" prop="mobile" />
<!-- <el-table-column align="center" label="手机号" prop="mobile" />-->
<el-table-column align="center" label="资格证书缩略图">
<template #default="{ row }">
<el-image
@ -74,7 +74,7 @@
<div>{{ row.industrys[row.industrys.length - 1] }}</div>
</template>
</el-table-column> -->
<el-table-column align="center" label="站点" prop="area" />
<!-- <el-table-column align="center" label="站点" prop="area" />-->
<el-table-column align="center" label="所在地" prop="wordAddress" />
<el-table-column align="center" label="申请时间" prop="createTime">
<template #default="{ row }">

179
src/views/order/broker-order/index.vue
View File

@ -1,6 +1,6 @@
<script setup>
import {orderStatusDict, orderTypeDict} from "@/constant/dict";
import {reactive, ref, toRefs} from "vue";
import { orderStatusDict, orderTypeDict } from "@/constant/dict";
import { reactive, ref, toRefs } from "vue";
import InfiniteSelect from "@/components/InfiniteSelect";
import {
addBrokerDealLog,
@ -10,8 +10,8 @@ import {
updateBrokerDealLog,
} from "@/api/order/broker-order";
import dayjs from "dayjs";
import {agentList} from "@/api/dataList/agent";
import {ElMessage, ElMessageBox} from "element-plus";
import { agentList } from "@/api/dataList/agent";
import { ElMessage, ElMessageBox } from "element-plus";
import DictTag from "@/components/DictTag/index.vue";
import RightToolbar from "@/components/RightToolbar/index.vue";
@ -21,7 +21,11 @@ const dataList = ref([]);
const total = ref(0);
const dialogVisible = ref(false);
const dialogTitle = ref("");
const invoiceDialogVisible = ref(false);
const invoiceDialogTitle = ref("");
const formRef = ref(null);
const invoiceFormRef = ref(null);
const data = reactive({
queryParams: {
pageNum: 1,
@ -34,18 +38,19 @@ const data = reactive({
},
form: {},
rules: {
orderNumber: [{required: true, message: "请输入订单号", trigger: "blur"}],
orderNumber: [{ required: true, message: "请输入订单号", trigger: "blur" }],
enterpriseName: [
{required: true, message: "请输入公司名称", trigger: "blur"},
{ required: true, message: "请输入公司名称", trigger: "blur" },
],
orderType: [
{required: true, message: "请选择订单类型", trigger: "change"},
{ required: true, message: "请选择订单类型", trigger: "change" },
],
status: [{required: true, message: "请选择订单状态", trigger: "change"}],
payTime: [{required: true, message: "请选择支付时间", trigger: "change"}],
status: [{ required: true, message: "请选择订单状态", trigger: "change" }],
payTime: [{ required: true, message: "请选择支付时间", trigger: "change" }],
},
invoiceForm: {},
});
const {queryParams, form, rules} = toRefs(data);
const { queryParams, form, rules, invoiceForm } = toRefs(data);
const getList = async () => {
loading.value = true;
@ -128,13 +133,28 @@ const handleConfirmSelect = (val) => {
* @param id
*/
const handleDealOrder = (id) => {
ElMessageBox.confirm("确认处理该条订单吗?", "提示", {
brokerDealLogDetail(id).then((resp) => {
invoiceForm.value = resp.data;
invoiceDialogTitle.value = "开票";
invoiceDialogVisible.value = true;
});
};
/**
* 开票
*/
const confirmInvoice = () => {
ElMessageBox.confirm("确认处理吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}).then(() => {
updateBrokerDealLog({id, status: "2"}).then(() => {
ElMessage.success("处理成功");
updateBrokerDealLog({
id: invoiceForm.value.id,
status: "2",
}).then(() => {
invoiceDialogVisible.value = false;
ElMessage.success("开票成功");
getList();
});
});
@ -154,19 +174,19 @@ getList();
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
icon="plus"
plain
size="default"
type="primary"
@click="handleAdd"
>新增
icon="plus"
plain
size="default"
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<right-toolbar v-model:show-search="showSearch" @query-table="getList"/>
<right-toolbar v-model:show-search="showSearch" @query-table="getList" />
</el-row>
<el-table v-loading="loading" :data="dataList">
<el-table-column align="center" label="订单号" prop="orderNumber"/>
<el-table-column align="center" label="经纪人名称" prop="brokerName"/>
<el-table-column align="center" label="订单号" prop="orderNumber" />
<el-table-column align="center" label="经纪人名称" prop="brokerName" />
<el-table-column align="center" label="订单类型">
<template #default="{ row }">
{{
@ -174,8 +194,8 @@ getList();
}}
</template>
</el-table-column>
<el-table-column align="center" label="金额" prop="amount"/>
<el-table-column align="center" label="数量" prop="total"/>
<el-table-column align="center" label="金额" prop="amount" />
<el-table-column align="center" label="数量" prop="total" />
<el-table-column align="center" label="充值时间" prop="payTime">
<template #default="{ row }">
{{ dayjs(row.payTime).format("YYYY-MM-DD HH:mm:ss") }}
@ -184,63 +204,63 @@ getList();
<!--订单状态-->
<el-table-column align="center" label="订单状态">
<template #default="{ row }">
<dict-tag :options="orderStatusDict" :value="row.status"/>
<dict-tag :options="orderStatusDict" :value="row.status" />
</template>
</el-table-column>
<el-table-column align="center" label="操作">
<template #default="{ row }">
<el-button
icon="edit"
size="small"
type="text"
@click="handleEdit(row.id)"
>修改
icon="edit"
size="small"
type="text"
@click="handleEdit(row.id)"
>修改
</el-button>
<!--处理按钮-->
<el-button
:disabled="row.status === '2' || row.status === '0'"
icon="check"
size="small"
type="text"
@click="handleDealOrder(row.id)"
>处理
:disabled="row.status === '2' || row.status === '0'"
icon="check"
size="small"
type="text"
@click="handleDealOrder(row.id)"
>处理
</el-button>
<el-button
icon="delete"
size="small"
type="text"
@click="handleDelete(row.id)"
>删除
icon="delete"
size="small"
type="text"
@click="handleDelete(row.id)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNum"
:total="total"
@pagination="getList"
v-show="total > 0"
v-model:limit="queryParams.pageSize"
v-model:page="queryParams.pageNum"
:total="total"
@pagination="getList"
/>
<!-- 订单-->
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="38%">
<el-form ref="formRef" :labelWidth="100" :model="form" :rules="rules">
<el-row>
<el-col :span="12">
<el-form-item label="经纪人名称" prop="brokerId">
<infinite-select
v-model="form.brokerId"
:default-label="form.brokerName"
:prop="{ label: 'name', value: 'brokerId' }"
:query="{
v-model="form.brokerId"
:default-label="form.brokerName"
:prop="{ label: 'name', value: 'brokerId' }"
:query="{
page: 'pageNum',
size: 'pageSize',
searchKey: 'name',
}"
:remote-method="loadBrokerOptions"
prefix-icon="user"
@confirm="handleConfirmSelect"
:remote-method="loadBrokerOptions"
prefix-icon="user"
@confirm="handleConfirmSelect"
/>
</el-form-item>
</el-col>
@ -248,10 +268,10 @@ getList();
<el-form-item label="订单类型" prop="orderType">
<el-select v-model="form.orderType">
<el-option
v-for="item in orderTypeDict"
:key="item.value"
:label="item.label"
:value="item.value"
v-for="item in orderTypeDict"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
@ -261,8 +281,8 @@ getList();
<el-col :span="12">
<el-form-item label="订单号" prop="orderNumber">
<el-input
v-model="form.orderNumber"
placeholder="请输入订单号"
v-model="form.orderNumber"
placeholder="请输入订单号"
></el-input>
</el-form-item>
</el-col>
@ -276,10 +296,10 @@ getList();
<el-col :span="12">
<el-form-item label="充值时间" prop="payTime">
<el-date-picker
v-model="form.payTime"
format="YYYY-MM-DD HH:mm:ss"
placeholder="选择充值时间"
type="datetime"
v-model="form.payTime"
format="YYYY-MM-DD HH:mm:ss"
placeholder="选择充值时间"
type="datetime"
/>
</el-form-item>
</el-col>
@ -297,6 +317,37 @@ getList();
</div>
</template>
</el-dialog>
<!--处理发票-->
<el-dialog
v-model="invoiceDialogVisible"
:title="invoiceDialogTitle"
width="38%"
>
<el-form ref="invoiceFormRef" :labelWidth="100" :model="invoiceForm">
<el-form-item label="公司名称" prop="companyName">
<el-input v-model="invoiceForm.companyName"></el-input>
</el-form-item>
<el-form-item label="公司税号" prop="taxNumber">
<el-input v-model="invoiceForm.taxNumber"></el-input>
</el-form-item>
<el-form-item label="电子邮箱" prop="email">
<el-input v-model="invoiceForm.email"></el-input>
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-input v-model="invoiceForm.phone" maxlength="11"></el-input>
</el-form-item>
<el-form-item label="地址" prop="address">
<el-input v-model="invoiceForm.address"></el-input>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button @click="invoiceDialogVisible = false">取 消</el-button>
<el-button type="primary" @click="confirmInvoice">确 定</el-button>
</div>
</template>
</el-dialog>
</div>
</template>

6
src/views/userAuditList/agent/index.vue
View File

@ -37,7 +37,7 @@
<el-table v-loading="loading" :data="dataList" border>
<el-table-column align="center" label="姓名" prop="name" />
<el-table-column align="center" label="手机号" prop="mobile" />
<!-- <el-table-column align="center" label="手机号" prop="mobile" />-->
<el-table-column align="center" label="资格证书缩略图">
<template #default="{ row }">
<el-image
@ -46,7 +46,7 @@
></el-image>
</template>
</el-table-column>
<el-table-column align="center" label="站点" prop="area" />
<!-- <el-table-column align="center" label="站点" prop="area" />-->
<el-table-column align="center" label="所在地" prop="wordAddress" />
<el-table-column align="center" label="申请时间" prop="createTime">
<template #default="{ row }">
@ -120,7 +120,7 @@ const getList = () => {
* 搜索按钮操作
*/
const handleQuery = () => {
queryParams.value.page_num = 1;
queryParams.value.pageNum = 1;
getList();
};

1
src/views/userAuditList/enterprise/index.vue
View File

@ -72,7 +72,6 @@
<el-table-column align="center" label="审核状态" prop="examineStatus">
<template #default="{ row }">
<dict-tag :options="auditStatusDict" :value="row.examineStatus" />
<!-- {{ auditStatusDict.find((e) => row.examineStatus === e.value)?.label }}-->
</template>
</el-table-column>
<el-table-column align="center" label="企业类型" prop="kind">

3
vite.config.js
View File

@ -32,7 +32,8 @@ export default defineConfig(({ mode, command }) => {
// https://cn.vitejs.dev/config/#server-proxy
"/dev-api": {
// target: "http://192.168.110.10:1618",
target: "http://192.168.0.201:1618",
target: 'http://101.34.131.16:1618',
// target: "http://192.168.0.201:1618",
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, ""),
},