Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
06a93630 2 parents 9dd3e040 243f0c3e

Merge branch 'release-v1.0.9.1' into release-v1.0.9

Inline Side-by-side
Showing 2 changed files with 47 additions and 18 deletions
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 <!-- 1.0.9 --> 72 <!-- 1.0.9 -->
73 <!-- 电商平台代码:、电商平台名称:、收发货人代码:、收发货人名称:、生产销售企业代码:、生产销售企业名称: --> 73 <!-- 电商平台代码:、电商平台名称:、收发货人代码:、收发货人名称:、生产销售企业代码:、生产销售企业名称: -->
74 <!-- 证书到期时间: --> 74 <!-- 证书到期时间: -->
75 - <el-row :gutter="5"> 75 + <el-row :gutter="5" v-if="0">
76 <el-col :span="8"> 76 <el-col :span="8">
77 <Formitem label="电商平台代码" prop="ebpcode" type="edit"> 77 <Formitem label="电商平台代码" prop="ebpcode" type="edit">
78 <el-input 78 <el-input
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 </Formitem> 117 </Formitem>
118 </el-col> 118 </el-col>
119 </el-row> 119 </el-row>
120 - <el-row :gutter="5"> 120 + <el-row :gutter="5" v-if="0">
121 <el-col :span="8"> 121 <el-col :span="8">
122 <Formitem 122 <Formitem
123 label="收发货人名称" 123 label="收发货人名称"
...@@ -223,7 +223,10 @@ ...@@ -223,7 +223,10 @@
223 <div class="dlTitle">青岛</div> 223 <div class="dlTitle">青岛</div>
224 <el-row :gutter="5"> 224 <el-row :gutter="5">
225 <!-- 公服DXPID --> 225 <!-- 公服DXPID -->
226 - <el-col :span="8"> 226 + <el-col
227 + :span="8"
228 + v-if="portConfig.TAO.orderDeclareChannel != 'SHANDONG_SINGLE'"
229 + >
227 <Formitem label="公服DXPID" prop="qingdaoUserDxpid" type="edit"> 230 <Formitem label="公服DXPID" prop="qingdaoUserDxpid" type="edit">
228 <el-input 231 <el-input
229 type="text" 232 type="text"
...@@ -237,7 +240,10 @@ ...@@ -237,7 +240,10 @@
237 </Formitem> 240 </Formitem>
238 </el-col> 241 </el-col>
239 <!-- User ID --> 242 <!-- User ID -->
240 - <el-col :span="8"> 243 + <el-col
244 + :span="8"
245 + v-if="portConfig.TAO.orderDeclareChannel != 'SHANDONG_SINGLE'"
246 + >
241 <Formitem label="User ID" prop="qingdaoUserId" type="edit"> 247 <Formitem label="User ID" prop="qingdaoUserId" type="edit">
242 <el-input 248 <el-input
243 type="text" 249 type="text"
...@@ -251,7 +257,10 @@ ...@@ -251,7 +257,10 @@
251 </Formitem> 257 </Formitem>
252 </el-col> 258 </el-col>
253 <!-- Key --> 259 <!-- Key -->
254 - <el-col :span="8"> 260 + <el-col
261 + :span="8"
262 + v-if="portConfig.TAO.orderDeclareChannel != 'SHANDONG_SINGLE'"
263 + >
255 <Formitem label="Key" prop="qingdaoKey" type="edit"> 264 <Formitem label="Key" prop="qingdaoKey" type="edit">
256 <el-input 265 <el-input
257 type="text" 266 type="text"
...@@ -265,7 +274,12 @@ ...@@ -265,7 +274,12 @@
265 </Formitem> 274 </Formitem>
266 </el-col> 275 </el-col>
267 <!-- </div>--> 276 <!-- </div>-->
268 - <el-col :span="8"> 277 + <el-col
278 + :span="8"
279 + v-if="
280 + portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
281 + "
282 + >
269 <Formitem 283 <Formitem
270 label="山电DXPID" 284 label="山电DXPID"
271 prop="qingdaoDanyiUserDxpid" 285 prop="qingdaoDanyiUserDxpid"
...@@ -282,7 +296,12 @@ ...@@ -282,7 +296,12 @@
282 ></el-input> 296 ></el-input>
283 </Formitem> 297 </Formitem>
284 </el-col> 298 </el-col>
285 - <el-col :span="8"> 299 + <el-col
300 + :span="8"
301 + v-if="
302 + portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
303 + "
304 + >
286 <Formitem label="山电用户名" prop="qingdaoUserName" type="edit"> 305 <Formitem label="山电用户名" prop="qingdaoUserName" type="edit">
287 <el-input 306 <el-input
288 type="text" 307 type="text"
...@@ -295,7 +314,12 @@ ...@@ -295,7 +314,12 @@
295 ></el-input> 314 ></el-input>
296 </Formitem> 315 </Formitem>
297 </el-col> 316 </el-col>
298 - <el-col :span="8"> 317 + <el-col
318 + :span="8"
319 + v-if="
320 + portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
321 + "
322 + >
299 <Formitem 323 <Formitem
300 label="山电用户密码" 324 label="山电用户密码"
301 prop="qingdaoUserPassword" 325 prop="qingdaoUserPassword"
...@@ -359,7 +383,13 @@ ...@@ -359,7 +383,13 @@
359 </Formitem> 383 </Formitem>
360 </el-col> 384 </el-col>
361 385
362 - <el-col :span="16" style="padding-right: 5px"> 386 + <el-col
387 + :span="16"
388 + style="padding-right: 5px"
389 + v-if="
390 + portConfig.TAO.orderDeclareChannel != 'QINGDAO_PUBLIC_SERVER'
391 + "
392 + >
363 <div class="uploadItem"> 393 <div class="uploadItem">
364 <div class="uploadbox"> 394 <div class="uploadbox">
365 <el-button 395 <el-button
......
...@@ -458,7 +458,6 @@ import { ...@@ -458,7 +458,6 @@ import {
458 arrivalInReceipt, 458 arrivalInReceipt,
459 exportDeclareData, 459 exportDeclareData,
460 } from "@/api/declareData-api.js"; 460 } from "@/api/declareData-api.js";
461 -import { getDictData } from "@/api/system/dict-api.js";
462 import DialogVue from "./dialog.vue"; 461 import DialogVue from "./dialog.vue";
463 import RevokeDialog from "./revokeDialog.vue"; 462 import RevokeDialog from "./revokeDialog.vue";
464 import TemplateDownloadDialog from "./templateDownloadDialog.vue"; 463 import TemplateDownloadDialog from "./templateDownloadDialog.vue";
...@@ -562,14 +561,14 @@ export default { ...@@ -562,14 +561,14 @@ export default {
562 align: "left", 561 align: "left",
563 slot: true, 562 slot: true,
564 }, 563 },
565 - { 564 + // {
566 - // release-v1.0.9 565 + // // release-v1.0.9
567 - name: "运抵单回执", 566 + // name: "运抵单回执",
568 - value: "arrivalInReceiptStatus", 567 + // value: "arrivalInReceiptStatus",
569 - width: "", 568 + // width: "",
570 - align: "left", 569 + // align: "left",
571 - slot: true, 570 + // slot: true,
572 - }, 571 + // },
573 { 572 {
574 name: "离境单回执", 573 name: "离境单回执",
575 value: "logisticsReceiptStatus", 574 value: "logisticsReceiptStatus",
......