Commit 513bb8dc authored by daniel's avatar daniel

fix(bag+invoice): 赛包+发票后台管理页面用新UI重构

parent 371b119c
......@@ -21,6 +21,9 @@ public class InvoiceParam {
@ApiModelProperty(value = "参赛号", notes = "参赛号")
private String markNo;
@ApiModelProperty(value = "关键字", notes = "关键字")
private String keyword;
@ApiModelProperty(value = "开票方式(0:电子发票,1:纸质发票)", notes = "开票方式(0:电子发票,1:纸质发票)")
private String paperInvoice;
......
......@@ -103,7 +103,7 @@
status
from invoice_record
where del_flag = 0
<include refid="bag-where-sql"/>
<include refid="invoice-where-sql"/>
order by create_date
limit #{page.offset},#{page.size}
</select>
......@@ -112,10 +112,10 @@
select count(1)
from invoice_record
where del_flag=0
<include refid="bag-where-sql"/>
<include refid="invoice-where-sql"/>
</select>
<sql id="bag-where-sql">
<sql id="invoice-where-sql">
and cmpt_id = #{param.cmptId}
<if test="param.status != null">
and status=#{param.status}
......@@ -129,6 +129,9 @@
<if test="param.markNo != null and param.markNo != '' ">
and mark_no=#{param.markNo}
</if>
<if test="param.keyword != null and param.keyword != '' ">
and (mark_no like '%${param.keyword}%' or receiver_name like '%${param.keyword}%' or receiver_phone like '%${param.keyword}%')
</if>
<if test="param.isCompany != null and param.isCompany != '' ">
and is_company=#{param.isCompany}
</if>
......
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<!doctype html>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="fns" uri="/WEB-INF/tlds/fns.tld" %>
<%@ taglib prefix="fnc" uri="/WEB-INF/tlds/fnc.tld" %>
<c:set var="ctx" value="${pageContext.request.contextPath}${fns:getAdminPath()}" />
<c:set var="path" value="${pageContext.request.contextPath}${fns:getPath()}" />
<c:set var="jaaproot" value="${pageContext.request.contextPath}" />
<c:set var="ctxStatic" value="${pageContext.request.contextPath}/static" />
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>赛包邮寄</title>
<!-- ... 保留原有的 Vue 引入 ... -->
<script src="https://unpkg.com/vue@3/dist/vue.global.prod.js"></script>
<!-- 添加 Naive UI 的引入 -->
<!-- 会使用最新版本,你最好指定一个版本 -->
<script src="https://unpkg.com/naive-ui"></script>
<!-- <script nomodule
src="https://unpkg.com/ionicons@7.1.0/dist/ionicons/ionicons.js"></script> -->
<script type="module"
src="https://unpkg.com/ionicons@7.1.0/dist/ionicons/ionicons.esm.js"></script>
<script nomodule
src="https://unpkg.com/ionicons@7.1.0/dist/ionicons/ionicons.js"></script>
<!-- Favicon-->
<link rel="shortcut icon" href="https://img.geexek.com/files/home/favicon.ico">
<!-- 自定义css -->
<link rel="stylesheet" href="${ctxStatic}/css/base.css">
<!-- Bootstrap CSS-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/vendor/bootstrap/css/bootstrap.min.css">
<!-- Font Awesome CSS-->
<link rel="stylesheet"
href="${ctxStatic}/newdermon/vendor/font-awesome/css/font-awesome.min.css">
<!-- Fontastic Custom icon font-->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/fontastic.css">
<!-- Google fonts - Poppins -->
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
href="${ctxStatic}/newdermon/vendor/bootstrap/css/bootstrap.min.css">
<!-- theme stylesheet-->
<link rel="stylesheet"
href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>"
......@@ -24,660 +42,646 @@
<!-- Custom stylesheet - for your changes-->
<link rel="stylesheet"
href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
<link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
<!-- Favicon-->
<link rel="shortcut icon" href="https://img.geexek.com/files/home/favicon.ico">
<link rel="stylesheet"
href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
<link rel="stylesheet"
href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
<link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
<link rel="stylesheet"
href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>" />
<link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css" />
<!-- Bootstrap CSS-->
<link rel="stylesheet" href="${ctxStatic}/css/base.css">
href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
<script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
<script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>
<link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
<link rel="stylesheet" href="/static/cmpt/score.css?<%=System.currentTimeMillis()%>">
<style>
.layui-layer-title {
color: white;
#app {
padding: 0 20px 20px 20px;
}
.layui-layer-btn {
color: white;
.layout {
min-height: 100vh;
}
.right {
height: auto !important;
width: 80%;
margin: 0px 0px 0px 40px;
.carousel-img {
width: 100%;
height: 240px;
object-fit: cover;
}
.action {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-around;
[v-cloak] {
display: none;
}
.dialog {
width: 40vw;
max-height: 80vh;
height: auto;
z-index: 99;
display: flex;
flex-direction: column;
left: 50%;
transform: translateX(-50%);
margin-left: 0;
padding: 20px;
border-radius: 10px;
.n-message .n-message__icon>* {
position: absolute;
left: 0;
top: -5px !important;
right: 0;
bottom: 0;
}
</style>
</head>
.dialog input {
width: 100% !important;
<body>
<jsp:include page="../common/header.jsp"></jsp:include>
<div class="page-content d-flex align-items-stretch main-body">
<jsp:include page="../common/menu.jsp"></jsp:include>
<div id="app" class="flex-1" v-cloak>
<n-config-provider :locale="locale" :date-locale="dateLocale">
<n-modal-provider>
<n-message-provider>
<n-notification-provider>
<my-app></my-app>
</n-notification-provider>
</n-message-provider>
</n-modal-provider>
</n-config-provider>
</div>
</div>
<script type="text/x-template" id="my-app">
<n-space vertical >
<!-- 顶部的搜索框 -->
<n-card :bordered="false">
<div class="w-full flex flex-row items-center gap-x-2">
<div style="width: 200px">
<n-tabs type="segment" @update:value="updateStatus" :value="query.status" animated pane-style="padding:0;">
<n-tab-pane v-for="item in [{name:'全部',value:''},...StatusEnum.data.map(v=>({name:v.name,value:v.value}))]" :name="item.value" :tab="item.name"></n-tab-pane>
</n-tabs>
</div>
<div class="ml-auto">
<n-input v-model:value="keyword" placeholder="请输入搜索内容" :clearable="true" @change="fetchData" />
</div>
</div>
</n-card>
<!-- 搜索框 -->
<n-data-table :columns="columns" :loading="loading" :data="list" :pagination="pagination"
:bordered="false"
:remote="true"/>
<n-modal :mask-closable="false" :loading="loading" style="width: 600px" :title="formData.id?'编辑赛包':'新增赛包'"
preset="card"
draggable v-model:show="showModal" >
<n-form
ref="formRef"
:model="formData"
:rules="rules"
size="small"
label-placement="left"
label-width="auto"
>
<n-form-item label="姓名" path="name">
<n-input v-model:value="formData.name" placeholder="请输入姓名" />
</n-form-item>
<n-form-item label="手机号" path="phone">
<n-input v-model:value="formData.phone" placeholder="请输入手机号" />
</n-form-item>
<n-form-item label="快递单号" path="deliveryNo">
<n-input v-model:value="formData.deliveryNo" placeholder="请输入快递单号" />
</n-form-item>
<n-form-item label="快递公司" >
<n-input v-model:value="formData.expressCompany" placeholder="请输入快递公司" />
</n-form-item>
<n-form-item label="省份" >
<n-input v-model:value="formData.province" placeholder="请输入省份" />
</n-form-item>
<n-form-item label="城市" >
<n-input v-model:value="formData.city" placeholder="请输入城市" />
</n-form-item>
<n-form-item label="区" >
<n-input v-model:value="formData.area" placeholder="请输入区" />
</n-form-item>
<n-form-item label="详细地址" >
<n-input v-model:value="formData.location" placeholder="请输入详细地址" />
</n-form-item>
<n-form-item label="赛包类型" path="invoiceType">
<n-radio-group v-model:value="formData.status" name="radiogroup">
<n-space>
<n-radio v-for="item in StatusEnum.data" :key="item.value" :value="item.value">
{{ item.name }}
</n-radio>
</n-space>
</n-radio-group>
</n-form-item>
<n-form-item label="备注" >
<n-input type="textarea" v-model:value="formData.remark" placeholder="请输入备注" />
</n-form-item>
</n-form>
<template #footer>
<div class="flex gap-x-2 flex-row items-center" >
<n-button class="flex-1" :loading="loading" @click="onCancel">
取消
</n-button>
<n-button class="flex-1"
:loading="loading" type='primary' @click="onSubmit">
保存
</n-button>
</div>
</template>
</n-modal>
<n-modal
v-model:show="showDelModal"
preset="dialog"
title="确认"
content="你确定要删除该赛包吗?"
positive-text="确认"
negative-text="算了"
@positive-click="onDelete"
/>
</n-space>
</script>
<script>
// 枚举class
class SuperEnum {
constructor(param) {
const keyObj = {};
const valueObj = {};
const nameObj = {};
if (!Array.isArray(param)) {
throw new TypeError('param is not an array!');
}
param.forEach((element) => {
if (!element.key || !element.name) {
return;
}
// 使用对象存储键值对,方便快速查找
keyObj[element.key] = element;
valueObj[element.value] = element;
nameObj[element.name] = element;
// 动态添加属性
this[element.key] = element;
this[element.name] = element;
if (element.key !== element.value) {
this[element.value] = element;
}
});
.action div {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
user-select: none;
}
// 保存源数组
this.data = param;
this.keyObj = keyObj;
this.valueObj = valueObj;
this.nameObj = nameObj;
.submit {
display: inline-block;
width: 120px;
height: 45px;
text-align: center;
line-height: 45px;
color: white;
background: #ce3939;
border-radius: 4px;
letter-spacing: 1px;
cursor: pointer;
font-size: 16px;
// 防止被修改
Object.freeze(this);
}
.cancel {
width: 120px;
height: 45px;
background: #949494;
border-radius: 4px;
font-size: 16px;
color: #FFFFFF;
line-height: 45px;
text-align: center;
margin-right: 20px;
getColorByKey(key) {
const prop = this.keyOf(key);
if (!prop) {
const error = new Error('No enum constant');
error.code = 'ENUM_NOT_FOUND';
throw error;
}
.input {
width: 100%;
height: 40px !important;
line-height: 40px !important;
border: 2px solid #F4F4F4;
border-radius: 4px;
margin-right: 30px;
margin-left: 0px;
padding-left: 12px;
background: rgba(247, 247, 247, 1);
border-radius: 4px;
border: 1px solid rgba(229, 229, 229, 1);
return prop.color;
}
.title {
font-size: 24px;
font-weight: 500;
color: rgba(51, 51, 51, 1);
getData() {
return this.data;
}
.form-label {
font-size: 15px;
color: rgb(92, 91, 91);
width: auto;
getKeyByName(name) {
const prop = this.nameOf(name);
if (!prop) {
const error = new Error('No enum constant');
error.code = 'ENUM_NOT_FOUND';
throw error;
}
.form-item {
display: flex;
flex-direction: column;
/* height: 90px; */
padding: 5px 0;
return prop.key;
}
.section {
display: flex;
background: rgba(255, 255, 255, 1);
border-radius: 4px;
flex-direction: column;
margin-bottom: 10px !important;
margin-top: 0px !important;
getNameByKey(key) {
const prop = this.keyOf(key);
if (!prop) {
const error = new Error('No enum constant');
error.code = 'ENUM_NOT_FOUND';
throw error;
}
.tip {
font-size: 16px;
color: rgba(51, 51, 51, 1);
position: absolute;
right: 45px;
top: 10px;
return prop.name;
}
.form-action {
display: flex;
justify-content: flex-end;
margin: 0 20px;
padding-top: 10px;
getNameByValue(value) {
const prop = this.valueOf(value);
if (!prop) {
const error = new Error('No enum constant');
error.code = 'ENUM_NOT_FOUND';
throw error;
}
label {
/* width: auto; */
/* width: 200px; */
display: flex;
flex-direction: row;
align-items: center;
return prop.name;
}
.label-box {
display: flex;
flex-direction: row;
align-items: center;
getValueByKey(key) {
const prop = this.keyOf(key);
if (!prop) {
const error = new Error('No enum constant');
error.code = 'ENUM_NOT_FOUND';
throw error;
}
.dialog label input {
width: 20px !important;
height: 20px !important;
margin: 0 10px !important;
return prop.value;
}
.cover {
width: 100%;
height: 100px;
background: rgba(247, 247, 247, 1);
border-radius: 4px;
border: 1px solid rgba(238, 238, 238, 1);
display: flex;
justify-content: center;
align-items: center;
getValueByName(name) {
const prop = this.nameOf(name);
if (!prop) {
const error = new Error('No enum constant');
error.code = 'ENUM_NOT_FOUND';
throw error;
}
.cover-img {
width: 300px;
cursor: pointer;
background-repeat: no-repeat;
background-position: center;
background-size: cover;
height: 300px;
return prop.value;
}
.icon-cover {
width: 34px;
height: 34px;
background-image: url("/static/images/icon_cover.png");
background-size: 100%;
background-repeat: no-repeat;
keyOf(key) {
return this.keyObj[key];
}
.section {
width: 100% !important;
display: flex;
flex-direction: column;
nameOf(name) {
return this.nameObj[name];
}
.rule-field tbody tr td:first-child {
padding-left: 5px !important;
height: auto !important;
valueOf(value) {
return this.valueObj[value];
}
tbody tr td {
font-size: 15px !important;
padding: 5px;
}
input[type=checkbox]::before {
border: none !important;
background: none !important;
// to 方法,封装try catch
const to = async (
promise,
errorExt,
) => {
try {
const data = await promise
const result = [null, data]
return result
} catch (error) {
if (errorExt) {
const parsedError = Object.assign({}, error, errorExt)
return [parsedError, undefined]
}
input[type=checkbox]:checked::before {
border: none !important;
background: none !important;
return [error, undefined]
}
input[type=checkbox] {
top: 0;
left: 0;
}
</style>
</head>
<body>
<jsp:include page="../common/header.jsp"></jsp:include>
<div class="page-content d-flex align-items-stretch main-body">
<jsp:include page="../common/menu.jsp"></jsp:include>
<div class="right" id="module">
<div class="section">
<div class="flex flex-row items-center justify-between">
<h3 class="title">赛包邮寄</h3>
<div class="btn-toolbar flex justify-between" role="toolbar"
aria-label="Toolbar with button groups">
<div class="btn-group" role="group" aria-label="First group">
<button :class="[index==statusIndex?'btn-danger':'btn-default']"
@click="changeStatus(index)" type="button"
v-for="(statusOpt,index) in statusOptions" :key="index"
class="btn btn-sm">
{{statusOpt.name}}
</button>
</div>
<div class="input-group ml-2 mr-2">
<input type="text" class="form-control" placeholder="请输入搜索关键字"
@keyup.enter="fetchData" v-model="keyword"
aria-label="Input group example" aria-describedby="btnGroupAddon">
</div>
<button class="btn btn-sm ml-auto " :class="{
'btn-danger':keyword
}" @click="fetchData">
搜索
</button>
</div>
</div>
</div>
<div style="margin-bottom: 50px">
<table style="width: 100%" class="rule-field">
<colgroup>
<col style="width:25%;">
<col style="width:25%;">
<col style="width:25%;">
<col style="width:10%;">
<col style="width:15%;">
</colgroup>
<thead>
<tr>
<th style="text-align: left;padding-left:5px;">选手</th>
<th style="text-align: left">地址</th>
<th style="text-align: left">物流</th>
<th style="text-align: left">状态</th>
<th style="text-align: center">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="item in list" :data-id="item.id">
<td>
<div class="flex flex-col">
<span class="lh-1.2">
姓名: {{item.name}}
</span>
<span class="lh-1.2">
参赛号:{{item.markNo}}
</span>
<span class="lh-1.2">
手机号:{{item.phone}}
</span>
<span class="lh-1.2">
申请时间:{{item.createDate}}
</span>
<span v-if="item.remark" class="lh-1.2">
备注:{{item.remark}}
</span>
</div>
</td>
<td class="name" style="text-align: left;">
<span class="lh-1.2">
{{item.province}}/{{item.city}}/{{item.area}}/{{item.location}}
</span>
</td>
<td class="name" style="text-align: left;">
<div class="flex flex-col">
<span class="lh-1.2" class="lh-1.2">
物流单号 {{item.deliveryNo}}
</span>
<span class="lh-1.2">
物流公司 {{ item.expressCompany }}
</span>
</div>
</td>
<td style="text-align: left;">
<span class="lh-1.2">{{statusEnum[item.status]}}</span>
</td>
<td style="text-align: center">
<div class="action">
<div class="opt edit.opt" @click="showEdit(item)">
<span class="icon-edit"></span>
<span class="edit">
编辑
</span>
</div>
<div class="opt del" @click="delBag(item)">
<span class="icon-del"></span>
<span class="del">
删除
</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<nav class="mt-2" v-if="list.length>0" aria-label="Page navigation">
<ul class="pagination">
<li class="page-item" v-if="page!==1" @click="preview"><a class="page-link"
href="#">Previous</a></li>
<li @click="changePage(item+1)" v-for="item,index in totalPage"
:key="item+'page'" class="page-item" :class="{active:(index+1)==page}">
<a class="page-link" href="#">{{item}}</a>
</li>
<li class="page-item" v-if="list.length===pageSize" @click="next"><a
class="page-link" href="#">Next</a></li>
<div class="ml-2 flex flex-row items-center gap-x-2">
<span>每页条数</span>
<select v-model="pageSize" @change="refresh" style="width: 50px;">
<option :value="10">10</option>
<option :value="20">20</option>
<option :value="50">50</option>
<option :value="100">100</option>
<option :value="500">500</option>
</select>
<span>共{{total}}条数据</span>
</div>
</ul>
</nav>
</div>
<div class="dialog" v-show="dialog">
<div>
<span class="title" style="margin-bottom: 10px; color: #CE3939">{{title}}</span>
</div>
<div style="display: flex;flex-direction: column;flex:1;overflow-y: auto;">
<div class="form-item">
<div>
<span class="form-label">姓名</span>
</div>
<div>
<input class="input" type="text" v-model="bag.name"
placeholder="请输入收件人姓名" />
</div>
</div>
<div class="form-item">
<div>
<span class="form-label">手机号</span>
</div>
<div>
<input class="input" type="text" v-model="bag.phone"
placeholder="请输入收件人手机号" />
</div>
</div>
<div class="form-item">
<div>
<span class="form-label">快递单号</span>
</div>
<div>
<input class="input" type="text" v-model="bag.deliveryNo"
placeholder="请输入快递单号" />
</div>
</div>
<div class="form-item">
<div>
<span class="form-label">快递公司</span>
</div>
<div>
<input class="input" type="text" v-model="bag.expressCompany"
placeholder="请输入快递公司" />
</div>
</div>
<div class="form-item">
<div>
<span class="form-label">省份</span>
</div>
<div>
<input class="input" type="text" v-model="bag.province"
placeholder="请输入省份" />
</div>
</div>
<div class="form-item">
<div>
<span class="form-label">城市</span>
</div>
<div>
<input class="input" type="text" v-model="bag.city"
placeholder="请输入城市" />
</div>
</div>
<div class="form-item">
<div>
<span class="form-label">详细地址</span>
</div>
<div>
<input class="input" type="text" v-model="bag.area"
placeholder="请输入详细地址" />
</div>
</div>
<div class="form-item">
<div>
<span class="form-label">备注</span>
</div>
<div>
<input class="input" type="text" v-model="bag.remark"
placeholder="请输入备注信息" />
</div>
</div>
<!-- 状态 (status) -->
<div class="form-item">
<span class="form-label">状态</span>
<div class="label-box">
<label>
<input type="radio" v-model="bag.status" value="1"> 提交
</label>
<label>
<input type="radio" v-model="bag.status" value="2"> 已处理
</label>
</div>
</div>
</div>
<div class="form-action">
<span @click="cancel" class="cancel cursor-pointer">取消</span>
<span @click="submit" class="submit">保存</span>
</div>
</div>
<div v-show="dialog"
style="position: fixed;height: 100%;width: 100%;background: black;z-index: 10;opacity: 0.5;top:0px;left:0px">
</div>
</div>
<script src="${ctxStatic}/vue/vue.js"></script>
// 状态
const StatusEnum =
new SuperEnum([
{ key: 'SUBMIT', name: '提交', color: 'warning', value: 1 },
// 增值
{ key: 'FINISHED', name: '已处理', color: 'success', value: 2 },
])
</script>
<script>
const uploadUrl = '/api-common/v1/upload?folder=' + 'gk/module' + '&cmptId=' + getCId()
var app = new Vue({
el: '#module',
data: {
list: [],
dialog: false,
title: '赛包邮寄',
statusIndex: 0,
keyword: '',
page: 1,
pageSize: 10,
totalPage: 1,
total: 0,
statusOptions: [
const { createApp, defineComponent, reactive, ref, onMounted, h } = Vue;
const { useMessage, useNotification, dateZhCN, NButton, NTag, zhCN, NSpace, NImageGroup, NImage, NText } = naive
// 添加全局 loading 指令
const FC_BASE_URL = window.location.origin + '/gk/feedback-category'
const F_BASE_URL = window.location.origin + '/gk/feedback'
const uploadUrl = window.location.origin + '/api-common/v1/upload?folder=' + 'gk/invoice' + '&cmptId=' + getCId()
const MyApp = defineComponent({
name: 'MyApp',
template: '#my-app',
setup() {
const message = useMessage()
const notification = useNotification()
const loading = ref(false)
/***----------------赛包相关 start -----------------*/
const columns = [
{
name: "全部",
value: ''
title: '选手',
key: 'name',
width: 300,
render: (row) => {
return h(NSpace, {
vertical: true,
}, [
h(NText, {}, "姓名:" + row.name),
h(NText, {}, "参赛号:" + row.markNo),
h(NText, {}, "手机号:" + row.phone),
h(NText, {}, "申请时间:" + row.createDate),
h(NText, {}, "备注:" + row.remark),
])
}
},
{
name: "提交",
value: 1
title: '地址',
width: 200,
key: 'province',
render: (row) => {
return h(NSpace, {
vertical: true,
}, [
h(NText, {}, row.province + "/" + row.city + "/" + row.area + "/" + row.location),
])
}
},
{
name: "已处理",
value: 2
},
],
statusEnum: {
1: "提交",
2: "已处理",
},
bag: {
"id": null,
"remarks": null,
"cmptId": getCId(),
"name": "",
"markNo": "",
"phone": "",
"area": "",
"province": "",
"city": "",
"location": "",
"deliveryNo": "",
"expressCompany": "",
"status": 1,
"remark": ""
},
statusType: {
0: '关闭',
1: '开启'
title: '物流',
key: 'deliveryNo',
width: 250,
render: (row) => {
return h(NSpace, {
vertical: true,
}, [
h(NText, {}, "物流单号:" + (row.deliveryNo ?? '--')),
h(NText, {}, "物流公司:" + (row.expressCompany ?? '--')),
])
}
},
methods: {
// 页面刷新
refresh() {
this.page = 1;
this.fetchData()
},
changeStatus(index) {
this.statusIndex = index;
this.page = 1;
this.fetchData()
},
changePage(page) {
this.page = page
this.fetchData()
},
next() {
this.page += 1
this.fetchData()
},
preview() {
this.page -= 1
this.fetchData()
},
// 重置表单
resetForm() {
this.bag = {
"id": null,
"remarks": null,
"cmptId": getCId(),
"name": "",
"markNo": "",
"phone": "",
"area": "",
"province": "",
"city": "",
"location": "",
"deliveryNo": "",
"expressCompany": "",
"status": 1,
"remark": ""
};
{
title: '状态',
key: 'status',
width: 250,
render: (row) => {
return h(NSpace, {
vertical: true,
}, [
h(NSpace, {}, [
h(NText, {}, "状态"),
h(NTag, {
size: "small",
type: StatusEnum[row.status].color
}, StatusEnum[row.status].name),
]),
])
}
},
{
title: '操作',
key: 'actions',
width: 150,
align: 'center',
render: (row) => {
// 两个按钮,一个 编辑 一个 删除
return h(NSpace, {}, [
h(NButton, {
type: 'primary',
size: 'small',
onClick: () => {
// 编辑
showEdit(detail) {
this.bag = { ...detail };
this.dialog = true;
},
// 删除
delBag(data) {
layer.confirm("确认要删除吗?", function () {
$.ajax({
url: '/gk/bag/delete?id=' + data.id,
type: 'get',
contentType: 'application/json',
beforeSend: () => {
layer.load()
},
success: () => {
layer.msg('删除成功!');
edit(row)
}
}, '编辑'),
h(NButton, {
type: 'error',
size: 'small',
onClick: () => {
editRecord.value = row
showDelModal.value = true
}
}, '删除')
])
}
}
]
// 分页
const pagination = reactive({
pageSize: 20,
page: 1,
pageCount: 0,
showSizePicker: true,
itemCount: 0,
pageSizes: [20, 50, 200, 500],
prefix: (info) => "共" + info.itemCount + "条数据",
onChange: (page) => {
pagination.page = page
fetchData()
},
complete: () => {
layer.closeAll()
app.fetchData();
onUpdatePageSize: (pageSize) => {
pagination.pageSize = pageSize
pagination.page = 1
fetchData()
}
});
});
})
// 查询的参数
const query = reactive({
status: '',
})
const keyword = ref('')
// 结果列表
const fileList = ref([])
// 赛包弹框
const showModal = ref(false)
// 删除赛包
const showDelModal = ref(false)
const editRecord = ref()
// 赛包的formRef
const formRef = ref(null)
// 赛包的数据列表
const list = ref([])
// 赛包表单
const formData = reactive({
id: null,
remarks: null,
name: "",
markNo: "",
phone: "",
area: "",
province: "",
city: "",
location: "",
deliveryNo: "",
expressCompany: "",
status: StatusEnum.SUBMIT.value,
remark: ""
})
// 赛包的校验规则
const rules = {
name: {
required: true,
message: '请输入赛包名称',
trigger: 'blur',
},
// 保存
submit() {
const bag = { ...this.bag }
const url = "/gk/bag/update"
$.ajax({
url,
data: JSON.stringify(bag), // 将 data 转换为 JSON 字符串
type: 'post',
contentType: 'application/json',
beforeSend: () => {
layer.load()
markNo: {
required: true,
message: '请输入赛包编号',
trigger: 'blur',
},
success: (res) => {
layer.msg(res.code == 1 ? '保存成功!' : res.msg);
this.dialog = false;
this.fetchData();
phone: {
required: true,
message: '请输入赛包手机号',
trigger: 'blur',
},
complete: () => {
layer.closeAll()
}
// 状态更新
const updateStatus = (value) => {
pagination.page = 1
query.status = value
fetchData()
}
// 状态更新
const updateType = (value) => {
pagination.page = 1
query.invoiceType = value
fetchData()
}
// 上传完成
const uploadFinish = ({
file,
event
}) => {
const response = JSON.parse(event?.target?.response)
file.url = response.content
return file
}
// 重置form数据
const resetForm = () => {
Object.assign(formData, {
id: null,
remarks: null,
name: "",
markNo: "",
phone: "",
area: "",
province: "",
city: "",
location: "",
deliveryNo: "",
expressCompany: "",
status: StatusEnum.SUBMIT.value,
remark: ""
})
}
// 删除赛包
const onDelete = () => {
if (!editRecord.value) {
showDelModal.value = false
return
}
loading.value = true
const messageReactive = message.loading('删除中...', {
duration: 0
})
// 发起请求
fetch("/gk/bag/delete?id=" + editRecord.value.id, {
method: 'GET',
headers: {
'Content-Type': 'application/json'
}
}).then(res => res.json()).then(data => {
if (data.code === 200) {
message.success('删除成功')
fetchData()
} else {
message.error(data.msg)
}
}).finally(() => {
loading.value = true
messageReactive.destroy()
showDelModal.value = false
})
}
// 编辑赛包
const edit = (record) => {
resetForm()
fileList.value = []
// 数据初始化
Object.assign(formData, record)
showModal.value = true
}
// 取消操作
const onCancel = () => {
showModal.value = false
resetForm()
}
// 提交
const onSubmit = (e) => {
e.preventDefault()
formRef.value?.validate(async (errors) => {
if (errors) return message.error('请检查表单是否填写完整')
// 使用fetch发起请求
const params = {
...editRecord.value,
...formData,
cmptId: getCId(),
invoiceUrl: fileList.value.map(v => v.url).join()
}
loading.value = true
const messageReactive = message.loading(formData.id ? '数据更新中...' : '数据添加中...', {
duration: 0
})
// 发起请求
const [err, data] = await to(fetch("/gk/bag/update", {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
// 返回
cancel() {
this.dialog = false;
},
// 查询所有
fetchData() {
if (!getCId()) return
body: JSON.stringify(params)
}).then(res => res.json()))
loading.value = false
messageReactive.destroy()
if (data.code === 200) {
message.success('操作成功')
showModal.value = false
resetForm()
fetchData()
} else {
message.error(data.msg)
}
})
}
// 获取赛包分页列表
const fetchData = async () => {
loading.value = true
let params = {
status: this.statusOptions[this.statusIndex].value,
page: this.page,
size: this.pageSize,
keyword: this.keyword,
cmptId: getCId()
}
const url = '/gk/bag/delivery/list?' + new URLSearchParams(params).toString()
$.ajax({
type: 'GET',
contentType: 'application/json',
url,
beforeSend: () => {
layer.load()
},
complete: () => {
layer.closeAll()
...query,
page: pagination.page,
size: pagination.pageSize,
cmptId: getCId(),
keyword: keyword.value
}
// 发起请求
const [err, data] = await to(fetch("/gk/bag/delivery/list?" + new URLSearchParams(params).toString(), {
method: "GET",
headers: {
'Content-Type': 'application/json'
},
success: (res) => {
this.list = res.content
if (res.content.length === this.pageSize) {
this.totalPage = this.page + 1
}).then(res => res.json()))
loading.value = false
if (data.code === 200) {
list.value = data.content
pagination.itemCount = data.total
} else {
this.totalPage = this.page
message.error(data.msg)
}
this.total = res.total
}
/***---------------- 赛包相关 end -----------------*/
onMounted(() => {
fetchData()
})
},
return {
// 赛包相关
updateStatus,
showModal,
formRef,
formData,
onCancel,
onSubmit,
fileList,
list,
query,
pagination,
columns,
onDelete,
showDelModal,
rules,
fileList,
keyword,
fetchData,
// 公共数据
uploadUrl,
uploadFinish,
loading,
StatusEnum,
}
});
app.fetchData();
}
})
const app = Vue.createApp({
setup() {
return {
locale: zhCN,
dateLocale: dateZhCN
}
}
})
app.component('my-app', MyApp)
app.use(naive)
app.mount('#app')
</script>
</body>
......
......@@ -756,7 +756,7 @@
loading.value = false
if (data.code === 200) {
feedbacks.value = data.content.content
pagination.itemCount = res.data.total
pagination.itemCount = data.content.total
} else {
message.error(data.msg)
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment