Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
feiyue.teng
2b34205b 1 parent 22feca60

查询管理详情页面 表单组件宽度调整

Inline Side-by-side
Showing 9 changed files with 114 additions and 108 deletions
NODE_ENV = production
# uat环境配置
# 测试环境配置
ENV = 'uat'
VUE_APP_BASE_ENV = "uat"
......@@ -8,21 +8,21 @@ VUE_APP_BASE_ENV = "uat"
VUE_APP_Version = '1.0.0'
#测试环境
VUE_APP_BASE_API = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API = 'http://101.132.100.41:7023/Ecom'
VUE_APP_BASE_ROUTE = '/Ecom'
VUE_APP_BASE_ROUTE = '/EcomUat'
VUE_APP_BASE_LOGINOUT = '/Ecom'
VUE_APP_BASE_LOGINOUT = '/EcomUat'
#后端版本校验版本号
VUE_APP_APIVERSION = '19DD6C1CEC504AC854645F352EB03209.A3889C390C14952AD666ABC3BE46BE40'
VUE_APP_APIVERSION = '033BD94B1168D7E4F0D644C3C95E35BF.A3889C390C14952AD666ABC3BE46BE40'
#iclearEmp系统地址
VUE_APP_REDIRECT_EMP = 'https://declarationuat.fedex.com.cn/Emp/#/login'
VUE_APP_REDIRECT_EMP = 'http://192.168.1.251/Emp/#login'
#Fcl登录地址
VUE_APP_REDIRECT_FCL = 'https://www.fedex.com/secure-login/#login-credentials?redirectUrl=https://iclearuat.cndcdmz.apac.fedex.com/Exp/sysUserController/wlgnForward'
#图文版使用指南
VUE_APP_FEDEX_HANDBOOK = 'https://declarationuat.fedex.com.cn/Exp/manager-server/FedEx.pdf'
VUE_APP_FEDEX_HANDBOOK = 'http://192.168.1.251/Emp/FedEx.pdf'
#视频版使用指南
VUE_APP_FEDEX_VIDEO = '/manager-server/OperationManual_cp.mp4'
#隐私政策
......@@ -38,9 +38,9 @@ VUE_APP_SHANGHAI_FILLING_NUMBER = 'http://www.beian.gov.cn/portal/registerSystem
#京ICP
VUE_APP_BEIJING_FILLING_NUMBER = 'https://beian.miit.gov.cn/#/Integrated/recordQuery'
VUE_APP_BASE_API_dev = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_test = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_demo = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_dev = 'http://192.168.1.251:7021/Exp'
VUE_APP_BASE_API_test = 'http://192.168.1.251:7022/Exp'
VUE_APP_BASE_API_demo = 'http://192.168.1.251:7023/Exp'
VUE_APP_BASE_API_uat = 'https://declarationuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_pre = 'https://iclearexpuat.fedex.com.cn/Exp'
VUE_APP_BASE_API_prod = 'https://declaration.fedex.com.cn/Exp'
\ No newline at end of file
......
......@@ -91,9 +91,10 @@ export default {
let str = value;
this.$store.getters.dict[dictkey].forEach((item) => {
if (value == item[key]) {
str = item.name;
str = item.itemChineseName;
}
});
return str;
},
},
......
......@@ -86,7 +86,7 @@
</Formitem>
</el-col>
<!-- 电商企业 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="电商企业" prop="ebcname">
<el-input
type="text"
......@@ -99,9 +99,11 @@
></el-input>
</Formitem>
</el-col>
<!-- 货款金额 -->
<el-col :span="3">
<Formitem label="货款金额" prop="goodsValue">
</el-row>
<el-row :gutter="5">
<!-- 商品金额 -->
<el-col :span="3">
<Formitem label="商品金额" prop="goodsValue">
<el-input
type="text"
class="inputShadow"
......@@ -113,8 +115,6 @@
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 运杂费 -->
<el-col :span="3">
<Formitem label="运杂费" prop="freight">
......@@ -149,7 +149,7 @@
</Formitem>
</el-col>
<!-- 申报状态 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="报送状态" prop="appStatus">
<el-select
type="text"
......@@ -187,7 +187,7 @@
</Formitem>
</el-col>
<!-- 申报日期 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="报送日期" prop="appTime">
<el-input
type="text"
......
......@@ -222,7 +222,7 @@
</el-row>
<el-row :gutter="5">
<!-- 收发货人名称 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="收发货人名称" prop="ebcname">
<el-input
type="text"
......@@ -250,7 +250,7 @@
</Formitem>
</el-col>
<!-- 生产销售企业名称 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="生产销售企业名称" prop="ownerName">
<el-input
type="text"
......@@ -305,8 +305,11 @@
></el-input>
</Formitem>
</el-col>
<!-- 贸易方式 -->
<el-col :span="3">
</el-row>
<el-row :gutter="5">
<!-- 贸易方式 -->
<el-col :span="3">
<Formitem label="贸易方式" prop="tradeMode">
<el-select
type="text"
......@@ -343,8 +346,6 @@
</el-select>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 运输工具名称 -->
<el-col :span="3">
<Formitem label="运输工具名称" prop="trafName">
......@@ -439,8 +440,11 @@
</el-select>
</Formitem>
</el-col>
<!-- 运费 -->
<el-col :span="3">
</el-row>
<el-row :gutter="5">
<!-- 运费 -->
<el-col :span="3">
<Formitem label="运费" prop="freight">
<el-input
type="text"
......@@ -472,8 +476,6 @@
</el-select>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 运费标志 -->
<el-col :span="3">
<Formitem label="运费标志" prop="fflag">
......@@ -573,8 +575,11 @@
></el-input>
</Formitem>
</el-col>
<!-- 净重(公斤) -->
<el-col :span="3">
</el-row>
<el-row :gutter="5">
<!-- 净重(公斤) -->
<el-col :span="3">
<Formitem label="净重(公斤)" prop="netWeight">
<el-input
type="text"
......@@ -601,8 +606,6 @@
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 业务状态 -->
<!-- <el-col :span="3">
<Formitem label="回执状态" prop="returnStatus">
......@@ -800,9 +803,10 @@ export default {
},
{
name: "法定单位",
value: "unit1",
value: "unit",
width: "",
align: "left",
slot: true,
},
{
name: "第二数量",
......@@ -816,12 +820,12 @@ export default {
width: "",
align: "left",
},
{
name: "毛重(KG)",
value: "",
width: "",
align: "left",
},
// {
// name: "毛重(KG)",
// value: "",
// width: "",
// align: "left",
// },
],
loadings: {
entryLoading: false,
......
......@@ -44,7 +44,7 @@
</Formitem>
</el-col>
<!-- 物流企业名称 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="物流企业名称" prop="logisticsName">
<el-input
type="text"
......@@ -58,7 +58,7 @@
</Formitem>
</el-col>
<!-- 电商企业名称 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="电商企业名称" prop="ebcname">
<el-input
type="text"
......@@ -99,34 +99,7 @@
></el-input>
</Formitem>
</el-col>
<!-- 运费 -->
<el-col :span="3">
<Formitem label="运费" prop="freight">
<el-input
type="text"
class="inputShadow"
id="inputInner--freight"
resize="none"
v-model="formData.freight"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 保价费 -->
<el-col :span="3">
<Formitem label="保价费" prop="insuredfee">
<el-input
type="text"
class="inputShadow"
id="inputInner--insuredfee"
resize="none"
v-model="formData.insuredfee"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 币制 -->
......@@ -162,22 +135,9 @@
></el-input>
</Formitem>
</el-col>
<!-- 件数 -->
<el-col :span="3">
<Formitem label="件数" prop="packNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--packNo"
resize="none"
v-model="formData.packNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 主要货物信息 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="主要货物信息" prop="goodsInfo">
<el-input
type="text"
......@@ -209,7 +169,7 @@
</el-select>
</Formitem>
</el-col> -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="报送时间" prop="createTime">
<el-input
type="text"
......@@ -222,6 +182,20 @@
></el-input>
</Formitem>
</el-col>
<!-- 件数 -->
<el-col :span="3">
<Formitem label="件数" prop="packNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--packNo"
resize="none"
v-model="formData.packNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<el-col :span="3">
<Formitem label="报送状态" prop="appStatus">
<el-select
......@@ -240,6 +214,34 @@
</el-select>
</Formitem>
</el-col>
<!-- 运费 -->
<el-col :span="3">
<Formitem label="运费" prop="freight">
<el-input
type="text"
class="inputShadow"
id="inputInner--freight"
resize="none"
v-model="formData.freight"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 保价费 -->
<el-col :span="3">
<Formitem label="保价费" prop="insuredfee">
<el-input
type="text"
class="inputShadow"
id="inputInner--insuredfee"
resize="none"
v-model="formData.insuredfee"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 备注 -->
<el-col :span="6">
<Formitem label="备注" prop="note">
......
......@@ -273,7 +273,7 @@
</Formitem>
</el-col>
<!-- 申报日期 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="报送日期" prop="appTime">
<el-input
type="text"
......@@ -287,7 +287,7 @@
</Formitem>
</el-col>
<!-- 备注 -->
<el-col :span="12">
<el-col :span="9">
<Formitem label="备注" prop="note">
<el-input
type="text"
......
......@@ -63,7 +63,7 @@
</Formitem>
</el-col>
<!-- 报送时间 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="报送时间" prop="appTime">
<el-input
type="text"
......@@ -77,7 +77,7 @@
</Formitem>
</el-col>
<!-- 物流企业名称 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="物流企业名称" prop="logisticsName">
<el-input
type="text"
......@@ -104,8 +104,11 @@
></el-input>
</Formitem>
</el-col>
<!-- 申报地海关代码 -->
<el-col :span="3">
</el-row>
<el-row :gutter="5">
<!-- 申报地海关代码 -->
<el-col :span="3">
<Formitem label="申报地海关代码" prop="customsCode">
<el-input
type="text"
......@@ -137,8 +140,6 @@
</el-select>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 运输工具名称 -->
<el-col :span="3">
<Formitem label="运输工具名称" prop="trafName">
......
......@@ -49,20 +49,11 @@
<!-- 运单号 -->
<el-col :span="5">
<Formitem label="运单编号" prop="logisticsWaybillNumber">
<el-input
type="text"
class="inputShadow"
id="inputInner--logisticsWaybillNumber"
resize="none"
v-model="sreachFormData.logisticsWaybillNumber"
clearable
placeholder=""
></el-input>
<!-- <FormTextareaInput
<FormTextareaInput
:formData="sreachFormData"
dataKey="logisticsWaybillNumber"
@formChange="formChange"
/> -->
/>
</Formitem>
</el-col>
<!-- 创建时间 -->
......@@ -311,10 +302,16 @@ export default {
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.createTime.length > 0) {
obj.createTimeStart = obj.createTime[0];
obj.createTimeEnd = obj.createTime[1];
}
delete obj.createTime
// if (obj.billNo != null && obj.billNo != "") {
// obj.billNo = obj.billNo.split("\n");
// } else {
......
......@@ -634,9 +634,10 @@ export default {
this.dropdownCode = val.code;
},
close(val) {
if (val) {
this.search(1);
}
// if (val) {
// this.search(1);
// }
this.search(1);
this.outerVisible = false;
},
popoverChange(val) {
......