Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
91cd51b0 1 parent 682080ec

feat: 修改查询页面的请求参数

Inline Side-by-side
Showing 21 changed files with 268 additions and 107 deletions
......@@ -8,10 +8,10 @@
v-model="textareaVisible"
>
<el-input
:name="`${dataKey}-textarea`"
:name="`${dataKey}${curKey}-textarea`"
type="textarea"
:rows="5"
:id="`popoverInput${dataKey}`"
:id="`popoverInput${dataKey}${curKey}`"
class="inputShadow textareaPopover"
v-model="formData[dataKey]"
resize="none"
......@@ -63,6 +63,10 @@ export default {
type: String,
default: "",
},
curKey: {
type: Number,
default: 1,
},
},
data() {
return {
......@@ -72,7 +76,7 @@ export default {
watch: {
formData: {
handler(val) {
if (!val[this.dataKey]) {
if (!val[this.dataKey] || val[this.dataKey].length <= 0) {
this.textareaVisible = false;
let inputInner = document.querySelector(
"#inputInner--" + this.dataKey
......@@ -89,7 +93,9 @@ export default {
textareaFocus(val) {
this.textareaVisible = true;
this.$nextTick(() => {
document.querySelector("#popoverInput" + this.dataKey).focus();
document
.querySelector(`#popoverInput${this.dataKey}${this.curKey}`)
.focus();
document.querySelector("#inputInner--" + this.dataKey).style.display =
"none";
});
......
......@@ -4,8 +4,8 @@
<!-- <keep-alive :include="cachedViews">
<router-view :key="key" />
</keep-alive> -->
<router-view v-if="!cachedViews.includes(cachesName)"></router-view>
<keep-alive v-else>
<!-- <router-view v-if="!cachedViews.includes(cachesName)"></router-view> -->
<keep-alive :include="tagsViewNames">
<router-view :key="key"></router-view>
</keep-alive>
</transition>
......@@ -20,6 +20,10 @@ export default {
console.log(this.$store.state.tagsView);
return this.$store.state.tagsView.cachedViews;
},
tagsViewNames() {
console.log(this.$store.state.tagsView);
return this.$store.state.tagsView.tagsViewNames;
},
key() {
console.log(this.$route, this.$route.fullPath);
return this.$route.fullPath;
......
......@@ -27,7 +27,7 @@ export default {
},
methods: {
linkProps(to) {
console.log(to);
// console.log(to);
if (this.isExternal) {
return {
......
......@@ -81,7 +81,7 @@ export default {
},
},
mounted() {
this.initTags();
// this.initTags();
this.addTags();
},
methods: {
......@@ -161,7 +161,7 @@ export default {
});
},
refreshSelectedTag(view) {
this.$store.dispatch("tagsView/delCachedView", view).then(() => {
this.$store.dispatch("tagsView/delCachedName", view).then(() => {
const { fullPath } = view;
this.$nextTick(() => {
this.$router.replace({
......@@ -199,11 +199,9 @@ export default {
},
closeAllTags(view) {
this.$store.dispatch("tagsView/delAllViews").then(({ visitedViews }) => {
console.log(this.affixTags, visitedViews, view);
if (this.affixTags.some((tag) => tag.path === this.$route.path)) {
return;
}
// if (this.affixTags.some((tag) => tag.path === this.$route.path)) {
// return;
// }
this.toLastView(visitedViews, view);
});
},
......
import { routeNameMap } from "../../layout/components/TagsView/route";
const state = {
visitedViews: [],
cachedViews: [],
tagsViewNames: [],
};
const mutations = {
......@@ -76,16 +79,44 @@ const mutations = {
const i = state.cachedViews.indexOf(item.name);
if (i > -1) {
state.cachedViews.splice(i, 1);
state.tagsViewNames.splice(i, 1);
}
return false;
});
},
// add Name tagsViewNames
ADD_CACHED_NAME: (state, view) => {
const name = routeNameMap[view.path];
if (state.tagsViewNames.includes(name)) return;
if (!view.meta.noCache) {
state.tagsViewNames.push(name);
}
},
DEL_CACHED_NAME: (state, view) => {
const name = routeNameMap[view.path];
const index = state.tagsViewNames.indexOf(name);
index > -1 && state.tagsViewNames.splice(index, 1);
},
DEL_OTHERS_CACHED_NAMES: (state, view) => {
const name = routeNameMap[view.path];
const index = state.tagsViewNames.indexOf(name);
if (index > -1) {
state.tagsViewNames = state.tagsViewNames.slice(index, index + 1);
} else {
state.tagsViewNames = [];
}
},
DEL_ALL_CACHED_NAMES: (state) => {
state.tagsViewNames = [];
},
};
const actions = {
addView({ dispatch }, view) {
dispatch("addVisitedView", view);
dispatch("addCachedView", view);
dispatch("addCachedName", view);
console.log("addView", view);
},
addVisitedView({ commit }, view) {
......@@ -94,14 +125,19 @@ const actions = {
addCachedView({ commit }, view) {
commit("ADD_CACHED_VIEW", view);
},
addCachedName({ commit }, view) {
commit("ADD_CACHED_NAME", view);
},
delView({ dispatch, state }, view) {
return new Promise((resolve) => {
dispatch("delVisitedView", view);
dispatch("delCachedView", view);
dispatch("delCachedName", view);
resolve({
visitedViews: [...state.visitedViews],
cachedViews: [...state.cachedViews],
tagsViewNames: [...state.tagsViewNames],
});
});
},
......@@ -117,14 +153,22 @@ const actions = {
resolve([...state.cachedViews]);
});
},
delCachedName({ commit, state }, view) {
return new Promise((resolve) => {
commit("DEL_CACHED_NAME", view);
resolve([...state.tagsViewNames]);
});
},
delOthersViews({ dispatch, state }, view) {
return new Promise((resolve) => {
dispatch("delOthersVisitedViews", view);
dispatch("delOthersCachedViews", view);
dispatch("delOthersCachedName", view);
resolve({
visitedViews: [...state.visitedViews],
cachedViews: [...state.cachedViews],
tagsViewNames: [...state.tagsViewNames],
});
});
},
......@@ -140,14 +184,22 @@ const actions = {
resolve([...state.cachedViews]);
});
},
delOthersCachedName({ commit, state }, view) {
return new Promise((resolve) => {
commit("DEL_OTHERS_CACHED_NAMES", view);
resolve([...state.tagsViewNames]);
});
},
delAllViews({ dispatch, state }, view) {
return new Promise((resolve) => {
dispatch("delAllVisitedViews", view);
dispatch("delAllCachedViews", view);
dispatch("delAllCachedName", view);
resolve({
visitedViews: [...state.visitedViews],
cachedViews: [...state.cachedViews],
tagsViewNames: [...state.tagsViewNames],
});
});
},
......@@ -163,6 +215,12 @@ const actions = {
resolve([...state.cachedViews]);
});
},
delAllCachedName({ commit, state }) {
return new Promise((resolve) => {
commit("DEL_ALL_CACHED_NAMES");
resolve([...state.tagsViewNames]);
});
},
updateVisitedView({ commit }, view) {
commit("UPDATE_VISITED_VIEW", view);
......
......@@ -47,6 +47,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="billNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -538,16 +539,22 @@ export default {
},
created() {
this.search(0);
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 260;
},
watch: {
$route(val, oldval) {
console.log("========================");
this.popoverClose();
this.popperClose();
},
},
mounted() {
this.searchPortDictData();
},
// beforeDestroy() {
// this.popoverClose();
// },
methods: {
getTotalDocumentsLevelLog: getTotalDocumentsLevelLog,
getOperationLogByBillNo: getOperationLogByBillNo,
......
......@@ -120,6 +120,8 @@ export default {
this.tabsKey = "1";
this.fetchData();
this.popperVisible = true;
} else {
this.popperVisible = false;
}
},
},
......
......@@ -10,7 +10,7 @@
<el-row class="row-border">
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
......@@ -18,7 +18,13 @@
v-model="sreachFormData.billNo"
clearable
placeholder=""
></el-input>
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="billNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
</el-col>
<el-col :span="5">
......@@ -26,6 +32,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -147,7 +154,7 @@ export default {
return {
sreachFormData: {
logisticsNo: [],
billNo: "",
billNo: [],
returnStatus: "",
preNo: "",
},
......@@ -246,7 +253,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 220;
},
methods: {
popoverClose(val) {
......@@ -309,8 +316,8 @@ export default {
// 清空
clear() {
this.sreachFormData = {
ogisticsNo: [],
billNo: "",
logisticsNo: [],
billNo: [],
returnStatus: "",
preNo: "",
};
......@@ -332,6 +339,11 @@ export default {
} else {
obj.logisticsNo = [];
}
if (obj.billNo != null && obj.billNo != "") {
obj.billNo = obj.billNo.split("\n");
} else {
obj.billNo = [];
}
getExportArrivalInList(obj)
.then((res) => {
......
......@@ -14,6 +14,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -21,7 +22,7 @@
<!-- 订单编号 -->
<el-col :span="5">
<Formitem label="订单编号" prop="orderNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--orderNo"
......@@ -29,7 +30,13 @@
v-model="sreachFormData.orderNo"
clearable
placeholder=""
></el-input>
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="orderNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
</el-col>
<!-- 电商企业代码 -->
......@@ -179,11 +186,11 @@ export default {
data() {
return {
sreachFormData: {
orderNo: "",
logisticsNo: [],
orderNo: [],
ebccode: "",
returnStatus: "",
createTime: [],
logisticsNo: "",
},
originalLogisticsNo: "", // 用于保存原始的 logisticsNo 字符串
page: {
......@@ -294,7 +301,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 270;
},
watch: {
$route() {
......@@ -325,6 +332,12 @@ export default {
} else {
obj.logisticsNo = [];
}
// 使用保存的原始 orderNo 字符串
if (obj.orderNo != null && obj.orderNo != "") {
obj.orderNo = obj.orderNo.split("\n");
} else {
obj.orderNo = [];
}
getAllExportingBills(obj)
.then((res) => {
if (res.code === "200") {
......@@ -348,7 +361,8 @@ export default {
//重置
clear() {
this.sreachFormData = {
orderNo: "",
logisticsNo: [],
orderNo: [],
ebccode: "",
returnStatus: "",
createTime: [],
......
......@@ -14,6 +14,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -21,7 +22,7 @@
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
......@@ -29,13 +30,19 @@
v-model="sreachFormData.billNo"
clearable
placeholder=""
></el-input>
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="billNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
</el-col>
<!-- 订单编号 -->
<el-col :span="5">
<Formitem label="订单编号" prop="orderNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--orderNo"
......@@ -43,7 +50,13 @@
v-model="sreachFormData.orderNo"
clearable
placeholder=""
></el-input>
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="orderNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
</el-col>
<!-- 创建时间 -->
......@@ -282,11 +295,11 @@ export default {
return {
customDialogShow: false,
sreachFormData: {
billNo: "",
billNo: [],
ebcName: "",
invtNo: "",
logisticsNo: [],
orderNo: "",
orderNo: [],
returnStatus: "",
summaryApplicationStatus: "",
createTime: [],
......@@ -390,10 +403,10 @@ export default {
align: "left",
},
],
dictData: {
ebccode: [],
returnStatus: [],
},
// dictData: {
// ebccode: [],
// returnStatus: [],
// },
loadings: {
searchLoading: false,
},
......@@ -408,7 +421,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 360;
},
watch: {
$route() {
......@@ -440,6 +453,16 @@ export default {
} else {
obj.logisticsNo = [];
}
if (obj.billNo != null && obj.billNo != "") {
obj.billNo = obj.billNo.split("\n");
} else {
obj.billNo = [];
}
if (obj.orderNo != null && obj.orderNo != "") {
obj.orderNo = obj.orderNo.split("\n");
} else {
obj.orderNo = [];
}
getAllexportList(obj)
.then((res) => {
if (res.code === "200") {
......@@ -463,8 +486,8 @@ export default {
//重置
clear() {
this.sreachFormData = {
orderNo: "",
ebccode: "",
orderNo: [],
billNo: [],
returnStatus: "",
createTime: [],
ebcName: "",
......@@ -489,7 +512,16 @@ export default {
} else {
obj.logisticsNo = [];
}
if (obj.billNo != null && obj.billNo != "") {
obj.billNo = obj.billNo.split("\n");
} else {
obj.billNo = [];
}
if (obj.orderNo != null && obj.orderNo != "") {
obj.orderNo = obj.orderNo.split("\n");
} else {
obj.orderNo = [];
}
// getListExport(obj).then((res) => {
// // 2. 清单查询
// console.log(res);
......
......@@ -24,6 +24,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -31,7 +32,7 @@
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
......@@ -39,12 +40,13 @@
v-model="sreachFormData.billNo"
clearable
placeholder=""
></el-input>
<!-- <FormTextareaInput
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="billNo"
:curKey="Date.now()"
@formChange="formChange"
/> -->
/>
</Formitem>
</el-col>
<!-- 回执状态 -->
......@@ -174,9 +176,10 @@ export default {
data() {
return {
sreachFormData: {
billNo: "",
billNo: [],
returnStatus: "",
createTime: [],
logisticsNo: [],
},
page: {
pageIndex: 1,
......@@ -280,7 +283,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 220;
},
methods: {
//查询详情
......@@ -317,11 +320,11 @@ export default {
} else {
obj.logisticsNo = [];
}
// if (obj.billNo != null && obj.billNo != "") {
// obj.billNo = obj.billNo.split("\n");
// } else {
// obj.billNo = [];
// }
if (obj.billNo != null && obj.billNo != "") {
obj.billNo = obj.billNo.split("\n");
} else {
obj.billNo = [];
}
getAllCancellation(obj)
.then((res) => {
if (res.code === "200") {
......@@ -345,8 +348,8 @@ export default {
//重置
clear() {
this.sreachFormData = {
orderNo: "",
ebccode: "",
logisticsNo: [],
billNo: [],
returnStatus: "",
createTime: [],
};
......
......@@ -14,6 +14,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -164,8 +165,7 @@ export default {
data() {
return {
sreachFormData: {
logisticsNo: "",
logisticsCode: "",
logisticsNo: [],
returnStatus: "",
createTime: [],
},
......@@ -265,7 +265,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 220;
},
methods: {
//查询详情
......@@ -319,8 +319,8 @@ export default {
//重置
clear() {
this.sreachFormData = {
orderNo: "",
ebccode: "",
logisticsNo: [],
returnStatus: "",
createTime: [],
};
......
......@@ -229,7 +229,7 @@ export default {
},
created() {
this.search(0);
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 255;
},
watch: {},
......
......@@ -14,6 +14,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -21,7 +22,7 @@
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
......@@ -29,12 +30,13 @@
v-model="sreachFormData.billNo"
clearable
placeholder=""
></el-input>
<!-- <FormTextareaInput
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="billNo"
:curKey="Date.now()"
@formChange="formChange"
/> -->
/>
</Formitem>
</el-col>
<!-- 回执状态 -->
......@@ -169,7 +171,7 @@ export default {
data() {
return {
sreachFormData: {
billNo: "",
billNo: [],
returnStatus: "",
createTime: [],
logisticsNo: [],
......@@ -277,7 +279,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 220;
},
methods: {
//查询详情
......@@ -305,11 +307,6 @@ export default {
obj.createTimeStart = obj.createTime[0];
obj.createTimeEnd = obj.createTime[1];
}
// if (obj.billNo != null && obj.billNo != "") {
// obj.billNo = obj.billNo.split("\n");
// } else {
// obj.billNo = [];
// }
// 使用保存的原始 logisticsNo 字符串
obj.logisticsNo = this.originalLogisticsNo;
if (obj.logisticsNo != null && obj.logisticsNo != "") {
......@@ -317,6 +314,12 @@ export default {
} else {
obj.logisticsNo = [];
}
if (obj.billNo != null && obj.billNo != "") {
obj.billNo = obj.billNo.split("\n");
} else {
obj.billNo = [];
}
getAllTotalScoreList(obj)
.then((res) => {
if (res.code === "200") {
......@@ -340,10 +343,10 @@ export default {
//重置
clear() {
this.sreachFormData = {
orderNo: "",
ebccode: "",
returnStatus: "",
createTime: [],
billNo: [],
logisticsNo: [],
};
this.originalLogisticsNo = "";
},
......
......@@ -228,7 +228,7 @@ export default {
},
created() {
this.search(0);
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 270;
},
mounted() {
this.fetchStatusList();
......
......@@ -10,10 +10,11 @@
<el-row class="row-border">
<!-- 运单号 -->
<el-col :span="5">
<Formitem label="物流运单编号" prop="logisticsWaybillNumber">
<Formitem label="物流运单编号" prop="logisticsNo">
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsWaybillNumber"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -21,7 +22,7 @@
<!-- 提运单号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
......@@ -29,12 +30,13 @@
v-model="sreachFormData.billNo"
clearable
placeholder=""
></el-input>
<!-- <FormTextareaInput
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="billNo"
:curKey="Date.now()"
@formChange="formChange"
/> -->
/>
</Formitem>
</el-col>
<!-- 回执状态 -->
......@@ -169,8 +171,8 @@ export default {
data() {
return {
sreachFormData: {
billNo: "",
logisticsWaybillNumber: "",
billNo: [],
logisticsNo: [],
returnStatus: "",
createTime: [],
},
......@@ -283,7 +285,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 220;
},
methods: {
//查询详情
......@@ -305,13 +307,17 @@ export default {
obj.pageSize = this.page.pageSize;
obj.createTimeStart = "";
obj.createTimeEnd = "";
obj.logisticsNo = obj.logisticsWaybillNumber;
delete obj.logisticsWaybillNumber;
if (obj.logisticsNo != null && obj.logisticsNo != "") {
obj.logisticsNo = obj.logisticsNo.split("\n");
} else {
obj.logisticsNo = [];
}
if (obj.billNo != null && obj.billNo != "") {
obj.billNo = obj.billNo.split("\n");
} else {
obj.billNo = [];
}
if (obj.createTime.length > 0) {
obj.createTimeStart = obj.createTime[0];
obj.createTimeEnd = obj.createTime[1];
......@@ -345,8 +351,8 @@ export default {
//重置
clear() {
this.sreachFormData = {
billNo: "",
logisticsWaybillNumber: "",
billNo: [],
logisticsNo: [],
returnStatus: "",
createTime: [],
};
......
......@@ -10,7 +10,7 @@
<el-row class="row-border">
<el-col :span="5">
<Formitem label="订单编号" prop="orderNo">
<el-input
<!-- <el-input
type="text"
class="inputShadow"
id="inputInner--orderNo"
......@@ -18,7 +18,13 @@
v-model="sreachFormData.orderNo"
clearable
placeholder=""
></el-input>
></el-input> -->
<FormTextareaInput
:formData="sreachFormData"
dataKey="orderNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
</el-col>
<el-col :span="5">
......@@ -26,6 +32,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
<!-- <el-input
......@@ -118,7 +125,7 @@
</el-col>
</el-row>
</el-form>
<div style="height: 20px"></div>
<Table
class="fedexDetialTable fedexSreachTable"
ref="entryTable"
......@@ -167,7 +174,7 @@ export default {
data() {
return {
sreachFormData: {
orderNo: "",
orderNo: [],
forwardStatus: "",
returnStatus: "",
logisticsNo: [],
......@@ -249,7 +256,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 270;
},
methods: {
formChange(val) {
......@@ -275,7 +282,7 @@ export default {
// 清空
clear() {
this.sreachFormData = {
orderNo: "",
orderNo: [],
forwardStatus: "",
returnStatus: "",
logisticsNo: [],
......@@ -316,6 +323,11 @@ export default {
} else {
obj.logisticsNo = [];
}
if (obj.orderNo != null && obj.orderNo != "") {
obj.orderNo = obj.orderNo.split("\n");
} else {
obj.orderNo = [];
}
obj.startTime = "";
obj.endTime = "";
if (this.sreachFormData.createTime.length > 0) {
......
......@@ -209,7 +209,7 @@ export default {
this.fetchReceiptStatus();
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 255;
},
methods: {
fetchReceiptStatus() {
......
......@@ -51,6 +51,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="billNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -61,6 +62,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -80,6 +82,7 @@
<FormTextareaInput
:formData="sreachFormData"
dataKey="orderNo"
:curKey="Date.now()"
@formChange="formChange"
/>
</Formitem>
......@@ -939,7 +942,7 @@ export default {
console.log(error);
} finally {
this.search(0);
this.tableMaxheight = window.innerHeight - 360;
this.tableMaxheight = window.innerHeight - 355;
}
},
mounted() {
......
......@@ -159,16 +159,17 @@
<!-- </el-col>-->
</el-row>
</el-form>
<!-- <div class="optionButton">-->
<!-- <el-button-->
<!-- class="entrySaveButton"-->
<!-- size="small"-->
<!-- icon="el-icon-download"-->
<!-- @click="downloadData"-->
<!-- >-->
<!-- 导出-->
<!-- </el-button>-->
<!-- </div>-->
<div class="optionButton">
<!-- <el-button-->
<!-- class="entrySaveButton"-->
<!-- size="small"-->
<!-- icon="el-icon-download"-->
<!-- @click="downloadData"-->
<!-- >-->
<!-- 导出-->
<!-- </el-button>-->
</div>
<Table
class="fedexDetialTable fedexSreachTable"
ref="entryTable"
......@@ -356,7 +357,7 @@ export default {
},
created() {
this.search(0);
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 270;
},
watch: {
......
......@@ -237,7 +237,7 @@ export default {
this.search(0);
},
mounted() {
this.tableMaxheight = window.innerHeight - 300;
this.tableMaxheight = window.innerHeight - 220;
},
methods: {
//查询
......