From 1f2cabb5282b692e35e71b6bd3bcec379ae51e03 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 21 九月 2023 19:32:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/WMS
---
src/views/overview/AddOverviewDialog.vue | 4 +-
src/views/overview/OverviewListView.vue | 50 +++++++++++++------------
src/views/productManage/product/index.vue | 12 ++++-
src/views/overview/index.vue | 2
4 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue
index 7e31f48..a2df069 100644
--- a/src/views/overview/AddOverviewDialog.vue
+++ b/src/views/overview/AddOverviewDialog.vue
@@ -160,7 +160,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">鍏朵粬淇℃伅</div>
- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
+ <!-- <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name">
<el-select
v-model="editConfig.infomation.memberId"
placeholder="璇烽�夋嫨"
@@ -171,7 +171,7 @@
<el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="璐熻矗浜�" prop="contacterName">
<el-select
v-model="editConfig.infomation.contacterName"
diff --git a/src/views/overview/OverviewListView.vue b/src/views/overview/OverviewListView.vue
index aab7906..51a2432 100644
--- a/src/views/overview/OverviewListView.vue
+++ b/src/views/overview/OverviewListView.vue
@@ -124,36 +124,36 @@
default: false,
date: true
},
- {
- label: "浜у搧鍙敤鎬�",
- prop: "status",
- isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
- default: false
- },
- {
- label: "鎴鏃ユ湡",
- prop: "faultTime",
- isShowColumn: showcol.includes("鎴鏃ユ湡"),
- default: false
- },
- {
- label: "瀹為檯鏃ユ湡",
- prop: "shopName",
- isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
- default: false
- },
+ // {
+ // label: "浜у搧鍙敤鎬�",
+ // prop: "status",
+ // isShowColumn: showcol.includes("浜у搧鍙敤鎬�"),
+ // default: false
+ // },
+ // {
+ // label: "鎴鏃ユ湡",
+ // prop: "faultTime",
+ // isShowColumn: showcol.includes("鎴鏃ユ湡"),
+ // default: false
+ // },
+ // {
+ // label: "瀹為檯鏃ユ湡",
+ // prop: "shopName",
+ // isShowColumn: showcol.includes("瀹為檯鏃ユ湡"),
+ // default: false
+ // },
{
label: "鏉ユ簮鍗曟嵁",
prop: "sourceNumber",
isShowColumn: showcol.includes("鏉ユ簮鍗曟嵁"),
default: false
},
- {
- label: "娆犲崟",
- prop: "status",
- isShowColumn: showcol.includes("娆犲崟"),
- default: false
- },
+ // {
+ // label: "娆犲崟",
+ // prop: "status",
+ // isShowColumn: showcol.includes("娆犲崟"),
+ // default: false
+ // },
{
label: "鍏ュ簱绫诲瀷",
prop: "faultTime",
@@ -201,6 +201,8 @@
// 鎼滅储
getList(val) {
console.log(val)
+ this.pagerOptions.currPage = 1
+ this.getData()
},
// 琛岀偣鍑�
tableRowClick(row) {
diff --git a/src/views/overview/index.vue b/src/views/overview/index.vue
index 91e33e5..45c4208 100644
--- a/src/views/overview/index.vue
+++ b/src/views/overview/index.vue
@@ -105,7 +105,7 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.content {
- height: calc(100% - 150px);
+ height: calc(100% - 130px);
background: #fff;
border-radius: 12px;
.list-view {
diff --git a/src/views/productManage/product/index.vue b/src/views/productManage/product/index.vue
index 6eb0622..e456017 100644
--- a/src/views/productManage/product/index.vue
+++ b/src/views/productManage/product/index.vue
@@ -35,7 +35,7 @@
</div>
<div class="right">
<div class="label">
- <span>{{ item.name }}</span>
+ {{ item.name }}
</div>
<div class="price">
<span>浠锋牸:锟�</span>
@@ -323,16 +323,22 @@
font-size: 13px;
margin-left: 10px;
.label {
+ // max-height: 30px;
color: #212529;
- margin-top: -10px;
+ // margin-top: -5px;
margin-right: 15px;
word-break: break-all;
word-wrap: break-word;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.price,
.library {
color: #495057;
- margin-top: 15px;
+ margin-top: 10px;
}
}
}
--
Gitblit v1.8.0