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) => { ...@@ -23,7 +23,7 @@ router.beforeEach((to, from, next) => {
23 store.dispatch('GetInfo').then((res) => { 23 store.dispatch('GetInfo').then((res) => {
24 // if (res.success) { 24 // if (res.success) {
25 store.dispatch('GenerateRoutes').then(accessRoutes => { 25 store.dispatch('GenerateRoutes').then(accessRoutes => {
26 - store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY']); 26 + store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY','APP_STATUS']);
27 // 根据roles权限生成可访问的路由表 27 // 根据roles权限生成可访问的路由表
28 router.addRoutes(accessRoutes) // 动态添加可访问路由表 28 router.addRoutes(accessRoutes) // 动态添加可访问路由表
29 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 29 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
......
...@@ -148,9 +148,28 @@ ...@@ -148,9 +148,28 @@
148 </el-select> 148 </el-select>
149 </Formitem> 149 </Formitem>
150 </el-col> 150 </el-col>
151 + <!-- 申报状态 -->
152 + <el-col :span="3">
153 + <Formitem label="报送状态" prop="appStatus">
154 + <el-select
155 + type="text"
156 + id="inputInner--appStatus"
157 + v-model="formData.appStatus"
158 + clearable
159 + placeholder=""
160 + >
161 + <el-option
162 + v-for="(item, index) in $store.getters.dict.APP_STATUS"
163 + :key="index"
164 + :label="item.itemChineseName"
165 + :value="item.itemValue"
166 + ></el-option>
167 + </el-select>
168 + </Formitem>
169 + </el-col>
151 <!-- 申报类型 --> 170 <!-- 申报类型 -->
152 <el-col :span="3"> 171 <el-col :span="3">
153 - <Formitem label="申报类型" prop="appType"> 172 + <Formitem label="报送类型" prop="appType">
154 <el-select 173 <el-select
155 type="text" 174 type="text"
156 id="inputInner--appType" 175 id="inputInner--appType"
...@@ -159,8 +178,7 @@ ...@@ -159,8 +178,7 @@
159 placeholder="" 178 placeholder=""
160 > 179 >
161 <el-option 180 <el-option
162 - v-for="(item, index) in $store.getters.dict 181 + v-for="(item, index) in $store.getters.dict.DECLARE_APPTYPE"
163 - .DECLARE_STATISTICS_FLAG"
164 :key="index" 182 :key="index"
165 :label="item.itemChineseName" 183 :label="item.itemChineseName"
166 :value="item.itemValue" 184 :value="item.itemValue"
...@@ -170,7 +188,7 @@ ...@@ -170,7 +188,7 @@
170 </el-col> 188 </el-col>
171 <!-- 申报日期 --> 189 <!-- 申报日期 -->
172 <el-col :span="3"> 190 <el-col :span="3">
173 - <Formitem label="申报日期" prop="appTime"> 191 + <Formitem label="报送日期" prop="appTime">
174 <el-input 192 <el-input
175 type="text" 193 type="text"
176 class="inputShadow" 194 class="inputShadow"
...@@ -183,7 +201,7 @@ ...@@ -183,7 +201,7 @@
183 </Formitem> 201 </Formitem>
184 </el-col> 202 </el-col>
185 <!-- 备注 --> 203 <!-- 备注 -->
186 - <el-col :span="12"> 204 + <el-col :span="9">
187 <Formitem label="备注" prop="note"> 205 <Formitem label="备注" prop="note">
188 <el-input 206 <el-input
189 type="text" 207 type="text"
......
...@@ -220,13 +220,13 @@ export default { ...@@ -220,13 +220,13 @@ export default {
220 }, 220 },
221 { 221 {
222 name: "申报企业", 222 name: "申报企业",
223 - value: "declaringEnterprise", 223 + value: "agentName",
224 width: "", 224 width: "",
225 align: "left", 225 align: "left",
226 }, 226 },
227 { 227 {
228 - name: "申报类型", 228 + name: "报送类型",
229 - value: "declaringType", 229 + value: "appTypeStr",
230 width: "", 230 width: "",
231 align: "left", 231 align: "left",
232 }, 232 },
...@@ -294,6 +294,7 @@ export default { ...@@ -294,6 +294,7 @@ export default {
294 } 294 }
295 getAllExportingBills(obj) 295 getAllExportingBills(obj)
296 .then((res) => { 296 .then((res) => {
297 +
297 if (res.code === "200") { 298 if (res.code === "200") {
298 this.tableData = res.data.value; 299 this.tableData = res.data.value;
299 this.page.total = res.data.totalItems; 300 this.page.total = res.data.totalItems;
......
...@@ -604,7 +604,7 @@ ...@@ -604,7 +604,7 @@
604 </el-row> 604 </el-row>
605 <el-row :gutter="5"> 605 <el-row :gutter="5">
606 <!-- 业务状态 --> 606 <!-- 业务状态 -->
607 - <el-col :span="3"> 607 + <!-- <el-col :span="3">
608 <Formitem label="回执状态" prop="returnStatus"> 608 <Formitem label="回执状态" prop="returnStatus">
609 <el-select 609 <el-select
610 type="text" 610 type="text"
...@@ -621,10 +621,28 @@ ...@@ -621,10 +621,28 @@
621 ></el-option> 621 ></el-option>
622 </el-select> 622 </el-select>
623 </Formitem> 623 </Formitem>
624 + </el-col> -->
625 + <el-col :span="3">
626 + <Formitem label="报送状态" prop="appStatus">
627 + <el-select
628 + type="text"
629 + id="inputInner--appStatus"
630 + v-model="formData.appStatus"
631 + clearable
632 + placeholder=""
633 + >
634 + <el-option
635 + v-for="(item, index) in $store.getters.dict.APP_STATUS"
636 + :key="index"
637 + :label="item.itemChineseName"
638 + :value="item.itemValue"
639 + ></el-option>
640 + </el-select>
641 + </Formitem>
624 </el-col> 642 </el-col>
625 <!-- 申报类型 --> 643 <!-- 申报类型 -->
626 <el-col :span="3"> 644 <el-col :span="3">
627 - <Formitem label="申报类型" prop="appType"> 645 + <Formitem label="报送类型" prop="appType">
628 <el-select 646 <el-select
629 type="text" 647 type="text"
630 id="inputInner--appType" 648 id="inputInner--appType"
...@@ -633,7 +651,7 @@ ...@@ -633,7 +651,7 @@
633 placeholder="" 651 placeholder=""
634 > 652 >
635 <el-option 653 <el-option
636 - v-for="(item, index) in $store.getters.dict.DECLARE_STATISTICS_FLAGF" 654 + v-for="(item, index) in $store.getters.dict.DECLARE_APPTYPE"
637 :key="index" 655 :key="index"
638 :label="item.itemChineseName" 656 :label="item.itemChineseName"
639 :value="item.itemValue" 657 :value="item.itemValue"
...@@ -643,13 +661,13 @@ ...@@ -643,13 +661,13 @@
643 </el-col> 661 </el-col>
644 <!-- 申报时间 --> 662 <!-- 申报时间 -->
645 <el-col :span="3"> 663 <el-col :span="3">
646 - <Formitem label="申报时间" prop="appTime"> 664 + <Formitem label="报送时间" prop="appTimeStr">
647 <el-input 665 <el-input
648 type="text" 666 type="text"
649 class="inputShadow" 667 class="inputShadow"
650 - id="inputInner--appTime" 668 + id="inputInner--appTimeStr"
651 resize="none" 669 resize="none"
652 - v-model="formData.appTime" 670 + v-model="formData.appTimeStr"
653 clearable 671 clearable
654 placeholder="" 672 placeholder=""
655 ></el-input> 673 ></el-input>
......
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
182 align: "left", 182 align: "left",
183 }, 183 },
184 { 184 {
185 - name: "申报类型", 185 + name: "报送类型",
186 value: "appType", 186 value: "appType",
187 width: "", 187 width: "",
188 align: "left", 188 align: "left",
......
...@@ -19,24 +19,19 @@ ...@@ -19,24 +19,19 @@
19 </Formitem> 19 </Formitem>
20 </el-col> 20 </el-col>
21 <!-- 物流企业代码 --> 21 <!-- 物流企业代码 -->
22 - <el-col :span="5"> 22 +<!-- <el-col :span="5">-->
23 - <Formitem label="物流企业代码" prop="logisticsCode"> 23 +<!-- <Formitem label="物流企业代码" prop="logisticsCode">-->
24 - <el-select 24 +<!-- <el-input-->
25 - type="text" 25 +<!-- type="text"-->
26 - id="inputInner--logisticsCode" 26 +<!-- class="inputShadow"-->
27 - v-model="sreachFormData.logisticsCode" 27 +<!-- id="inputInner&#45;&#45;logisticsCode"-->
28 - clearable 28 +<!-- resize="none"-->
29 - placeholder="" 29 +<!-- v-model="sreachFormData.logisticsCode"-->
30 - > 30 +<!-- clearable-->
31 - <el-option 31 +<!-- placeholder=""-->
32 - v-for="(item, index) in $store.getters.dict.logisticsCode" 32 +<!-- ></el-input>-->
33 - :key="index" 33 +<!-- </Formitem>-->
34 - :label="item.name" 34 +<!-- </el-col>-->
35 - :value="item.code"
36 - ></el-option>
37 - </el-select>
38 - </Formitem>
39 - </el-col>
40 <!-- 回执状态 --> 35 <!-- 回执状态 -->
41 <el-col :span="5"> 36 <el-col :span="5">
42 <Formitem label="回执状态" prop="returnStatus"> 37 <Formitem label="回执状态" prop="returnStatus">
...@@ -212,7 +207,7 @@ export default { ...@@ -212,7 +207,7 @@ export default {
212 }, 207 },
213 { 208 {
214 name: "创建时间", 209 name: "创建时间",
215 - value: "createTime", 210 + value: "createTimeStr",
216 width: "", 211 width: "",
217 align: "left", 212 align: "left",
218 }, 213 },
...@@ -223,7 +218,7 @@ export default { ...@@ -223,7 +218,7 @@ export default {
223 align: "left", 218 align: "left",
224 }, 219 },
225 { 220 {
226 - name: "申报类型", 221 + name: "报送类型",
227 value: "appType", 222 value: "appType",
228 width: "", 223 width: "",
229 align: "left", 224 align: "left",
......
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
191 </Formitem> 191 </Formitem>
192 </el-col> 192 </el-col>
193 <!-- 回执状态 --> 193 <!-- 回执状态 -->
194 - <el-col :span="3"> 194 + <!-- <el-col :span="3">
195 <Formitem label="回执状态" prop="returnStatus"> 195 <Formitem label="回执状态" prop="returnStatus">
196 <el-select 196 <el-select
197 type="text" 197 type="text"
...@@ -208,9 +208,40 @@ ...@@ -208,9 +208,40 @@
208 ></el-option> 208 ></el-option>
209 </el-select> 209 </el-select>
210 </Formitem> 210 </Formitem>
211 + </el-col> -->
212 + <el-col :span="3">
213 + <Formitem label="报送时间" prop="createTimeStr">
214 + <el-input
215 + type="text"
216 + class="inputShadow"
217 + id="inputInner--createTimeStr"
218 + resize="none"
219 + v-model="formData.createTimeStr"
220 + clearable
221 + placeholder=""
222 + ></el-input>
223 + </Formitem>
224 + </el-col>
225 + <el-col :span="3">
226 + <Formitem label="报送状态" prop="appStatus">
227 + <el-select
228 + type="text"
229 + id="inputInner--appStatus"
230 + v-model="formData.appStatus"
231 + clearable
232 + placeholder=""
233 + >
234 + <el-option
235 + v-for="(item, index) in $store.getters.dict.APP_STATUS"
236 + :key="index"
237 + :label="item.itemChineseName"
238 + :value="item.itemCode"
239 + ></el-option>
240 + </el-select>
241 + </Formitem>
211 </el-col> 242 </el-col>
212 <!-- 备注 --> 243 <!-- 备注 -->
213 - <el-col :span="9"> 244 + <el-col :span="6">
214 <Formitem label="备注" prop="note"> 245 <Formitem label="备注" prop="note">
215 <el-input 246 <el-input
216 type="text" 247 type="text"
......
...@@ -148,8 +148,8 @@ ...@@ -148,8 +148,8 @@
148 ></el-input> 148 ></el-input>
149 </Formitem> 149 </Formitem>
150 </el-col> 150 </el-col>
151 - <!-- 提运单号 --> 151 + <!-- 提运单号 重复出现-->
152 - <el-col :span="3"> 152 + <!-- <el-col :span="3">
153 <Formitem label="提运单号" prop="billNo"> 153 <Formitem label="提运单号" prop="billNo">
154 <el-input 154 <el-input
155 type="text" 155 type="text"
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
161 placeholder="" 161 placeholder=""
162 ></el-input> 162 ></el-input>
163 </Formitem> 163 </Formitem>
164 - </el-col> 164 + </el-col> -->
165 <!-- 境内运输工具编号 --> 165 <!-- 境内运输工具编号 -->
166 <el-col :span="3"> 166 <el-col :span="3">
167 <Formitem label="境内运输工具编号" prop="domesticTrafNo"> 167 <Formitem label="境内运输工具编号" prop="domesticTrafNo">
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
191 </Formitem> 191 </Formitem>
192 </el-col> 192 </el-col>
193 <!-- 物流企业名称 --> 193 <!-- 物流企业名称 -->
194 - <el-col :span="6"> 194 + <el-col :span="9">
195 <Formitem label="物流企业名称" prop="logisticsName"> 195 <Formitem label="物流企业名称" prop="logisticsName">
196 <el-input 196 <el-input
197 type="text" 197 type="text"
...@@ -236,16 +236,16 @@ ...@@ -236,16 +236,16 @@
236 </el-col> 236 </el-col>
237 <!-- 业务状态 --> 237 <!-- 业务状态 -->
238 <el-col :span="3"> 238 <el-col :span="3">
239 - <Formitem label="业务状态" prop="returnStatus"> 239 + <Formitem label="报送状态" prop="appStatus">
240 <el-select 240 <el-select
241 type="text" 241 type="text"
242 - id="inputInner--returnStatus" 242 + id="inputInner--appStatus"
243 - v-model="formData.returnStatus" 243 + v-model="formData.appStatus"
244 clearable 244 clearable
245 placeholder="" 245 placeholder=""
246 > 246 >
247 <el-option 247 <el-option
248 - v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS" 248 + v-for="(item, index) in $store.getters.dict.APP_STATUS"
249 :key="index" 249 :key="index"
250 :label="item.itemChineseName" 250 :label="item.itemChineseName"
251 :value="item.itemValue" 251 :value="item.itemValue"
...@@ -255,21 +255,26 @@ ...@@ -255,21 +255,26 @@
255 </el-col> 255 </el-col>
256 <!-- 申报类型 --> 256 <!-- 申报类型 -->
257 <el-col :span="3"> 257 <el-col :span="3">
258 - <Formitem label="申报类型" prop="appTypeStr"> 258 + <Formitem label="报送类型" prop="appType">
259 - <el-input 259 + <el-select
260 type="text" 260 type="text"
261 - class="inputShadow" 261 + id="inputInner--appType"
262 - id="inputInner--appTypeStr" 262 + v-model="formData.appType"
263 - resize="none"
264 - v-model="formData.appTypeStr"
265 clearable 263 clearable
266 placeholder="" 264 placeholder=""
267 - ></el-input> 265 + >
266 + <el-option
267 + v-for="(item, index) in $store.getters.dict.DECLARE_APPTYPE"
268 + :key="index"
269 + :label="item.itemChineseName"
270 + :value="item.itemValue"
271 + ></el-option>
272 + </el-select>
268 </Formitem> 273 </Formitem>
269 </el-col> 274 </el-col>
270 <!-- 申报日期 --> 275 <!-- 申报日期 -->
271 <el-col :span="3"> 276 <el-col :span="3">
272 - <Formitem label="申报日期" prop="appTime"> 277 + <Formitem label="报送日期" prop="appTime">
273 <el-input 278 <el-input
274 type="text" 279 type="text"
275 class="inputShadow" 280 class="inputShadow"
......
...@@ -212,7 +212,7 @@ export default { ...@@ -212,7 +212,7 @@ export default {
212 align: "left", 212 align: "left",
213 }, 213 },
214 { 214 {
215 - name: "申报类型", 215 + name: "报送类型",
216 value: "appType", 216 value: "appType",
217 width: "", 217 width: "",
218 align: "left", 218 align: "left",
......
...@@ -45,16 +45,16 @@ ...@@ -45,16 +45,16 @@
45 </el-col> 45 </el-col>
46 <!-- 业务状态 --> 46 <!-- 业务状态 -->
47 <el-col :span="3"> 47 <el-col :span="3">
48 - <Formitem label="业务状态" prop="returnStatus"> 48 + <Formitem label="报送状态" prop="appStatus">
49 <el-select 49 <el-select
50 type="text" 50 type="text"
51 - id="inputInner--returnStatus" 51 + id="inputInner--appStatus"
52 - v-model="formData.returnStatus" 52 + v-model="formData.appStatus"
53 clearable 53 clearable
54 placeholder="" 54 placeholder=""
55 > 55 >
56 <el-option 56 <el-option
57 - v-for="(item, index) in $store.getters.dict.RECEIPT_STATUS" 57 + v-for="(item, index) in $store.getters.dict.APP_STATUS"
58 :key="index" 58 :key="index"
59 :label="item.itemChineseName" 59 :label="item.itemChineseName"
60 :value="item.itemValue" 60 :value="item.itemValue"
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
168 </Formitem> 168 </Formitem>
169 </el-col> 169 </el-col>
170 <!-- 申报日期 --> 170 <!-- 申报日期 -->
171 - <el-col :span="3"> 171 + <!-- <el-col :span="3">
172 <Formitem label="申报日期" prop="createTimeStr"> 172 <Formitem label="申报日期" prop="createTimeStr">
173 <el-input 173 <el-input
174 type="text" 174 type="text"
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
180 placeholder="" 180 placeholder=""
181 ></el-input> 181 ></el-input>
182 </Formitem> 182 </Formitem>
183 - </el-col> 183 + </el-col> -->
184 <!-- 备注 --> 184 <!-- 备注 -->
185 <el-col :span="9"> 185 <el-col :span="9">
186 <Formitem label="备注" prop="note"> 186 <Formitem label="备注" prop="note">
......
...@@ -244,7 +244,7 @@ export default { ...@@ -244,7 +244,7 @@ export default {
244 align: "left", 244 align: "left",
245 }, 245 },
246 { 246 {
247 - name: "申报日期", 247 + name: "报送日期",
248 value: "appTime", 248 value: "appTime",
249 width: "", 249 width: "",
250 align: "left", 250 align: "left",
......