From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
index 54d0c87..c91deac 100644
--- a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
@@ -50,10 +50,10 @@
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="applicationForm"
title="浠櫒璁惧閲忓�兼函婧愮鐞嗘�讳綋璁″垝" width="80%" @close="closeDialog">
<div style="display: flex;align-items: center;">
- <el-button v-if="operationType === 'edit'" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
+ <el-button v-if="operationType === 'edit' || operationType === 'add'" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
<span style="width: 60px;margin-left: 10px">骞翠唤锛�</span>
<el-date-picker v-model="form.planYear" type="year" value-format="yyyy" clearable size="small" format="yyyy"
- placeholder="閫夋嫨骞�" :disabled="operationType !== 'edit'">
+ placeholder="閫夋嫨骞�" :disabled="operationType !== 'edit' && operationType !== 'add'">
</el-date-picker>
</div>
<div style="margin: 10px 0">
@@ -63,53 +63,53 @@
<el-table-column align="center" header-align="center" label="搴忓彿" type="index" width="60"></el-table-column>
<el-table-column label="璁惧鍚嶇О" min-width="170" prop="deviceId">
<template slot-scope="scope">
- <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit'" clearable
+ <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="鍨嬪彿" min-width="140" prop="specificationModel">
<template slot-scope="scope">
- <el-input v-model="scope.row.specificationModel" :disabled="operationType !== 'edit'" clearable
+ <el-input v-model="scope.row.specificationModel" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="璁惧缂栧彿" min-width="140" prop="managementNumber">
<template slot-scope="scope">
- <el-input v-model="scope.row.managementNumber" :disabled="operationType !== 'edit'" clearable
+ <el-input v-model="scope.row.managementNumber" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small"></el-input>
</template>
</el-table-column>
<el-table-column label="鎶�鏈寚鏍囧弬鏁�" min-width="150" prop="technicalIndexParameters">
<template slot-scope="scope">
- <el-input v-model="scope.row.technicalIndexParameters" :disabled="operationType !== 'edit'" clearable
+ <el-input v-model="scope.row.technicalIndexParameters" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="鎶�鏈寚鏍囪姹�" min-width="150" prop="technicalRequirements">
<template slot-scope="scope">
- <el-input v-model="scope.row.technicalRequirements" :disabled="operationType !== 'edit'" clearable
+ <el-input v-model="scope.row.technicalRequirements" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="妫�瀹氬懆鏈�" min-width="120" prop="verificationCycle">
<template slot-scope="scope">
- <el-input v-model="scope.row.verificationCycle" :disabled="operationType !== 'edit'" clearable
+ <el-input v-model="scope.row.verificationCycle" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="妫�瀹氬崟浣�" min-width="90" prop="verificationUnit">
<template slot-scope="scope">
- <el-input v-model="scope.row.verificationUnit" :disabled="operationType !== 'edit'" clearable
+ <el-input v-model="scope.row.verificationUnit" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable
size="small" type="textarea"></el-input>
</template>
</el-table-column>
<el-table-column label="澶囨敞" min-width="90" prop="remark">
<template slot-scope="scope">
- <el-input v-model="scope.row.remark" :disabled="operationType !== 'edit'" clearable size="small"
+ <el-input v-model="scope.row.remark" :disabled="operationType !== 'edit' && operationType !== 'add'" clearable size="small"
type="textarea"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="80" align="center" v-if="operationType === 'edit'">
+ <el-table-column label="鎿嶄綔" width="80" align="center" v-if="operationType === 'edit' || operationType === 'add'">
<template slot-scope="scope">
<el-button style="color: #f56c6c" type="text" @click="deleteRow(scope.$index)">鍒犻櫎</el-button>
</template>
@@ -118,7 +118,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeDialog">鍙� 娑�</el-button>
- <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary" @click="submitForm">纭�
+ <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary" @click="submitForm">纭�
璁�</el-button>
<el-button v-if="operationType === 'check'" :loading="submitFormLoading" type="primary"
@click="checkStatus(0)">涓嶉�氳繃</el-button>
@@ -138,7 +138,7 @@
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="addEquipDia = false">鍙� 娑�</el-button>
- <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary"
+ <el-button v-if="operationType === 'edit' || operationType === 'add'" :loading="submitFormLoading" type="primary"
@click="changeMachineName">纭�
璁�</el-button>
</span>
--
Gitblit v1.9.3