diff --git a/mallplusui-web-admin/src/icons/svg/cross.svg b/mallplusui-web-admin/src/icons/svg/cross.svg
new file mode 100644
index 0000000..277d865
--- /dev/null
+++ b/mallplusui-web-admin/src/icons/svg/cross.svg
@@ -0,0 +1,2 @@
+
\ No newline at end of file
diff --git a/mallplusui-web-admin/src/styles/index.scss b/mallplusui-web-admin/src/styles/index.scss
index 7b1379b..ff959b1 100644
--- a/mallplusui-web-admin/src/styles/index.scss
+++ b/mallplusui-web-admin/src/styles/index.scss
@@ -55,14 +55,80 @@ a:hover {
}
.app-container {
- padding: 20px;
+ margin: 0 0 25px 0;
+ background-color: #fff;
}
//搜索栏样式
.filter-container {
}
-
+// 搜索的
+.webtop {
+ // position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000;
+ background-color: #fff;
+ display: flex !important;
+ flex-direction: row;
+ justify-content: space-between !important;
+ align-items: center;
+ margin-bottom: 0px !important;
+ font-size: 20px;
+}
+.tab-header {
+ background-color: #edf1f7;
+ padding: 10px 20px;
+}
+// 设置了页面头部的内边距和背景色
+.tab-header {
+ font-size: 20px;
+ font-weight: bold;
+}
+// 设置了搜索条件里的样式
+.search {
+ .tab-header {
+ .el-form-item {
+ margin-right: 16px;
+ .el-form-item__label {
+ font-size: 16px;
+ font-weight: 500;
+ }
+ }
+ }
+}
+.search .btn {
+ padding: 5px 0;
+ border: 1px solid #e0e3eb;
+ text-align: center;
+ margin-bottom: 5px;
+}
+.searchcon{margin: 0px 0 10px 0;}
+.searchcon .searchbtn{margin: 10px 0;border: #2cab69 1px solid;color: #2cab69;}
+// 隐藏显示按钮
+.main-content {
+ .searchcon {
+ .searchbtn {
+ margin: 5px 0;
+ border: #2cab69 1px solid;
+ color: #2cab69;
+ }
+ }}
+ // 页面上的button按钮
+ .app-container {
+ .el-button--medium {
+ padding: 10px 14px;
+ font-size: 16px;
+ }
+
+ .el-button--small {
+ padding: 8px 12px;
+ font-size: 14px;
+ }
+
+ .el-button--mini {
+ padding: 7px 10px;
+ font-size: 12px;
+ }
+ }
//操作栏样式
.operate-container {
margin-top: 20px;
diff --git a/mallplusui-web-admin/src/views/pms/product/index.vue b/mallplusui-web-admin/src/views/pms/product/index.vue
index 1a95fa1..5b324bc 100644
--- a/mallplusui-web-admin/src/views/pms/product/index.vue
+++ b/mallplusui-web-admin/src/views/pms/product/index.vue
@@ -1,6 +1,6 @@
-
+
-
+
{{ searchxianshitit }}
@@ -102,16 +102,31 @@
回收站
-
+
-
+
+
+
+
+
+
+ 确定
+
+
+
@@ -203,22 +218,7 @@
-
-
-
-
-
-
- 确定
-
-
-
+
@@ -344,7 +344,7 @@
name: "productList",
data() {
return {
- status: 0,
+ status: 0,
btndisabled: false,
isSearchShow: false,
searchxianshitit: '显示查询条件',
@@ -436,6 +436,12 @@
label: '回收站'
}],
btnList: [{
+ type: 'primary',
+ size: 'small',
+ icon: 'add',
+ btnKey: 'toAdd',
+ btnLabel: '新增'
+ }, {
type: 'info',
size: 'small',
icon: 'cross',
@@ -443,20 +449,20 @@
btnLabel: '关闭'
}],
queryParams: {
- current: 1,
- size: 10,
- total: 0,
- params: {
- orderId: '',
- supplierName: '',
- auditStatus: '',
- goodsStatus: '',
- orderStartDate: '',
- orderEndDate: '',
- arrivalStartDate: '',
- arrivalEndDate: '',
- queryType: ''
- }
+ current: 1,
+ size: 10,
+ total: 0,
+ params: {
+ orderId: '',
+ supplierName: '',
+ auditStatus: '',
+ goodsStatus: '',
+ orderStartDate: '',
+ orderEndDate: '',
+ arrivalStartDate: '',
+ arrivalEndDate: '',
+ queryType: ''
+ }
},
}
},
@@ -516,27 +522,27 @@
}
},
dosearch() {
- this.queryParams.current = 1
- // this.loadList()
+ this.queryParams.current = 1
+ // this.loadList()
},
resetQuery() {
- this.queryParams = {
- current: 1,
- size: 10,
- total: 0,
- params: {
- orderId: '',
- supplierName: '',
- auditStatus: '',
- goodsStatus: '',
- orderStartDate: '',
- orderEndDate: '',
- arrivalStartDate: '',
- arrivalEndDate: '',
- queryType: ''
- }
- }
- // this.loadList()
+ this.queryParams = {
+ current: 1,
+ size: 10,
+ total: 0,
+ params: {
+ orderId: '',
+ supplierName: '',
+ auditStatus: '',
+ goodsStatus: '',
+ orderStartDate: '',
+ orderEndDate: '',
+ arrivalStartDate: '',
+ arrivalEndDate: '',
+ queryType: ''
+ }
+ }
+ // this.loadList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)