Commit d0a4ac19 by gao_yingdong

人档车档

parent eb35449b
...@@ -24,8 +24,15 @@ ...@@ -24,8 +24,15 @@
>导出</el-button >导出</el-button
> >
</div> </div>
<div v-if="cxType == 'mySjh'" style="font-size:16px;margin-bottom:5px"> <div
<span style="font-wight:500;font-size:18px;margin-right:5px">{{phoneInfo.sjhm}}</span> <span style="margin-right:5px">{{phoneInfo.gsd}}</span> <span>{{phoneInfo.yys}}</span> v-if="cxType == 'mySjh'"
style="font-size: 16px; margin-bottom: 5px"
>
<span style="font-wight: 500; font-size: 18px; margin-right: 5px">{{
phoneInfo.sjhm
}}</span>
<span style="margin-right: 5px">{{ phoneInfo.gsd }}</span>
<span>{{ phoneInfo.yys }}</span>
</div> </div>
<!--表格--> <!--表格-->
<el-table <el-table
...@@ -66,7 +73,6 @@ ...@@ -66,7 +73,6 @@
:total="dataLength" :total="dataLength"
> >
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
...@@ -95,6 +101,7 @@ export default { ...@@ -95,6 +101,7 @@ export default {
default: () => [], default: () => [],
}, },
cxType: String, cxType: String,
fj: String,
}, },
data() { data() {
return { return {
...@@ -106,7 +113,7 @@ export default { ...@@ -106,7 +113,7 @@ export default {
tableLoading: false, tableLoading: false,
tableData: [], tableData: [],
key: 1, key: 1,
phoneInfo:{} phoneInfo: {},
}; };
}, },
created() { created() {
...@@ -148,21 +155,20 @@ export default { ...@@ -148,21 +155,20 @@ export default {
for (let i in self.queryData) { for (let i in self.queryData) {
json[i] = self.queryData[i]; json[i] = self.queryData[i];
} }
if (self.cxSj) {
json["cxSj"] = json["cxSj"] =
self.cxSj != "" && self.cxSj != null self.cxSj != "" && self.cxSj != null
? `${window.util.timeStampTurnTime( ? `${window.util.timeStampTurnTime(
self.cxSj[0] self.cxSj[0]
)} - ${window.util.timeStampTurnTime(self.cxSj[1])}` )} - ${window.util.timeStampTurnTime(self.cxSj[1])}`
: ""; : "";
}
tHeader = []; tHeader = [];
filterVal = []; filterVal = [];
self.formThead.forEach((val) => { self.formThead.forEach((val) => {
tHeader.push(val.label); tHeader.push(val.label);
filterVal.push(val.prop); filterVal.push(val.prop);
}); });
self.doQueryRequest(JSON.stringify(json)).then((res) => { self.doQueryRequest(json).then((res) => {
if (res.success === true) { if (res.success === true) {
if (res.data.total > 5000) { if (res.data.total > 5000) {
self.$message({ self.$message({
...@@ -211,24 +217,34 @@ export default { ...@@ -211,24 +217,34 @@ export default {
return arr; return arr;
}, },
handleSizeChange(val) { handleSizeChange(val) {
debugger debugger;
this.page_size = val; this.page_size = val;
this.doQuery("yes"); this.doQuery("yes");
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
debugger debugger;
this.currentPage1 = val; this.currentPage1 = val;
this.doQuery("yes"); this.doQuery("yes");
}, },
doQueryRequest(form) { doQueryRequest(form) {
/*post方法*/ /*post方法*/
var currentUrl = this.cxUrl; var currentUrl = this.cxUrl;
if (this.fj == "queryFj") {
return request({
url: url.rzURL + currentUrl,
data: form,
method: "post",
headers: {
"content-type": "application/x-www-form-urlencoded",
},
});
} else {
return request({ return request({
url: url.rzURL + currentUrl, url: url.rzURL + currentUrl,
data: JSON.parse(form), data: JSON.parse(form),
method: "post", method: "post",
}); });
}
}, },
doQuery(flag) { doQuery(flag) {
let self = this, let self = this,
...@@ -236,8 +252,18 @@ export default { ...@@ -236,8 +252,18 @@ export default {
for (let i in self.queryData) { for (let i in self.queryData) {
json[i] = self.queryData[i]; json[i] = self.queryData[i];
} }
json.page = this.currentPage1 json.page = this.currentPage1;
if (self.cxSj) { if (self.cxSj && self.fj == "queryFj") {
debugger;
json["startDate"] =
self.cxSj != "" && self.cxSj != null
? `${window.util.timeStampTurnTime(self.cxSj[0])}`
: "";
json["endDate"] =
self.cxSj != "" && self.cxSj != null
? `${window.util.timeStampTurnTime(self.cxSj[1])}`
: "";
} else {
json["cxSj"] = json["cxSj"] =
self.cxSj != "" && self.cxSj != null self.cxSj != "" && self.cxSj != null
? `${window.util.timeStampTurnTime( ? `${window.util.timeStampTurnTime(
...@@ -246,14 +272,42 @@ export default { ...@@ -246,14 +272,42 @@ export default {
: ""; : "";
} }
if (flag) { if (flag) {
if (self.fj == "queryFj") {
let params = new FormData();
params.append("startDate", json.startDate);
params.append("endDate", json.endDate);
params.append("page", json.page);
params.append("limit", json.limit);
params.append("objectValue", json.objectValue);
self
.doQueryRequest(params)
.then((res) => {
if (res.code === 200) {
self.tableData = res.data.rows;
self.dataLength = parseInt(res.data.total);
self.phoneInfo = res.data.phoneInfo;
debugger;
// self.closeLoading();
} else {
/*self.$message({
type: "error",
message: response.data.message
});*/
// self.closeLoading();
}
})
.catch((err) => {
this.tableLoading = false;
});
} else {
self self
.doQueryRequest(JSON.stringify(json)) .doQueryRequest(JSON.stringify(json))
.then((res) => { .then((res) => {
if (res.code === 200) { if (res.code === 200) {
self.tableData = res.data.rows; self.tableData = res.data.rows;
self.dataLength = parseInt(res.data.total); self.dataLength = parseInt(res.data.total);
self.phoneInfo = res.data.phoneInfo self.phoneInfo = res.data.phoneInfo;
debugger debugger;
// self.closeLoading(); // self.closeLoading();
} else { } else {
/*self.$message({ /*self.$message({
...@@ -267,6 +321,7 @@ export default { ...@@ -267,6 +321,7 @@ export default {
this.tableLoading = false; this.tableLoading = false;
}); });
} }
}
}, },
}, },
watch: { watch: {
......
...@@ -271,26 +271,26 @@ export default { ...@@ -271,26 +271,26 @@ export default {
// prop:'zzdzxz', // prop:'zzdzxz',
// value: "", // value: "",
// }, // },
{ // {
name: "发动机号", // name: "发动机号",
prop:'fdjh', // prop:'fdjh',
value: "", // value: "",
}, // },
{ {
name: "车架号", name: "车架号",
prop:'cjh', prop:'clsbdh',
value: "", value: "",
}, },
{ {
name: "车辆序号", name: "车辆序号",
prop:'xh', prop:'clxh',
value: "",
},
{
name: "发证机关",
prop:'fzjg',
value: "", value: "",
}, },
// {
// name: "发证机关",
// prop:'fzjg',
// value: "",
// },
], ],
carOnwer: [ carOnwer: [
{ {
...@@ -342,27 +342,27 @@ export default { ...@@ -342,27 +342,27 @@ export default {
sfzp: "", sfzp: "",
timeRule: [ timeRule: [
{ {
address: "HSQMB-赛罕金桥二路华渊青晓东门口北SHQ2009", address: "HSQMB-海南省海口市琼山区国兴大道南SHQ2009",
timelong: "9小时2分20秒", timelong: "9小时2分20秒",
captureTimes: "2次", captureTimes: "2次",
}, },
{ {
address: "HSQMB-塞罕金桥一路与鸟尼尔西街交口东南角电子警察杆南日", address: "HSQMB-海南省海口市美兰区蓝天路31号",
timelong: "1小时16分54秒", timelong: "1小时16分54秒",
captureTimes: "2次", captureTimes: "2次",
}, },
{ {
address: "HSQMB-罕金桥二路黄金海岸西西sH0", address: "HSQMB-海南省海口市美兰区国兴大道63号sH0",
timelong: "10分19秒", timelong: "10分19秒",
captureTimes: "2次", captureTimes: "2次",
}, },
{ {
address: "HSQMB-塞罕金桥二路黄金海岸西门口西SHQ005", address: "HSQMB-海南省海口市琼山区凤翔西路24号SHQ005",
timelong: "1天15分41秒", timelong: "1天15分41秒",
captureTimes: "3次", captureTimes: "3次",
}, },
{ {
address: "HSQMB-塞罕金桥二路华端有晓东门口北sHQ0", address: "HSQMB-海南省海口市龙华区城西路78号sHQ0",
timelong: "9小时", timelong: "9小时",
captureTimes: "2次", captureTimes: "2次",
}, },
......
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
label: "现住址", label: "现住址",
prop: "xzzDzmc", prop: "xzzDzmc",
width: "140", width: "140",
} },
], ],
zhrkQueryData: { zhrkQueryData: {
objectValue: sessionStorage.getItem("zjhm"), objectValue: sessionStorage.getItem("zjhm"),
...@@ -363,103 +363,103 @@ export default { ...@@ -363,103 +363,103 @@ export default {
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
text: '最近一个月', text: "最近一个月",
onClick (picker) { onClick(picker) {
const end = new Date() const end = new Date();
const start = new Date() const start = new Date();
let year = start.getFullYear() let year = start.getFullYear();
let month = start.getMonth() let month = start.getMonth();
if (month === 0) { if (month === 0) {
month = 12 month = 12;
year = year - 1 year = year - 1;
} }
if (month < 0) { if (month < 0) {
month = 12 + month month = 12 + month;
year = year - 1 year = year - 1;
} }
if (month < 10 && month > 0) { if (month < 10 && month > 0) {
month = '0' + month month = "0" + month;
} }
let firstDayOfPreMonth = let firstDayOfPreMonth =
year + '-' + month + '-' + start.getDate() year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth) firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit('pick', [firstDayOfPreMonth, end]) picker.$emit("pick", [firstDayOfPreMonth, end]);
} },
}, },
{ {
text: '最近三个月', text: "最近三个月",
onClick (picker) { onClick(picker) {
const end = new Date() const end = new Date();
const start = new Date() const start = new Date();
let year = start.getFullYear() let year = start.getFullYear();
let month = start.getMonth() - 2 let month = start.getMonth() - 2;
if (month === 0) { if (month === 0) {
month = 12 month = 12;
year = year - 1 year = year - 1;
} }
if (month < 0) { if (month < 0) {
month = 12 + month month = 12 + month;
year = year - 1 year = year - 1;
} }
if (month < 10 && month > 0) { if (month < 10 && month > 0) {
month = '0' + month month = "0" + month;
} }
let firstDayOfPreMonth = let firstDayOfPreMonth =
year + '-' + month + '-' + start.getDate() year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth) firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit('pick', [firstDayOfPreMonth, end]) picker.$emit("pick", [firstDayOfPreMonth, end]);
} },
}, },
{ {
text: '最近六个月', text: "最近六个月",
onClick (picker) { onClick(picker) {
const end = new Date() const end = new Date();
const start = new Date() const start = new Date();
let year = start.getFullYear() let year = start.getFullYear();
let month = start.getMonth() - 5 let month = start.getMonth() - 5;
if (month === 0) { if (month === 0) {
month = 12 month = 12;
year = year - 1 year = year - 1;
} }
if (month < 0) { if (month < 0) {
month = 12 + month month = 12 + month;
year = year - 1 year = year - 1;
} }
if (month < 10 && month > 0) { if (month < 10 && month > 0) {
month = '0' + month month = "0" + month;
} }
let firstDayOfPreMonth = let firstDayOfPreMonth =
year + '-' + month + '-' + start.getDate() year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth) firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit('pick', [firstDayOfPreMonth, end]) picker.$emit("pick", [firstDayOfPreMonth, end]);
} },
}, },
{ {
text: '最近一年', text: "最近一年",
onClick (picker) { onClick(picker) {
const end = new Date() const end = new Date();
const start = new Date() const start = new Date();
let year = start.getFullYear() let year = start.getFullYear();
let month = start.getMonth() - 11 let month = start.getMonth() - 11;
if (month === 0) { if (month === 0) {
month = 12 month = 12;
year = year - 1 year = year - 1;
} }
if (month < 0) { if (month < 0) {
month = 12 + month month = 12 + month;
year = year - 1 year = year - 1;
} }
if (month < 10 && month > 0) { if (month < 10 && month > 0) {
month = '0' + month month = "0" + month;
} }
let firstDayOfPreMonth = let firstDayOfPreMonth =
year + '-' + month + '-' + start.getDate() year + "-" + month + "-" + start.getDate();
firstDayOfPreMonth = new Date(firstDayOfPreMonth) firstDayOfPreMonth = new Date(firstDayOfPreMonth);
picker.$emit('pick', [firstDayOfPreMonth, end]) picker.$emit("pick", [firstDayOfPreMonth, end]);
} },
} },
] ],
} },
}; };
}, },
watch: { watch: {
...@@ -467,11 +467,47 @@ export default { ...@@ -467,11 +467,47 @@ export default {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
}, },
}, },
mounted() { mounted() {},
created() {
this.haflYear();
this.cxSj = [this.sj, new Date()];
}, },
methods: { methods: {
haflYear() {
var timeStamp = new Date().getTime();
var halfYear = (365 / 2) * 24 * 3600 * 1000;
var pastResult = timeStamp - halfYear;
var pastDate = new Date(pastResult);
var pastYear = pastDate.getFullYear();
var pastMonth = pastDate.getMonth() + 1;
var pastDay = pastDate.getDate();
if (pastMonth >= 1 && pastMonth <= 9) {
pastMonth = "0" + pastMonth;
}
if (pastDay >= 0 && pastDay <= 9) {
pastDay = "0" + pastDay;
}
var h = pastDate.getHours();
h = h < 10 ? "0" + h : h;
var minute = pastDate.getMinutes();
var second = pastDate.getSeconds();
minute = minute < 10 ? "0" + minute : minute;
second = second < 10 ? "0" + second : second;
var firstDayOfPreMonth =
pastYear +
"-" +
pastMonth +
"-" +
pastDay +
" " +
h +
":" +
minute +
":" +
second;
this.sj = new Date(firstDayOfPreMonth);
},
toTable(node) { toTable(node) {
debugger; debugger;
if (node.id != 1 && node.id != 3) { if (node.id != 1 && node.id != 3) {
......
...@@ -275,6 +275,7 @@ export default { ...@@ -275,6 +275,7 @@ export default {
], ],
}, },
cxSj: [], cxSj: [],
sj: "",
hyFormThead: [ hyFormThead: [
{ {
label: "姓名", label: "姓名",
...@@ -295,7 +296,7 @@ export default { ...@@ -295,7 +296,7 @@ export default {
label: "关系名称", label: "关系名称",
prop: "gxmc", prop: "gxmc",
width: "120", width: "120",
} },
], ],
hyQueryData: { hyQueryData: {
objectValue: sessionStorage.getItem("zjhm"), objectValue: sessionStorage.getItem("zjhm"),
...@@ -324,7 +325,7 @@ export default { ...@@ -324,7 +325,7 @@ export default {
label: "关系名称", label: "关系名称",
prop: "gxmc", prop: "gxmc",
width: "120", width: "120",
} },
], ],
gxrqQueryData: { gxrqQueryData: {
objectValue: sessionStorage.getItem("zjhm"), objectValue: sessionStorage.getItem("zjhm"),
...@@ -353,7 +354,7 @@ export default { ...@@ -353,7 +354,7 @@ export default {
label: "关系名称", label: "关系名称",
prop: "gxmc", prop: "gxmc",
width: "120", width: "120",
} },
], ],
gjgxQueryData: { gjgxQueryData: {
objectValue: sessionStorage.getItem("zjhm"), objectValue: sessionStorage.getItem("zjhm"),
...@@ -382,7 +383,7 @@ export default { ...@@ -382,7 +383,7 @@ export default {
label: "关系名称", label: "关系名称",
prop: "gxmc", prop: "gxmc",
width: "120", width: "120",
} },
], ],
shxxQueryData: { shxxQueryData: {
objectValue: sessionStorage.getItem("zjhm"), objectValue: sessionStorage.getItem("zjhm"),
...@@ -398,7 +399,46 @@ export default { ...@@ -398,7 +399,46 @@ export default {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
}, },
}, },
created() {
this.haflYear();
this.cxSj = [this.sj, new Date()];
},
methods: { methods: {
haflYear() {
var timeStamp = new Date().getTime();
var halfYear = (365 / 2) * 24 * 3600 * 1000;
var pastResult = timeStamp - halfYear;
var pastDate = new Date(pastResult);
var pastYear = pastDate.getFullYear();
var pastMonth = pastDate.getMonth() + 1;
var pastDay = pastDate.getDate();
if (pastMonth >= 1 && pastMonth <= 9) {
pastMonth = "0" + pastMonth;
}
if (pastDay >= 0 && pastDay <= 9) {
pastDay = "0" + pastDay;
}
var h = pastDate.getHours();
h = h < 10 ? "0" + h : h;
var minute = pastDate.getMinutes();
var second = pastDate.getSeconds();
minute = minute < 10 ? "0" + minute : minute;
second = second < 10 ? "0" + second : second;
var firstDayOfPreMonth =
pastYear +
"-" +
pastMonth +
"-" +
pastDay +
" " +
h +
":" +
minute +
":" +
second;
this.sj = new Date(firstDayOfPreMonth);
},
filterNode(value, data) { filterNode(value, data) {
if (!value) return true; if (!value) return true;
return data.label.indexOf(value) !== -1; return data.label.indexOf(value) !== -1;
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</div> </div>
<div class="right"> <div class="right">
<div class="con-wrap"> <div class="con-wrap">
<div class="name">民航订座 ({{ mhdzTableData.length }}</div> <!-- <div class="name">民航订座 ({{ mhdzTableData.length }}</div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="mhdzTableData" :data="mhdzTableData"
...@@ -54,19 +54,19 @@ ...@@ -54,19 +54,19 @@
style="width: 100%" style="width: 100%"
> >
<el-table-column type="selection" width="80"> </el-table-column> <el-table-column type="selection" width="80"> </el-table-column>
<el-table-column prop="xm" label="旅客中文名" width="160"> <el-table-column prop="xm" label="名" width="160">
</el-table-column> </el-table-column>
<el-table-column prop="zjhm" label="旅客证件号码" width="200"> <el-table-column prop="zjhm" label="证件号码" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="hkgs" label="承运航空公司" width="200"> <el-table-column prop="hbh" label="航班号" width="200">
</el-table-column> </el-table-column>
<el-table-column prop="hbhz" label="航班后缀" width="160"> <el-table-column prop="dicQfjcdm" label="起飞机场" width="160">
</el-table-column> </el-table-column>
<el-table-column prop="zcw" label="子舱位" width="120"> <el-table-column prop="dicDdjcdm" label="到达机场" width="160">
</el-table-column> </el-table-column>
<el-table-column prop="cfrq" label="当地出发日期" width="160"> <el-table-column prop="ddcfRq" label="订单起飞日期" width="170">
</el-table-column> </el-table-column>
<el-table-column prop="ddrq" label="当地到达日期" width="160"> <el-table-column prop="ddddRq" label="订单到达日期" width="170">
</el-table-column> </el-table-column>
<el-table-column label="详情" width="120"> <el-table-column label="详情" width="120">
<template <template
...@@ -80,7 +80,15 @@ ...@@ -80,7 +80,15 @@
></i ></i
></template> ></template>
</el-table-column> </el-table-column>
</el-table> </el-table> -->
<table-component
:DefaultAjFormThead="fjFormThead"
:propQueryData="fjQueryData"
:cxUrl="fjCxUrl"
:tableName="fjTableName"
:cxSj="cxSj"
:fj='fj'
></table-component>
</div> </div>
<div class="con-wrap"> <div class="con-wrap">
<table-component <table-component
...@@ -435,13 +443,58 @@ export default { ...@@ -435,13 +443,58 @@ export default {
width: "140", width: "140",
}, },
], ],
fjFormThead: [
{
label: "姓名",
prop: "xm",
width: "220",
},
{
label: "证件号码",
prop: "zjhm",
width: "200",
},
{
label: "航班号",
prop: "hbh",
width: "220",
},
{
label: "起飞机场",
prop: "dicQfjcdm",
width: "120",
},
{
label: "到达机场",
prop: "dicDdjcdm",
width: "160",
},
{
label: "订单起飞日期",
prop: "ddcfRq",
width: "160",
},
{
label: "订单到达日期",
prop: "ddddRq",
width: "160",
},
],
mhQueryData: { mhQueryData: {
objectValue: sessionStorage.getItem("zjhm"), objectValue: sessionStorage.getItem("zjhm"),
page: 1, page: 1,
limit: 5, limit: 5,
}, },
fjQueryData: {
objectValue: sessionStorage.getItem("zjhm"),
page: 1,
limit: 5,
},
mhCxUrl: "/daapi/getHbjcgxx", mhCxUrl: "/daapi/getHbjcgxx",
fjCxUrl: "/ktsj/getHbdpxxBySfzh",
mhTableName: "进出港信息", mhTableName: "进出港信息",
fj: 'queryFj',
fjTableName: "民航订座",
cxSj: [], cxSj: [],
}; };
}, },
...@@ -450,7 +503,46 @@ export default { ...@@ -450,7 +503,46 @@ export default {
this.$refs.tree.filter(val); this.$refs.tree.filter(val);
}, },
}, },
created() {
this.haflYear();
this.cxSj = [this.sj, new Date()];
},
methods: { methods: {
haflYear() {
var timeStamp = new Date().getTime();
var halfYear = (365 / 2) * 24 * 3600 * 1000;
var pastResult = timeStamp - halfYear;
var pastDate = new Date(pastResult);
var pastYear = pastDate.getFullYear();
var pastMonth = pastDate.getMonth() + 1;
var pastDay = pastDate.getDate();
if (pastMonth >= 1 && pastMonth <= 9) {
pastMonth = "0" + pastMonth;
}
if (pastDay >= 0 && pastDay <= 9) {
pastDay = "0" + pastDay;
}
var h = pastDate.getHours();
h = h < 10 ? "0" + h : h;
var minute = pastDate.getMinutes();
var second = pastDate.getSeconds();
minute = minute < 10 ? "0" + minute : minute;
second = second < 10 ? "0" + second : second;
var firstDayOfPreMonth =
pastYear +
"-" +
pastMonth +
"-" +
pastDay +
" " +
h +
":" +
minute +
":" +
second;
this.sj = new Date(firstDayOfPreMonth);
},
filterNode(value, data) { filterNode(value, data) {
if (!value) return true; if (!value) return true;
return data.label.indexOf(value) !== -1; return data.label.indexOf(value) !== -1;
......
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