From 2d55ed180fddd028bf4f839345bf0ef4d2f032e7 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 07 三月 2025 13:34:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/api/cnas/resourceDemand/device.js | 2
src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue | 9
src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue | 9
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 25 --
src/api/cnas/process/reportResults.js | 2
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue | 8
src/views/CNAS/systemManagement/documentControl/components/FileList.vue | 4
src/views/business/unpass/components/unPassDialog.vue | 11 -
src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue | 11 -
src/views/business/productOrder/index.vue | 19 -
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue | 4
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 5
src/views/business/inspectionTask/index.vue | 8
src/views/CNAS/systemManagement/customerSatisfaction/components/formDialog.vue | 2
src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue | 4
src/views/business/materialOrder/copperOrder.vue | 2
src/views/CNAS/process/uncertainty/index.vue | 7
src/views/structural/capabilityAndLaboratory/laboratory/index.vue | 4
src/components/Table/value-table.vue | 16 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue | 1
src/views/CNAS/process/sampleDisposal/index.vue | 9
src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue | 11 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue | 1
src/views/business/productOrder/components/add.vue | 37 ++--
src/views/business/inspectionTask/inspection.vue | 16 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue | 1
src/views/performance/manHour/workTimeManagement.vue | 6
src/views/CNAS/systemManagement/correctiveAction/components/correctiveInfo.vue | 1
src/views/performance/manHour/workTimeStatistics.vue | 1
src/views/standard/standardLibrary/components/bindSupplierDensityDialogAsk.vue | 3
src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue | 13 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue | 1
src/views/business/inspectionTask/components/InspectionWord.vue | 17 -
src/views/standard/standardLibrary/index.vue | 50 -----
src/views/CNAS/resourceDemand/device/component/files.vue | 21 -
src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue | 9
src/views/CNAS/process/method/standardMethod/index.vue | 1
src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue | 3
src/views/CNAS/resourceDemand/device/component/calibration.vue | 9
src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue | 1
src/views/business/inspectionTask/components/EditInspectionItem.vue | 1
src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 13 -
src/views/business/materialOrder/customsInspection.vue | 1
src/views/standard/standardLibrary/components/BatchCopy.vue | 4
src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue | 7
src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue | 1
src/views/performance/class/index.vue | 10 -
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue | 1
src/views/business/reportPreparation/index.vue | 11 -
src/views/CNAS/process/reportResults/index.vue | 4
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 18 -
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 14 -
src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue | 5
src/plugins/download.js | 42 +++-
src/views/CNAS/systemManagement/correctiveAction/index.vue | 3
55 files changed, 103 insertions(+), 396 deletions(-)
diff --git a/src/api/cnas/process/reportResults.js b/src/api/cnas/process/reportResults.js
index a7f25d6..bfd2fd5 100644
--- a/src/api/cnas/process/reportResults.js
+++ b/src/api/cnas/process/reportResults.js
@@ -5,7 +5,7 @@
export function exportProcessReport(data) {
return request({
url: "/processReport/exportProcessReport",
- method: "post",
+ method: "get",
data: data,
});
}
diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index 137a598..400a1ec 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -669,7 +669,7 @@
// 鑾峰彇鐩稿叧鏂囨。鏁版嵁鐨刟pi-鏇存柊
export function updateDocument(data) {
return request({
- url: "/documents/updateDocument",
+ url: "/deviceDocuments/updateDocument",
method: "post",
data: data,
});
diff --git a/src/components/Table/value-table.vue b/src/components/Table/value-table.vue
index 5269c88..1d50835 100644
--- a/src/components/Table/value-table.vue
+++ b/src/components/Table/value-table.vue
@@ -1120,10 +1120,6 @@
},
})
.then((res) => {
- if (res.code === 201) {
- this.addLoad = false;
- return;
- }
this.$message.success("娣诲姞鎴愬姛");
this.addDia = false;
this.selectList("page");
@@ -1162,10 +1158,6 @@
}
)
.then((res) => {
- if (res.code === 201) {
- this.loading = false;
- return;
- }
this.downDia = false;
this.loading = false;
this.$message.success("瀵煎嚭鎴愬姛");
@@ -1213,7 +1205,7 @@
this.$refs.upload.clearFiles();
this.uploadDia = false;
this.uploading = false;
- if (response.code == 201) {
+ if (response.code != 200) {
this.$message.error(response.message);
return;
}
@@ -1315,9 +1307,6 @@
),
})
.then((res) => {
- if (res.code === 201) {
- return;
- }
this.$message.success("鍒犻櫎鎴愬姛");
this.selectList("page");
})
@@ -1352,9 +1341,6 @@
}
)
.then((res) => {
- if (res.code === 201) {
- return;
- }
this.$parent.submitBatchCheckDialog();
this.$message.success("鎿嶄綔鎴愬姛");
});
diff --git a/src/plugins/download.js b/src/plugins/download.js
index c0c1878..36db93e 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -4,6 +4,7 @@
import { getToken } from "@/utils/auth";
import errorCode from "@/utils/errorCode";
import { blobValidate } from "@/utils/ruoyi";
+import Vue from "vue";
const baseURL = process.env.VUE_APP_BASE_API;
let downloadLoadingInstance;
@@ -80,22 +81,37 @@
downloadLoadingInstance.close();
});
},
+ async downloadFileFromUrl(url, filename) {
+ try {
+ let state = /\.(jpg|jpeg|png|gif)$/i.test(url) // 鍒ゆ柇鏄惁涓哄浘鐗�
+ let url1 = ''
+ if (state) {
+ url1 = Vue.prototype.javaApi + '/img/' + url;
+ } else {
+ url1 = Vue.prototype.javaApi + '/word/' + url
+ }
+ // 浣跨敤 fetch 鑾峰彇鏂囦欢
+ const response = await fetch(url1);
+ if (!response.ok) {
+ throw new Error('鏂囦欢涓嬭浇澶辫触: ' + response.statusText);
+ }
+ // 灏嗘枃浠惰浆鎹负 Blob
+ const blob = await response.blob();
+ // 浣跨敤 saveAs 淇濆瓨鏂囦欢
+ saveAs(blob, filename);
+ Message.success("鏁版嵁瀵煎嚭鎴愬姛");
+ } catch (error) {
+ Message.error(error);
+ }
+ },
saveAs(text, name, opts) {
- if (typeof text === "string") {
- // 璺緞涓嬭浇
+ // 娴佷笅杞�
+ blobToText(text).then((result) => {
+ Message.error(result.msg);
+ }).catch(() => {
saveAs(text, name, opts);
Message.success("鏁版嵁瀵煎嚭鎴愬姛");
- } else {
- // 娴佷笅杞�
- blobToText(text)
- .then((result) => {
- Message.error(result.msg);
- })
- .catch(() => {
- saveAs(text, name, opts);
- Message.success("鏁版嵁瀵煎嚭鎴愬姛");
- });
- }
+ });
},
async printErrMsg(data) {
const resText = await data.text();
diff --git a/src/views/CNAS/process/method/standardMethod/index.vue b/src/views/CNAS/process/method/standardMethod/index.vue
index bb4602e..ead5404 100644
--- a/src/views/CNAS/process/method/standardMethod/index.vue
+++ b/src/views/CNAS/process/method/standardMethod/index.vue
@@ -385,7 +385,6 @@
})
.then(() => {
delStandardMethod({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.getList();
});
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index 4321fb6..59d2b8c 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -14,7 +14,7 @@
</div>
<div>
<el-button size="medium" type="primary" @click="openApprovalDialog1">寤� 妗�</el-button>
- <el-upload ref='upload' :action="action" :before-upload="beforeUpload" :headers="headers" :on-error="onError"
+ <el-upload ref='upload' :action="action" :before-upload="beforeUpload" :headers="uploadHeader" :on-error="onError"
:on-success="handleSuccessUp" :show-file-list="false"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
style="display: inline-block; margin-left: 10px;">
@@ -96,6 +96,7 @@
addSearchNewArchived, exportMethodSearchNew,
pageMethodSearchNew, pageSearchNewArchived, pageSearchNewBackups, ratifySearchNewArchivedr
} from '@/api/cnas/process/method/standardNoveltyRetrieval'
+import {selectUserCondition} from "@/api/performance/class";
export default {
name: 'a7-standard-novelty-retrieval',
@@ -468,7 +469,6 @@
writeDate: '',
ratifyDate: '',
},
- userList: [],
approvalDialog: false,
approvalDialog1: false,
viewRocordDia: false,
@@ -670,30 +670,9 @@
this.oldPage.size = page.limit
this.searchList();
},
- //
- getUserList() {
- this.$axios.post(this.$api.user.selectUserList, {
- page: { current: -1, size: -1, },
- entity: { name: null }
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
- if (res.code === 201) {
- return
- }
- this.userList = res.data.body.records
- })
- },
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
- headers() {
- return {
- 'token': sessionStorage.getItem('token')
- }
- },
action() {
return this.javaApi + '/processMethodSearchNew/importMethodSearchNew'
}
diff --git a/src/views/CNAS/process/reportResults/index.vue b/src/views/CNAS/process/reportResults/index.vue
index 08ad966..695cdc1 100644
--- a/src/views/CNAS/process/reportResults/index.vue
+++ b/src/views/CNAS/process/reportResults/index.vue
@@ -222,9 +222,7 @@
this.outLoading = true
exportProcessReport({ ids: this.mutilSelect.map(m => m.id) }).then(res => {
this.outLoading = false
- if (res.code === 201) return
- const url = this.javaApi + '/word/' + res.data;
- this.$download.saveAs(url, "鎶ュ憡缁撴灉");
+ this.$download.downloadFileFromUrl(res.data, "鎶ュ憡缁撴灉");
})
},
openAdd() {
diff --git a/src/views/CNAS/process/sampleDisposal/index.vue b/src/views/CNAS/process/sampleDisposal/index.vue
index 8759567..c534d45 100644
--- a/src/views/CNAS/process/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/sampleDisposal/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="sample-disposal">
+ <div class="capacity-scope">
<el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="queryParams.totaldealId = ''">
<el-tab-pane label="濉啓" name="濉啓" style="height: 100%;" :key="1">
<el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;">鏂板</el-button>
@@ -505,9 +505,12 @@
},
// 瀵煎嚭璇︽儏
handleDown0(row) {
+ if (!row.url) {
+ this.$message.warning('鏆傛棤鏂囦欢')
+ return
+ }
// 鍚庣涓嬭浇
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
+ this.$download.downloadFileFromUrl(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
},
handleDelete(row) {
this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
diff --git a/src/views/CNAS/process/uncertainty/index.vue b/src/views/CNAS/process/uncertainty/index.vue
index 053008b..8aca44f 100644
--- a/src/views/CNAS/process/uncertainty/index.vue
+++ b/src/views/CNAS/process/uncertainty/index.vue
@@ -183,8 +183,11 @@
})
},
handleDown(row) {
- let url = this.javaApi + '/word/' + row.reportUrl
- this.$download.saveAs(url, row.reportName);
+ if (!row.reportUrl) {
+ this.$message.warning('鏆傛棤鏂囦欢')
+ return
+ }
+ this.$download.downloadFileFromUrl(row.reportUrl, row.reportName);
},
beforeUpload(file) {
if (file.size > 1024 * 1024 * 10) {
diff --git a/src/views/CNAS/resourceDemand/device/component/calibration.vue b/src/views/CNAS/resourceDemand/device/component/calibration.vue
index 0a83361..10954a3 100644
--- a/src/views/CNAS/resourceDemand/device/component/calibration.vue
+++ b/src/views/CNAS/resourceDemand/device/component/calibration.vue
@@ -416,14 +416,7 @@
})
},
handleAttachmentClick(row) {
- let state = /\.(jpg|jpeg|png|gif)$/i.test(row.systemFileName)
- if (state) {
- let url = this.javaApi + '/img/' + row.systemFileName;
- this.$download.saveAs(url, row.systemFileName)
- } else {
- const url = this.javaApi + '/word/' + row.systemFileName
- this.$download.saveAs(url, row.systemFileName)
- }
+ this.$download.downloadFileFromUrl(row.systemFileName, row.systemFileName)
},
//瀵煎嚭
handleDown() {
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
index 8dcd2c2..49004f4 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
@@ -197,14 +197,7 @@
},
// 涓嬭浇
upload(row) {
- let url = '';
- if (row.type == 1) {
- url = this.javaApi + '/img/' + row.fileUrl
- this.$download.saveAs(url, row.fileName)
- } else {
- url = this.javaApi + '/word/' + row.fileUrl
- this.$download.saveAs(url, row.fileName)
- }
+ this.$download.downloadFileFromUrl(row.fileUrl, row.fileName)
},
// 鍒犻櫎
delete(row) {
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index bb72b97..c28facd 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -175,7 +175,7 @@
<el-table-column fixed="right" label="鎿嶄綔" min-width="180">
<template slot-scope="scope">
<el-button type="text" size="small" @click="handleAttachmentClick(scope.row)">涓嬭浇闄勪欢</el-button>
- <el-button type="text" size="small" @click="handleViewClick(scope.row)">鏌ョ湅</el-button>
+ <el-button type="text" size="small" @click="handleViewClick(scope.row)">缂栬緫</el-button>
<el-button type="text" size="small" @click="handleDeleteClick(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -341,7 +341,7 @@
</el-row>
</span>
</el-dialog>
- <el-dialog title="娣诲姞璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
+ <el-dialog title="璁惧闄勪欢" top="5vh" v-if="dialogVisible1" :visible.sync="dialogVisible1" width="40%">
<el-form ref="form" :model="addFile" label-width="120px">
<el-row :gutter="20">
<el-col :span="12">
@@ -618,18 +618,7 @@
handleAttachmentClick(row) {
console.log(row)
if (row.fileName) {
- let state = /\.(jpg|jpeg|png|gif)$/i.test(row.fileName)
- if (state) {
- let url = this.javaApi + '/img/' + row.fileName;
- fileDownload.downloadIamge(url, row.fileName)
- } else {
- const url = this.javaApi + '/word/' + row.fileName
- const link = document.createElement('a');
- link.href = url;
- link.download = row.fileName;
- link.click();
- this.$message.success('涓嬭浇鎴愬姛')
- }
+ this.$download.downloadFileFromUrl(row.fileName)
} else {
this.$message.warning('鏈笂浼犳枃浠讹紒')
}
@@ -1063,14 +1052,14 @@
.device-main {
width: 90%;
margin: 0px 5%;
- height: 460px;
+ height: 500px;
padding: 25px 0px;
background-color: #fff;
}
.device-center {
width: 90%;
- height: 460px;
+ height: 490px;
margin: 0px 5%;
border-radius: 15px;
background-color: #fff;
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
index 48e5b68..71a7c67 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue
@@ -250,9 +250,11 @@
})
},
download(row) {
- let url = '';
- url = this.javaApi + '/img/' + row.systemFileName
- this.$download.saveAs(url, row.fileName)
+ if (!row.systemFileName) {
+ this.$message.warning('鏆傛棤鏂囦欢')
+ return
+ }
+ this.$download.downloadFileFromUrl(row.systemFileName, row.fileName)
}
}
}
diff --git a/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue b/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue
index 3c6a5bd..1e281d6 100644
--- a/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue
+++ b/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue
@@ -94,7 +94,6 @@
this.tableLoading = true
getSuperviseDetailCorrectFileList({ superviseDetailsCorrectId: this.info.superviseDetailsCorrectId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data
}).catch(err => {
this.tableLoading = false
@@ -111,21 +110,13 @@
},
// 涓嬭浇
upload(row) {
- let url = '';
- if (row.type == 1) {
- url = this.javaApi + '/img/' + row.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + row.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
+ this.$download.downloadFileFromUrl(row.fileUrl, row.fileName);
},
// 鍒犻櫎
delete(row) {
this.tableLoading = true
delSuperviseDetailCorrectFile({ superviseDetailsCorrectFileId: row.superviseDetailsCorrectFileId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchTableList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/correctiveAction/components/correctiveInfo.vue b/src/views/CNAS/systemManagement/correctiveAction/components/correctiveInfo.vue
index 16d0d92..e84cb27 100644
--- a/src/views/CNAS/systemManagement/correctiveAction/components/correctiveInfo.vue
+++ b/src/views/CNAS/systemManagement/correctiveAction/components/correctiveInfo.vue
@@ -203,7 +203,6 @@
searchInfo(row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
getSuperviseDetailCorrect({ superviseDetailsId: row.superviseDetailsId }).then(res => {
- if (res.code === 201) return
this.form = res.data
}).catch(err => {
console.log('err---', err);
diff --git a/src/views/CNAS/systemManagement/correctiveAction/index.vue b/src/views/CNAS/systemManagement/correctiveAction/index.vue
index 9360848..b86b2a3 100644
--- a/src/views/CNAS/systemManagement/correctiveAction/index.vue
+++ b/src/views/CNAS/systemManagement/correctiveAction/index.vue
@@ -42,7 +42,7 @@
name: 'a8-corrective-action',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
- // QualityInfo,
+ // QualityInfo,
CorrectiveInfo,
limsTable,
TableCard,
@@ -129,7 +129,6 @@
this.tableLoading = true
pageSuperviseDetailCorrect({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/components/formDialog.vue b/src/views/CNAS/systemManagement/customerSatisfaction/components/formDialog.vue
index 13e5d6d..0310230 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/components/formDialog.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/components/formDialog.vue
@@ -193,7 +193,6 @@
if (this.operationType === 'add') {
addClientSatisfaction(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.closeFormDia()
}).catch(err => {
@@ -203,7 +202,6 @@
} else {
updateClientSatisfaction(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.closeFormDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 4a1900c..6ea9848 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -218,7 +218,6 @@
this.tableLoading = true
pageClientSatisfaction({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
@@ -229,7 +228,6 @@
this.tableLoading1 = true
pageAnalyseFile({ ...entity, ...page }).then(res => {
this.tableLoading1 = false
- if (res.code === 201) return
this.tableData1 = res.data.records
this.page1.total = res.data.total
}).catch(err => {
@@ -286,7 +284,6 @@
this.tableLoading = true
delClientSatisfaction({ clientSatisfactionId: row.clientSatisfactionId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
@@ -307,14 +304,7 @@
},
// 涓嬭浇瀹㈡埛绂忓缓
upload(row) {
- let url = '';
- if (row.type == 1) {
- url = this.javaApi + '/img/' + row.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + row.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
+ this.$download.downloadFileFromUrl(row.fileUrl, row.fileName);
},
// 鍒犻櫎瀹㈡埛鍒嗘瀽闄勪欢
delFile(row) {
@@ -326,7 +316,6 @@
this.tableLoading = true
delAnalyseFile({ analyseFileId: row.analyseFileId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
index cc35075..d6cc6d9 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
@@ -461,8 +461,7 @@
},
handleDown(row) {
if (!row.url) return this.$message.warning('鏂囦欢鏈笂浼�')
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, row.url);
+ this.$download.downloadFileFromUrl(row.url, row.url);
},
async uploadPDF(pdfBlob) {
const formData = new FormData();
@@ -509,7 +508,6 @@
})
.then(() => {
delManageDocumentControlled({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
index 3c08b0d..879f070 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
@@ -542,7 +542,6 @@
})
.then(() => {
delManageDocumentIssueRecycle({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
index b68fb55..8f9d12a 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
@@ -568,8 +568,7 @@
// 涓嬭浇闄勪欢
handleDown(row) {
if (!row.alterAfterUrl) return this.$message.warning('鏂囦欢鏈笂浼�')
- let url = this.javaApi + '/word/' + row.alterAfterUrl
- this.$download.saveAs(url, row.alterAfterUrl)
+ this.$download.downloadFileFromUrl(row.alterAfterUrl, row.alterAfterUrl)
},
// 鎵撳紑瀹℃牳寮规
handleCheck(row) {
@@ -629,7 +628,6 @@
})
.then(() => {
delManageDocumentAlter({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
index 88bc13d..4696f3e 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
@@ -252,8 +252,7 @@
// 涓嬭浇鏂囦欢
handleDown(row) {
if (!row.url) return this.$message.warning('鏂囦欢鏈笂浼�')
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, row.url);
+ this.$download.downloadFileFromUrl(row.url, row.url);
},
// 鏌ョ湅鏂囦欢
handleLook(row) {
@@ -361,7 +360,6 @@
})
.then(() => {
delManageDocumentList({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
index 128cd8b..0cb20d9 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
@@ -438,7 +438,6 @@
})
.then(() => {
delManageDocumentCancel({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
index ef71f30..d64c541 100644
--- a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
@@ -283,9 +283,7 @@
// queryParams
exportOutManageRecordCheck(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) return this.$message.error('瀵煎嚭澶辫触')
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, '鏂囦欢瀹℃壒璁板綍')
+ this.$download.downloadFileFromUrl(res.data, '鏂囦欢瀹℃壒璁板綍')
})
},
getAuthorizedPerson() {
@@ -313,7 +311,6 @@
if (action === 'confirm') {
// 鐐瑰嚮鈥滅‘瀹氣�濇寜閽紝鍏佽鍏抽棴
checkManageRecordCheck({ id: row.id, checkState: '閫氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -327,7 +324,6 @@
} else if (action === 'cancel') {
// 鐐瑰嚮鈥滃彇娑堚�濇寜閽紝涓嶅厑璁稿叧闂�
checkManageRecordCheck({ id: row.id, checkState: '涓嶉�氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -359,7 +355,6 @@
if (action === 'confirm') {
// 鐐瑰嚮鈥滅‘瀹氣�濇寜閽紝鍏佽鍏抽棴
ratifyManageRecordCheck({ id: row.id, ratifyState: '閫氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -373,7 +368,6 @@
} else if (action === 'cancel') {
// 鐐瑰嚮鈥滃彇娑堚�濇寜閽紝涓嶅厑璁稿叧闂�
ratifyManageRecordCheck({ id: row.id, ratifyState: '涓嶉�氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -462,7 +456,6 @@
})
.then(() => {
delManageRecordCheck({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
index 686e6eb..3ab5cc0 100644
--- a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
@@ -243,9 +243,7 @@
this.outLoading = true
exportOutManageRecordCancel(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) return this.$message.error('瀵煎嚭澶辫触')
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, "浣滃簾鏂囦欢閿�姣佽褰�");
+ this.$download.downloadFileFromUrl(res.data, "浣滃簾鏂囦欢閿�姣佽褰�");
})
},
getList() {
@@ -326,9 +324,6 @@
if (this.title == '鏂板') {
addManageRecordCancel(obj).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -339,9 +334,6 @@
} else {
doManageRecordCancel(obj).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -380,7 +372,6 @@
if (action === 'confirm') {
// 鐐瑰嚮鈥滅‘瀹氣�濇寜閽紝鍏佽鍏抽棴
ratifyManageRecordCancel({ id: row.id, ratifyState: '閫氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -394,7 +385,6 @@
} else if (action === 'cancel') {
// 鐐瑰嚮鈥滃彇娑堚�濇寜閽紝涓嶅厑璁稿叧闂�
ratifyManageRecordCancel({ id: row.id, ratifyState: '涓嶉�氳繃' }).then(res => {
- if (res.code === 201) return
this.refreshTable()
done();
this.$message({
@@ -422,7 +412,6 @@
})
.then(() => {
delManageRecordCancel({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
index d224ee2..cf9982a 100644
--- a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
@@ -300,9 +300,7 @@
this.outLoading = true
exportOutManageRecordIssueRecycle(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) return this.$message.error('瀵煎嚭澶辫触')
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
+ this.$download.downloadFileFromUrl(res.data, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
})
},
getList() {
@@ -409,9 +407,6 @@
if (this.title == '鏂板') {
addManageRecordIssueRecycle(obj).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -422,9 +417,6 @@
} else {
doManageRecordIssueRecycle(obj).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -446,9 +438,6 @@
obj = { id, documentCode, documentName, documentVersion, pages, documentType, number, receiveUser, receiveDate, departLims, signedDate: getYearAndMonthAndDays(), signedUser: this.userId }
doManageRecordIssueRecycle(obj).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -472,7 +461,6 @@
})
.then(() => {
delManageRecordIssueRecycle({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index c7c2922..cc13d08 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -393,8 +393,7 @@
}).catch(err => { });
},
handleDown0(row) {
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, '澶栨潵鏂囦欢纭璁板綍')
+ this.$download.downloadFileFromUrl(row.url, '澶栨潵鏂囦欢纭璁板綍')
},
// 鎻愪氦
handleSubmit(row) {
@@ -432,7 +431,6 @@
}).then(res => {
this.checkLoading = false
this.noCheckLoading = false
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎿嶄綔鎴愬姛!'
@@ -449,7 +447,6 @@
})
.then(() => {
delManageRecordVerify({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.getList0()
});
diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index 432faea..60eafd1 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -345,9 +345,7 @@
this.outLoading = true
exportOutManageRecordIntervals(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) return this.$message.error('瀵煎嚭澶辫触')
- let url = this.javaApi + 'word/' + res.message
- this.$download.saveAs(url, "鏂囦欢瀹氭湡瀹℃煡璁板綍");
+ this.$download.downloadFileFromUrl(res.message, "鏂囦欢瀹氭湡瀹℃煡璁板綍");
})
},
getList() {
@@ -476,9 +474,6 @@
if (this.title == '鏂板') {
addManageRecordIntervals(obj).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -489,9 +484,6 @@
} else {
doManageRecordIntervals(obj).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -518,9 +510,6 @@
ratifyState: state
}).then(res => {
this.checkLoading = false
- if (res.code == 201) {
- return
- }
this.noCheckLoading = false
this.$message({
type: 'success',
@@ -543,8 +532,7 @@
}
},
handleDown0(row) {
- let url = this.javaApi + '/word/' + row.url
- this.$download.saveAs(url, "鎵�鏈夋枃浠跺畾鏈熸鏌ヨ褰�");
+ this.$download.downloadFileFromUrl(row.url, "鎵�鏈夋枃浠跺畾鏈熸鏌ヨ褰�");
},
// 鎻愪氦
handleSubmit(row) {
@@ -556,7 +544,6 @@
submitManageRecordIntervalsTotal({
id: row.id
}).then(res => {
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎻愪氦鎴愬姛!'
@@ -578,7 +565,6 @@
})
.then(() => {
delManageRecordIntervals({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refreshTable();
});
diff --git a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
index e5fa49b..47d4106 100644
--- a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
@@ -550,9 +550,7 @@
this.outLoading = true
exportOutManageRecordAudit(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) return this.$message.error('瀵煎嚭澶辫触')
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, "鏂囦欢淇琛�");
+ this.$download.downloadFileFromUrl(res.data, "鏂囦欢淇琛�");
})
},
getList() {
@@ -693,9 +691,6 @@
})
.then(() => {
ratifyManageRecordAudit({ id: row.id }).then(res => {
- if (res.code === 201) {
- return;
- }
this.$message.success('鎿嶄綔鎴愬姛');
this.refreshTable();
})
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue
index fac2da1..a96569d 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue
@@ -116,14 +116,7 @@
},
// 涓嬭浇
upload(row) {
- let url = '';
- if (row.type == 1) {
- url = this.javaApi + '/img/' + row.fileUrl
- this.$download.saveAs(url, row.fileName)
- } else {
- url = this.javaApi + '/word/' + row.fileUrl
- this.$download.saveAs(url, row.fileName)
- }
+ this.$download.downloadFileFromUrl(row.fileUrl, row.fileName)
},
// 鍒犻櫎
delete(row) {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
index 8b851ca..8fd7254 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
@@ -171,7 +171,6 @@
this.tableLoading = true
pageInternalCheck({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
index a1f1e58..8295da4 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
@@ -134,7 +134,6 @@
this.diaLoading = true
getInternalCheckOne({ checkId: row.checkId }).then(res => {
this.diaLoading = false
- if (res.code === 201) return
this.form = res.data
this.checkDetailList = this.form.checkDetailList
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
index f18a42f..116cbce 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
@@ -119,7 +119,6 @@
this.tableLoading = true
pageInternalMeeting({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue
index e648ee2..892d098 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue
@@ -101,7 +101,6 @@
this.diaLoading = true
getInternalMeetingOne({ meetingId: row.meetingId }).then(res => {
this.diaLoading = false
- if (res.code === 201) return
this.form = res.data
this.form.participant = this.form.participant.split(',').map(Number)
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
index 6909f5e..a29da33 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
@@ -229,7 +229,6 @@
this.tableLoading = true
pageInternalReport({ ...entity, ...page }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue b/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
index 14dc270..b5f1c61 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
@@ -282,8 +282,7 @@
},
handleDown0(url, name) {
if (!url) return this.$message.warning('鏂囦欢鏈笂浼�')
- let url0 = this.javaApi + '/word/' + url
- this.$download.saveAs(url0, name);
+ this.$download.downloadFileFromUrl(url, name);
}
}
};
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
index bf9e244..988e8e2 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
@@ -136,7 +136,6 @@
},
initData() {
getPageList(this.search).then(res => {
- if (res.code === 201) return;
this.tableData = res.data.records;
this.search.total = res.data.total;
});
@@ -166,7 +165,6 @@
// 瀹℃壒鎺ュ彛
approvalApi(userId, status) {
riskAnalysisApprovalOfControlPlanChecklist({ approval: userId, status }).then(res => {
- if (res.code === 201) return;
this.initData()
this.$message({
type: 'success',
@@ -199,7 +197,6 @@
// 鎵瑰噯鎺ュ彛
approveApi(userId, status) {
approvalOfControlPlanChecklist({ approve: userId, status }).then(res => {
- if (res.code === 201) return;
this.initData()
this.$message({
type: 'success',
@@ -214,7 +211,7 @@
});
},
onSuccess(response) {
- if (response.code == 201) {
+ if (response.code != 200) {
this.$message({
type: 'error',
message: response.message,
diff --git a/src/views/business/inspectionTask/components/EditInspectionItem.vue b/src/views/business/inspectionTask/components/EditInspectionItem.vue
index 3b711e9..fc13ce9 100644
--- a/src/views/business/inspectionTask/components/EditInspectionItem.vue
+++ b/src/views/business/inspectionTask/components/EditInspectionItem.vue
@@ -216,7 +216,6 @@
updateProductOnPlan(params)
.then((res) => {
this.handleEditLoading = false;
- if (res.code === 201) return;
this.$message.success("淇敼鎴愬姛");
this.editAskDia = false;
this.getTableData();
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 8ff12cb..51c9645 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -247,7 +247,7 @@
import AddUnPass from "@/views/business/unpass/components/addUnPass.vue";
import {
checkSubmitPlan,
- doInsOrder,
+ doInsOrder, downFile,
getInsProductUnqualifiedRetest,
search, selectUserCondition,
submitPlan,
@@ -1848,10 +1848,6 @@
currentTable: this.currentTable,
sampleId: this.currentSample.id
}).then(res => {
- if (res.code == 201) {
- this.$message.error('淇濆瓨澶辫触')
- return
- }
this.$message.success('宸蹭繚瀛�')
})
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
@@ -2036,16 +2032,7 @@
downFile({
id: row.id,
}).then(res => {
- if (res.code === 200) {
- let url = '';
- if (res.data.type == 1) {
- url = this.javaApi + '/img/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
- }
+ this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
}).catch(error => {
})
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index e03b541..d3505bf 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -933,10 +933,6 @@
this.bindCurrentInfo = row;
getBindingProductByProductId({ productId: row.insProductId })
.then((res) => {
- if (res.coe == 201) {
- // this.$message.error('鏈粦瀹氭楠岄」')
- return;
- }
// console.log(res)
this.bindTableData = res.data;
this.bindDialogVisible = true;
@@ -950,10 +946,6 @@
productId: this.bindCurrentInfo.insProductId,
})
.then((res) => {
- if (res.coe == 201) {
- // this.$message.error('鏈粦瀹氭楠岄」')
- return;
- }
// console.log(res)
this.bindAddTableData = res.data;
this.bindAddDialogVisible = true;
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 55af32e..9df7731 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -1482,7 +1482,6 @@
[type]: type === "remark" ? m : Number(m),
id: this.insOrder.id,
}).then((res) => {
- if (res.code == 201) return;
this.$message.success("淇濆瓨鎴愬姛");
});
},
@@ -2710,10 +2709,6 @@
orderId: this.orderId,
sonLaboratory: this.sonLaboratory
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("淇濆瓨澶辫触");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
@@ -2884,16 +2879,7 @@
},
handleDown(row) {
downFile({ id: row.id }).then((res) => {
- if (res.code === 200) {
- let url = "";
- if (res.data.type == 1) {
- url = this.javaApi + "/img/" + res.data.fileUrl;
- this.$download.saveAs(url, row.fileName)
- } else {
- url = this.javaApi + "/word/" + res.data.fileUrl;
- this.$download.saveAs(url, row.fileName)
- }
- }
+ this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName)
})
.catch((error) => { });
},
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 15b20e2..8227fdd 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -730,7 +730,6 @@
})
}).then(res => {
this.noNeedCheckLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.closeOpenPage()
}).catch(e=>{
@@ -1171,7 +1170,6 @@
})
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
this.closeOpenPage()
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 797161c..de04e8c 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -1072,7 +1072,6 @@
}),
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.bsm3Dia = false;
this.closeOpenPage()
diff --git a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
index 8dc8ee0..ef642c2 100644
--- a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
@@ -154,16 +154,7 @@
// 涓嬭浇
handleDown(row) {
downFile({ id: row.id, }).then(res => {
- if (res.code === 200) {
- let url = '';
- if (res.data.type == 1) {
- url = this.javaApi + '/img/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
- }
+ this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
}).catch(error => {
})
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 5f151a6..2a65236 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -117,13 +117,29 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
+ <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
+ <el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
+ <el-radio :label="0" border>鍏朵粬</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
+ <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini" style="display: flex; flex-direction: column;">
+ <el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
+ <el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item label="鐢熶骇鍗曚綅:" prop="production">
<el-input v-model="addObj.production" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
size="small"></el-input>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鐢熶骇鍗曚綅EN:" prop="productionEn">
<el-input v-model="addObj.productionEn" :disabled="active>1&&tabIndex!=4" clearable placeholder="璇疯緭鍏�"
@@ -131,26 +147,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏍峰搧澶勭悊鏂瑰紡:">
- <el-radio-group v-model="addObj.processing" :disabled="active>1&&tabIndex!=4" size="mini">
- <el-radio :label="0" border style="margin-right: 0">濮旀墭鍗曚綅鍙栧洖</el-radio>
- <el-radio :label="1" border>瀹為獙瀹ゅ鐞�</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="6">
<el-form-item label="鏄惁鐣欐牱:">
<el-radio-group v-model="addObj.isLeave" border :disabled="active>1&&tabIndex!=4" size="mini">
<el-radio :label="0" border style="margin-right: 0">涓嶇暀鏍�</el-radio>
<el-radio :label="1" border>鐣欐牱</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎶ュ憡鍙戦�佹柟寮�:">
- <el-radio-group v-model="addObj.send" :disabled="active>1&&tabIndex!=4" size="mini">
- <el-radio :label="1" border style="margin-right: 0">鑷彇</el-radio>
- <el-radio :label="0" border>鍏朵粬</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -1301,7 +1301,6 @@
company: this.addObj.company
}).then(res => {
this.saveLoad = false
- if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
selectOrderManDay({
id: this.currentId
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index a7a22f7..0d97704 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -986,25 +986,16 @@
downFile({
id: row.id,
}).then(res => {
- if (res.code === 200) {
- let url = '';
- if (res.data.type == 1) {
- url = this.javaApi + '/img/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
- }
+ this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
}).catch(error => {
})
},
// 涓嬭浇鎶ュ憡
download(row) {
- let url = this.javaApi + '/word/' + row.urlS ? row.urlS : row.url;
+ let url = row.urlS ? row.urlS : row.url;
if (url) {
- this.$download.saveAs(url, this.downLoadInfo.fileName);
+ this.$download.downloadFileFromUrl(url, this.downLoadInfo.fileName);
}
},
// 鎾ら攢
@@ -1131,10 +1122,6 @@
userId: this.distributeData.userId,
sonLaboratory: this.distributeData.sonLaboratory,
}).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.issuedDialogVisible = false
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index d47b9cf..3ff9d9c 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -547,16 +547,7 @@
downFile({
id: row.id,
}).then(res => {
- if (res.code === 200) {
- let url = '';
- if (res.data.type == 1) {
- url = this.javaApi + '/img/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
- }
+ this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
}).catch(error => {
})
diff --git a/src/views/business/unpass/components/unPassDialog.vue b/src/views/business/unpass/components/unPassDialog.vue
index abb940f..d7de2a8 100644
--- a/src/views/business/unpass/components/unPassDialog.vue
+++ b/src/views/business/unpass/components/unPassDialog.vue
@@ -180,16 +180,7 @@
downFile({
id: row.id,
}).then(res => {
- if (res.code === 200) {
- let url = '';
- if (res.data.type == 1) {
- url = this.javaApi + '/img/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- } else {
- url = this.javaApi + '/word/' + res.data.fileUrl
- this.$download.saveAs(url, row.fileName);
- }
- }
+ this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
}).catch(error => {
})
diff --git a/src/views/performance/class/index.vue b/src/views/performance/class/index.vue
index 4a318ef..209139c 100644
--- a/src/views/performance/class/index.vue
+++ b/src/views/performance/class/index.vue
@@ -565,7 +565,6 @@
laboratory: this.query.laboratory,
}).then((res) => {
this.pageLoading = false;
- if (res.code == 201) return;
this.total = res.data.total;
this.yearList = res.data.records.map((item) => {
for (let key in item.year) {
@@ -625,7 +624,6 @@
})
.then((res) => {
this.loading = false;
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.schedulingVisible = false;
this.schedulingQuery = {
@@ -650,7 +648,6 @@
this.configTimeVisibleLoading = true;
list()
.then((res) => {
- if (res.code == 201) return;
if (res.data.length > 0) {
res.data.forEach((item) => {
item.isEdit = false;
@@ -702,14 +699,12 @@
// 缂栬緫
newObj.id = item.id;
shiftUpdate(newObj).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.getTimeList();
});
} else {
// 鏂板
shiftAdd(newObj).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.getTimeList();
});
@@ -720,7 +715,6 @@
shiftRemove({
id: item.id,
}).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.getTimeList();
});
@@ -802,7 +796,6 @@
id: m.id,
shift: e,
}).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
m.shift = e;
});
@@ -810,9 +803,6 @@
},
getUsers() {
selectUserCondition({ type: 1 }).then((res) => {
- if (res.code === 201) {
- return;
- }
let arr = res.data;
this.personList = arr;
});
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index 7fb4049..8be8062 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -660,7 +660,6 @@
if (!this.formData.id) {
insertAuxiliaryWorkingHoursDay(this.formData).then((res) => {
this.addLoad = false;
- if (res.code == 201) return;
this.$message.success("宸叉彁浜�");
this.formData.number = "";
this.formData.amount = "";
@@ -675,7 +674,6 @@
} else {
updateAuxiliaryWorkingHoursDay(this.formData).then((res) => {
this.addLoad = false;
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.formData.number = "";
this.formData.amount = "";
@@ -728,9 +726,6 @@
});
approve({ auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays }).then(
(res) => {
- if (res.code === 201) {
- return;
- }
this.submitBatchCheckDialog();
this.$message.success("鎿嶄綔鎴愬姛");
}
@@ -767,7 +762,6 @@
} else {
this.checkLoadY = false;
}
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.checkVisible = false;
this.refreshTable("page");
diff --git a/src/views/performance/manHour/workTimeStatistics.vue b/src/views/performance/manHour/workTimeStatistics.vue
index daffdf6..21dff0b 100644
--- a/src/views/performance/manHour/workTimeStatistics.vue
+++ b/src/views/performance/manHour/workTimeStatistics.vue
@@ -118,7 +118,6 @@
selectAuxiliaryAllByMonth(this.queryParams)
.then((res) => {
this.tableLoading = false;
- if (res.code === 201) return;
this.tableData = res.data;
})
.catch(() => {
diff --git a/src/views/standard/standardLibrary/components/BatchCopy.vue b/src/views/standard/standardLibrary/components/BatchCopy.vue
index 4b60223..7ea84b4 100644
--- a/src/views/standard/standardLibrary/components/BatchCopy.vue
+++ b/src/views/standard/standardLibrary/components/BatchCopy.vue
@@ -537,7 +537,6 @@
};
// 鎺掑簭澶嶅埗
copyStandardProductSort(params).then((res) => {
- if (res.code === 201) return;
this.$message.success("澶嶅埗鎴愬姛");
this.compareDia = false;
this.batchCopyDia = false;
@@ -551,7 +550,6 @@
};
// 璋冨彇鍗曠嫭姣旇緝宸﹀彸瑕佹眰鍊肩殑鎺ュ彛
copyStandardProductOne(params).then((res) => {
- if (res.code === 201) return;
this.compareDia = true;
this.compareList = res.data;
});
@@ -563,7 +561,6 @@
};
// 璋冨彇姣旇緝宸﹀彸瑕佹眰鍊肩殑鎺ュ彛
copyStandardProductList(params).then((res) => {
- if (res.code === 201) return;
this.compareDia = true;
this.compareList = res.data;
});
@@ -578,7 +575,6 @@
updateStandardProductListBatch(params)
.then((res) => {
this.handleCompareLoading = false;
- if (res.code === 201) return;
this.$message.success("澶嶅埗鎴愬姛");
this.compareDia = false;
this.batchCopyDia = false;
diff --git a/src/views/standard/standardLibrary/components/bindSupplierDensityDialogAsk.vue b/src/views/standard/standardLibrary/components/bindSupplierDensityDialogAsk.vue
index 3c44f19..bcace15 100644
--- a/src/views/standard/standardLibrary/components/bindSupplierDensityDialogAsk.vue
+++ b/src/views/standard/standardLibrary/components/bindSupplierDensityDialogAsk.vue
@@ -196,9 +196,6 @@
.then(() => {
deleteProductSupplierAsk({ supplierAskId: row.supplierAskId })
.then((res) => {
- if (res.code === 201) {
- return;
- }
this.$message.success("鍒犻櫎鎴愬姛");
this.searchTableData();
})
diff --git a/src/views/standard/standardLibrary/index.vue b/src/views/standard/standardLibrary/index.vue
index dab88fd..36e74a2 100644
--- a/src/views/standard/standardLibrary/index.vue
+++ b/src/views/standard/standardLibrary/index.vue
@@ -878,10 +878,6 @@
this.addLoad = true;
addStandardTree(this.addOb)
.then((res) => {
- if (res.code === 201) {
- this.addLoad = false;
- return;
- }
this.$message.success("娣诲姞鎴愬姛");
this.addDia = false;
this.list
@@ -915,10 +911,6 @@
this.updateLoad = true;
updateStandardTree(this.addOb)
.then((res) => {
- if (res.code === 201) {
- this.updateLoad = false;
- return;
- }
this.$message.success("娣诲姞鎴愬姛");
this.$tab.refreshPage();
// this.selectStandardTreeList();
@@ -952,10 +944,6 @@
ask: value,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
},
@@ -966,10 +954,6 @@
tell: value,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
},
@@ -981,10 +965,6 @@
methodS: value,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
},
@@ -996,10 +976,6 @@
radius: value,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
},
@@ -1010,10 +986,6 @@
price: value,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
},
@@ -1024,10 +996,6 @@
manHour: value,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
},
@@ -1038,10 +1006,6 @@
templateId: value,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
});
},
@@ -1122,11 +1086,7 @@
state: row.state,
}),
}).then((res) => {
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
- // this.$message.success('宸蹭繚瀛�')
+ this.$message.success('宸蹭繚瀛�')
});
},
filterHandler(value) {
@@ -1276,10 +1236,6 @@
}),
}).then((res) => {
this.sectionLoad = false;
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
this.sectionUpDia = false;
});
@@ -1298,10 +1254,6 @@
},
}).then((res) => {
this.sectionLoad = false;
- if (res.code == 201) {
- this.$message.error("鏈繚瀛�");
- return;
- }
this.$message.success("宸蹭繚瀛�");
this.sectionUpDia = false;
this.currentPage0 = 1;
diff --git a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue b/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
index 16a9d49..ad3396d 100644
--- a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
@@ -332,8 +332,7 @@
this.$message.warning('鏆傛棤闄勪欢')
return;
}
- const url = this.javaApi + "/img/" + row.fileUrl;
- this.$download.saveAs(url, row.fileUrl);
+ this.$download.downloadFileFromUrl(row.fileUrl, row.fileUrl);
},
openAdd() {
this.qualificationsConnectVisible = true;
@@ -381,7 +380,6 @@
addCertificationDetail({ ...this.formData })
.then((res) => {
this.loading = false;
- if (res.code === 201) return;
this.$message.success("宸叉彁浜�");
this.refreshTable();
this.resetForm("formDataRef");
--
Gitblit v1.9.3