From d5c935fbaf14f3c0632a03a73536b127742717ca Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 22 九月 2023 13:22:02 +0800
Subject: [PATCH] style: 采购订单模块样式调整
---
src/views/productManage/product/index.vue | 28 ++++----
src/views/purchaseManage/index.vue | 3
src/views/purchaseManage/purchase/index.vue | 140 ++++++++++++++++++++++++----------------------
src/components/makepager/CommonSearch.vue | 2
4 files changed, 90 insertions(+), 83 deletions(-)
diff --git a/src/components/makepager/CommonSearch.vue b/src/components/makepager/CommonSearch.vue
index 5850cc3..d8502d3 100644
--- a/src/components/makepager/CommonSearch.vue
+++ b/src/components/makepager/CommonSearch.vue
@@ -341,7 +341,7 @@
::v-deep {
.el-input__inner {
height: 30px;
- color: #2765e1;
+ //color: #2765e1;
}
.el-input__prefix,
.el-input__suffix {
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index d6a3029..ac53129 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -91,7 +91,7 @@
tableColumn: [
{ label: "浜у搧缂栫爜", prop: "number", min: 190, isCommonClick: true },
{ label: "浜у搧鍚嶇О", prop: "name", min: 130 },
- { label: "渚涘簲鍟�", prop: "supplierNumber", min: 130 },
+ { label: "渚涘簲鍟�", prop: "supplierName", min: 130 },
{ label: "浜у搧绫诲埆", prop: "productType", min: 130 },
{ label: "瑙勬牸", prop: "specifications", min: 130 },
{ label: "鍨嬪彿", prop: "modelNumber", min: 130 },
@@ -109,9 +109,9 @@
}
},
// 璇锋眰鏁版嵁
- async getData(val, content) {
+ async getData() {
await getProductList({
- [val]: content,
+ keyword: this.searchText,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -128,22 +128,20 @@
})
},
// 鎼滅储
- searchClick(val, content) {
- console.log(val, content)
- this.getData(val.value, content)
- },
+ // searchClick(val, content) {
+ // console.log(val, content)
+ // this.getData(val.value, content)
+ // },
onFilterSearch(val){
this.searchText = val ?? ''
- console.log(this.searchText)
-
- // TODO: 闇�瑕佹帴鍙ｆ敮鎸�
- throw new Error("鍔熻兘鏈疄鐜�")
- },
-
- resetClick() {
+ this.pagerOptions.currPage = 1
this.getData()
},
+
+ // resetClick() {
+ // this.getData()
+ // },
// 鏂板缓
addBtnClick() {
this.editConfig.visible = true
@@ -199,6 +197,8 @@
height: 80px;
display: flex;
align-items: center;
+ box-sizing: border-box;
+ padding: 10px 20px;
flex: 1;
border-radius: 12px;
background-color: #fff;
diff --git a/src/views/purchaseManage/index.vue b/src/views/purchaseManage/index.vue
index adc8766..33670c0 100644
--- a/src/views/purchaseManage/index.vue
+++ b/src/views/purchaseManage/index.vue
@@ -15,7 +15,6 @@
<style lang="scss" scoped>
.content {
width: 100%;
- background-color: #fff;
- height: calc(100vh - 70px);
+ height: calc(100vh - 50px);
}
</style>
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index 9154e05..8625999 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -1,46 +1,51 @@
<template>
- <div class="rightContent">
- <div class="content-box" v-loading="tableLoading">
- <div class="supplier-search">
- <SearchCommonView
- ref="searchCommonView"
- :inputSelect="false"
- placeholder="鍙緭鍏ヤ緵搴斿晢,鐗╂枡,閲囪喘鍗曠瓑鎼滅储"
- @searchClick="searchClick"
- @resetClick="resetClick"
+ <div class="purchase" v-loading="tableLoading">
+ <div class="filter">
+ <div class="filter-card">
+ <CommonSearch
+ :show-add="true"
+ add-title="鏂板缓"
+ @addCommonClick="addBtnClick"
+ :show-download="false"
+ :amount-view="false"
+ :show-action-btn="false"
+ :placeholder="'璇疯緭鍏ヤ緵搴斿晢/鐗╂枡/閲囪喘鍗曠瓑'"
+ @searchClick="onFilterSearch"
/>
- <div class="add-view">
- <el-button type="primary" size="mini" @click="addBtnClick">鏂板缓</el-button>
- </div>
</div>
- <template>
- <TableCommonView
- class="content-table"
- ref="tableListRef"
- :table-list="tableList"
- @selCommonClick="selCommonClick"
- >
- <template slot="tableButton">
- <el-table-column label="鐘舵��" width="120">
- <template slot-scope="scope">
- {{ getpurchaseStatus(scope.row.status) }}
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" width="120" fixed="right">
- <template slot-scope="scope">
- <el-button type="text" size="small" @click="editClick(scope.row)" style="margin-right: 5px"
+ </div>
+
+ <div class="body">
+ <div class="body-card">
+ <div class="list-view">
+ <TableCommonView
+ ref="tableListRef"
+ :table-list="tableList"
+ @selCommonClick="selCommonClick"
+ >
+ <template slot="tableButton">
+ <el-table-column label="鐘舵��" width="120">
+ <template slot-scope="scope">
+ {{ getpurchaseStatus(scope.row.status) }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" width="120" fixed="right">
+ <template slot-scope="scope">
+ <el-button type="text" size="small" @click="editClick(scope.row)" style="margin-right: 5px"
>缂栬緫</el-button
- >
- <el-button @click="submitClick(scope.row)" type="text" size="small">鎻愪氦</el-button>
- </template>
- </el-table-column>
- </template>
- </TableCommonView>
+ >
+ <el-button @click="submitClick(scope.row)" type="text" size="small">鎻愪氦</el-button>
+ </template>
+ </el-table-column>
+ </template>
+ </TableCommonView>
+ </div>
<div class="btn-pager">
<PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
</div>
- </template>
+ </div>
</div>
+
<!-- 鏂板缓/缂栬緫閿�鍞嚎绱� -->
<!-- <AddSalesLeadDialog v-if="editSalesLeadConfig.visible" :edit-rightContent-config="editSalesLeadConfig" /> -->
@@ -142,6 +147,10 @@
this.search = ""
this.getData()
},
+ onFilterSearch(searchText){
+ this.search = searchText
+ this.getData()
+ },
// 鏂板缓
addBtnClick() {
// this.editRow = {};
@@ -238,41 +247,40 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
-.rightContent {
- width: 100%;
- height: calc(100% - 10px);
- .content-box {
- height: 100%;
- .supplier-search {
+.purchase{
+ height: 100%;
+ overflow: hidden;
+ background-color: transparent;
+ .filter{
+ height: 80px;
+ display: flex;
+ align-items: center;
+ padding: 12px 20px 0 20px;
+ &-card{
+ height: 80px;
display: flex;
align-items: center;
- .add-view {
- margin-left: auto;
- margin-right: 20px;
- }
- }
- .content-table {
- // height:calc(100% - 60px - 42px);
- }
- .btn-pager {
- display: flex;
- // background: #fff;
- .page {
- margin-left: auto;
- }
+ box-sizing: border-box;
+ padding: 10px 20px;
+ flex: 1;
+ border-radius: 12px;
+ background-color: #fff;
}
}
- .bottom {
- .product-search {
- display: flex;
- align-items: center;
- .search {
- margin-left: auto;
- }
- .add-view {
- margin-left: 20px;
- margin-right: 20px;
- }
+ .body{
+ box-sizing: border-box;
+ padding: 10px 20px;
+ border-radius: 12px;
+ height: calc(100% - 92px);
+ &-card {
+ background-color: #fff;
+ border-radius: 12px;
+ height: 100%;
+ overflow: hidden;
+ }
+ .list-view {
+ height: calc(100% - 60px);
+ overflow: hidden;
}
.btn-pager {
display: flex;
--
Gitblit v1.8.0