Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
jiaxing.zhou
238c6e50 2 parents 14876694 4a077082

Merge remote-tracking branch 'origin/dev-jiaxing.zhou'

Inline Side-by-side
Showing 2 changed files with 56 additions and 55 deletions
...@@ -9,47 +9,61 @@ ...@@ -9,47 +9,61 @@
9 > 9 >
10 <el-row class="row-border"> 10 <el-row class="row-border">
11 <!-- 提运单号 --> 11 <!-- 提运单号 -->
12 +<!-- <el-col :span="5">-->
13 +<!-- <Formitem label="提运单号" prop="billNo">-->
14 +<!-- <el-input-->
15 +<!-- type="text"-->
16 +<!-- class="inputShadow"-->
17 +<!-- id="inputInner&#45;&#45;billNo"-->
18 +<!-- resize="none"-->
19 +<!-- v-model="sreachFormData.billNo"-->
20 +<!-- clearable-->
21 +<!-- placeholder=""-->
22 +<!-- ></el-input>-->
23 +<!--&lt;!&ndash; <FormTextareaInput&ndash;&gt;-->
24 +<!--&lt;!&ndash; :formData="sreachFormData"&ndash;&gt;-->
25 +<!--&lt;!&ndash; dataKey="billNo"&ndash;&gt;-->
26 +<!--&lt;!&ndash; @formChange="formChange"&ndash;&gt;-->
27 +<!--&lt;!&ndash; />&ndash;&gt;-->
28 +<!-- </Formitem>-->
29 +<!-- </el-col>-->
30 + <!-- 预录入编号 -->
12 <el-col :span="5"> 31 <el-col :span="5">
13 - <Formitem label="提运单号" prop="billNo"> 32 + <Formitem label="预录入编号" prop="preNo">
14 <el-input 33 <el-input
15 type="text" 34 type="text"
16 class="inputShadow" 35 class="inputShadow"
17 - id="inputInner--billNo" 36 + id="inputInner--preNo"
18 resize="none" 37 resize="none"
19 - v-model="sreachFormData.billNo" 38 + v-model="sreachFormData.preNo"
20 clearable 39 clearable
21 placeholder="" 40 placeholder=""
22 ></el-input> 41 ></el-input>
23 -<!-- <FormTextareaInput-->
24 -<!-- :formData="sreachFormData"-->
25 -<!-- dataKey="billNo"-->
26 -<!-- @formChange="formChange"-->
27 -<!-- />-->
28 </Formitem> 42 </Formitem>
29 </el-col> 43 </el-col>
30 - <!-- 预录入编号 --> 44 + <!-- 电商企业代码 -->
31 <el-col :span="5"> 45 <el-col :span="5">
32 - <Formitem label="预录入编号" prop="preNo"> 46 + <Formitem label="电商企业代码" prop="agentCode">
33 <el-input 47 <el-input
34 type="text" 48 type="text"
35 class="inputShadow" 49 class="inputShadow"
36 - id="inputInner--preNo" 50 + id="inputInner--agentCode"
37 resize="none" 51 resize="none"
38 - v-model="sreachFormData.preNo" 52 + v-model="sreachFormData.agentCode"
39 clearable 53 clearable
40 placeholder="" 54 placeholder=""
41 ></el-input> 55 ></el-input>
42 </Formitem> 56 </Formitem>
43 </el-col> 57 </el-col>
44 - <!-- 电商企业代码 --> 58 + <!-- 汇总申请编号 -->
45 <el-col :span="5"> 59 <el-col :span="5">
46 - <Formitem label="电商企业代码" prop="agentCode"> 60 + <Formitem label="汇总申请编号" prop="sumNo">
47 <el-input 61 <el-input
48 type="text" 62 type="text"
49 class="inputShadow" 63 class="inputShadow"
50 - id="inputInner--agentCode" 64 + id="inputInner--sumNo"
51 resize="none" 65 resize="none"
52 - v-model="sreachFormData.agentCode" 66 + v-model="sreachFormData.sumNo"
53 clearable 67 clearable
54 placeholder="" 68 placeholder=""
55 ></el-input> 69 ></el-input>
...@@ -96,20 +110,6 @@ ...@@ -96,20 +110,6 @@
96 </el-button> 110 </el-button>
97 </el-form-item> 111 </el-form-item>
98 </el-col> 112 </el-col>
99 - <!-- 汇总申请编号 -->
100 - <el-col :span="5">
101 - <Formitem label="汇总申请编号" prop="sumNo">
102 - <el-input
103 - type="text"
104 - class="inputShadow"
105 - id="inputInner--sumNo"
106 - resize="none"
107 - v-model="sreachFormData.sumNo"
108 - clearable
109 - placeholder=""
110 - ></el-input>
111 - </Formitem>
112 - </el-col>
113 <!-- 报关企业代码 --> 113 <!-- 报关企业代码 -->
114 <el-col :span="5"> 114 <el-col :span="5">
115 <Formitem label="报关企业代码" prop="declagAgentCode"> 115 <Formitem label="报关企业代码" prop="declagAgentCode">
...@@ -228,10 +228,12 @@ ...@@ -228,10 +228,12 @@
228 </div> 228 </div>
229 </TablePopover> 229 </TablePopover>
230 </template> 230 </template>
231 - <template v-slot:preNo="scope"> 231 + <template slot="optionColumn">
232 - <el-button type="text" @click="view(scope.row)">{{ 232 + <el-table-column align="center" label="操作" width="150">
233 - scope.row.preNo 233 + <template slot-scope="scope">
234 - }}</el-button> 234 + <el-button type="text" @click="view(scope.row)"> 详情 </el-button>
235 + </template>
236 + </el-table-column>
235 </template> 237 </template>
236 </Table> 238 </Table>
237 </div> 239 </div>
...@@ -278,14 +280,13 @@ export default { ...@@ -278,14 +280,13 @@ export default {
278 value: "preNo", 280 value: "preNo",
279 width: "", 281 width: "",
280 align: "left", 282 align: "left",
281 - slot: true,
282 - },
283 - {
284 - name: "提运单号",
285 - value: "billNo",
286 - width: "",
287 - align: "left",
288 }, 283 },
284 + // {
285 + // name: "提运单号",
286 + // value: "billNo",
287 + // width: "",
288 + // align: "left",
289 + // },
289 { 290 {
290 name: "汇总申请单编号", 291 name: "汇总申请单编号",
291 value: "sumNo", 292 value: "sumNo",
......
...@@ -16,19 +16,19 @@ ...@@ -16,19 +16,19 @@
16 > 16 >
17 <el-row :gutter="5"> 17 <el-row :gutter="5">
18 <!-- 提运单号 --> 18 <!-- 提运单号 -->
19 - <el-col :span="3"> 19 +<!-- <el-col :span="3">-->
20 - <Formitem label="提运单号" prop="billNo"> 20 +<!-- <Formitem label="提运单号" prop="billNo">-->
21 - <el-input 21 +<!-- <el-input-->
22 - type="text" 22 +<!-- type="text"-->
23 - class="inputShadow" 23 +<!-- class="inputShadow"-->
24 - id="inputInner--billNo" 24 +<!-- id="inputInner&#45;&#45;billNo"-->
25 - resize="none" 25 +<!-- resize="none"-->
26 - v-model="formData.billNo" 26 +<!-- v-model="formData.billNo"-->
27 - clearable 27 +<!-- clearable-->
28 - placeholder="" 28 +<!-- placeholder=""-->
29 - ></el-input> 29 +<!-- ></el-input>-->
30 - </Formitem> 30 +<!-- </Formitem>-->
31 - </el-col> 31 +<!-- </el-col>-->
32 <!-- 电子口岸编号 --> 32 <!-- 电子口岸编号 -->
33 <el-col :span="3"> 33 <el-col :span="3">
34 <Formitem label="电子口岸编号" prop="preNo"> 34 <Formitem label="电子口岸编号" prop="preNo">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 </Formitem> 104 </Formitem>
105 </el-col> 105 </el-col>
106 <!-- 报关单位名称 --> 106 <!-- 报关单位名称 -->
107 - <el-col :span="9"> 107 + <el-col :span="12">
108 <Formitem label="报关单位名称" prop="declAgentName"> 108 <Formitem label="报关单位名称" prop="declAgentName">
109 <el-input 109 <el-input
110 type="text" 110 type="text"
......