|
@@ -6,6 +6,7 @@
|
|
|
:inline="true"
|
|
|
v-show="showSearch"
|
|
|
label-width="68px"
|
|
|
+ style="margin-top: 8px"
|
|
|
>
|
|
|
<!-- <el-form-item label="客户" prop="fCorpid">-->
|
|
|
<!-- <el-select-->
|
|
@@ -155,33 +156,32 @@
|
|
|
>搜索</el-button>
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
</el-form-item>
|
|
|
- </el-form>
|
|
|
-
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
- <div class="tabSetting">
|
|
|
-<!-- <el-col :span="1.5">-->
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- type="warning"-->
|
|
|
-<!-- icon="el-icon-download"-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- @click="handleExport"-->
|
|
|
-<!-- >导出</el-button-->
|
|
|
-<!-- >-->
|
|
|
-<!-- </el-col>-->
|
|
|
- <right-toolbar
|
|
|
- :showSearch.sync="showSearch"
|
|
|
- @queryTable="getList"
|
|
|
- ></right-toolbar>
|
|
|
- <div style="margin: 0 12px">
|
|
|
- <el-button
|
|
|
- icon="el-icon-setting"
|
|
|
- size="mini"
|
|
|
- circle
|
|
|
- @click="showSetting = !showSetting"
|
|
|
- ></el-button>
|
|
|
+ <el-form-item>
|
|
|
+ <div class="tabSetting">
|
|
|
+ <!-- <el-col :span="1.5">-->
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- type="warning"-->
|
|
|
+ <!-- icon="el-icon-download"-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- @click="handleExport"-->
|
|
|
+ <!-- >导出</el-button-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- </el-col>-->
|
|
|
+ <right-toolbar
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
+ @queryTable="getList"
|
|
|
+ ></right-toolbar>
|
|
|
+ <div style="margin: 0 12px">
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-setting"
|
|
|
+ size="mini"
|
|
|
+ circle
|
|
|
+ @click="showSetting = !showSetting"
|
|
|
+ ></el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </el-row>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
<el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" append-to-body>
|
|
|
<div>配置排序列数据(拖动调整顺序)</div>
|
|
|
<div style="margin-left: 17px">
|
|
@@ -242,6 +242,7 @@
|
|
|
ref="table"
|
|
|
:height="tableHeight"
|
|
|
:header-cell-style="{background: '#2A328E',color: '#fff'}"
|
|
|
+ style="margin-top: -12px"
|
|
|
>
|
|
|
<el-table-column
|
|
|
type="index"
|
|
@@ -527,7 +528,20 @@ export default {
|
|
|
checked: 0,
|
|
|
width: 100,
|
|
|
},
|
|
|
-
|
|
|
+ {
|
|
|
+ surface: "9",
|
|
|
+ label: "fBusinessTypes",
|
|
|
+ name: "产地",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ surface: "10",
|
|
|
+ label: "fMarks",
|
|
|
+ name: "品质",
|
|
|
+ checked: 0,
|
|
|
+ width: 100,
|
|
|
+ },
|
|
|
// {
|
|
|
// surface: "9",
|
|
|
// label: "fTrademodeid",
|
|
@@ -940,9 +954,10 @@ export default {
|
|
|
this.loading = true;
|
|
|
this.queryParams.fTel = Cookies.get("phone")
|
|
|
this.queryParams.fTel = decrypt(this.queryParams.fTel)
|
|
|
- console.log(this.queryParams.fTel)
|
|
|
+ this.queryParams.fTel = String(this.queryParams.fTel)
|
|
|
+ // delete this.queryParams.fTel
|
|
|
request({
|
|
|
- url: '/warehouseBusiness/whgenleg/websiteWhGenLegList',
|
|
|
+ url: '/warehouseBusiness/whgenleg/whgenlegList',
|
|
|
method: 'get',
|
|
|
params: this.queryParams
|
|
|
}).then((response) => {
|
|
@@ -1139,4 +1154,7 @@ export default {
|
|
|
/deep/ .el-table__fixed-footer-wrapper {
|
|
|
background-color: #2A328E;
|
|
|
}
|
|
|
+::v-deep .el-form-item {
|
|
|
+ margin-bottom: 10px;
|
|
|
+}
|
|
|
</style>
|