From 80dc4f0481f24deb307e6922364dbb12813f9d64 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Wed, 13 Nov 2024 10:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/safetyReview/projectManage/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index 94994c5..6aca90d 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -128,8 +128,8 @@
<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="180">
<template #default="scope">
<el-button link type="primary" @click="toProcess('view',scope.row)">查看</el-button>
- <el-button link type="primary" @click="toProcess('edit',scope.row)">编辑</el-button>
- <el-button link type="danger" v-if="(isAgency && scope.row.reportProgress !== 14) || !isAgency" @click="del(scope.row)">删除</el-button>
+ <el-button link type="primary" v-if="scope.row.reportProgress !== 14" @click="toProcess('edit',scope.row)">编辑</el-button>
+ <el-button link type="danger" v-if="(isAgency && scope.row.reportProgress !== 14) || (!isAgency && scope.row.reportProgress !== 14)" @click="del(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -171,10 +171,10 @@
/>
</el-form-item>
<el-form-item label="项目名称" >
- <el-input v-model="search.queryParams.name" placeholder="请输入项目名称"></el-input>
+ <el-input v-model.trim="search.queryParams.name" placeholder="请输入项目名称"></el-input>
</el-form-item>
<el-form-item label="委托单位">
- <el-input v-model="search.queryParams.client" placeholder="委托单位"></el-input>
+ <el-input v-model.trim="search.queryParams.client" placeholder="委托单位"></el-input>
</el-form-item>
<el-form-item label="业务范围">
<el-select v-model="search.queryParams.business" class="m-2" size="large" placeholder="请选择" style="width: 100%" >
--
Gitblit v1.9.2