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 @@
>
<el-row class="row-border">
<!-- 提运单号 -->
<!-- <el-col :span="5">-->
<!-- <Formitem label="提运单号" prop="billNo">-->
<!-- <el-input-->
<!-- type="text"-->
<!-- class="inputShadow"-->
<!-- id="inputInner&#45;&#45;billNo"-->
<!-- resize="none"-->
<!-- v-model="sreachFormData.billNo"-->
<!-- clearable-->
<!-- placeholder=""-->
<!-- ></el-input>-->
<!--&lt;!&ndash; <FormTextareaInput&ndash;&gt;-->
<!--&lt;!&ndash; :formData="sreachFormData"&ndash;&gt;-->
<!--&lt;!&ndash; dataKey="billNo"&ndash;&gt;-->
<!--&lt;!&ndash; @formChange="formChange"&ndash;&gt;-->
<!--&lt;!&ndash; />&ndash;&gt;-->
<!-- </Formitem>-->
<!-- </el-col>-->
<!-- 预录入编号 -->
<el-col :span="5">
<Formitem label="提运单号" prop="billNo">
<Formitem label="预录入编号" prop="preNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
id="inputInner--preNo"
resize="none"
v-model="sreachFormData.billNo"
v-model="sreachFormData.preNo"
clearable
placeholder=""
></el-input>
<!-- <FormTextareaInput-->
<!-- :formData="sreachFormData"-->
<!-- dataKey="billNo"-->
<!-- @formChange="formChange"-->
<!-- />-->
</Formitem>
</el-col>
<!-- 预录入编号 -->
<!-- 电商企业代码 -->
<el-col :span="5">
<Formitem label="预录入编号" prop="preNo">
<Formitem label="电商企业代码" prop="agentCode">
<el-input
type="text"
class="inputShadow"
id="inputInner--preNo"
id="inputInner--agentCode"
resize="none"
v-model="sreachFormData.preNo"
v-model="sreachFormData.agentCode"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 电商企业代码 -->
<!-- 汇总申请编号 -->
<el-col :span="5">
<Formitem label="电商企业代码" prop="agentCode">
<Formitem label="汇总申请编号" prop="sumNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--agentCode"
id="inputInner--sumNo"
resize="none"
v-model="sreachFormData.agentCode"
v-model="sreachFormData.sumNo"
clearable
placeholder=""
></el-input>
......@@ -96,20 +110,6 @@
</el-button>
</el-form-item>
</el-col>
<!-- 汇总申请编号 -->
<el-col :span="5">
<Formitem label="汇总申请编号" prop="sumNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--sumNo"
resize="none"
v-model="sreachFormData.sumNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- 报关企业代码 -->
<el-col :span="5">
<Formitem label="报关企业代码" prop="declagAgentCode">
......@@ -228,10 +228,12 @@
</div>
</TablePopover>
</template>
<template v-slot:preNo="scope">
<el-button type="text" @click="view(scope.row)">{{
scope.row.preNo
}}</el-button>
<template slot="optionColumn">
<el-table-column align="center" label="操作" width="150">
<template slot-scope="scope">
<el-button type="text" @click="view(scope.row)"> 详情 </el-button>
</template>
</el-table-column>
</template>
</Table>
</div>
......@@ -278,14 +280,13 @@ export default {
value: "preNo",
width: "",
align: "left",
slot: true,
},
{
name: "提运单号",
value: "billNo",
width: "",
align: "left",
},
// {
// name: "提运单号",
// value: "billNo",
// width: "",
// align: "left",
// },
{
name: "汇总申请单编号",
value: "sumNo",
......
......@@ -16,19 +16,19 @@
>
<el-row :gutter="5">
<!-- 提运单号 -->
<el-col :span="3">
<Formitem label="提运单号" prop="billNo">
<el-input
type="text"
class="inputShadow"
id="inputInner--billNo"
resize="none"
v-model="formData.billNo"
clearable
placeholder=""
></el-input>
</Formitem>
</el-col>
<!-- <el-col :span="3">-->
<!-- <Formitem label="提运单号" prop="billNo">-->
<!-- <el-input-->
<!-- type="text"-->
<!-- class="inputShadow"-->
<!-- id="inputInner&#45;&#45;billNo"-->
<!-- resize="none"-->
<!-- v-model="formData.billNo"-->
<!-- clearable-->
<!-- placeholder=""-->
<!-- ></el-input>-->
<!-- </Formitem>-->
<!-- </el-col>-->
<!-- 电子口岸编号 -->
<el-col :span="3">
<Formitem label="电子口岸编号" prop="preNo">
......@@ -104,7 +104,7 @@
</Formitem>
</el-col>
<!-- 报关单位名称 -->
<el-col :span="9">
<el-col :span="12">
<Formitem label="报关单位名称" prop="declAgentName">
<el-input
type="text"
......