From da614b00cc2b6721a6deadeb51f278d5a17f732e Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 04 三月 2025 09:56:38 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/system/customer/index.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue
index b6d0e30..e88b72b 100644
--- a/src/views/system/customer/index.vue
+++ b/src/views/system/customer/index.vue
@@ -18,7 +18,10 @@
</div>
</div>
<div>
- <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"></lims-table>
+ <lims-table :tableData="tableData" :column="column"
+ :height="'calc(100vh - 250px)'"
+ :page="page" :tableLoading="tableLoading"
+ @pagination="pagination"></lims-table>
</div>
<el-dialog :title="formTitle" :visible.sync="addDia" width="450px">
<el-form ref="userForm" :model="user" :rules="userRules" label-position="right" label-width="100px">
@@ -111,12 +114,14 @@
formTitle: '',
addDia: false,
addPower: true,
- user: {},
+ user: {
+ company: ''
+ },
userRules: {
company: [{ required: true, message: '璇疯緭鍏ュ鎴峰悕绉�', trigger: 'blur' }],
companyEn: [{ required: true, message: '璇疯緭鍏ュ鎴峰悕绉癊N', trigger: 'blur' }],
address: [{ required: true, message: '璇疯緭鍏ュ崟浣嶅湴鍧�', trigger: 'blur' }],
- addressEn: [{ required: true, message: '璇疯緭鍗曚綅鍦板潃EN', trigger: 'blur' }],
+ addressEn: [{ required: true, message: '璇疯緭鍏ュ崟浣嶅湴鍧�EN', trigger: 'blur' }],
num: [{ required: true, message: '璇疯緭鍏ュ姞鎬ラ搴�', trigger: 'blur' }],
code2: [{ required: true, message: '璇疯緭鍏ュ鎴风紪鍙�', trigger: 'blur' }],
},
@@ -146,12 +151,17 @@
this.queryParams.company = ''
this.getList()
},
+ pagination (page) {
+ this.page.size = page.limit
+ this.getList()
+ },
openFormDia (type, row) {
this.addDia = true
+ this.user = {}
this.formTitle = type === 'add' ? '鏂板瀹㈡埛' : '缂栬緫瀹㈡埛'
this.operationType = type
if (type === 'edit') {
- this.user = row
+ this.user = this.HaveJson(row)
}
},
customAdd() {
@@ -183,8 +193,9 @@
})
},
reset () {
- this.addDia = false
+ this.user = {}
this.resetForm("userForm");
+ this.addDia = false
},
delete (row) {
this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
--
Gitblit v1.9.3