From 06ca842a5219511302497d0a87be4293ae7cb7a0 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 23:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
index bb806b6..54d0c87 100644
--- a/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/quantityValueTraceabilityPlan.vue
@@ -25,10 +25,11 @@
</el-table-column>
<el-table-column label="鎵瑰噯鏃堕棿" min-width="180" prop="auditDate"></el-table-column>
<!-- 鎿嶄綔鎸夐挳 -->
- <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="240">
+ <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="270">
<template slot-scope="scope">
<el-button :disabled="scope.row.status === 1" size="small" type="text"
@click="handleForm('edit', scope.row)">缂栬緫</el-button>
+ <el-button size="small" type="text" @click="handleForm('view', scope.row)">鏌ョ湅</el-button>
<el-button :disabled="scope.row.status === 1" size="small" type="text"
@click="tellApprove(scope.row.traceabilityManagementId)">鎵瑰噯閫氱煡</el-button>
<el-button :disabled="scope.row.status === 1 || userId != scope.row.auditId" size="small" type="text"
@@ -49,66 +50,66 @@
<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 !== 'check'" size="small" type="primary" @click="addTableRow">娣诲姞</el-button>
+ <el-button v-if="operationType === 'edit'" 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="閫夋嫨骞�">
+ placeholder="閫夋嫨骞�" :disabled="operationType !== 'edit'">
</el-date-picker>
</div>
<div style="margin: 10px 0">
- <el-table ref="yearTable" :data="deviceTraceabilityManagementDetails" height="300px" id="templateParamTable"
+ <el-table ref="yearTable" :data="deviceTraceabilityManagementDetails" height="560px" id="templateParamTable"
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
row-key="deviceId" v-loading="yearTableLoading">
<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 === 'check'" clearable
+ <el-input v-model="scope.row.deviceName" :disabled="operationType !== 'edit'" 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 === 'check'" clearable
+ <el-input v-model="scope.row.specificationModel" :disabled="operationType !== 'edit'" 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 === 'check'" clearable
+ <el-input v-model="scope.row.managementNumber" :disabled="operationType !== 'edit'" 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 === 'check'" clearable
+ <el-input v-model="scope.row.technicalIndexParameters" :disabled="operationType !== 'edit'" 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 === 'check'" clearable
+ <el-input v-model="scope.row.technicalRequirements" :disabled="operationType !== 'edit'" 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 === 'check'" clearable
+ <el-input v-model="scope.row.verificationCycle" :disabled="operationType !== 'edit'" 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 === 'check'" clearable
+ <el-input v-model="scope.row.verificationUnit" :disabled="operationType !== 'edit'" 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 === 'check'" clearable size="small"
+ <el-input v-model="scope.row.remark" :disabled="operationType !== 'edit'" clearable size="small"
type="textarea"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="80" align="center" v-if="operationType !== 'check'">
+ <el-table-column fixed="right" label="鎿嶄綔" width="80" align="center" v-if="operationType === 'edit'">
<template slot-scope="scope">
<el-button style="color: #f56c6c" type="text" @click="deleteRow(scope.$index)">鍒犻櫎</el-button>
</template>
@@ -117,7 +118,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closeDialog">鍙� 娑�</el-button>
- <el-button v-if="operationType !== 'check'" :loading="submitFormLoading" type="primary" @click="submitForm">纭�
+ <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary" @click="submitForm">纭�
璁�</el-button>
<el-button v-if="operationType === 'check'" :loading="submitFormLoading" type="primary"
@click="checkStatus(0)">涓嶉�氳繃</el-button>
@@ -137,7 +138,7 @@
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="addEquipDia = false">鍙� 娑�</el-button>
- <el-button v-if="operationType !== 'check'" :loading="submitFormLoading" type="primary"
+ <el-button v-if="operationType === 'edit'" :loading="submitFormLoading" type="primary"
@click="changeMachineName">纭�
璁�</el-button>
</span>
--
Gitblit v1.9.3