This commit is contained in:
parent
5109025c52
commit
45d7c2b26d
|
@ -46,19 +46,19 @@ export const menuItems = [
|
|||
{
|
||||
id: 67,
|
||||
label: "menuitems.complete.day7",
|
||||
link: '/home/list?days=7',
|
||||
link: '/home/complete?days=7',
|
||||
parentId: 66
|
||||
},
|
||||
{
|
||||
id: 68,
|
||||
label: "menuitems.complete.day30",
|
||||
link: '/home/list?days=30',
|
||||
link: '/home/complete?days=30',
|
||||
parentId: 66
|
||||
},
|
||||
{
|
||||
id: 69,
|
||||
label: "menuitems.complete.day90",
|
||||
link: '/home/list?days=90',
|
||||
link: '/home/complete?days=90',
|
||||
parentId: 66
|
||||
}
|
||||
]
|
||||
|
|
|
@ -17,6 +17,8 @@ export default {
|
|||
var links = document.getElementsByClassName("side-nav-link-ref");
|
||||
var matchingMenuItem = null;
|
||||
for (var i = 0; i < links.length; i++) {
|
||||
console.log('window.location.',window.location);
|
||||
console.log('links[i]..',links[i]);
|
||||
if (window.location.pathname === links[i].pathname) {
|
||||
matchingMenuItem = links[i];
|
||||
break;
|
||||
|
@ -287,7 +289,7 @@ export default {
|
|||
display: flex;
|
||||
}
|
||||
.container-fluid{
|
||||
max-width: 70% !important;
|
||||
max-width: 75% !important;
|
||||
}
|
||||
.header-item{
|
||||
height: 50px !important;
|
||||
|
|
|
@ -63,6 +63,10 @@ export default {
|
|||
goLink(){
|
||||
window.open('https://ceac.state.gov/CEACStatTracker/Status.aspx','_blank');
|
||||
},
|
||||
goDonate(){
|
||||
// window.open('https://www.checkee.info/donation.php','_blank');
|
||||
this.$router.push('/donate');
|
||||
},
|
||||
toggleRightSidebar() {
|
||||
this.$parent.toggleRightSidebar();
|
||||
},
|
||||
|
@ -187,6 +191,7 @@ export default {
|
|||
</div>
|
||||
<div class="d-flex save-ad">预留广告位</div>
|
||||
<div class="d-flex">
|
||||
<b-button pill variant="info" @click="goDonate()">Donate</b-button>
|
||||
<!-- <div class="font-size-16 header-item" style="line-height:70px; margin-right:2rem; cursor: pointer;text-decoration:underline;" @click="goLink()">{{$t('navbar.link.text')}}</div> -->
|
||||
<!-- <select v-model="$i18n.locale" class="lang-dropdown border-0">
|
||||
<option v-for="(locale, i) in languages" :key="`locale-${i}`" :value="locale.language">
|
||||
|
|
|
@ -54,8 +54,8 @@ service.interceptors.response.use(
|
|||
// ElMessage.error('用户未激活');
|
||||
// return Promise.reject(code)
|
||||
// }else{
|
||||
ElMessage.error(dataAxios.data)
|
||||
return Promise.reject(dataAxios.data)
|
||||
ElMessage.error(dataAxios.data||dataAxios.message)
|
||||
return Promise.reject(dataAxios.data||dataAxios.message)
|
||||
// }
|
||||
}else{
|
||||
return dataAxios.data;
|
||||
|
|
|
@ -99,10 +99,10 @@ export default {
|
|||
margin-top: 100px !important;
|
||||
}
|
||||
.container-fluid{
|
||||
max-width: 70% !important;
|
||||
max-width: 80% !important;
|
||||
}
|
||||
.content-ad{
|
||||
width: 15%;
|
||||
width: 10%;
|
||||
font-size: 30px;
|
||||
font-weight: bold;
|
||||
display: flex;
|
||||
|
|
|
@ -17,6 +17,14 @@ export default [
|
|||
},
|
||||
component: () => import("./views/dashboards/default"),
|
||||
},
|
||||
{
|
||||
path: "/donate",
|
||||
name: "donate",
|
||||
meta: {
|
||||
authRequired: true,
|
||||
},
|
||||
component: () => import("./views/account/donate"),
|
||||
},
|
||||
{
|
||||
path: "/login",
|
||||
name: "login",
|
||||
|
@ -101,6 +109,11 @@ export default [
|
|||
name: "homelist",
|
||||
component: () => import("./views/home/list"),
|
||||
},
|
||||
{
|
||||
path: "/home/complete",
|
||||
name: "homecomplete",
|
||||
component: () => import("./views/home/completeList"),
|
||||
},
|
||||
{
|
||||
path: "/visa/add",
|
||||
name: "addRecord",
|
||||
|
|
|
@ -0,0 +1,89 @@
|
|||
<script>
|
||||
|
||||
import Layout from "../../layouts/main";
|
||||
import appConfig from "@/app.config";
|
||||
|
||||
/**
|
||||
* Confirm-mail component
|
||||
*/
|
||||
export default {
|
||||
page: {
|
||||
title: "Confirm Mail",
|
||||
meta: [{ name: "description", content: appConfig.description }],
|
||||
},
|
||||
data() {
|
||||
return {};
|
||||
},
|
||||
components: {Layout},
|
||||
methods: {},
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Layout>
|
||||
<div class="account-pages my-5 pt-sm-5">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="text-center mb-5 text-muted">
|
||||
<router-link to="/" class="d-block auth-logo">
|
||||
<img
|
||||
src="@/assets/images/logo-dark.png"
|
||||
alt=""
|
||||
height="20"
|
||||
class="auth-logo-dark mx-auto"
|
||||
/>
|
||||
<img
|
||||
src="@/assets/images/logo-light.png"
|
||||
alt=""
|
||||
height="20"
|
||||
class="auth-logo-light mx-auto"
|
||||
/>
|
||||
</router-link>
|
||||
<!-- <p class="mt-3">If you think checkee.info is helpful, please donate for our website, we appreciate your support!</p>
|
||||
<p class="mt-3">如果您认为checkee.info对您有帮助,请打赏我们的网站,谢谢您的支持!</p> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end row -->
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-8 col-lg-6 col-xl-5">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="p-2">
|
||||
<div class="text-center">
|
||||
<div class="avatar-md mx-auto">
|
||||
<div class="avatar-title rounded-circle bg-light">
|
||||
<i class="bx bx-mail-send h1 mb-0 text-primary"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="p-2 mt-4">
|
||||
<h4>WELCOME !</h4>
|
||||
<!-- <p class="text-muted">
|
||||
At vero eos et accusamus et iusto odio dignissimos ducimus
|
||||
qui blanditiis praesentium voluptatum deleniti atque
|
||||
corrupti quos dolores et
|
||||
</p> -->
|
||||
<p class="mt-3">If you think checkee.info is helpful, please donate for our website, we appreciate your support!</p>
|
||||
<p class="mt-3">如果您认为checkee.info对您有帮助,请打赏我们的网站,谢谢您的支持!</p>
|
||||
<div class="mt-4">
|
||||
<router-link to="/" class="btn btn-success"
|
||||
>Back to Home</router-link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-5 text-center">
|
||||
<p>
|
||||
© {{ new Date().getFullYear() }} Skote. Crafted with
|
||||
<i class="mdi mdi-heart text-danger"></i> by Themesbrand
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Layout>
|
||||
</template>
|
|
@ -0,0 +1,302 @@
|
|||
<script>
|
||||
import Layout from "../../layouts/main";
|
||||
import PageHeader from "@/components/page-header";
|
||||
import appConfig from "@/app.config";
|
||||
import Stat from "@/components/widgets/stat";
|
||||
import Stat1 from "@/components/widgets/stat1";
|
||||
import Profile from "@/components/widgets/profile";
|
||||
export default {
|
||||
page: {
|
||||
title: "Visa",
|
||||
meta: [{ name: "description", content: appConfig.description }],
|
||||
},
|
||||
components: { Layout,PageHeader,Profile, Stat, Stat1 },
|
||||
data() {
|
||||
return {
|
||||
title: "Visa",
|
||||
items: [],
|
||||
list:[],
|
||||
currentPage: 1,
|
||||
pageSize:10,
|
||||
searchForm:{
|
||||
search:'',
|
||||
checkStartDate:'',
|
||||
checkEndDate:'',
|
||||
code:7,
|
||||
},
|
||||
statData: [
|
||||
{
|
||||
icon: "bx bx-time-five",
|
||||
title: "Pending",
|
||||
value: "",
|
||||
},
|
||||
{
|
||||
icon: "bx bx-check-circle",
|
||||
title: "Clear",
|
||||
value: "",
|
||||
},
|
||||
{
|
||||
icon: "bx bx-no-entry",
|
||||
title: "Reject",
|
||||
value: "",
|
||||
},
|
||||
],
|
||||
currentUser:{},
|
||||
lastMonth:{},
|
||||
statList:[],
|
||||
currentMonth:'',
|
||||
statTitle:'',
|
||||
};
|
||||
},
|
||||
watch:{
|
||||
'$route.query.days':{
|
||||
immediate: true,
|
||||
handler(newVal, oldVal) {
|
||||
console.log(newVal, oldVal)
|
||||
if(newVal){
|
||||
this.getList();
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
this.currentUser = this.$store.getters['auth/getCurrentUser'];
|
||||
this.getList();
|
||||
},
|
||||
methods:{
|
||||
showItems(){
|
||||
this.items = [{
|
||||
text: "Visa",
|
||||
href: "/",
|
||||
},
|
||||
{
|
||||
text: "Complete Case",
|
||||
href: "/home/list?days="+this.$route.query.days,
|
||||
},
|
||||
{
|
||||
text: this.getTracker(),
|
||||
active: true,
|
||||
}]
|
||||
},
|
||||
getTracker(){
|
||||
let _str = ''
|
||||
let _days = this.$route.query.days
|
||||
if(_days==7){
|
||||
_str = this.$t('menuitems.complete.day7');
|
||||
}else if(_days==30){
|
||||
_str = this.$t('menuitems.complete.day30');
|
||||
}else if(_days==90){
|
||||
_str = this.$t('menuitems.complete.day90');
|
||||
}
|
||||
_str = "Tracker("+_str+")";
|
||||
console.log('getTracker()---_str',_str)
|
||||
return _str;
|
||||
},
|
||||
showUpdate(item){
|
||||
console.log('修改',JSON.stringify(item))
|
||||
this.$router.push({path:'/visa/add',query:{id:item.id}})
|
||||
},
|
||||
showDetail(item){
|
||||
console.log('查看详情',JSON.stringify(item))
|
||||
this.$router.push({path:'/visa/detail',query:{id:item.id}})
|
||||
},
|
||||
formSubmit(){
|
||||
alert('搜索---')
|
||||
this.searchForm.completeEndDate = '';
|
||||
this.searchForm.completeStartDate = '';
|
||||
if(this.searchForm.code){ // 将近几天的时间转换成事件范围
|
||||
this.searchForm.completeEndDate = new Date().DateFormat('yyyy-MM-dd')
|
||||
this.searchForm.completeStartDate = new Date(new Date().getTime()-parseInt(this.searchForm.code)*24*3600*1000).DateFormat('yyyy-MM-dd')
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
getList(){
|
||||
this.showItems()
|
||||
this.$axios
|
||||
.get("/api/visa_report/QueryLastCompetedDaysReportData?lastCompetedDays="+this.$route.query.days)
|
||||
.then((res) => {
|
||||
this.mylist = res.visaCaseList;
|
||||
this.lastMonth = res.summaryItem;
|
||||
this.statTitle = res.title;
|
||||
this.statData[0].value = this.lastMonth.pendingCaseCount
|
||||
this.statData[1].value = this.lastMonth.clearCaseCount
|
||||
this.statData[2].value = this.lastMonth.rejectCaseCount
|
||||
this.statList = [{name:"Total",value:this.lastMonth.totalCaseCount},{name:'Ave. Waiting Days for Complete Cases',value:this.lastMonth.aveWaitingDaysForCompleteCases}]
|
||||
console.log(res);
|
||||
}).catch(e=>{
|
||||
console.log(e);
|
||||
})
|
||||
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<Layout>
|
||||
<PageHeader :title="title" :items="items" />
|
||||
<div class="row">
|
||||
<div class="col-xl-4">
|
||||
<Profile :updating="fetchingStats" />
|
||||
</div>
|
||||
<!-- end col -->
|
||||
<div class="col-xl-8">
|
||||
<div class="row">
|
||||
<Stat1 :list="statList" :title="statTitle" />
|
||||
</div>
|
||||
<div class="row">
|
||||
<div v-for="stat of statData" :key="stat.icon" class="col-md-4">
|
||||
<Stat :icon="stat.icon" :title="stat.title" :value="stat.value" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="row">
|
||||
<div class="col-12">
|
||||
<form class="form-horizontal" role="form" @submit.prevent="formSubmit">
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<b-form-group
|
||||
class="mb-3"
|
||||
label-cols-lg="3"
|
||||
label="Email:"
|
||||
label-for="Search"
|
||||
>
|
||||
<b-form-input
|
||||
for="Search"
|
||||
v-model="searchForm.search"
|
||||
></b-form-input>
|
||||
</b-form-group>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="mb-3 row">
|
||||
<label class="col-md-4 col-form-label">Complete Case:</label>
|
||||
<div class="col-md-8">
|
||||
<select class="form-control" v-model="searchForm.code">
|
||||
<option :value="7">Last 7 Days' Complete Cases</option>
|
||||
<option :value="30">Last 30 Days' Complete Cases</option>
|
||||
<option :value="90">Last 90 Days' Complete Cases</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<b-form-group
|
||||
class="mb-3"
|
||||
label-cols-sm="4"
|
||||
label-cols-lg="4"
|
||||
label="StartDate:"
|
||||
label-for="checkStartDate"
|
||||
>
|
||||
<b-form-input
|
||||
id="checkStartDate"
|
||||
v-model="searchForm.checkStartDate"
|
||||
type="date"
|
||||
pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}"
|
||||
></b-form-input>
|
||||
</b-form-group>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<b-form-group
|
||||
class="mb-3"
|
||||
label-cols-sm="4"
|
||||
label-cols-lg="4"
|
||||
label="EndDate:"
|
||||
label-for="checkEndDate"
|
||||
>
|
||||
<b-form-input
|
||||
id="checkEndDate"
|
||||
v-model="searchForm.checkEndDate"
|
||||
type="date"
|
||||
pattern="[0-9]{4}-[0-9]{2}-[0-9]{2}"
|
||||
></b-form-input>
|
||||
</b-form-group>
|
||||
</div>
|
||||
<div class="col-md-2"><button class="btn btn-primary" type="submit">Search</button></div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="row">
|
||||
<div class="col-xl-24">
|
||||
<div class="table-responsive mb-0">
|
||||
<table class="table align-middle table-nowrap">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th class="align-middle">#</th>
|
||||
<th class="align-middle">ID</th>
|
||||
<th class="align-middle">Visa Type</th>
|
||||
<th class="align-middle">Visa Entry</th>
|
||||
<th class="align-middle">US Consulate</th>
|
||||
<th class="align-middle">Major</th>
|
||||
<th class="align-middle">Status</th>
|
||||
<th class="align-middle">Check Date</th>
|
||||
<th class="align-middle">Complete Date</th>
|
||||
<th class="align-middle">Waiting Day(s)</th>
|
||||
<th class="align-middle">Action</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(item,index) in mylist" :key="index">
|
||||
<td scope="row">{{index+1}}</td>
|
||||
<td>{{item.userName}}</td>
|
||||
<td>{{item.visaCategory}}</td>
|
||||
<td>{{item.visaEntry}}</td>
|
||||
<td>{{item.embassyConsulate}}</td>
|
||||
<td>{{item.major}}</td>
|
||||
<td>
|
||||
<b-button v-if="item.visaStatus=='Pending'" pill variant="info">{{item.visaStatus}}</b-button>
|
||||
<b-button v-if="item.visaStatus=='Clear'" pill variant="success">{{item.visaStatus}}</b-button>
|
||||
<b-button v-if="item.visaStatus=='Reject'" pill variant="danger">{{item.visaStatus}}</b-button>
|
||||
</td>
|
||||
<td>{{item.dateVisaInterview}}</td>
|
||||
<td>{{item.dateVisaCheckCompleted}}</td>
|
||||
<td>{{item.waitDays}}</td>
|
||||
<td>
|
||||
<button
|
||||
v-if="item.saveUserId==currentUser.userId"
|
||||
type="button"
|
||||
class="btn btn-primary btn-sm btn-rounded"
|
||||
@click="showUpdate(item)"
|
||||
>
|
||||
Update
|
||||
</button>
|
||||
<el-tooltip v-if="item.note" class="box-item" effect="dark" :content="item.note" placement="bottom">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary btn-sm btn-rounded"
|
||||
@click="showDetail(item)"
|
||||
>
|
||||
Detail
|
||||
</button>
|
||||
</el-tooltip>
|
||||
<button
|
||||
v-else
|
||||
type="button"
|
||||
class="btn btn-primary btn-sm btn-rounded"
|
||||
@click="showDetail(item)"
|
||||
>
|
||||
Detail
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <hr class="my-4" />
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<b-pagination
|
||||
v-model="currentPage"
|
||||
:total-rows="list.length"
|
||||
:per-page="pageSize"
|
||||
align="center"
|
||||
aria-controls="my-table"
|
||||
></b-pagination>
|
||||
</div>
|
||||
</div> -->
|
||||
</Layout>
|
||||
</template>
|
|
@ -33,11 +33,6 @@ export default {
|
|||
checkEndDate:'',
|
||||
code:7,
|
||||
},
|
||||
codeList:[
|
||||
"Last 7 Days' Complete Cases",
|
||||
"Last 30 Days' Complete Cases",
|
||||
"Last 90 Days' Complete Cases",
|
||||
],
|
||||
statData: [
|
||||
{
|
||||
icon: "bx bx-time-five",
|
||||
|
|
|
@ -29,11 +29,6 @@ export default {
|
|||
checkEndDate:'',
|
||||
code:7,
|
||||
},
|
||||
codeList:[
|
||||
"Last 7 Days' Complete Cases",
|
||||
"Last 30 Days' Complete Cases",
|
||||
"Last 90 Days' Complete Cases",
|
||||
],
|
||||
statData: [
|
||||
{
|
||||
icon: "bx bx-time-five",
|
||||
|
@ -54,7 +49,8 @@ export default {
|
|||
currentUser:{},
|
||||
lastMonth:{},
|
||||
statList:[],
|
||||
currentMonth:''
|
||||
currentMonth:'',
|
||||
statTitle:'',
|
||||
};
|
||||
},
|
||||
watch:{
|
||||
|
@ -68,34 +64,10 @@ export default {
|
|||
}
|
||||
}
|
||||
},
|
||||
'$route.query.days':{
|
||||
immediate: true,
|
||||
handler(newVal, oldVal) {
|
||||
console.log(newVal, oldVal)
|
||||
if(newVal){
|
||||
// 测试数据写死月份 稍后需要换接口
|
||||
if(this.$route.query.days){
|
||||
this.currentMonth = '2022-10'
|
||||
}
|
||||
this.getList();
|
||||
}
|
||||
}
|
||||
}
|
||||
// currentPage: {
|
||||
// immediate: true,
|
||||
// handler(newVal, oldVal) {
|
||||
// console.log(newVal, oldVal)
|
||||
// this.currentPage = newVal;
|
||||
// this.mylist = this.list.slice((this.currentPage-1)*this.pageSize,this.currentPage*this.pageSize)
|
||||
// }
|
||||
// }
|
||||
},
|
||||
mounted(){
|
||||
this.currentMonth = this.$route.query.month;
|
||||
this.currentUser = this.$store.getters['auth/getCurrentUser'];
|
||||
if(this.$route.query.days){
|
||||
this.currentMonth = '2022-10'
|
||||
}
|
||||
this.getList();
|
||||
},
|
||||
methods:{
|
||||
|
@ -105,67 +77,50 @@ export default {
|
|||
href: "/",
|
||||
},
|
||||
{
|
||||
text: this.$route.query.month?"Monthly Case":"Complete Case",
|
||||
text: "Monthly Case",
|
||||
href: "/home/list?month="+this.$route.query.month,
|
||||
},
|
||||
{
|
||||
text: this.getTracker(),
|
||||
text: this.$route.query.month,
|
||||
active: true,
|
||||
}]
|
||||
},
|
||||
getTracker(){
|
||||
let _str = ''
|
||||
if(this.$route.query.days){
|
||||
let _days = this.$route.query.days
|
||||
if(_days==7){
|
||||
_str = this.$t('menuitems.complete.day7');
|
||||
}else if(_days==30){
|
||||
_str = this.$t('menuitems.complete.day30');
|
||||
}else if(_days==90){
|
||||
_str = this.$t('menuitems.complete.day90');
|
||||
}
|
||||
}else{
|
||||
_str = this.$route.query.month;
|
||||
}
|
||||
_str = "Tracker("+_str+")";
|
||||
console.log('getTracker()---_str',_str)
|
||||
return _str;
|
||||
showUpdate(item){
|
||||
console.log('修改',JSON.stringify(item))
|
||||
this.$router.push({path:'/visa/add',query:{id:item.id}})
|
||||
},
|
||||
showDetail(item){
|
||||
console.log('查看详情',JSON.stringify(item))
|
||||
this.$router.push({path:'/visa/detail',query:{id:item.id}})
|
||||
},
|
||||
formSubmit(){
|
||||
alert('搜索---')
|
||||
this.searchForm.completeEndDate = '';
|
||||
this.searchForm.completeStartDate = '';
|
||||
if(this.searchForm.code){ // 将近几天的时间转换成事件范围
|
||||
this.searchForm.completeEndDate = new Date().DateFormat('yyyy-MM-dd')
|
||||
this.searchForm.completeStartDate = new Date(new Date().getTime()-parseInt(this.searchForm.code)*24*3600*1000).DateFormat('yyyy-MM-dd')
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
showUpdate(item){
|
||||
console.log('修改',JSON.stringify(item))
|
||||
this.$router.push({path:'/visa/add',query:{id:item.id}})
|
||||
},
|
||||
showDetail(item){
|
||||
console.log('查看详情',JSON.stringify(item))
|
||||
this.$router.push({path:'/visa/detail',query:{id:item.id}})
|
||||
},
|
||||
formSubmit(){
|
||||
alert('搜索---')
|
||||
this.searchForm.completeEndDate = '';
|
||||
this.searchForm.completeStartDate = '';
|
||||
if(this.searchForm.code){ // 将近几天的时间转换成事件范围
|
||||
this.searchForm.completeEndDate = new Date().DateFormat('yyyy-MM-dd')
|
||||
this.searchForm.completeStartDate = new Date(new Date().getTime()-parseInt(this.searchForm.code)*24*3600*1000).DateFormat('yyyy-MM-dd')
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
getList(){
|
||||
this.showItems()
|
||||
this.$axios
|
||||
.get("/api/visa_report/QueryMonthlyReportData?monthKey="+this.currentMonth)
|
||||
.then((res) => {
|
||||
this.mylist = res.visaCaseList;
|
||||
this.lastMonth = res.summaryItem
|
||||
|
||||
this.statData[0].value = this.lastMonth.pendingCaseCount
|
||||
this.statData[1].value = this.lastMonth.clearCaseCount
|
||||
this.statData[2].value = this.lastMonth.rejectCaseCount
|
||||
this.statList = [{name:"Total",value:this.lastMonth.totalCaseCount},{name:'Ave. Waiting Days for Complete Cases',value:this.lastMonth.aveWaitingDaysForCompleteCases}]
|
||||
// this.mylist = this.list.slice((this.currentPage-1)*this.pageSize,this.currentPage*this.pageSize)
|
||||
console.log(res);
|
||||
}).catch(e=>{
|
||||
console.log(e);
|
||||
})
|
||||
.get("/api/visa_report/QueryMonthlyReportData?monthKey="+this.currentMonth)
|
||||
.then((res) => {
|
||||
this.mylist = res.visaCaseList;
|
||||
this.lastMonth = res.summaryItem
|
||||
this.statTitle = res.title;
|
||||
this.statData[0].value = this.lastMonth.pendingCaseCount
|
||||
this.statData[1].value = this.lastMonth.clearCaseCount
|
||||
this.statData[2].value = this.lastMonth.rejectCaseCount
|
||||
this.statList = [{name:"Total",value:this.lastMonth.totalCaseCount},{name:'Ave. Waiting Days for Complete Cases',value:this.lastMonth.aveWaitingDaysForCompleteCases}]
|
||||
// this.mylist = this.list.slice((this.currentPage-1)*this.pageSize,this.currentPage*this.pageSize)
|
||||
console.log(res);
|
||||
}).catch(e=>{
|
||||
console.log(e);
|
||||
})
|
||||
|
||||
},
|
||||
}
|
||||
};
|
||||
|
@ -181,7 +136,7 @@ export default {
|
|||
<!-- end col -->
|
||||
<div class="col-xl-8">
|
||||
<div class="row">
|
||||
<Stat1 :list="statList" :title="lastMonth.month" />
|
||||
<Stat1 :list="statList" :title="statTitle" />
|
||||
</div>
|
||||
<div class="row">
|
||||
<div v-for="stat of statData" :key="stat.icon" class="col-md-4">
|
||||
|
@ -301,7 +256,17 @@ export default {
|
|||
>
|
||||
Update
|
||||
</button>
|
||||
<el-tooltip v-if="item.note" class="box-item" effect="dark" :content="item.note" placement="bottom">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary btn-sm btn-rounded"
|
||||
@click="showDetail(item)"
|
||||
>
|
||||
Detail
|
||||
</button>
|
||||
</el-tooltip>
|
||||
<button
|
||||
v-else
|
||||
type="button"
|
||||
class="btn btn-primary btn-sm btn-rounded"
|
||||
@click="showDetail(item)"
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<script>
|
||||
import Layout from "../../layouts/main";
|
||||
import appConfig from "@/app.config";
|
||||
import Datepicker from "vue3-datepicker";
|
||||
// import Datepicker from "vue3-datepicker";
|
||||
import useVuelidate from "@vuelidate/core";
|
||||
import { ref } from 'vue'
|
||||
// import { ref } from 'vue'
|
||||
|
||||
import PageHeader from "@/components/page-header";
|
||||
import {
|
||||
|
@ -15,7 +15,7 @@ export default {
|
|||
title: "My Case",
|
||||
meta: [{ name: "description", content: appConfig.description }],
|
||||
},
|
||||
components: { Layout, Datepicker, PageHeader },
|
||||
components: { Layout, PageHeader },
|
||||
data() {
|
||||
return {
|
||||
title: "My Case",
|
||||
|
@ -25,13 +25,13 @@ export default {
|
|||
href: "/",
|
||||
},
|
||||
{
|
||||
text: "Add Record",
|
||||
text: "Add New Case",
|
||||
active:true,
|
||||
},
|
||||
],
|
||||
typeform: {
|
||||
dateVisaInterview:ref(new Date()),
|
||||
dateVisaCheckCompleted: null,
|
||||
dateVisaInterview:'',
|
||||
dateVisaCheckCompleted: '',
|
||||
major: "",
|
||||
visaCategory: "",
|
||||
visaStatus: "",
|
||||
|
@ -50,6 +50,8 @@ export default {
|
|||
validations: {
|
||||
typeform: {
|
||||
dateVisaInterview:{ required: helpers.withMessage("CheckDate is required", required) },
|
||||
visaEntry:{ required: helpers.withMessage("Visa Entry is required", required) },
|
||||
visaStatus:{ required: helpers.withMessage("Visa Status is required", required) },
|
||||
},
|
||||
},
|
||||
mounted(){
|
||||
|
@ -65,8 +67,12 @@ export default {
|
|||
.get("/api/visa/GetById?id="+_id)
|
||||
.then((res) => {
|
||||
this.typeform = Object.assign(res);
|
||||
this.typeform.dateVisaCheckCompleted = ref(new Date(this.typeform.dateVisaCheckCompleted))
|
||||
this.typeform.dateVisaInterview = ref(new Date(this.typeform.dateVisaInterview))
|
||||
// if(this.typeform.dateVisaCheckCompleted){
|
||||
// this.typeform.dateVisaCheckCompleted = new Date(this.typeform.dateVisaCheckCompleted)
|
||||
// }
|
||||
// if(this.typeform.dateVisaInterview){
|
||||
// this.typeform.dateVisaInterview = new Date(this.typeform.dateVisaInterview)
|
||||
// }
|
||||
return res;
|
||||
}).catch(e=>{
|
||||
console.log(e)
|
||||
|
@ -89,31 +95,56 @@ export default {
|
|||
doClick(item){
|
||||
console.log('查看详情',JSON.stringify(item))
|
||||
},
|
||||
checkValid(){
|
||||
let result = true
|
||||
if((this.typeform.visaStatus=='Reject'||this.typeform.visaStatus=='Clear')&&!this.typeform.dateVisaCheckCompleted){
|
||||
result = false;
|
||||
this.$message.error('VISA STATUS为Reject或Clear时,Complete Date必填');
|
||||
}else if(this.typeform.dateVisaCheckCompleted&&this.typeform.dateVisaInterview&&new Date(this.typeform.dateVisaInterview).getTime()>new Date(this.typeform.dateVisaCheckCompleted).getTime()){
|
||||
result = false;
|
||||
this.$message.error('Complete Date必须大于Check Date');
|
||||
}
|
||||
return result;
|
||||
},
|
||||
typeForm() {
|
||||
this.typesubmit = true;
|
||||
this.v$.$touch();
|
||||
if (this.v$.$invalid) {
|
||||
return;
|
||||
}else{
|
||||
if(this.detailId){
|
||||
// 修改
|
||||
this.$axios
|
||||
.post("/api/visa/UpdateVisaCase/"+this.detailId, this.typeform)
|
||||
.then((res) => {
|
||||
return res;
|
||||
}).catch(e=>{
|
||||
console.log(e)
|
||||
})
|
||||
}else{
|
||||
this.$axios
|
||||
.post("/api/visa/AddVisaCase", this.typeform)
|
||||
.then((res) => {
|
||||
return res;
|
||||
}).catch(e=>{
|
||||
console.log(e)
|
||||
})
|
||||
if(this.checkValid()){
|
||||
let date1 = ''
|
||||
let date2 = '';
|
||||
if(this.typeform.dateVisaInterview){
|
||||
date1 = new Date(this.typeform.dateVisaInterview).DateFormat('yyyy-MM-dd');
|
||||
}
|
||||
if(this.typeform.dateVisaCheckCompleted){
|
||||
date2 = new Date(this.typeform.dateVisaCheckCompleted).DateFormat('yyyy-MM-dd')
|
||||
}
|
||||
console.log('date1:',date1,'--date2',date2);
|
||||
if(this.detailId){
|
||||
// 修改
|
||||
this.$axios
|
||||
.post("/api/visa/UpdateVisaCase/"+this.detailId, Object.assign(this.typeform,{dateVisaInterview:date1,dateVisaCheckCompleted:date2}))
|
||||
.then((res) => {
|
||||
this.$message.success('操作成功');
|
||||
this.$router.go(-1);
|
||||
return res;
|
||||
}).catch(e=>{
|
||||
console.log(e)
|
||||
})
|
||||
}else{
|
||||
this.$axios
|
||||
.post("/api/visa/AddVisaCase", Object.assign(this.typeform,{dateVisaInterview:date1,dateVisaCheckCompleted:date2}))
|
||||
.then((res) => {
|
||||
this.$message.success('操作成功');
|
||||
this.$router.go(-1);
|
||||
return res;
|
||||
}).catch(e=>{
|
||||
console.log(e)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
}
|
||||
|
@ -130,63 +161,110 @@ export default {
|
|||
<div class="card-body">
|
||||
<!-- <h4 class="card-title">Visa information</h4> -->
|
||||
<form action="#" @submit.prevent="typeForm">
|
||||
<div class="mb-3">
|
||||
<div class="row">
|
||||
<div class="mb-3">
|
||||
<label>Check Date</label>
|
||||
<div>
|
||||
<datepicker v-model="typeform.dateVisaInterview" :first-day-of-week="1" :lang="$i18n.locale" class="form-control"
|
||||
:class="{
|
||||
'is-invalid': typesubmit && v$.typeform.dateVisaInterview.$error,
|
||||
}"
|
||||
></datepicker>
|
||||
<div
|
||||
v-for="(item, index) in v$.typeform.dateVisaInterview.$errors"
|
||||
:key="index"
|
||||
class="invalid-feedback"
|
||||
>
|
||||
<span v-if="item.$message">{{ item.$message }}</span>
|
||||
</div>
|
||||
<!-- <datepicker v-model="typeform.dateVisaInterview" :first-day-of-week="1" :lang="$i18n.locale" class="form-control"
|
||||
:class="{
|
||||
'is-invalid': typesubmit && v$.typeform.dateVisaInterview.$error,
|
||||
}"
|
||||
></datepicker> -->
|
||||
<input
|
||||
v-model="typeform.dateVisaInterview"
|
||||
type="date"
|
||||
name="dateVisaInterview"
|
||||
class="form-control"
|
||||
:class="{
|
||||
'is-invalid': typesubmit && v$.typeform.dateVisaInterview.$error,
|
||||
}"
|
||||
/>
|
||||
<div
|
||||
v-for="(item, index) in v$.typeform.dateVisaInterview.$errors"
|
||||
:key="index"
|
||||
class="invalid-feedback"
|
||||
>
|
||||
<span v-if="item.$message">{{ item.$message }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<div class="mb-3">
|
||||
<label>VISA TYPE:</label>
|
||||
<select class="form-control" v-model="typeform.visaCategory">
|
||||
<option v-for="item in dictionaryCategory['VISA_TYPE']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="mb-3">
|
||||
<label>VISA ENTRY:</label>
|
||||
<select class="form-control" v-model="typeform.visaEntry"
|
||||
:class="{
|
||||
'is-invalid': typesubmit && v$.typeform.visaEntry.$error,
|
||||
}"
|
||||
>
|
||||
<option v-for="item in dictionaryCategory['VISA_ENTRY']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
<div
|
||||
v-for="(item, index) in v$.typeform.visaEntry.$errors"
|
||||
:key="index"
|
||||
class="invalid-feedback"
|
||||
>
|
||||
<span v-if="item.$message">{{ item.$message }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="mb-3">
|
||||
<label>US CONSULATE:</label>
|
||||
<select class="form-control" v-model="typeform.embassyConsulate">
|
||||
<option v-for="item in dictionaryCategory['US_CONSULATE']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="mb-3">
|
||||
<label>Major</label>
|
||||
<input
|
||||
v-model="typeform.major"
|
||||
type="text"
|
||||
name="major"
|
||||
class="form-control"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="mb-3">
|
||||
<label>VISA STATUS:</label>
|
||||
<select class="form-control" v-model="typeform.visaStatus"
|
||||
:class="{
|
||||
'is-invalid': typesubmit && v$.typeform.visaStatus.$error,
|
||||
}"
|
||||
>
|
||||
<option v-for="item in dictionaryCategory['VISA_STATUS']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
<div
|
||||
v-for="(item, index) in v$.typeform.visaStatus.$errors"
|
||||
:key="index"
|
||||
class="invalid-feedback"
|
||||
>
|
||||
<span v-if="item.$message">{{ item.$message }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="mb-3">
|
||||
<label>Complete Date:</label>
|
||||
<!-- <datepicker v-model="typeform.dateVisaCheckCompleted" :first-day-of-week="1" :lang="$i18n.locale" class="form-control"></datepicker> -->
|
||||
<input
|
||||
v-model="typeform.dateVisaCheckCompleted"
|
||||
type="date"
|
||||
name="dateVisaCheckCompleted"
|
||||
class="form-control"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="col-form-label">VISA TYPE:</label>
|
||||
<select class="form-control" v-model="typeform.visaCategory">
|
||||
<option v-for="item in dictionaryCategory['VISA_TYPE']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="col-form-label">VISA ENTRY:</label>
|
||||
<select class="form-control" v-model="typeform.visaEntry">
|
||||
<option v-for="item in dictionaryCategory['VISA_ENTRY']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="col-form-label">US CONSULATE:</label>
|
||||
<select class="form-control" v-model="typeform.embassyConsulate">
|
||||
<option v-for="item in dictionaryCategory['US_CONSULATE']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label>Major</label>
|
||||
<input
|
||||
v-model="typeform.major"
|
||||
type="text"
|
||||
name="major"
|
||||
class="form-control"
|
||||
placeholder="major"
|
||||
/>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="col-form-label">VISA_STATUS:</label>
|
||||
<select class="form-control" v-model="typeform.visaStatus">
|
||||
<option v-for="item in dictionaryCategory['VISA_STATUS']" :value="item.value" :key="item.id">{{item.value}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label>Complete Date:</label>
|
||||
<datepicker v-model="typeform.dateVisaCheckCompleted" :first-day-of-week="1" :lang="$i18n.locale" class="form-control"></datepicker>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label>Note:</label>
|
||||
|
@ -200,7 +278,7 @@ export default {
|
|||
</div>
|
||||
</div>
|
||||
<div class="mb-3 mb-0">
|
||||
<div>
|
||||
<div style="float:right;">
|
||||
<button type="submit" class="btn btn-primary">Submit</button>
|
||||
<!-- <button type="reset" class="btn btn-secondary ms-1">
|
||||
Cancel
|
||||
|
|
|
@ -93,7 +93,6 @@ export default {
|
|||
<option value="30">Last 30 Days' Complete Cases</option>
|
||||
<option value="90">Last 90 Days' Complete Cases</option>
|
||||
</select>
|
||||
<!-- <multiselect v-model="searchForm.code" :options="codeList"></multiselect> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue