From c6e96cdb8b1cfb51e9a45bf86c38d1353e983127 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:19:48 +0800
Subject: [PATCH] 设备模块业务完善及前序页面优化
---
src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue | 623 +++++++++++++++++++++++---------------------------------
1 files changed, 260 insertions(+), 363 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
index 1bb40cf..58862d8 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
@@ -1,114 +1,84 @@
<template>
<!-- 璁惧鏍″噯璁″垝-->
<div>
- <div>
- <div style="margin: 10px 0;display: flex;align-items: center;justify-content: space-between;">
- <div class="title">
- <span style="font-weight: bold">骞村害璁″垝琛�</span>
+ <div style="margin: 10px 0 14px;">
+ <div class="plan-top">
+ <div class="plan-top-left">
+ <span class="title" style="margin-bottom: 0;">{{ planInfo.planName || (planYear + '骞村害璁惧鏍″噯璁″垝') }}</span>
+ <el-select v-model="planYear" size="small" style="width: 110px; margin-left: 16px;" @change="handleYearChange">
+ <el-option v-for="y in yearOptions" :key="y" :label="y" :value="y"></el-option>
+ </el-select>
</div>
<div>
- <el-button size="small" type="primary" @click="getYearTableData">鍒锋柊</el-button>
- <el-button size="small" type="primary" @click="addYearPlan('add')">鏂板</el-button>
- <!-- <el-button size="small" type="primary" @click="record">瀵煎叆</el-button>-->
+ <el-button size="small" type="primary" @click="loadPlan">鍒锋柊</el-button>
+ <el-button size="small" type="primary" :disabled="planInfo.ratifyStatus === 1"
+ @click="tellApprove">鎵瑰噯閫氱煡</el-button>
+ <el-button size="small" type="primary"
+ :disabled="planInfo.ratifyStatus === 1 || userId != planInfo.ratifyUserId" @click="handleApprove">鎵瑰噯</el-button>
+ <el-button size="small" type="primary" @click="downLoadPost">瀵煎嚭</el-button>
</div>
</div>
+ <div class="plan-info-bar">
+ <span>缂栧埗浜猴細{{ planInfo.writeName || '鈥�' }}</span>
+ <span>缂栧埗鏃ユ湡锛歿{ planInfo.writeTimeStr || '鈥�' }}</span>
+ <span v-if="planInfo.ratifyStatus === 1">鎵瑰噯鐘舵�侊細<el-tag type="success">鎵瑰噯</el-tag></span>
+ <span v-else-if="planInfo.ratifyStatus === 0">鎵瑰噯鐘舵�侊細<el-tag type="danger">涓嶆壒鍑�</el-tag></span>
+ <span v-if="planInfo.ratifyRemark">鎵瑰噯鍐呭锛歿{ planInfo.ratifyRemark }}</span>
+ <span v-if="isRatified && planInfo.ratifyName">鎵瑰噯浜猴細{{ planInfo.ratifyName }}</span>
+ <span v-if="isRatified && planInfo.ratifyTimeStr">鎵瑰噯鏃堕棿锛歿{ planInfo.ratifyTimeStr }}</span>
+ </div>
+ </div>
+ <div class="search">
<div>
- <el-table ref="yearTable" v-loading="yearTableDataLoading"
- :data="yearTableData" height="calc(60vh - 16em)"
- border
- highlight-current-row @current-change="currentChange">
- <!-- 琛ㄦ牸鍒� -->
- <el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
- width="70"></el-table-column>
- <el-table-column label="骞翠唤" min-width="80" prop="planYear"></el-table-column>
- <el-table-column label="璁″垝鍚嶇О" min-width="180" prop="planName" show-overflow-tooltip></el-table-column>
- <el-table-column label="缂栧埗浜�" min-width="100" prop="writeName"></el-table-column>
- <el-table-column label="缂栧埗鏃ユ湡" min-width="160" prop="writeTime"></el-table-column>
- <el-table-column label="鎵瑰噯鐘舵��" min-width="100" prop="ratifyStatus">
- <template #default="scope">
- <el-tag v-if="scope.row.ratifyStatus === 1" type="success">鎵瑰噯</el-tag>
- <el-tag v-if="scope.row.ratifyStatus === 0" type="danger">涓嶆壒鍑�</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="鎵瑰噯鍐呭" min-width="150" prop="ratifyRemark"></el-table-column>
- <el-table-column label="鎵瑰噯浜�" min-width="100" prop="ratifyName"></el-table-column>
- <el-table-column label="鎵瑰噯鏃堕棿" min-width="150" prop="ratifyTime"></el-table-column>
- <!-- 鎿嶄綔鎸夐挳 -->
- <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="240">
- <template #default="scope">
- <el-button :disabled="scope.row.ratifyStatus === 1" size="small" link type="primary"
- @click="addYearPlan('edit', scope.row)">缂栬緫</el-button>
- <el-button :disabled="scope.row.ratifyStatus === 1" size="small" link type="primary"
- @click="tellApprove(scope.row.planId)">鎵瑰噯閫氱煡</el-button>
- <el-button :disabled="scope.row.ratifyStatus === 1 || userId != scope.row.ratifyUserId" size="small"
- link type="primary" @click="handleApprove(scope.row.planId)">鎵瑰噯</el-button>
- <el-button size="small" link type="primary" @click="downLoadPost(scope.row.planId)">瀵煎嚭</el-button>
- <el-button :disabled="scope.row.ratifyStatus === 1" size="small" link type="danger"
- @click="deleteFun(scope.row.planId)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination :current-page="1" :page-size="pagination.size" :page-sizes="[10, 20, 30, 50, 100]"
- background :total="pagination.total" layout="->,total, sizes, prev, pager, next, jumper"
- @size-change="handleSizeChange" @current-change="handleCurrentChange">
- </el-pagination>
+ <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
+ <el-form-item label="璁惧鍚嶇О鍙婂瀷鍙�" prop="deviceName">
+ <el-input v-model="searchForm.deviceName" clearable @keyup.enter="handleQuery"
+ size="small"></el-input>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿" prop="deviceNumber">
+ <el-input v-model="searchForm.deviceNumber" @keyup.enter="handleQuery" clearable
+ size="small"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="small" @click="handleQuery">鏌ヨ</el-button>
+ <el-button size="small" @click="reset">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
</div>
</div>
<div>
- <div class="title">
- <span style="font-weight: bold">骞村害璁″垝鏄庣粏琛�</span>
- </div>
- <div class="search">
- <div>
- <el-form :model="searchForm" ref="searchForm" size="small" :inline="true">
- <el-form-item label="璁惧鍚嶇О鍙婂瀷鍙�" prop="deviceName">
- <el-input v-model="searchForm.deviceName" clearable
- @keyup.enter="getYearTableDetailData(currentRow)" size="small"></el-input>
- </el-form-item>
- <el-form-item label="浠櫒缂栧彿" prop="deviceNumber">
- <el-input v-model="searchForm.deviceNumber"
- @keyup.enter="getYearTableDetailData(currentRow)" clearable size="small"></el-input>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" size="small" @click="getYearTableDetailData(currentRow)">鏌ヨ</el-button>
- <el-button size="small" @click="reset">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
- </div>
- <div>
- <el-button size="small" type="primary" @click="handleForm('add')">鏂板</el-button>
- </div>
- </div>
- <div>
- <el-table ref="yearTableDetailData" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData"
- border
- :height="'calc(100vh - 34em)'" style="width: 100% ;">
- <!-- 琛ㄦ牸鍒� -->
- <el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
- width="70"></el-table-column>
- <el-table-column label="璁惧鍚嶇О鍙婂瀷鍙�" min-width="180" prop="deviceName" show-overflow-tooltip></el-table-column>
- <el-table-column label="璁惧鏁伴噺" min-width="180" prop="deviceAmount"></el-table-column>
- <el-table-column label="浠櫒缂栧彿" min-width="150" prop="deviceNumber"></el-table-column>
- <el-table-column label="妫�瀹氬崟浣�" min-width="150" prop="verificationUnit"> </el-table-column>
- <el-table-column label="妫�瀹氬懆鏈�" min-width="150" prop="verificationCycles"></el-table-column>
- <el-table-column label="鏈�杩戞瀹氭椂闂�" min-width="150" prop="lastDate"></el-table-column>
- <el-table-column label="鏈勾璁″垝鏍″噯鏃堕棿" min-width="150" prop="planDate"></el-table-column>
- <el-table-column label="澶囨敞" min-width="150" prop="remark"></el-table-column>
- <!-- 鎿嶄綔鎸夐挳 -->
- <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="140">
- <template #default="scope">
- <el-button size="small" link type="primary" @click="handleForm('edit', scope.row)">缂栬緫</el-button>
- <el-button size="small" link type="primary" @click="handleForm('view', scope.row)">鏌ョ湅</el-button>
- <el-button size="small" link type="danger"
- @click="deleteFun1(scope.row.planDetailId)">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination :current-page="1" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
- background :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
- @size-change="handleSizeChange1" @current-change="handleCurrentChange1">
- </el-pagination>
- </div>
+ <el-table ref="yearTableDetailData" v-loading="yearTableDetailDataLoading" :data="yearTableDetailData" border
+ :row-class-name="tableRowClassName" :height="'calc(100vh - 29em)'" style="width: 100% ;">
+ <!-- 琛ㄦ牸鍒� -->
+ <el-table-column align="center" header-align="center" label="搴忓彿" prop="prop" type="index"
+ width="70"></el-table-column>
+ <el-table-column label="璁惧鍚嶇О鍙婂瀷鍙�" min-width="180" prop="deviceName" show-overflow-tooltip></el-table-column>
+ <el-table-column label="璁惧鏁伴噺" min-width="90" prop="deviceAmount"></el-table-column>
+ <el-table-column label="浠櫒缂栧彿" min-width="150" prop="deviceNumber"></el-table-column>
+ <el-table-column label="妫�瀹氬崟浣�" min-width="150" prop="verificationUnit"> </el-table-column>
+ <el-table-column label="妫�瀹氬懆鏈�" min-width="100" prop="verificationCycles"></el-table-column>
+ <el-table-column label="鏈�杩戞瀹氭椂闂�" min-width="130" prop="lastDate"
+ :formatter="formatDateCell"></el-table-column>
+ <el-table-column label="鏈勾璁″垝鏍″噯鏃堕棿" min-width="130" prop="planDate"
+ :formatter="formatDateCell"></el-table-column>
+ <el-table-column label="澶囨敞" min-width="130" prop="remark"></el-table-column>
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="210">
+ <template #default="scope">
+ <el-button size="small" link type="primary" :disabled="!scope.row.deviceId"
+ @click="handleExecute(scope.row)">鎵ц</el-button>
+ <el-button size="small" link type="primary" :disabled="planInfo.ratifyStatus === 1"
+ @click="handleForm('edit', scope.row)">缂栬緫</el-button>
+ <el-button size="small" link type="primary" @click="handleForm('view', scope.row)">鏌ョ湅</el-button>
+ <el-button size="small" link type="danger" :disabled="planInfo.ratifyStatus === 1"
+ @click="deleteFun1(scope.row.planDetailId)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination :current-page="pagination1.current" :page-size="pagination1.size" :page-sizes="[10, 20, 30, 50, 100]"
+ background :total="pagination1.total" layout="->,total, sizes, prev, pager, next, jumper"
+ @size-change="handleSizeChange1" @current-change="handleCurrentChange1">
+ </el-pagination>
</div>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-model="dialogVisible" title="璁惧鏍″噯璁″垝"
width="80%" @close="resetForm">
@@ -162,7 +132,7 @@
</el-form-item>
</el-col>
</el-form>
- <template #footer><span class="dialog-footer">
+ <template #footer><span class="dialog-footer">
<el-button @click="resetForm">鍙� 娑�</el-button>
<el-button :loading="submitFormLoading" type="primary" @click="submitForm" v-if="operationType !== 'view'">纭�
璁�</el-button>
@@ -173,7 +143,7 @@
鎵瑰噯澶囨敞锛�
<el-input v-model="ratifyRemark" type="textarea"></el-input>
</span>
- <template #footer><span class="dialog-footer">
+ <template #footer><span class="dialog-footer">
<el-button :loading="approvalLoading" @click="handleApproval(0)">涓嶆壒鍑�</el-button>
<el-button :loading="approvalLoading" type="primary" @click="handleApproval(1)">鎵� 鍑�</el-button>
</span></template>
@@ -186,53 +156,36 @@
</el-option>
</el-select>
</span>
- <template #footer><span class="dialog-footer">
+ <template #footer><span class="dialog-footer">
<el-button :loading="notificationLoading" @click="closeNotificationDia">鍙� 娑�</el-button>
<el-button :loading="notificationLoading" type="primary" @click="notification">鎻� 浜�</el-button>
</span></template>
</el-dialog>
- <!--涓婁紶鎶ュ憡-->
- <el-dialog v-model="uploadDia" title="鏁版嵁瀵煎叆" width="500px">
- 骞翠唤锛�
- <el-date-picker v-model="planYear" type="year" value-format="YYYY" clearable format="YYYY" placeholder="閫夋嫨骞�">
- </el-date-picker>
- <div style="margin: 0 auto;">
- <el-upload ref="upload1" :action="action" :auto-upload="false" :file-list="fileList" :headers="uploadHeader"
- :limit="1" accept='.doc,.docx' :on-change="beforeUpload" :on-error="onError" :on-success="handleSuccessUp"
- drag name="file">
- <lims-icon name="el-icon-upload"></lims-icon>
- <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- </el-upload>
- </div>
- <template #footer><span class="dialog-footer">
- <el-button @click="uploadDia = false">鍙� 娑�</el-button>
- <el-button :loading="uploading" type="primary" @click="submitUpload()">涓� 浼�</el-button>
- </span></template>
- </el-dialog>
- <add-year-plan-dia v-if="addYearPlanDia" ref="addYearPlanDia" @closeDia="closeDia"></add-year-plan-dia>
+ <!-- 娣诲姞/鏌ョ湅鏍″噯璁板綍寮圭獥 -->
+ <calibration-record-dia ref="calibrationRecordDia" @success="getYearTableDetailData"></calibration-record-dia>
</div>
</template>
<script>
-import AddYearPlanDia from "./addYearPlanDia.vue";
-import AddVerificationYearPlanDia from "./addVerificationYearPlanDia.vue";
+import CalibrationRecordDia from "./calibrationRecordDia.vue";
import {
pageDeviceCalibrationPlan,
+ getCalibrationPlanByYear,
submiatRatifyDeviceCalibrationPlan,
exportDeviceCalibrationPlanDetail,
- delDeviceCalibrationPlan,
delDeviceCalibrationPlanDetail,
pageDeviceCalibrationPlanDetail,
- addDeviceCalibrationPlanDetail,
updateDeviceCalibrationPlanDetail,
ratifyDeviceCalibrationPlan,
} from '@/api/cnas/resourceDemand/device.js'
import { selectUserCondition } from "@/api/performance/class";
import { mapGetters } from "@/utils/store-compat";
+import { formatDateOnly } from './dateFormat'
+import { saveBlobOrShowError } from '@/utils/saveBlob'
export default {
name: "equipment-calibration-plan",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { AddVerificationYearPlanDia, AddYearPlanDia },
+ components: { CalibrationRecordDia },
props: {
clickNodeVal: {
type: Object,
@@ -244,18 +197,15 @@
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
+ planYear: '',
+ yearOptions: [],
+ planInfo: {},
dialogVisible: false,
searchForm: {
deviceName: '',
deviceNumber: '',
},
- yearTableData: [],
yearTableDetailData: [],
- pagination: {
- size: 10,
- current: 1,
- total: 0,
- },
pagination1: {
size: 10,
current: 1,
@@ -278,66 +228,165 @@
deviceNumber: [{ required: true, message: '璇峰～鍐欎华鍣ㄧ紪鍙�', trigger: 'blur' }],
planDate: [{ required: true, message: '璇烽�夋嫨鏃ユ湡', trigger: 'change' }],
},
- yearTableDataLoading: false,
yearTableDetailDataLoading: false,
- currentRow: {},
approvalDialog: false,
approvalLoading: false,
submitFormLoading: false,
ratifyRemark: '',
currentRowId: '',
- uploadDia: false,
- uploading: false,
- addYearPlanDia: false,
- fileList: [],
- planYear: '',
responsibleOptions: [],
notificationDia: false,
notificationLoading: false,
ratifyUserId: '',
- planId: ''
}
},
mounted() {
- this.getYearTableData()
+ this.loadYearOptions()
},
// 鏂规硶闆嗗悎
methods: {
- // 鏌ヨ骞村害璁″垝琛�
- getYearTableData() {
- this.yearTableDataLoading = true
+ // 骞翠唤涓嬫媺閫夐」锛氬凡鏈夎鍒掑勾浠� + 褰撳墠骞翠唤
+ loadYearOptions() {
pageDeviceCalibrationPlan({
current: 1,
size: 99,
}).then(res => {
+ let years = []
if (res.code == 200) {
- this.yearTableData = res.data.records
- this.pagination.total = res.data.total
- if (this.yearTableData.length > 0) {
- this.currentRow = this.yearTableData[0]
- this.$refs.yearTable.setCurrentRow(this.currentRow)
- }
+ years = (res.data.records || []).map(r => r.planYear).filter(Boolean)
}
- this.yearTableDataLoading = false
- }).catch(err => {
- this.yearTableDataLoading = false
+ const currentYear = String(new Date().getFullYear())
+ if (years.indexOf(currentYear) === -1) {
+ years.push(currentYear)
+ }
+ this.yearOptions = [...new Set(years)].sort((a, b) => b.localeCompare(a))
+ this.planYear = currentYear
+ this.loadPlan()
})
},
- // 鍒嗛〉
- handleSizeChange(val) {
- this.pagination.size = val
- this.getYearTableData()
+ // 鍒囨崲骞翠唤
+ handleYearChange() {
+ this.pagination1.current = 1
+ this.loadPlan()
+ },
+ // 鏌ヨ骞翠唤璁″垝锛堜笉瀛樺湪鑷姩鍒涘缓骞惰ˉ鍏ㄥ埌鐐规槑缁嗭級锛岄殢鍚庡埛鏂版槑缁�
+ loadPlan() {
+ getCalibrationPlanByYear({ planYear: this.planYear }).then(res => {
+ if (res.code == 200) {
+ this.planInfo = res.data || {}
+ }
+ this.getYearTableDetailData()
+ }).catch(() => {
+ this.planInfo = {}
+ this.yearTableDetailData = []
+ this.pagination1.total = 0
+ this.yearTableDetailDataLoading = false
+ })
+ },
+ // 鏌ヨ鏉′欢鍙樺寲鍚庝粠绗竴椤靛紑濮嬫煡
+ handleQuery() {
+ this.pagination1.current = 1
+ this.getYearTableDetailData()
+ },
+ // 鏄庣粏-鏌ヨ
+ getYearTableDetailData() {
+ if (!this.planInfo.planId) {
+ return
+ }
+ this.yearTableDetailDataLoading = true
+ pageDeviceCalibrationPlanDetail({
+ current: this.pagination1.current,
+ size: this.pagination1.size,
+ planId: this.planInfo.planId,
+ deviceName: this.searchForm.deviceName,
+ deviceNumber: this.searchForm.deviceNumber,
+ }).then(res => {
+ if (res.code == 200) {
+ this.yearTableDetailData = res.data.records
+ this.pagination1.total = res.data.total
+ }
+ this.yearTableDetailDataLoading = false
+ }).catch(err => {
+ this.yearTableDetailDataLoading = false
+ })
+ },
+ formatDateCell(row, column, cellValue) {
+ return formatDateOnly(cellValue)
+ },
+ // 鍒扮偣闇�鏍″噯鐨勮鏍囩孩
+ tableRowClassName({ row }) {
+ return row.redFlag === 1 ? 'red-row' : ''
+ },
+ reset() {
+ this.searchForm = {
+ deviceName: '',
+ deviceNumber: '',
+ }
+ this.pagination1.current = 1
+ this.getYearTableDetailData()
},
// 鍒嗛〉
- handleCurrentChange(val) {
- this.pagination.current = val
- this.getYearTableData()
+ handleSizeChange1(val) {
+ this.pagination1.size = val
+ this.getYearTableDetailData()
+ },
+ // 鍒嗛〉
+ handleCurrentChange1(val) {
+ this.pagination1.current = val
+ this.getYearTableDetailData()
+ },
+ // 鎵ц锛氭墦寮�鏍″噯璁板綍寮圭獥褰曞叆
+ handleExecute(row) {
+ this.$refs.calibrationRecordDia.open(row.deviceId, 'add')
+ },
+ // 鎵撳紑鏄庣粏寮规
+ handleForm(type, row) {
+ this.operationType = type
+ this.dialogVisible = true
+ this.$nextTick(() => {
+ this.form = this.HaveJson(row)
+ })
+ },
+ // 鎻愪氦琛ㄥ崟
+ submitForm() {
+ this.$refs.modelForm.validate(valid => {
+ if (valid) {
+ this.submitFormLoading = true
+ updateDeviceCalibrationPlanDetail(this.form).then(res => {
+ if (res.code == 200) {
+ this.$message.success('淇敼鎴愬姛')
+ this.dialogVisible = false
+ this.getYearTableDetailData()
+ }
+ this.submitFormLoading = false
+ }).catch(err => {
+ this.submitFormLoading = false
+ })
+ }
+ })
+ },
+ // 鏄庣粏-鍒犻櫎
+ deleteFun1(id) {
+ this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ枃浠�, 鏄惁缁х画?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ delDeviceCalibrationPlanDetail({ planDetailsId: id }).then(res => {
+ this.$message.success('鍒犻櫎鎴愬姛锛�');
+ this.getYearTableDetailData()
+ });
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '宸插彇娑堝垹闄�'
+ });
+ });
},
// 鎵撳紑鎻愪氦鎵瑰噯寮规
- tellApprove(planId) {
+ tellApprove() {
this.getUserList()
this.notificationDia = true
- this.planId = planId
},
// 鍏抽棴鎻愪氦鎵瑰噯寮规
closeNotificationDia() {
@@ -353,184 +402,23 @@
this.notificationLoading = true
submiatRatifyDeviceCalibrationPlan({
ratifyUserId: this.ratifyUserId,
- planId: this.planId,
+ planId: this.planInfo.planId,
}).then(res => {
this.notificationLoading = false
if (res.code == 200) {
this.closeNotificationDia()
- this.getYearTableData()
+ this.loadPlan()
}
}).catch(err => {
this.notificationLoading = false
})
},
- // 骞村害璁″垝琛�-鎵瑰噯
- handleApprove(id) {
- this.currentRowId = id
+ // 鎵瑰噯
+ handleApprove() {
+ this.currentRowId = this.planInfo.planId
this.approvalDialog = true
},
- // 骞村害璁″垝琛�-瀵煎嚭
- downLoadPost(planId) {
- exportDeviceCalibrationPlanDetail({ planId }).then(res => {
- const blob = new Blob([res], { type: 'application/msword' });
- this.$download.saveAs(blob, '璁惧鏍″噯璁″垝.docx')
- })
- },
- // 骞村害璁″垝琛�-鍒犻櫎
- deleteFun(id) {
- this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ枃浠�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- delDeviceCalibrationPlan({ planId: id }).then(res => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.getYearTableData();
- });
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- });
- });
- },
- // 骞村害璁″垝璇︽儏琛�-鍒犻櫎
- deleteFun1(id) {
- this.$confirm('姝ゆ搷浣滃皢姘镐箙鍒犻櫎璇ユ枃浠�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- delDeviceCalibrationPlanDetail({ planDetailsId: id }).then(res => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.getYearTableDetailData(this.currentRow)
- });
- }).catch(() => {
- this.$message({
- type: 'info',
- message: '宸插彇娑堝垹闄�'
- });
- });
- },
- currentChange(row) {
- this.currentRow = row
- this.getYearTableDetailData(this.currentRow)
- },
- getYearTableDetailData(row) {
- this.yearTableDetailDataLoading = true
- pageDeviceCalibrationPlanDetail({
- current: this.pagination1.current,
- size: this.pagination1.size,
- planId: row.planId,
- deviceName: this.searchForm.deviceName,
- deviceNumber: this.searchForm.deviceNumber,
- }).then(res => {
- if (res.code == 200) {
- this.yearTableDetailData = res.data.records
- this.pagination1.total = res.data.total
- }
- this.yearTableDetailDataLoading = false
- }).catch(err => {
- this.yearTableDetailDataLoading = false
- })
- },
- reset() {
- this.searchForm = {
- deviceName: '',
- deviceNumber: '',
- }
- this.getYearTableDetailData(this.currentRow)
- },
- // 鍒嗛〉
- handleSizeChange1(val) {
- this.pagination1.size = val
- this.getYearTableDetailData(this.currentRow)
- },
- // 鍒嗛〉
- handleCurrentChange1(val) {
- this.pagination1.current = val
- this.getYearTableDetailData(this.currentRow)
- },
- // 鎵撳紑寮规
- handleForm(type, row) {
- this.operationType = type
- this.dialogVisible = true
- this.form.planId = this.currentRow.planId
- if (this.operationType !== 'add') {
- this.$nextTick(() => {
- this.form = this.HaveJson(row)
- })
- } else {
- this.form = {
- deviceName: '',
- deviceAmount: '',
- deviceNumber: '',
- verificationUnit: '',
- verificationCycles: '',
- lastDate: '',
- planDate: '',
- remark: '',
- planId: this.currentRow.planId,
- planDetailId: '',
- }
- }
- },
- // 鎻愪氦琛ㄥ崟
- submitForm() {
- this.$refs.modelForm.validate(valid => {
- if (valid) {
- if (this.operationType === 'add') {
- this.submitFormLoading = true
- addDeviceCalibrationPlanDetail(this.form).then(res => {
- if (res.code == 200) {
- this.$message.success('鏂板鎴愬姛')
- this.dialogVisible = false
- this.getYearTableData()
- }
- this.submitFormLoading = false
- }).catch(err => {
- this.submitFormLoading = false
- })
- } else {
- this.submitFormLoading = true
- updateDeviceCalibrationPlanDetail(this.form).then(res => {
- if (res.code == 200) {
- this.$message.success('鏂板鎴愬姛')
- this.dialogVisible = false
- this.getYearTableData()
- }
- this.submitFormLoading = false
- }).catch(err => {
- this.submitFormLoading = false
- })
- }
- }
- })
- },
- // 鎵撳紑鏂板寮规
- addYearPlan(type, row) {
- this.addYearPlanDia = true
- this.$nextTick(() => {
- this.$refs.addYearPlanDia.openDialog(type, row)
- })
- },
- closeDia() {
- this.addYearPlanDia = false
- this.getYearTableData()
- },
- submitUpload() {
- if (!this.planYear) {
- this.$message.warning('璇烽�夋嫨骞翠唤')
- return;
- }
- if (this.$refs.upload1.uploadFiles.length === 0) {
- this.$message.error('鏈�夋嫨鏂囦欢')
- return
- }
- this.uploading = true
- this.$refs.upload1.submit();
- },
- // 鎻愪氦鎵瑰噯
+ // 鎻愪氦鎵瑰噯缁撴灉
handleApproval(status) {
const personTrainingUpdateDto = {
planId: this.currentRowId,
@@ -542,43 +430,22 @@
if (res.code === 200) {
this.$message.success('鎻愪氦鎴愬姛锛�');
this.approvalDialog = false
- this.getYearTableData();
+ this.loadPlan()
}
this.approvalLoading = false
}).catch(() => {
this.approvalLoading = false
})
},
+ // 瀵煎嚭
+ downLoadPost() {
+ exportDeviceCalibrationPlanDetail({ planId: this.planInfo.planId }).then(res => {
+ saveBlobOrShowError(res, '璁惧鏍″噯璁″垝.docx', 'application/msword')
+ }).catch(() => { })
+ },
resetForm() {
this.$refs.modelForm.resetFields();
this.dialogVisible = false
- },
- // 鎵撳紑鎶ュ憡寮规
- record(row) {
- this.uploadDia = true
- },
- // 瀵煎叆娴佺▼
- beforeUpload(file) {
- if (file.size > 1024 * 1024 * 10) {
- this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
- this.$refs.upload.clearFiles()
- return false;
- } else {
- return true;
- }
- },
- onError(err, file, fileList) {
- this.$message.error('涓婁紶澶辫触')
- this.$refs.upload.clearFiles()
- },
- handleSuccessUp(response) {
- this.uploading = false;
- if (response.code == 200) {
- this.$message.success('涓婁紶鎴愬姛');
- this.getYearTableData()
- } else {
- this.$message.error('涓婁紶澶辫触')
- }
},
// 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
getUserList() {
@@ -596,12 +463,12 @@
});
}
},
- // 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
- action() {
- return this.javaApi + '/deviceCalibrationPlan/importDeviceCalibrationPlan' + '?planYear=' + this.planYear
- },
...mapGetters(["userId"]),
+ // 鏄惁宸插畬鎴愬鎵癸紙鎵瑰噯/涓嶆壒鍑嗭級
+ isRatified() {
+ return this.planInfo.ratifyStatus === 0 || this.planInfo.ratifyStatus === 1;
+ },
},
}
</script>
@@ -626,9 +493,39 @@
background-color: var(--el-color-primary);
border-radius: 2px;
}
+
+.plan-top {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ flex-wrap: wrap;
+}
+
+.plan-top-left {
+ display: flex;
+ align-items: center;
+}
+
+.plan-info-bar {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: 32px;
+ background: #f5f7fa;
+ border-radius: 4px;
+ padding: 10px 16px;
+ margin-top: 14px;
+ font-size: 14px;
+ color: #606266;
+}
+
.search {
- height: 46px;
display: flex;
justify-content: space-between;
+ margin-bottom: 10px;
+}
+
+:deep(.red-row td) {
+ background: #ffcccc !important;
}
</style>
--
Gitblit v1.9.3