From f16c91bc9b96c415b7129e3eccf29b5b9f93d7a3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 26 三月 2025 08:29:13 +0800
Subject: [PATCH] 工时查询修改, 样品搜索问题修复

---
 src/views/system/customer/index.vue |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/system/customer/index.vue b/src/views/system/customer/index.vue
index b6d0e30..d7dd187 100644
--- a/src/views/system/customer/index.vue
+++ b/src/views/system/customer/index.vue
@@ -8,8 +8,8 @@
                       @keyup.enter.native="getList"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">鏌� 璇�</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+            <el-button type="primary" size="mini" @click="getList">鏌ヨ</el-button>
+            <el-button size="mini" @click="refresh">閲嶇疆</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -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">
@@ -61,6 +64,7 @@
 import limsTable from '@/components/Table/lims-table.vue'
 import {addCustom, delCustomById, selectCustomPageList, upCustom} from "@/api/system/customer";
 export default {
+  name: 'Customer',
   components: {
     limsTable
   },
@@ -102,7 +106,7 @@
       ],
       page: {
         total:0,
-        size:10,
+        size:20,
         current:0
       },
       tableLoading: false,
@@ -111,12 +115,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 +152,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 +194,9 @@
       })
     },
     reset () {
-      this.addDia = false
+      this.user = {}
       this.resetForm("userForm");
+      this.addDia = false
     },
     delete (row) {
       this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {

--
Gitblit v1.9.3