Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
xingru.liu
fee7f878 1 parent 47c2cefd

修复字段显示

Inline Side-by-side
Showing 11 changed files with 130 additions and 62 deletions
......@@ -23,7 +23,7 @@ router.beforeEach((to, from, next) => {
store.dispatch('GetInfo').then((res) => {
// if (res.success) {
store.dispatch('GenerateRoutes').then(accessRoutes => {
store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY']);
store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY','APP_STATUS']);
// 根据roles权限生成可访问的路由表
router.addRoutes(accessRoutes) // 动态添加可访问路由表
next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
......
......@@ -148,9 +148,28 @@
</el-select>
</Formitem>
</el-col>
<!-- 申报状态 -->
<el-col :span="3">
<Formitem label="报送状态" prop="appStatus">
<el-select
type="text"
id="inputInner--appStatus"
v-model="formData.appStatus"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.APP_STATUS"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- 申报类型 -->
<el-col :span="3">
<Formitem label="申报类型" prop="appType">
<Formitem label="报送类型" prop="appType">
<el-select
type="text"
id="inputInner--appType"
......@@ -159,8 +178,7 @@
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict
.DECLARE_STATISTICS_FLAG"
v-for="(item, index) in $store.getters.dict.DECLARE_APPTYPE"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
......@@ -170,7 +188,7 @@
</el-col>
<!-- 申报日期 -->
<el-col :span="3">
<Formitem label="申报日期" prop="appTime">
<Formitem label="报送日期" prop="appTime">
<el-input
type="text"
class="inputShadow"
......@@ -183,7 +201,7 @@
</Formitem>
</el-col>
<!-- 备注 -->
<el-col :span="12">
<el-col :span="9">
<Formitem label="备注" prop="note">
<el-input
type="text"
......
......@@ -220,13 +220,13 @@ export default {
},
{
name: "申报企业",
value: "declaringEnterprise",
value: "agentName",
width: "",
align: "left",
},
{
name: "申报类型",
value: "declaringType",
name: "报送类型",
value: "appTypeStr",
width: "",
align: "left",
},
......@@ -294,6 +294,7 @@ export default {
}
getAllExportingBills(obj)
.then((res) => {
if (res.code === "200") {
this.tableData = res.data.value;
this.page.total = res.data.totalItems;
......
......@@ -604,7 +604,7 @@
</el-row>
<el-row :gutter="5">
<!-- 业务状态 -->
<el-col :span="3">
<!-- <el-col :span="3">
<Formitem label="回执状态" prop="returnStatus">
<el-select
type="text"
......@@ -621,10 +621,28 @@
></el-option>
</el-select>
</Formitem>
</el-col> -->
<el-col :span="3">
<Formitem label="报送状态" prop="appStatus">
<el-select
type="text"
id="inputInner--appStatus"
v-model="formData.appStatus"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.APP_STATUS"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- 申报类型 -->
<el-col :span="3">
<Formitem label="申报类型" prop="appType">
<Formitem label="报送类型" prop="appType">
<el-select
type="text"
id="inputInner--appType"
......@@ -633,7 +651,7 @@
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.DECLARE_STATISTICS_FLAGF"
v-for="(item, index) in $store.getters.dict.DECLARE_APPTYPE"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
......@@ -643,13 +661,13 @@
</el-col>
<!-- 申报时间 -->
<el-col :span="3">
<Formitem label="申报时间" prop="appTime">
<Formitem label="报送时间" prop="appTimeStr">
<el-input
type="text"
class="inputShadow"
id="inputInner--appTime"
id="inputInner--appTimeStr"
resize="none"
v-model="formData.appTime"
v-model="formData.appTimeStr"
clearable
placeholder=""
></el-input>
......
......@@ -182,7 +182,7 @@ export default {
align: "left",
},
{
name: "申报类型",
name: "报送类型",
value: "appType",
width: "",
align: "left",
......
......@@ -19,24 +19,19 @@
</Formitem>
</el-col>
<!-- 物流企业代码 -->
<el-col :span="5">
<Formitem label="物流企业代码" prop="logisticsCode">
<el-select
type="text"
id="inputInner--logisticsCode"
v-model="sreachFormData.logisticsCode"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.logisticsCode"
:key="index"
:label="item.name"
:value="item.code"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- <el-col :span="5">-->
<!-- <Formitem label="物流企业代码" prop="logisticsCode">-->
<!-- <el-input-->
<!-- type="text"-->
<!-- class="inputShadow"-->
<!-- id="inputInner&#45;&#45;logisticsCode"-->
<!-- resize="none"-->
<!-- v-model="sreachFormData.logisticsCode"-->
<!-- clearable-->
<!-- placeholder=""-->
<!-- ></el-input>-->
<!-- </Formitem>-->
<!-- </el-col>-->
<!-- 回执状态 -->
<el-col :span="5">
<Formitem label="回执状态" prop="returnStatus">
......@@ -212,7 +207,7 @@ export default {
},
{
name: "创建时间",
value: "createTime",
value: "createTimeStr",
width: "",
align: "left",
},
......@@ -223,7 +218,7 @@ export default {
align: "left",
},
{
name: "申报类型",
name: "报送类型",
value: "appType",
width: "",
align: "left",
......
......@@ -191,7 +191,7 @@
</Formitem>
</el-col>
<!-- 回执状态 -->
<el-col :span="3">
<!-- <el-col :span="3">
<Formitem label="回执状态" prop="returnStatus">
<el-select
type="text"
......@@ -208,9 +208,40 @@
></el-option>
</el-select>
</Formitem>
</el-col> -->
<el-col :span="3">
<Formitem label="报送时间" prop="createTimeStr">
<el-input
type="text"
class="inputShadow"
id="inputInner--createTimeStr"
resize="none"
v-model="formData.createTimeStr"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<el-col :span="3">
<Formitem label="报送状态" prop="appStatus">
<el-select
type="text"
id="inputInner--appStatus"
v-model="formData.appStatus"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.APP_STATUS"
:key="index"
:label="item.itemChineseName"
:value="item.itemCode"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- 备注 -->
<el-col :span="9">
<el-col :span="6">
<Formitem label="备注" prop="note">
<el-input
type="text"
......
......@@ -148,8 +148,8 @@
></el-input>
</Formitem>
</el-col>
<!-- 提运单号 -->
<el-col :span="3">
<!-- 提运单号 重复出现-->
<!-- <el-col :span="3">
<Formitem label="提运单号" prop="billNo">
<el-input
type="text"
......@@ -161,7 +161,7 @@
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-col> -->
<!-- 境内运输工具编号 -->
<el-col :span="3">
<Formitem label="境内运输工具编号" prop="domesticTrafNo">
......@@ -191,7 +191,7 @@
</Formitem>
</el-col>
<!-- 物流企业名称 -->
<el-col :span="6">
<el-col :span="9">
<Formitem label="物流企业名称" prop="logisticsName">
<el-input
type="text"
......@@ -236,16 +236,16 @@
</el-col>
<!-- 业务状态 -->
<el-col :span="3">
<Formitem label="业务状态" prop="returnStatus">
<Formitem label="报送状态" prop="appStatus">
<el-select
type="text"
id="inputInner--returnStatus"
v-model="formData.returnStatus"
id="inputInner--appStatus"
v-model="formData.appStatus"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
v-for="(item, index) in $store.getters.dict.APP_STATUS"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
......@@ -255,21 +255,26 @@
</el-col>
<!-- 申报类型 -->
<el-col :span="3">
<Formitem label="申报类型" prop="appTypeStr">
<el-input
<Formitem label="报送类型" prop="appType">
<el-select
type="text"
class="inputShadow"
id="inputInner--appTypeStr"
resize="none"
v-model="formData.appTypeStr"
id="inputInner--appType"
v-model="formData.appType"
clearable
placeholder=""
></el-input>
>
<el-option
v-for="(item, index) in $store.getters.dict.DECLARE_APPTYPE"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- 申报日期 -->
<el-col :span="3">
<Formitem label="申报日期" prop="appTime">
<Formitem label="报送日期" prop="appTime">
<el-input
type="text"
class="inputShadow"
......
......@@ -212,7 +212,7 @@ export default {
align: "left",
},
{
name: "申报类型",
name: "报送类型",
value: "appType",
width: "",
align: "left",
......
......@@ -45,16 +45,16 @@
</el-col>
<!-- 业务状态 -->
<el-col :span="3">
<Formitem label="业务状态" prop="returnStatus">
<Formitem label="报送状态" prop="appStatus">
<el-select
type="text"
id="inputInner--returnStatus"
v-model="formData.returnStatus"
id="inputInner--appStatus"
v-model="formData.appStatus"
clearable
placeholder=""
>
<el-option
v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS"
v-for="(item, index) in $store.getters.dict.APP_STATUS"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
......@@ -168,7 +168,7 @@
</Formitem>
</el-col>
<!-- 申报日期 -->
<el-col :span="3">
<!-- <el-col :span="3">
<Formitem label="申报日期" prop="createTimeStr">
<el-input
type="text"
......@@ -180,7 +180,7 @@
placeholder=""
></el-input>
</Formitem>
</el-col>
</el-col> -->
<!-- 备注 -->
<el-col :span="9">
<Formitem label="备注" prop="note">
......
......@@ -244,7 +244,7 @@ export default {
align: "left",
},
{
name: "申报日期",
name: "报送日期",
value: "appTime",
width: "",
align: "left",
......