From eb34b3d70926539b607f62e86434d1bace037792 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 21 十月 2026 15:05:35 +0800
Subject: [PATCH] feat: 行业分类统一改为标准分类
---
src/views/structural/premises/index.vue | 29 +++++++----------------------
src/views/CNAS/process/method/standardMethod/index.vue | 21 ++++++++++++++-------
2 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/src/views/CNAS/process/method/standardMethod/index.vue b/src/views/CNAS/process/method/standardMethod/index.vue
index ead7cd7..b141bf1 100644
--- a/src/views/CNAS/process/method/standardMethod/index.vue
+++ b/src/views/CNAS/process/method/standardMethod/index.vue
@@ -19,6 +19,13 @@
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.name"
@keyup.enter="refreshTable()"></el-input>
</el-form-item>
+ <el-form-item label="鏍囧噯鍒嗙被" prop="industryId">
+ <el-select v-model="queryParams.industryId" size="small" clearable filterable placeholder="璇烽�夋嫨"
+ style="width: 180px">
+ <el-option v-for="item in industryOptions" :key="item.id" :label="item.laboratoryName"
+ :value="item.id"/>
+ </el-select>
+ </el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="refreshTable">鏌ヨ</el-button>
<el-button size="small" @click="refresh">閲嶇疆</el-button>
@@ -34,8 +41,8 @@
<!-- 鏂板/缂栬緫 -->
<el-dialog :title="title" v-model="addDlog" width="500px">
<el-form :model="addForm" ref="addForm" :rules="addRules" label-position="right" label-width="120px">
- <el-form-item label="琛屼笟" prop="industryIds">
- <el-select v-model="addForm.industryIds" multiple filterable clearable collapse-tags placeholder="璇烽�夋嫨琛屼笟"
+ <el-form-item label="鏍囧噯鍒嗙被" prop="industryIds">
+ <el-select v-model="addForm.industryIds" multiple filterable clearable collapse-tags placeholder="璇烽�夋嫨鏍囧噯鍒嗙被"
style="width: 100%">
<el-option v-for="item in industryOptions" :key="item.id" :label="item.laboratoryName" :value="item.id"/>
</el-select>
@@ -52,7 +59,7 @@
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addForm.remark">
</el-input>
</el-form-item>
- <el-form-item label="璧勮川" prop="qualificationId">
+ <el-form-item v-if="title === '缂栬緫'" label="璧勮川" prop="qualificationId">
<el-select v-model="addForm.qualificationId" size="small" clearable placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in qualificationList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -135,14 +142,13 @@
addPower: true,
title: "鏂板",
inPower: true,
- queryParams: {},
+ queryParams: {industryId: ''},
tableData: [],
column: [
- {label: "琛屼笟", prop: "industryNames", width: "140px"},
+ {label: "鏍囧噯鍒嗙被", prop: "industryNames", width: "140px"},
{label: "鏍囧噯缂栧彿", prop: "code", width: "100px"},
{label: "鏍囧噯鎻忚堪", prop: "name", width: "100px"},
{label: "澶囨敞", prop: "remark"},
- {label: "璧勮川", prop: "qualificationId"},
{
label: "鏄惁浜у搧鏍囧噯",
prop: "isProduct",
@@ -262,6 +268,7 @@
this.tableLoading = true;
let param = {...this.queryParams, ...this.page};
delete param.total;
+ if (param.industryId === '' || param.industryId === null) delete param.industryId;
selectStandardMethodList({...param})
.then((res) => {
this.tableLoading = false;
@@ -287,7 +294,7 @@
refresh() {
this.loadIndustryOptions();
this.page.current = 1;
- this.queryParams = {};
+ this.queryParams = {industryId: ''};
this.getList();
},
openAdd() {
diff --git a/src/views/structural/premises/index.vue b/src/views/structural/premises/index.vue
index f4f8e6e..2308639 100644
--- a/src/views/structural/premises/index.vue
+++ b/src/views/structural/premises/index.vue
@@ -3,12 +3,8 @@
<div class="search">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
- <el-form-item label="琛屼笟鍚嶇О" prop="laboratoryName">
+ <el-form-item label="鏍囧噯鍒嗙被" prop="laboratoryName">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.laboratoryName"
- @keyup.enter="refreshTable"></el-input>
- </el-form-item>
- <el-form-item label="琛屼笟缂栫爜" prop="laboratoryNumber">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="queryParams.laboratoryNumber"
@keyup.enter="refreshTable"></el-input>
</el-form-item>
<el-form-item>
@@ -29,23 +25,14 @@
<el-dialog :title="formTitle" v-model="addDia" width="450px">
<el-form ref="laboratoryForm" :model="laboratoryForm" :rules="userRules" label-position="right"
label-width="100px">
- <el-form-item label="琛屼笟鍚嶇О" prop="laboratoryName">
+ <el-form-item label="鏍囧噯鍒嗙被" prop="laboratoryName">
<el-input v-model="laboratoryForm.laboratoryName" size="small" clearable></el-input>
- </el-form-item>
- <el-form-item label="鍦烘墍缂栫爜" prop="laboratoryNumber">
- <el-input v-model="laboratoryForm.laboratoryNumber" size="small" clearable></el-input>
- </el-form-item>
- <el-form-item label="琛屼笟浠ｅ彿" prop="laboratoryCode">
- <el-input v-model="laboratoryForm.laboratoryCode" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="璐熻矗浜�" prop="head">
<el-input v-model="laboratoryForm.head" size="small" clearable></el-input>
</el-form-item>
<el-form-item label="璐熻矗浜虹數璇�" prop="phoneNumber">
<el-input v-model="laboratoryForm.phoneNumber" size="small" clearable></el-input>
- </el-form-item>
- <el-form-item label="鍦板潃" prop="address">
- <el-input v-model="laboratoryForm.address" size="small" clearable></el-input>
</el-form-item>
</el-form>
<template #footer><span class="dialog-footer">
@@ -73,17 +60,13 @@
return {
queryParams: {
laboratoryName: '',
- laboratoryNumber: '',
},
tableData: [],
tableLoading: false,
column: [
- { label: '琛屼笟鍚嶇О', prop: 'laboratoryName' },
- { label: '鍦烘墍缂栫爜', prop: 'laboratoryNumber' },
- { label: '琛屼笟浠ｅ彿', prop: 'laboratoryCode' },
+ { label: '鏍囧噯鍒嗙被', prop: 'laboratoryName' },
{ label: '璐熻矗浜�', prop: 'head' },
{ label: '璐熻矗浜虹數璇�', prop: 'phoneNumber' },
- { label: '鍦板潃', prop: 'address' },
{ label: '鍒涘缓浜�', prop: 'createUserName' },
{ label: '鍒涘缓鏃堕棿', prop: 'createTime' },
{
@@ -119,8 +102,7 @@
},
operationType: '',
userRules: {
- laboratoryName: [{ required: true, message: '璇疯緭鍏ヨ涓氬悕绉�', trigger: 'blur' }],
- laboratoryNumber: [{ required: true, message: '璇疯緭鍏ュ満鎵�缂栫爜', trigger: 'blur' }],
+ laboratoryName: [{ required: true, message: '璇疯緭鍏ユ爣鍑嗗垎绫�', trigger: 'blur' }],
head: [{ required: true, message: '璇疯緭鍏ヨ礋璐ｄ汉', trigger: 'blur' }],
phoneNumber: [{ required: true, message: '璇疯緭鍏ヨ礋璐ｄ汉鐢佃瘽', trigger: 'blur' }],
},
@@ -158,6 +140,9 @@
this.operationType = type
if (type === 'edit') {
this.laboratoryForm = this.HaveJson(row)
+ } else {
+ // 鏂板鏃舵竻绌鸿〃鍗曪紝閬垮厤甯﹀叆涓婁竴鏉＄紪杈戣褰曢噷鏈睍绀哄瓧娈电殑鍊�
+ this.laboratoryForm = {}
}
this.addDia = true
},
--
Gitblit v1.9.3