From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/a5-laboratory-qualifications.vue | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/components/view/a5-laboratory-qualifications.vue b/src/components/view/a5-laboratory-qualifications.vue
index 21cca26..6850540 100644
--- a/src/components/view/a5-laboratory-qualifications.vue
+++ b/src/components/view/a5-laboratory-qualifications.vue
@@ -54,14 +54,14 @@
<div class="capacity-scope">
<div>
<el-row class="title">
- <el-col :span="12">
+ <el-col :span="12" style="text-align: left">
<el-radio-group v-model="radio" @input="selectorSwitch" size="medium" fill="#3A7BFA">
<el-radio-button label="0">璧勮川鏄庣粏</el-radio-button>
<el-radio-button label="1">璧勮川鎬昏</el-radio-button>
</el-radio-group>
</el-col>
<el-col :span="12" style="text-align: right;" v-if="radio==0">
- <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
+ <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">璧勮川鏇存柊</el-button>
<el-button size="medium" icon="el-icon-delete" @click="handleDel" v-if="delPower">鍒犻櫎</el-button>
</el-col>
</el-row>
@@ -149,7 +149,7 @@
</div>
<el-dialog title="璧勮川鏇存柊" :visible.sync="qualificationsConnectVisible" width="400px">
<div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">璧勮川鍚嶇О锛�</div>
+ <div class="search_label" style="width:120px"><span class="required-span">* </span>璧勮川鍚嶇О锛�</div>
<div class="search_input">
<el-select v-model="formData.name" placeholder="璇烽�夋嫨" style="width: 100%;" size="small" clearable>
<el-option
@@ -162,7 +162,7 @@
</div>
</div>
<div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">璧勮川缂栫爜锛�</div>
+ <div class="search_label" style="width:120px"><span class="required-span">* </span>璧勮川缂栫爜锛�</div>
<div class="search_input">
<el-input
size="small"
@@ -172,7 +172,7 @@
</div>
</div>
<div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">棰佸彂鏈烘瀯锛�</div>
+ <div class="search_label" style="width:120px"><span class="required-span">* </span>棰佸彂鏈烘瀯锛�</div>
<div class="search_input">
<el-input
size="small"
@@ -191,10 +191,12 @@
v-model="formData.explanation"></el-input>
</div>
</div>
+
+
<div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">棣栨棰佸彂鏃堕棿锛�</div>
+ <div class="search_label" style="width:120px"><span class="required-span">* </span>棰佸彂鏃堕棿锛�</div>
<div class="search_input">
- <el-date-picker style="width:100%" v-model="formData.firstTime"
+ <el-date-picker style="width:100%" v-model="formData.dateOfIssuance"
type="datetime"
size="small"
format="yyyy-MM-dd HH:mm:ss"
@@ -205,20 +207,7 @@
</div>
</div>
<div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">鏈�杩戦鍙戞椂闂达細</div>
- <div class="search_input">
- <el-date-picker style="width:100%" v-model="formData.recentlyTime"
- type="datetime"
- size="small"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- clearable
- placeholder="閫夋嫨鏃ユ湡">
- </el-date-picker>
- </div>
- </div>
- <div class="search_thing" style="margin-bottom: 16px;">
- <div class="search_label" style="width:120px">鍒版湡棰佸彂鏃堕棿锛�</div>
+ <div class="search_label" style="width:120px"><span class="required-span">* </span>鍒版湡鏃堕棿锛�</div>
<div class="search_input">
<el-date-picker style="width:100%" v-model="formData.expireTime"
type="datetime"
@@ -362,9 +351,9 @@
this.refreshTable();
}
},
- refreshTable() {
+ refreshTable(e) {
if (this.radio === '0') {
- this.$refs['itemParameterTable'].selectList()
+ this.$refs['itemParameterTable'].selectList(e)
} else {
if(this.currentPage>1){
this.isLoding = true
@@ -445,6 +434,7 @@
const link = document.createElement('a');
link.href = this.javaApi + '/img/'+ url;
document.body.appendChild(link);
+ link.target = '_blank';
link.click();
},
handleSuccessUpImg(response,name) {
@@ -514,7 +504,7 @@
this.loading = false
if (res.code == 201) return
this.$message.success('宸叉彁浜�')
- this.refreshTable()
+ this.refreshTable('page')
this.qualificationsConnectVisible = false
})
},
--
Gitblit v1.9.3