Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
feiyue.teng
1d14de6b 1 parent 22322e9f

申报数据管理申报数据后页面回显最新状态

Inline Side-by-side
Showing 9 changed files with 88 additions and 40 deletions
......@@ -438,8 +438,6 @@ export default {
}
this.$nextTick(() => {
if (table) {
console.log('debug==',tableBody.clientHeight,this.maxHeight);
table.style.maxHeight = this.maxHeight;
tableBody.clientHeight >= parseInt(this.maxHeight)
? (table.style.height = this.maxHeight - 40 + "px")
......
......@@ -31,7 +31,7 @@
:pageSizes="[20, 30, 50, 100]"
:totalCount="0"
:loading="tableLoading"
:emptyText="$t('portEntry.emptyText')"
:emptyText="(loadingDatas && !rowData.popoverData.length) ? '数据加载中' : $t('portEntry.emptyText')"
height="350px"
maxHeight="500px"
rowKey="id"
......@@ -82,14 +82,20 @@ export default {
},
data() {
return {
tableLoading: false,
tableLoading: false
};
},
computed:{
loadingDatas(){
return this.$store.state.viewOption.loadingDatas
}
},
methods: {
//弹框关闭
popoverClose() {
this.$emit("popoverClose");
this.parentDom.$refs.tables.$refs.bodyWrapper.style.overflowY = "auto";
this.$store.dispatch('setLoadingState', true)
},
//弹框状态改版
popoverChange(data, type) {
......
......@@ -7,13 +7,17 @@ const viewOption = {
tab: '',
submitType: false,
updateType: false,
}
},
loadingDatas:true
},
mutations: {
SET_ENTRYDATA(state, entryData) {
state.entryEdit = entryData
}
},
SET_LOADINGDATA(state, isLoading) {
state.loadingDatas = isLoading
},
},
actions: {
......@@ -28,7 +32,10 @@ const viewOption = {
submitType: false,
updateType: false,
})
}
},
setLoadingState({ commit, state }, data) {
commit('SET_LOADINGDATA', data)
},
}
}
......
......@@ -272,7 +272,7 @@ export default {
if (val == 0) {
this.page.pageIndex = 1;
}
let obj = this.sreachFormData;
let obj = {...this.sreachFormData};
obj.pageIndex = this.page.pageIndex;
obj.pageSize = this.page.pageSize;
obj.endCreationTime = "";
......@@ -312,10 +312,7 @@ export default {
});
},
clear() {
this.sreachFormData = {
portCode: "",
dxpid: "",
};
this.$refs.sreachForm.resetFields();
},
//下载证书
downloadFile(val) {
......
......@@ -38,7 +38,7 @@
<el-col :span="4">
<Formitem label="企业商品描述" prop="enterpriseProductDescribe">
<el-input
type="text"
type="textarea"
class="inputShadow"
id="inputInner--enterpriseProductDescribe"
resize="none"
......@@ -77,7 +77,7 @@
<el-col :span="4">
<Formitem label="规格型号" prop="model">
<el-input
type="text"
type="textarea"
class="inputShadow"
id="inputInner--model"
resize="none"
......@@ -122,6 +122,7 @@
id="inputInner--destinationCountryRegionCode"
v-model="tableRowformData.destinationCountryRegionCode"
clearable
filterable
placeholder=""
>
<el-option
......@@ -140,6 +141,7 @@
id="inputInner--unit"
v-model="tableRowformData.unit"
clearable
filterable
placeholder=""
>
<el-option
......@@ -154,7 +156,7 @@
<el-col :span="4">
<Formitem label="数量" prop="qty">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--qty"
resize="none"
......@@ -167,7 +169,7 @@
<el-col :span="4">
<Formitem label="法定数量" prop="legalQty">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--legalQty"
resize="none"
......@@ -186,6 +188,7 @@
id="inputInner--currency"
v-model="tableRowformData.currency"
clearable
filterable
placeholder=""
>
<el-option
......@@ -200,7 +203,7 @@
<el-col :span="4">
<Formitem label="单价" prop="price">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--price"
resize="none"
......@@ -213,7 +216,7 @@
<el-col :span="4">
<Formitem label="总价" prop="totalPrice">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--totalPrice"
resize="none"
......@@ -226,7 +229,7 @@
<el-col :span="4">
<Formitem label="净重" prop="netWeight">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--netWeight"
resize="none"
......@@ -239,7 +242,7 @@
<el-col :span="8">
<Formitem label="备注" prop="remark">
<el-input
type="text"
type="textarea"
class="inputShadow"
id="inputInner--remark"
resize="none"
......@@ -270,18 +273,32 @@
tableRowFormRules:{
enterpriseProductCode: [
{ required: true, message: '请输入企业商品货号', trigger: 'blur' },
{ max: 30, message: '长度不能超过30个字符', trigger: 'blur' }
],
enterpriseProductName: [
{ required: true, message: '请输入企业商品名称', trigger: 'blur' }
{ required: true, message: '请输入企业商品名称', trigger: 'blur' },
{ max: 250, message: '长度不能超过250个字符', trigger: 'blur' }
],
enterpriseProductDescribe: [
{ max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
],
productName: [
{ required: true, message: '请输入商品名称', trigger: 'blur' }
{ required: true, message: '请输入商品名称', trigger: 'blur' },
{ max: 250, message: '长度不能超过250个字符', trigger: 'blur' }
],
productCode: [
{ required: true, message: '请输入商品编码', trigger: 'blur' }
{ required: true, message: '请输入商品编码', trigger: 'blur' },
{ max: 10, message: '长度不能超过10个字符', trigger: 'blur' }
],
model: [
{ required: true, message: '请输入规格型号', trigger: 'blur' }
{ required: true, message: '请输入规格型号', trigger: 'blur' },
{ max: 250, message: '长度不能超过250个字符', trigger: 'blur' }
],
accountBookMaterialNumber: [
{ max: 30, message: '长度不能超过30个字符', trigger: 'blur' }
],
barCode: [
{ max: 50, message: '长度不能超过50个字符', trigger: 'blur' }
],
destinationCountryRegionCode: [
{ required: true, message: '请选择目的国(地区)代码', trigger: 'change' }
......@@ -307,6 +324,9 @@
netWeight: [
{ required: true, message: '请输入净重', trigger: 'blur' }
],
remark: [
{ max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
],
}
};
},
......
......@@ -116,7 +116,7 @@
<el-col :span="3">
<Formitem label="商品金额" prop="goodsValue">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--goodsValue"
resize="none"
......@@ -130,7 +130,7 @@
<el-col :span="3">
<Formitem label="运杂费" prop="miscellaneousFreight">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--miscellaneousFreight"
resize="none"
......@@ -150,6 +150,7 @@
type="text"
id="inputInner--currency"
v-model="formData.currency"
filterable
clearable
placeholder=""
>
......@@ -166,7 +167,7 @@
<el-col :span="3">
<Formitem label="主要货物信息" prop="mainGoodsInfo">
<el-input
type="text"
type="textarea"
class="inputShadow"
id="inputInner--mainGoodsInfo"
resize="none"
......@@ -267,6 +268,7 @@
id="inputInner--destinationCountryRegion"
v-model="formData.destinationCountryRegion"
clearable
filterable
placeholder=""
>
<el-option
......@@ -287,6 +289,7 @@
resize="none"
v-model="formData.portCode"
clearable
filterable
placeholder=""
></el-input>
</Formitem>
......@@ -294,7 +297,7 @@
<el-col :span="3">
<Formitem label="运费" prop="freight">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--freight"
resize="none"
......@@ -311,6 +314,7 @@
id="inputInner--freightCurrency"
v-model="formData.freightCurrency"
clearable
filterable
placeholder=""
>
<el-option
......@@ -343,7 +347,7 @@
<el-col :span="3">
<Formitem label="保费" prop="insuredfee">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--insuredfee"
resize="none"
......@@ -360,6 +364,7 @@
id="inputInner--insuredfeeCurrency"
v-model="formData.insuredfeeCurrency"
clearable
filterable
placeholder=""
>
<el-option
......@@ -412,7 +417,7 @@
<el-col :span="3">
<Formitem label="件数" prop="packNo">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--packNo"
resize="none"
......@@ -425,7 +430,7 @@
<el-col :span="3">
<Formitem label="毛重(公斤)" prop="weight">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--weight"
resize="none"
......@@ -438,7 +443,7 @@
<el-col :span="3">
<Formitem label="净重(公斤)" prop="netWeight">
<el-input
type="text"
type="number"
class="inputShadow"
id="inputInner--netWeight"
resize="none"
......@@ -543,9 +548,11 @@
],
orderNo: [
{ required: true, message: '请输入订单编号', trigger: 'blur' },
{ max: 60, message: '长度不能超过60个字符', trigger: 'blur' }
],
logisticsNo: [
{ required: true, message: '请输入物流运单编号', trigger: 'blur' },
{ max: 80, message: '长度不能超过80个字符', trigger: 'blur' }
],
declareCustomsCode: [
{ required: true, message: '请选择申报地海关', trigger: 'change' }
......@@ -563,16 +570,26 @@
{ required: true, message: '请选择币制', trigger: 'change' }
],
mainGoodsInfo: [
{ required: true, message: '请输入主要物品信息', trigger: 'blur' }
{ required: true, message: '请输入主要物品信息', trigger: 'blur' },
{ max: 200, message: '长度不能超过200个字符', trigger: 'blur' }
],
flightNumber: [
{ required: true, message: '请输入航班号', trigger: 'blur' }
{ required: true, message: '请输入航班号', trigger: 'blur' },
{ max: 32, message: '长度不能超过32个字符', trigger: 'blur' }
],
billno: [
{ required: true, message: '请输入提运单号', trigger: 'blur' }
{ required: true, message: '请输入提运单号', trigger: 'blur' },
{ max: 37, message: '长度不能超过37个字符', trigger: 'blur' }
],
totalPackageNo: [
{ required: true, message: '请输入总包号', trigger: 'blur' }
{ required: true, message: '请输入总包号', trigger: 'blur' },
{ max: 37, message: '长度不能超过37个字符', trigger: 'blur' }
],
regulatoryVenueCode: [
{ max: 10, message: '长度不能超过10个字符', trigger: 'blur' }
],
licenseKey: [
{ max: 19, message: '长度不能超过19个字符', trigger: 'blur' }
],
destinationCountryRegion: [
{ required: true, message: '请选择运抵国', trigger: 'change' }
......@@ -611,7 +628,8 @@
{ required: true, message: '请输入净重', trigger: 'blur' }
],
remark: [
{ required: true, message: '请输入备注', trigger: 'blur' }
{ required: true, message: '请输入备注', trigger: 'blur' },
{ max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
]
},
detailData: [],
......
......@@ -663,7 +663,7 @@
</Formitem>
</el-col>
<!-- 申报时间 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="报送时间" prop="appTime">
<el-input
type="text"
......@@ -677,7 +677,7 @@
</Formitem>
</el-col>
<!-- 备注 -->
<el-col :span="9">
<el-col :span="6">
<Formitem label="备注" prop="note">
<el-input
type="text"
......
......@@ -278,7 +278,7 @@ export default {
if (val == 0) {
this.page.pageIndex = 1;
}
let obj = this.sreachFormData;
let obj = {...this.sreachFormData};
obj.pageIndex = this.page.pageIndex;
obj.pageSize = this.page.pageSize;
obj.createTimeStart = "";
......
......@@ -696,6 +696,7 @@ export default {
this.alertWarningMsg(res.message);
}
this.loadings.dropDownLoading = false;
this.search(0);
})
.catch((err) => {
console.log(err);
......@@ -735,6 +736,7 @@ export default {
})
.finally(() => {
this.$nextTick(() => {
this.$store.dispatch('setLoadingState', false)
this.$refs.orderReceiptStatusPopover.tableLoading = false;
this.$refs.wayBillReceiptPopover.tableLoading = false;
this.$refs.listReceiptStatusPopover.tableLoading = false;
......