From a1faa94fbf85553f22da934a1abc745d89dd8667 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 17:23:49 +0800
Subject: [PATCH] fix: 取消设备核查/比对的身份限制与三张设备计划的审批功能
---
src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue | 113 -------------
src/api/cnas/resourceDemand/standardMaterial/standardMaterial.js | 15 -
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 75 ---------
src/views/CNAS/resourceDemand/device/component/checkRecord.vue | 6
src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue | 6
src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue | 105 ------------
src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue | 108 -------------
7 files changed, 17 insertions(+), 411 deletions(-)
diff --git a/src/api/cnas/resourceDemand/standardMaterial/standardMaterial.js b/src/api/cnas/resourceDemand/standardMaterial/standardMaterial.js
index bd9ca1f..454bac5 100644
--- a/src/api/cnas/resourceDemand/standardMaterial/standardMaterial.js
+++ b/src/api/cnas/resourceDemand/standardMaterial/standardMaterial.js
@@ -9,7 +9,7 @@
})
}
-//鏍囧噯鐗╄川娓呭崟鏂板缂栬緫
+//鏍囧噯鐗╄川鍙拌处鏂板缂栬緫
export function addStandardSubstance(query) {
return request({
url: '/feStandardSubstance/addStandardSubstance',
@@ -18,7 +18,7 @@
})
}
-//鍒犻櫎鏍囧噯鐗╄川娓呭崟
+//鍒犻櫎鏍囧噯鐗╄川鍙拌处
export function removeStandardSubstance(query) {
return request({
url: '/feStandardSubstance/removeStandardSubstance',
@@ -37,16 +37,7 @@
});
}
-// 涓嬭浇鏍囧噯鐗╄川瀵煎叆妯℃澘
-export function downloadStandardSubstanceImportTemplate() {
- return request({
- url: '/feStandardSubstance/importTemplate',
- method: 'get',
- responseType: 'blob'
- })
-}
-
-//鏍囧噯鐗╄川娓呭崟鍊熺敤
+//鏍囧噯鐗╄川鍙拌处鍊熺敤
export function borrowSubstance(query) {
return request({
url: '/feStandardSubstanceRecord/borrowSubstance',
diff --git a/src/views/CNAS/resourceDemand/device/component/checkRecord.vue b/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
index 3fe2c2f..c651824 100644
--- a/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
+++ b/src/views/CNAS/resourceDemand/device/component/checkRecord.vue
@@ -210,10 +210,10 @@
</el-row>
<template #footer><span class="dialog-footer">
<el-button @click="resetForm">鍙� 娑�</el-button>
- <el-button v-if="currentStep === 0 && checkChargerUserId == userId" :loading="submitFormLoading" type="primary" @click="submitCheck">纭�
+ <el-button v-if="currentStep === 0" :loading="submitFormLoading" type="primary" @click="submitCheck">纭�
瀹�</el-button>
- <el-button v-if="currentStep === 1 && userId == reviewUserId" :loading="submitFormLoading" @click="examine(0)">涓嶉�氳繃</el-button>
- <el-button v-if="currentStep === 1 && userId == reviewUserId" :loading="submitFormLoading" type="primary" @click="examine(1)">閫�
+ <el-button v-if="currentStep === 1" :loading="submitFormLoading" @click="examine(0)">涓嶉�氳繃</el-button>
+ <el-button v-if="currentStep === 1" :loading="submitFormLoading" type="primary" @click="examine(1)">閫�
杩�</el-button>
</span></template>
</el-dialog>
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
index 58862d8..07c0f0d 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCalibrationPlan.vue
@@ -11,10 +11,6 @@
</div>
<div>
<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>
@@ -67,10 +63,10 @@
<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"
+ <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" :disabled="planInfo.ratifyStatus === 1"
+ <el-button size="small" link type="danger"
@click="deleteFun1(scope.row.planDetailId)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -138,29 +134,6 @@
璁�</el-button>
</span></template>
</el-dialog>
- <el-dialog v-model="approvalDialog" title="鎵瑰噯" width="30%" @close="approvalDialog = false">
- <span>
- 鎵瑰噯澶囨敞锛�
- <el-input v-model="ratifyRemark" type="textarea"></el-input>
- </span>
- <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>
- </el-dialog>
- <el-dialog v-model="notificationDia" title="鎻愪氦鎵瑰噯" width="30%" @close="closeNotificationDia">
- <span style="margin-top: 10px;display: inline-block">
- 璇烽�夋嫨鎵瑰噯浜猴細
- <el-select v-model="ratifyUserId" clearable filterable size="small" style="width: 90%;">
- <el-option v-for="item in responsibleOptions" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </span>
- <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>
<!-- 娣诲姞/鏌ョ湅鏍″噯璁板綍寮圭獥 -->
<calibration-record-dia ref="calibrationRecordDia" @success="getYearTableDetailData"></calibration-record-dia>
</div>
@@ -171,15 +144,11 @@
import {
pageDeviceCalibrationPlan,
getCalibrationPlanByYear,
- submiatRatifyDeviceCalibrationPlan,
exportDeviceCalibrationPlanDetail,
delDeviceCalibrationPlanDetail,
pageDeviceCalibrationPlanDetail,
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 {
@@ -229,15 +198,7 @@
planDate: [{ required: true, message: '璇烽�夋嫨鏃ユ湡', trigger: 'change' }],
},
yearTableDetailDataLoading: false,
- approvalDialog: false,
- approvalLoading: false,
submitFormLoading: false,
- ratifyRemark: '',
- currentRowId: '',
- responsibleOptions: [],
- notificationDia: false,
- notificationLoading: false,
- ratifyUserId: '',
}
},
mounted() {
@@ -383,60 +344,6 @@
});
});
},
- // 鎵撳紑鎻愪氦鎵瑰噯寮规
- tellApprove() {
- this.getUserList()
- this.notificationDia = true
- },
- // 鍏抽棴鎻愪氦鎵瑰噯寮规
- closeNotificationDia() {
- this.notificationDia = false
- this.ratifyUserId = ''
- },
- // 鎻愪氦鎵瑰噯閫氱煡
- notification() {
- if (!this.ratifyUserId) {
- this.$message.warning('璇烽�夋嫨鎵瑰噯浜�')
- return
- }
- this.notificationLoading = true
- submiatRatifyDeviceCalibrationPlan({
- ratifyUserId: this.ratifyUserId,
- planId: this.planInfo.planId,
- }).then(res => {
- this.notificationLoading = false
- if (res.code == 200) {
- this.closeNotificationDia()
- this.loadPlan()
- }
- }).catch(err => {
- this.notificationLoading = false
- })
- },
- // 鎵瑰噯
- handleApprove() {
- this.currentRowId = this.planInfo.planId
- this.approvalDialog = true
- },
- // 鎻愪氦鎵瑰噯缁撴灉
- handleApproval(status) {
- const personTrainingUpdateDto = {
- planId: this.currentRowId,
- ratifyRemark: this.ratifyRemark,
- ratifyStatus: status
- }
- this.approvalLoading = true
- ratifyDeviceCalibrationPlan(personTrainingUpdateDto).then(res => {
- if (res.code === 200) {
- this.$message.success('鎻愪氦鎴愬姛锛�');
- this.approvalDialog = false
- this.loadPlan()
- }
- this.approvalLoading = false
- }).catch(() => {
- this.approvalLoading = false
- })
- },
// 瀵煎嚭
downLoadPost() {
exportDeviceCalibrationPlanDetail({ planId: this.planInfo.planId }).then(res => {
@@ -446,25 +353,9 @@
resetForm() {
this.$refs.modelForm.resetFields();
this.dialogVisible = false
- },
- // 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
- getUserList() {
- selectUserCondition().then(res => {
- if (res.code == 200) {
- let data = [];
- res.data.forEach((a) => {
- data.push({
- label: a.name,
- value: a.id,
- });
- });
- this.responsibleOptions = data
- }
- });
}
},
computed: {
- ...mapGetters(["userId"]),
// 鏄惁宸插畬鎴愬鎵癸紙鎵瑰噯/涓嶆壒鍑嗭級
isRatified() {
return this.planInfo.ratifyStatus === 0 || this.planInfo.ratifyStatus === 1;
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue b/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
index e414157..dfe897f 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentCheck.vue
@@ -128,10 +128,10 @@
</div>
<template #footer><span class="dialog-footer">
<el-button @click="handleCancel">鍙� 娑�</el-button>
- <el-button v-if="currentStep === 0 && userId == checkChargerUserId" :loading="submitFormLoading" type="primary" @click="submitCheck">纭�
+ <el-button v-if="currentStep === 0" :loading="submitFormLoading" type="primary" @click="submitCheck">纭�
瀹�</el-button>
- <el-button v-if="currentStep === 1 && userId == reviewUserId" :loading="submitFormLoading" @click="examine(0)">涓嶉�氳繃</el-button>
- <el-button v-if="currentStep === 1 && userId == reviewUserId" :loading="submitFormLoading" type="primary" @click="examine(1)">閫�
+ <el-button v-if="currentStep === 1" :loading="submitFormLoading" @click="examine(0)">涓嶉�氳繃</el-button>
+ <el-button v-if="currentStep === 1" :loading="submitFormLoading" type="primary" @click="examine(1)">閫�
杩�</el-button>
</span></template>
</el-dialog>
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
index 7ebc381..0c19357 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentMaintenancePlan.vue
@@ -11,10 +11,6 @@
</div>
<div>
<el-button size="small" type="primary" @click="loadPlan">鍒锋柊</el-button>
- <el-button size="small" type="primary" :disabled="planInfo.status === 1"
- @click="tellApprove">瀹℃牳閫氱煡</el-button>
- <el-button size="small" type="primary"
- :disabled="planInfo.status === 1 || userId != planInfo.auditId" @click="handleApprove">瀹℃牳</el-button>
<el-button size="small" type="primary" :loading="outLoading" @click="handleDownOne">瀵煎嚭</el-button>
</div>
</div>
@@ -23,7 +19,6 @@
<span>缂栧埗鏃ユ湡锛歿{ planInfo.datePreparationStr || '鈥�' }}</span>
<span v-if="planInfo.status === 1">瀹℃牳鐘舵�侊細<el-tag type="success">閫� 杩�</el-tag></span>
<span v-else-if="planInfo.status === 0">瀹℃牳鐘舵�侊細<el-tag type="danger">涓嶉�氳繃</el-tag></span>
- <span v-else>瀹℃牳鐘舵�侊細<el-tag type="info">鏈鏍�</el-tag></span>
<span v-if="planInfo.auditRemark">瀹℃牳淇℃伅锛歿{ planInfo.auditRemark }}</span>
<span v-if="isAudited && planInfo.audit">瀹℃牳浜猴細{{ planInfo.audit }}</span>
<span v-if="isAudited && planInfo.auditDateStr">瀹℃牳鏃堕棿锛歿{ planInfo.auditDateStr }}</span>
@@ -66,10 +61,10 @@
:formatter="formatDateCell"></el-table-column>
<el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="160">
<template #default="scope">
- <el-button size="small" link type="primary" :disabled="planInfo.status === 1"
+ <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" :disabled="planInfo.status === 1"
+ <el-button size="small" link type="danger"
@click="deleteRow(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -132,45 +127,18 @@
v-if="operationType !== 'view'">纭� 璁�</el-button>
</span></template>
</el-dialog>
- <el-dialog v-model="approvalDialog" title="瀹℃牳" width="30%" @close="approvalDialog = false">
- <span>
- 瀹℃牳淇℃伅锛�
- <el-input v-model="approvalRemark" type="textarea"></el-input>
- </span>
- <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>
- </el-dialog>
- <el-dialog v-model="notificationDia" title="鎻愪氦瀹℃牳" width="30%" @close="closeNotificationDia">
- <span style="margin-top: 10px;display: inline-block">
- 璇烽�夋嫨瀹℃牳浜猴細
- <el-select v-model="auditUserId" clearable filterable size="small" style="width: 90%;">
- <el-option v-for="item in responsibleOptions" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </span>
- <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>
</div>
</template>
<script>
import {
selectDeviceMaintenancePlanByPage,
- submitReviewMaintenancePlanStatus,
getMaintenancePlanByYear,
pageMaintenancePlanDetail,
updateMaintenancePlanDetail,
deleteMaintenancePlanDetail,
exportDeviceMaintenancePlan,
- reviewMaintenancePlanStatus,
} from '@/api/cnas/resourceDemand/device.js'
-import { selectUserCondition } from "@/api/business/inspectionTask";
-import { mapGetters } from "@/utils/store-compat";
import { formatDateOnly } from './dateFormat'
import { saveBlobOrShowError } from '@/utils/saveBlob'
export default {
@@ -207,13 +175,6 @@
},
submitFormLoading: false,
outLoading: false,
- responsibleOptions: [],
- notificationDia: false,
- notificationLoading: false,
- auditUserId: '',
- approvalDialog: false,
- approvalLoading: false,
- approvalRemark: '',
}
},
mounted() {
@@ -374,59 +335,6 @@
});
});
},
- // 鎵撳紑鎻愪氦瀹℃牳寮规
- tellApprove() {
- this.getUserList()
- this.notificationDia = true
- },
- // 鍏抽棴鎻愪氦瀹℃牳寮规
- closeNotificationDia() {
- this.notificationDia = false
- this.auditUserId = ''
- },
- // 鎻愪氦瀹℃牳閫氱煡
- notification() {
- if (!this.auditUserId) {
- this.$message.warning('璇烽�夋嫨瀹℃牳浜�')
- return
- }
- this.notificationLoading = true
- submitReviewMaintenancePlanStatus({
- auditId: this.auditUserId,
- maintenancePlanId: this.planInfo.maintenancePlanId,
- }).then(res => {
- this.notificationLoading = false
- if (res.code == 200) {
- this.closeNotificationDia()
- this.loadPlan()
- }
- }).catch(() => {
- this.notificationLoading = false
- })
- },
- // 鎵撳紑瀹℃牳寮规
- handleApprove() {
- this.approvalRemark = ''
- this.approvalDialog = true
- },
- // 鎻愪氦瀹℃牳缁撴灉
- handleApproval(status) {
- this.approvalLoading = true
- reviewMaintenancePlanStatus({
- maintenancePlanId: this.planInfo.maintenancePlanId,
- status: status,
- auditRemark: this.approvalRemark,
- }).then(res => {
- if (res.code == 200) {
- this.$message.success('瀹℃牳鎴愬姛锛�');
- this.approvalDialog = false
- this.loadPlan()
- }
- this.approvalLoading = false
- }).catch(() => {
- this.approvalLoading = false
- })
- },
// 瀵煎嚭
handleDownOne() {
this.outLoading = true
@@ -436,21 +344,9 @@
}).catch(() => {
this.outLoading = false
})
- },
- // 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
- getUserList() {
- selectUserCondition().then(res => {
- if (res.code == 200) {
- this.responsibleOptions = (res.data || []).map(item => ({
- label: item.name,
- value: item.id,
- }))
- }
- });
}
},
computed: {
- ...mapGetters(["userId"]),
// 鏄惁宸插畬鎴愬鏍革紙閫氳繃/涓嶉�氳繃锛�
isAudited() {
return this.planInfo.status === 0 || this.planInfo.status === 1;
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index 028e5e2..84a1130 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -11,10 +11,6 @@
</div>
<div>
<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>
@@ -80,13 +76,13 @@
<!-- 鎿嶄綔鎸夐挳 -->
<el-table-column align="center" fixed="right" label="鎿嶄綔" min-width="260">
<template #default="scope">
- <el-button size="small" link type="primary" :disabled="planInfo.ratifyStatus === 1"
+ <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="primary" @click="handleRecord(scope.row)">璁板綍</el-button>
<el-button size="small" link type="primary" @click="handleCheck(scope.row)">瀵规瘮</el-button>
<el-button size="small" link type="primary" @click="handleDown(scope.row)">瀵煎嚭</el-button>
- <el-button size="small" link type="danger" :disabled="planInfo.ratifyStatus === 1"
+ <el-button size="small" link type="danger"
@click="deleteFun1(scope.row.planDetailsId)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -155,16 +151,6 @@
v-if="operationType !== 'view'">纭� 璁�</el-button>
</span></template>
</el-dialog>
- <el-dialog v-model="approvalDialog" title="鎵瑰噯" width="30%" @close="approvalDialog = false">
- <span>
- 鎵瑰噯澶囨敞锛�
- <el-input v-model="ratifyRemark" type="textarea"></el-input>
- </span>
- <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>
- </el-dialog>
<el-dialog v-model="downloadDialog" title="瀵煎嚭" width="600px">
<span>
<el-button :loading="outLoading" type="primary" :disabled="!downRow.recordStatus"
@@ -174,19 +160,6 @@
</span>
<template #footer><span class="dialog-footer">
<el-button @click="downloadDialog = false">鍙� 娑�</el-button>
- </span></template>
- </el-dialog>
- <el-dialog v-model="notificationDia" title="鎻愪氦鎵瑰噯" width="30%" @close="closeNotificationDia">
- <span style="margin-top: 10px;display: inline-block">
- 璇烽�夋嫨鎵瑰噯浜猴細
- <el-select v-model="ratifyUserId" clearable filterable size="small" style="width: 90%;">
- <el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </span>
- <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>
<equipment-check v-if="equipmentCheck" ref="equipmentCheck" @closeDialog="closeDialog"></equipment-check>
@@ -200,17 +173,14 @@
import {
pageDeviceExaminePlan,
getExaminePlanByYear,
- submitRatifyDeviceExaminePlan,
exportDeviceExaminePlanDetail,
delDeviceExaminePlanDetail,
pageDeviceExaminePlanDetail,
updateDeviceExaminePlanDetail,
- ratifyDeviceExaminePlan,
exportReviewExamineRecordDetail,
exportReviewExamineRecordContrast,
} from '@/api/cnas/resourceDemand/device.js'
import { selectUserCondition } from "@/api/performance/class";
-import { mapGetters } from "@/utils/store-compat";
import draftSave from '@/mixins/draftSave'
import { formatListDate } from './dateFormat'
export default {
@@ -262,21 +232,13 @@
checkMethod: [{ required: true, message: '璇峰～鍐欐牳鏌ユ柟娉�', trigger: 'blur' }],
},
yearTableDetailDataLoading: false,
- approvalDialog: false,
- approvalLoading: false,
submitFormLoading: false,
- ratifyRemark: '',
- currentRowId: '',
userList: [],
equipmentCheck: false,
checkRecord: false,
downloadDialog: false,
outLoading: false,
downRow: {},
- responsibleOptions: [],
- notificationDia: false,
- notificationLoading: false,
- ratifyUserId: '',
}
},
mounted() {
@@ -435,60 +397,6 @@
});
});
},
- // 鎵撳紑鎻愪氦鎵瑰噯寮规
- tellApprove() {
- this.getUserList1()
- this.notificationDia = true
- },
- // 鍏抽棴鎻愪氦鎵瑰噯寮规
- closeNotificationDia() {
- this.notificationDia = false
- this.ratifyUserId = ''
- },
- // 鎻愪氦鎵瑰噯閫氱煡
- notification() {
- if (!this.ratifyUserId) {
- this.$message.warning('璇烽�夋嫨鎵瑰噯浜�')
- return
- }
- this.notificationLoading = true
- submitRatifyDeviceExaminePlan({
- ratifyUserId: this.ratifyUserId,
- planId: this.planInfo.planId,
- }).then(res => {
- this.notificationLoading = false
- if (res.code == 200) {
- this.closeNotificationDia()
- this.loadPlan()
- }
- }).catch(err => {
- this.notificationLoading = false
- })
- },
- // 鎵瑰噯
- handleApprove() {
- this.currentRowId = this.planInfo.planId
- this.approvalDialog = true
- },
- // 鎻愪氦鎵瑰噯缁撴灉
- handleApproval(status) {
- const personTrainingUpdateDto = {
- planId: this.currentRowId,
- ratifyRemark: this.ratifyRemark,
- ratifyStatus: status
- }
- this.approvalLoading = true
- ratifyDeviceExaminePlan(personTrainingUpdateDto).then(res => {
- if (res.code === 200) {
- this.$message.success('鎻愪氦鎴愬姛锛�');
- this.approvalDialog = false
- this.loadPlan()
- }
- this.approvalLoading = false
- }).catch(() => {
- this.approvalLoading = false
- })
- },
// 瀵煎嚭骞村害璁″垝琛�
downLoadPost() {
exportDeviceExaminePlanDetail({ planId: this.planInfo.planId }).then(res => {
@@ -577,18 +485,9 @@
if (index > -1) {
this.form.checkChargerUser = this.userList[index].name
}
- },
- // 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
- getUserList1() {
- selectUserCondition().then(res => {
- if (res.code == 200) {
- this.responsibleOptions = res.data
- }
- });
}
},
computed: {
- ...mapGetters(["userId"]),
// 鏄惁宸插畬鎴愬鎵癸紙鎵瑰噯/涓嶆壒鍑嗭級
isRatified() {
return this.planInfo.ratifyStatus === 0 || this.planInfo.ratifyStatus === 1;
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index 39c9343..3a58882 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -19,7 +19,6 @@
</div>
<div>
<el-button size="small" @click="exportFun">瀵� 鍑�</el-button>
- <el-button size="small" type="primary" @click="importVisible = true">瀵� 鍏�</el-button>
</div>
</div>
<div class="table">
@@ -28,22 +27,6 @@
</div>
<form-dia v-if="formDia" ref="formDia" @closeYearDia="closeYearDia"></form-dia>
<borrow-dia v-if="borrowDia" ref="borrowDia" @closeBorrowDia="closeBorrowDia"></borrow-dia>
- <el-dialog title="鏍囧噯鐗╄川瀵煎叆" v-model="importVisible" width="500px" @closed="resetImport">
- <div style="margin-bottom: 12px;">
- 璇蜂娇鐢ㄦ爣鍑嗙墿璐ㄥ鍏ユā鏉垮～鍐欐暟鎹紝鍗曚釜鏂囦欢涓嶈秴杩�10MB銆�
- <el-button link type="primary" @click="downloadTemplate">涓嬭浇瀵煎叆妯℃澘</el-button>
- </div>
- <el-upload ref="standardSubstanceUpload" drag name="file" accept=".xlsx" :action="importAction"
- :headers="uploadHeader" :auto-upload="false" :limit="1" :file-list="importFiles"
- :before-upload="beforeImport" :on-success="importSuccess" :on-error="importError">
- <lims-icon name="el-icon-upload"></lims-icon>
- <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- </el-upload>
- <template #footer><span class="dialog-footer">
- <el-button @click="importVisible = false">鍙栨秷</el-button>
- <el-button type="primary" :loading="importing" @click="submitImport">瀵煎叆</el-button>
- </span></template>
- </el-dialog>
</div>
</template>
@@ -54,8 +37,7 @@
import {
getPageStandardSubstance,
removeStandardSubstance,
- exportOfStandardSubstanceList,
- downloadStandardSubstanceImportTemplate
+ exportOfStandardSubstanceList
} from '@/api/cnas/resourceDemand/standardMaterial/standardMaterial'
import FormDia from '../standardMaterial/component/formDia.vue';
import BorrowDia from '../standardMaterial/component/borrowDia.vue';
@@ -197,71 +179,18 @@
total: 0,
formDia: false,
borrowDia: false,
- importVisible: false,
- importing: false,
- importFiles: [],
- }
- },
- computed: {
- importAction() {
- return this.javaApi + '/feStandardSubstance/importStandardSubstance'
}
},
mounted() {
this.searchList()
},
methods: {
- downloadTemplate() {
- downloadStandardSubstanceImportTemplate().then(res => {
- this.$download.saveAs(new Blob([res]), '鏍囧噯鐗╄川瀵煎叆妯℃澘.xlsx')
- })
- },
- submitImport() {
- if (!this.$refs.standardSubstanceUpload.uploadFiles.length) {
- this.$message.warning('璇烽�夋嫨闇�瑕佸鍏ョ殑Excel鏂囦欢')
- return
- }
- this.$refs.standardSubstanceUpload.submit()
- },
- beforeImport(file) {
- if (!file.name.toLowerCase().endsWith('.xlsx')) {
- this.$message.error('浠呮敮鎸�.xlsx鏍煎紡鏂囦欢')
- return false
- }
- if (file.size > 10 * 1024 * 1024) {
- this.$message.error('瀵煎叆鏂囦欢涓嶈兘瓒呰繃10MB')
- return false
- }
- this.importing = true
- return true
- },
- importSuccess(response) {
- this.importing = false
- if (response.code !== 200) {
- this.$message.error(response.message || response.msg || '瀵煎叆澶辫触')
- return
- }
- this.$message.success(`鎴愬姛瀵煎叆${response.data}鏉℃爣鍑嗙墿璐╜)
- this.importVisible = false
- this.searchList()
- },
- importError() {
- this.importing = false
- this.$message.error('瀵煎叆澶辫触')
- },
- resetImport() {
- this.importing = false
- this.importFiles = []
- if (this.$refs.standardSubstanceUpload) {
- this.$refs.standardSubstanceUpload.clearFiles()
- }
- },
exportFun() {
this.outLoading = true
exportOfStandardSubstanceList(this.searchForm).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' }, false);
- this.$download.saveAs(blob, '鏍囧噯鐗╄川娓呭崟.xlsx')
+ this.$download.saveAs(blob, '鏍囧噯鐗╄川鍙拌处.xlsx')
})
},
// 鏌ヨ鍒楄〃
--
Gitblit v1.9.3