From 368b525db5f3f4f82b13c074341708a46b9a4111 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 11 三月 2025 09:11:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/api/cnas/process/ensureResults/qualityMonitor.js | 18
src/views/CNAS/process/method/methodVerification/index.vue | 2
src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue | 4
src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue | 6
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/lightning-protection-detection.vue | 3
src/views/business/unpass/components/unPassDialog.vue | 2
src/views/business/productOrder/index.vue | 46
src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue | 5
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue | 33
src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue | 41
src/views/business/materialOrder/copperOrder.vue | 1
src/views/structural/capabilityAndLaboratory/laboratory/index.vue | 2
src/views/CNAS/process/sampleDisposal/index.vue | 55 -
src/views/business/rawMaterialInspection/index.vue | 20
src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue | 2
src/views/business/productOrder/components/add.vue | 7
src/views/business/inspectionTask/inspection.vue | 32
src/views/CNAS/process/complaint/index.vue | 52 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue | 7
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue | 4
src/views/CNAS/systemManagement/managementReview/components/managementFormDIa.vue | 14
src/views/CNAS/process/method/standardMethodsChange/component/formDIaChange.vue | 2
src/views/CNAS/process/demand/index.vue | 4
src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue | 2
src/api/business/insOrderRates.js | 19
src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue | 2
src/views/business/inspectionTask/components/InspectionWord.vue | 4
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue | 2
src/views/CNAS/resourceDemand/device/component/management.vue | 47 -
src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue | 4
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue | 2
src/views/CNAS/process/method/standardMethod/index.vue | 24
src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue | 10
src/views/business/costStatistics/index.vue | 118 ++
src/views/statisticalCharts/qualificationRateStatistics/index.vue | 1
src/views/CNAS/process/method/methodVerification/component/formDIa.vue | 2
src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue | 32
src/views/CNAS/externalService/supplierManage/index.vue | 2
src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue | 1
src/views/CNAS/systemManagement/managementReview/components/reviewReportDia.vue | 2
src/views/CNAS/systemManagement/customerSatisfaction/index.vue | 2
src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue | 8
src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue | 32
src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue | 7
src/views/CNAS/resourceDemand/device/component/check.vue | 5
src/views/business/reportPreparation/index.vue | 2
src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue | 51 -
src/views/business/materialOrder/index.vue | 31
src/views/CNAS/resourceDemand/device/component/borrow.vue | 1
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 4
src/views/CNAS/process/method/standardMethodsChange/index.vue | 2
src/views/CNAS/process/nonconformingWork/nonconformingItem/components/qualityInfo.vue | 1
src/plugins/download.js | 61
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue | 2
src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue | 26
src/views/CNAS/resourceDemand/device/component/inspectionForm.vue | 3
src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue | 2
src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue | 46
src/views/CNAS/systemManagement/managementReview/components/meetingRecordsDia.vue | 2
src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue | 4
src/views/CNAS/resourceDemand/standardMaterial/index.vue | 4
src/views/CNAS/systemManagement/documentControl/components/FileList.vue | 26
src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveActionDIa.vue | 2
src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue | 19
src/views/CNAS/process/nonconformingWork/nonconformingDistribution/components/formDia.vue | 3
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue | 1
src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue | 31
src/views/CNAS/process/uncertainty/index.vue | 37
src/views/business/unpass/index-manage.vue | 3
src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue | 7
src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue | 7
src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue | 4
src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue | 2
src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue | 3
src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue | 8
src/views/performance/manHour/workTimeManagement.vue | 2
src/views/CNAS/resourceDemand/device/component/failureForm.vue | 3
src/components/echarts/DataComparison.vue | 5
src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue | 39
src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue | 1
src/views/CNAS/resourceDemand/device/component/files.vue | 8
src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue | 13
src/views/CNAS/systemManagement/internalAuditManagement/components/auditReportDia.vue | 3
src/views/CNAS/resourceDemand/standardMaterial/component/formDia.vue | 1
src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue | 8
src/views/CNAS/resourceDemand/device/component/calibration.vue | 2
src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue | 3
src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue | 56 -
src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue | 7
src/views/performance/class/index.vue | 1
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue | 2
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 5
src/views/CNAS/process/reportResults/index.vue | 42
src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue | 12
src/views/CNAS/resourceDemand/device/component/scrapApplicationForm.vue | 3
/dev/null | 1365 -----------------------------
src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue | 39
src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue | 2
src/views/CNAS/process/method/standardNoveltyRetrieval/component/FormDialog.vue | 1
src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue | 2
100 files changed, 369 insertions(+), 2,341 deletions(-)
diff --git a/src/api/business/insOrderRates.js b/src/api/business/insOrderRates.js
new file mode 100644
index 0000000..abe50f5
--- /dev/null
+++ b/src/api/business/insOrderRates.js
@@ -0,0 +1,19 @@
+// 璐圭敤缁熻椤甸潰鐩稿叧鎺ュ彛
+import request from '@/utils/request'
+
+// 鏌ヨ璁㈠崟鍒楄〃
+export function selectRatesPage(query) {
+ return request({
+ url: '/insOrderRates/selectRatesPage',
+ method: 'get',
+ params: query
+ })
+}
+// 鏌ヨ璁㈠崟璐圭敤璇︽儏
+export function selectRatesDetail(query) {
+ return request({
+ url: '/insOrderRates/selectRatesDetail',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/cnas/process/ensureResults/qualityMonitor.js b/src/api/cnas/process/ensureResults/qualityMonitor.js
index 221c369..55bb995 100644
--- a/src/api/cnas/process/ensureResults/qualityMonitor.js
+++ b/src/api/cnas/process/ensureResults/qualityMonitor.js
@@ -148,3 +148,21 @@
data: query
})
}
+
+// 鏌ヨ鐩戞帶璇勪环闄勪欢鍒楄〃
+export function getEvaluateFileList(query) {
+ return request({
+ url: "/qualityMonitor/getEvaluateFileList",
+ method: "get",
+ params: query,
+ });
+}
+
+// 鍒犻櫎鐩戞帶璇勪环闄勪欢鍒楄〃
+export function delVerifyEvaluateFileList(query) {
+ return request({
+ url: '/qualityMonitor/delVerifyEvaluateFileList',
+ method: 'delete',
+ params: query
+ })
+}
diff --git a/src/components/Table/value-table.vue b/src/components/Table/value-table.vue
deleted file mode 100644
index 1d50835..0000000
--- a/src/components/Table/value-table.vue
+++ /dev/null
@@ -1,1365 +0,0 @@
-<style scoped>
-.value-table {
- width: 100%;
- height: 100%;
- overflow-y: auto;
-}
-
-.table {
- width: 100%;
- height: calc(100% - 42px);
-}
-
-.page {
- width: 100%;
- height: 30px;
- text-align: right;
- margin-top: 10px;
-}
-
-.down-left {
- width: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.down-right {
- width: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.body {
- overflow-x: hidden;
-}
-
-.handleBtn {
- border: none;
- padding: 0;
- color: #409eff;
- background: transparent;
-}
-
-.handleBtn:hover {
- background: transparent;
-}
-
-.handleBtn.is-disabled {
- color: #c0c4cc;
-}
-
-.red {
- color: red !important;
-}
-
->>>.el-loading-parent--relative {
- z-index: 1 !important;
-}
-
->>>.el-table__body-wrapper::-webkit-scrollbar {
- height: 14px;
- /* 璁剧疆婊氬姩鏉″搴� */
-}
-</style>
-<style>
-/* .value-table .highlight-warning-row-border td {
- border-top: 2px solid #ffcd29;
- border-bottom: 2px solid #ffcd29;
- } */
-
-.value-table .highlight-warning-row-border td:first-child {
- border-left: 4px solid #ffcd29;
-}
-
-.value-table .highlight-warning-row-border td:last-child {
- border-right: 4px solid #ffcd29;
-}
-
-/* .value-table .highlight-danger-row-border td {
- border-top: 2px solid red;
- border-bottom: 2px solid red;
- } */
-
-.value-table .highlight-danger-row-border td:first-child {
- border-left: 4px solid #f56c6c;
-}
-
-.value-table .highlight-danger-row-border td:last-child {
- border-right: 4px solid #f56c6c;
-}
-
-.value-table .el-upload {
- width: 100%;
-}
-
-.value-table .el-upload-dragger {
- width: 100%;
-}
-
-.value-table .handleBtn.is-disabled .el-upload:focus {
- color: #c0c4cc !important;
-}
-
-.value-table .avatar-uploader .el-upload {
- height: 80px;
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
-.el-table__empty-text {
- text-align: left;
- width: 100%;
- display: inline-block;
- margin-left: 200px;
-}
-</style>
-
-<template>
- <div class="value-table">
- <div :style="data.isPage != undefined && data.isPage != true ? 'height:100%' : ''
- " class="table">
- <el-table :key="specialKey" ref="eltable" v-loading="loading" :current-row-key="data.currentId" :data="tableData"
- :highlight-current-row="data.highlight === undefined || data.highlight" :row-class-name="tableRowClassName"
- :row-key="(record) => record[rowKey]" :show-summary="data.countFleid != undefined && data.countFleid.length > 0
- " :span-method="spanMethod" :summary-method="getSummaries" height="100%" style="width: 100%"
- tooltip-effect="dark" @select="select" @selection-change="selectChange" @sort-change="sortChange"
- @row-click="rowClick">
- <el-table-column v-if="data.showSelect" :key="Math.random()" :width="selectionWidth" type="selection">
- </el-table-column>
- <el-table-column v-if="data.isIndex" :key="Math.random()" :width="selectionWidth" align="center" label="搴忓彿"
- type="index">
- </el-table-column>
- <el-table-column v-for="(a, ai) in tableHead" v-if="
- !data.headNoShow ||
- (data.headNoShow && data.headNoShow.length == 0) ||
- (data.headNoShow &&
- data.headNoShow.length > 0 &&
- !data.headNoShow.find((d) => d == a.label))
- " :key="ai + 'bbbbb'" :isColumnWidth="isColumnWidth" :isShowZero="isShowZero" :label="a.value"
- :min-width="columnMinWidth" :prop="a.label" :sortable="a.sort === 'custom' ? 'custom' : false"
- show-overflow-tooltip>
- <template slot-scope="scope">
- <div v-if="showType(a.label, data.tagField) != null">
- <template v-if="typeof scope.row[a.label] == 'object'">
- <template v-for="(param, i) in scope.row[a.label]">
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" v-if="b.value == param" :key="bi + 'cccc'"
- :type="b.type" size="medium" style="margin-right: 5px">{{ b.label }}</el-tag>
- </template>
- </template>
- <template v-else>
- <el-tag v-for="(b, bi) in data.tagField[a.label].select" v-show="b.value == scope.row[a.label]"
- :key="bi + 'ddddd'" :type="b.type" size="medium">{{ b.label }}</el-tag>
- </template>
- </div>
- <!-- 鍙搷浣滆杩涜鐐瑰嚮浜嬩欢 -->
- <span v-else-if="data.linkEvent && showLink(a.label, data.linkEvent)"
- style="color: #409eff; cursor: pointer" @click="handleLinkEvent(scope.row, data.linkEvent[a.label])">{{
- scope.row[a.label] }}</span>
- <img v-else-if="showUpload(a.label) && scope.row[a.label]" :src="javaApi + '/img/' + scope.row[a.label]"
- alt="" style="width: 40px; height: 40px; margin-top: 10px" />
- <span v-else :class="{ red: getRedColor(a.label, scope.row) }">{{
- scope.row[a.label]
- }}</span>
- </template>
- </el-table-column>
- <el-table-column v-if="data.do.length > 0" :width="getWidth()" align="center" fixed="right" label="鎿嶄綔">
- <template slot-scope="scope">
- <el-button v-for="(a, ai) in data.do" :key="ai + 'qqqq'" :disabled="a.disabFun ? a.disabFun(scope.row, scope.$index) : false
- " :type="a.type" class="handleBtn" @click="main(scope.row, a)">
- <span v-if="a.type != 'upload'">{{ a.font }}</span>
- <el-upload v-else ref="upload" :accept="a.uploadConfig.accept"
- :action="javaApi + a.uploadConfig.url + '?id=' + (a.uploadConfig.uploadIdFun ? a.uploadConfig.uploadIdFun(scope.row) : scope.row.id)"
- :disabled="a.disabFun ? a.disabFun(scope.row, scope.$index) : false
- " :headers="token" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false"
- name="file" style="background: transparent">
- <span>{{ a.font }}</span>
- </el-upload>
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <div v-if="data.isPage == undefined || data.isPage" class="page">
- <el-pagination :current-page="page.current" :page-size="page.size" :page-sizes="[10, 20, 30, 50, 100]"
- :total="total" layout="total, sizes, prev, pager, next, jumper" @size-change="sizeChange"
- @current-change="currentChange">
- </el-pagination>
- </div>
- <el-dialog :close-on-click-modal="false" :visible.sync="upDia"
- :width="data.row == 1 ? '500px' : 540 + data.row * 200 + 'px'" append-to-body title="缂栬緫">
- <div class="body" style="max-height: 600px; overflow-y: auto; padding: 5px 10px 5px 0">
- <div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai + 'ffff'" style="line-height: 50px">
- <el-col :offset="1" :span="6 / data.row" style="text-align: right">
- <span v-if="showUpReq(a.label)" class="required-span">* </span>{{ a.value }}锛�
- </el-col>
- <el-col :span="16 / data.row">
- <el-input v-if="
- showType(a.label, data.selectField) == null &&
- !showUpload(a.label) &&
- !showCascader(a.label)
- " v-model="upData[a.label]" :disabled="isDisabled(a.label)" :placeholder="`璇疯緭鍏�${a.value}`" clearable
- size="small"></el-input>
- <el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
- :allow-create="data.selectField[a.label].allowCreate" :default-first-option="data.selectField[a.label].defaultFirstOption
- " :disabled="isDisabled(a.label)" :multiple="data.selectField[a.label].choose" clearable filterable
- size="small" style="width: 100%">
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi + 'eeeee'" :label="b.label"
- :value="b.value">
- </el-option>
- </el-select>
- <el-upload v-if="showUpload(a.label)" ref="upload" :accept="data.addUploadConfig.accept"
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="(m) => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader"
- name="file" style="
- background: transparent;
- width: 80px;
- height: 80px;
- border: 1px solid #dcdfe6;
- border-radius: 6px;
- margin: 10px 0;
- ">
- <img v-if="upData[a.label]" :src="javaApi + '/img/' + upData[a.label]" class="avatar"
- style="width: 80px; height: 80px; border-radius: 6px" />
- <i v-else class="el-icon-plus avatar-uploader-icon"></i>
- </el-upload>
- <el-cascader v-if="showCascader(a.label)" :options="data.cascaderField[a.label].tree"
- :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" :show-all-levels="false"
- :value="upData[a.label]" clearable filterable size="small" style="width: 100%"
- @change="(m) => handleCascader(m, a.label)"></el-cascader>
- </el-col>
- </div>
- </div>
- <div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai + 'ggggg'" style="line-height: 50px">
- <el-col :span="6" style="text-align: right">
- <span v-if="showUpReq(a.label)" class="required-span">* </span>{{ a.value }}锛�
- </el-col>
- <el-col :offset="1" :span="16">
- <el-input v-if="
- showType(a.label, data.selectField) == null &&
- !showUpload(a.label) &&
- !showCascader(a.label)
- " v-model="upData[a.label]" :disabled="isDisabled(a.label)" :placeholder="`璇疯緭鍏�${a.value}`" clearable
- size="small"></el-input>
- <el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
- :disabled="isDisabled(a.label)" :multiple="data.selectField[a.label].choose" clearable filterable
- size="small" style="width: 100%">
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi + 'fffff'" :label="b.label"
- :value="b.value"></el-option>
- </el-select>
- <el-upload v-if="showUpload(a.label)" ref="upload" :accept="data.addUploadConfig.accept"
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="(m) => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader"
- name="file" style="
- background: transparent;
- width: 80px;
- height: 80px;
- border: 1px solid #dcdfe6;
- border-radius: 6px;
- margin: 10px 0;
- ">
- <img v-if="upData[a.label]" :src="javaApi + '/img/' + upData[a.label]" class="avatar"
- style="width: 80px; height: 80px; border-radius: 6px" />
- <i v-else class="el-icon-plus avatar-uploader-icon"></i>
- </el-upload>
- <el-cascader v-if="showCascader(a.label)" :options="data.cascaderField[a.label].tree"
- :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" :show-all-levels="false"
- :value="upData[a.label]" clearable filterable size="small" style="width: 100%"
- @change="(m) => handleCascader(m, a.label)"></el-cascader>
- </el-col>
- </el-row>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="upDia = false">鍙� 娑�</el-button>
- <el-button :loading="upLoad" type="primary" @click="saveUpData">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog :close-on-click-modal="false" :visible.sync="addDia"
- :width="data.row == 1 ? '500px' : 540 + data.row * 200 + 'px'" append-to-body title="鏂板">
- <div v-if="addDia" class="body" style="max-height: 550px; overflow-y: auto; padding: 5px 10px 5px 0">
- <div v-if="data.row > 1">
- <div v-for="(a, ai) in upHead" :key="ai + 'yyyyy'" style="line-height: 50px">
- <el-col :offset="1" :span="6 / data.row" style="text-align: right"><span v-if="showAddReq(a.label)"
- class="required-span">* </span>{{ a.value }}锛�</el-col>
- <el-col :span="16 / data.row">
- <el-input v-if="
- showType(a.label, data.selectField) == null &&
- !showUpload(a.label) &&
- !showCascader(a.label)
- " v-model="upData[a.label]" :placeholder="`璇疯緭鍏�${a.value}`" clearable size="small"></el-input>
- <el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
- :multiple="data.selectField[a.label].choose" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable
- size="small" style="width: 100%">
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi + 'hhhh'" :label="b.label"
- :value="b.value"></el-option>
- </el-select>
- <el-upload v-if="showUpload(a.label)" ref="upload" :accept="data.addUploadConfig.accept"
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="(m) => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader"
- name="file" style="
- background: transparent;
- width: 80px;
- height: 80px;
- border: 1px solid #dcdfe6;
- border-radius: 6px;
- margin: 10px 0;
- ">
- <img v-if="upData[a.label]" :src="javaApi + '/img/' + upData[a.label]" class="avatar"
- style="width: 80px; height: 80px; border-radius: 6px" />
- <i v-else class="el-icon-plus avatar-uploader-icon"></i>
- </el-upload>
- <el-cascader v-if="showCascader(a.label)" :options="data.cascaderField[a.label].tree"
- :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" :show-all-levels="false" clearable
- filterable size="small" style="width: 100%" @change="(m) => handleCascader(m, a.label)"></el-cascader>
- </el-col>
- </div>
- </div>
- <div v-else>
- <el-row v-for="(a, ai) in upHead" :key="ai + 'jjjjj'" style="line-height: 50px">
- <el-col :span="6" style="text-align: right"><span v-if="showAddReq(a.label)" class="required-span">*
- </span>{{
- a.value }}锛�</el-col>
- <el-col :offset="1" :span="16">
- <el-input v-if="
- showType(a.label, data.selectField) == null &&
- !showUpload(a.label) &&
- !showCascader(a.label)
- " v-model="upData[a.label]" :placeholder="`璇疯緭鍏�${a.value}`" clearable size="small"></el-input>
- <el-select v-if="showType(a.label, data.selectField) != null" v-model="upData[a.label]"
- :multiple="data.selectField[a.label].choose" :placeholder="`璇烽�夋嫨${a.value}`" clearable size="small"
- style="width: 100%">
- <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi + 'mmmmmm'" :label="b.label"
- :value="b.value"></el-option>
- </el-select>
- <el-upload v-if="showUpload(a.label)" ref="upload" :accept="data.addUploadConfig.accept"
- :action="javaApi + data.addUploadConfig.url" :headers="token" :multiple="false" :on-error="onError"
- :on-success="(m) => handleSuccessUp(m, a.label)" :show-file-list="false" class="avatar-uploader"
- name="file" style="
- background: transparent;
- width: 80px;
- height: 80px;
- border: 1px solid #dcdfe6;
- border-radius: 6px;
- margin: 10px 0;
- ">
- <img v-if="upData[a.label]" :src="javaApi + '/img/' + upData[a.label]" class="avatar"
- style="width: 80px; height: 80px; border-radius: 6px" />
- <i v-else class="el-icon-plus avatar-uploader-icon"></i>
- </el-upload>
- <el-cascader v-if="showCascader(a.label)" :options="data.cascaderField[a.label].tree"
- :placeholder="`璇烽�夋嫨${a.value}`" :props="data.cascaderField.props" :show-all-levels="false" clearable
- filterable size="small" style="width: 100%" @change="(m) => handleCascader(m, a.label)"></el-cascader>
- </el-col>
- </el-row>
- </div>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="addDia = false">鍙� 娑�</el-button>
- <el-button :loading="addLoad" type="primary" @click="saveAddData">纭� 瀹�</el-button>
- </span>
- </el-dialog>
- <el-dialog :visible.sync="downDia" title="瀵煎嚭" width="400px">
- <div style="display: flex; width: 100%; height: 100px">
- <div class="down-left" @click="downFile(true)">
- <el-button>鏈〉瀵煎嚭</el-button>
- </div>
- <div class="down-right" @click="downFile(false)">
- <el-button>鍏ㄩ儴瀵煎嚭</el-button>
- </div>
- </div>
- </el-dialog>
- <el-dialog :visible.sync="uploadDia" title="鏁版嵁瀵煎叆" width="500px">
- <div style="margin: 0 auto">
- <el-upload ref="upload" :accept="data.accept === undefined ? '.csv' : data.accept" :action="javaApi + inputUrl"
- :auto-upload="false" :data="{ param: data.uploadStr }" :file-list="fileList" :headers="token" :limit="1"
- :on-change="beforeUpload" :on-error="onError" :on-success="onSuccess" drag name="file">
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
- </el-upload>
- </div>
- <span slot="footer" class="dialog-footer">
- <el-button @click="uploadDia = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="submitUpload()">涓� 浼�</el-button>
- </span>
- </el-dialog>
- </div>
-</template>
-
-<script>
-export default {
- props: {
- selectionWidth: {
- type: String,
- default: () => "65",
- },
- columnMinWidth: {
- type: String,
- default: () => "155",
- },
- isColumnWidth: {
- type: Boolean,
- default: () => false,
- },
- isShowZero: {
- type: Boolean,
- default: () => false,
- },
- tableRowClassName: {
- type: Function,
- },
- rowKey: {
- type: String,
- default: () => {
- return "id";
- },
- },
- url: {
- type: String,
- default: () => null,
- },
- upUrl: {
- type: String,
- default: () => null,
- },
- delUrl: {
- type: String,
- default: () => null,
- },
- downUrl: {
- type: String,
- default: () => null,
- },
- inputUrl: {
- type: String,
- default: () => null,
- },
- componentData: {
- type: Object,
- default: () => {
- return {
- entity: {
- orderBy: {
- field: "id",
- order: "asc",
- },
- },
- isIndex: false,
- showSelect: false,
- select: true,
- row: 1,
- do: [
- {
- id: "update",
- font: "缂栬緫",
- type: "text",
- method: "doDiy",
- },
- {
- id: "delete",
- font: "鍒犻櫎",
- type: "text",
- method: "doDiy",
- },
- ],
- doDiy: true,
- tagField: [
- {
- label: "state",
- select: [
- {
- value: "1",
- type: "success",
- label: "鍚敤",
- },
- {
- value: "0",
- type: "danger",
- label: "鍋滅敤",
- },
- ],
- },
- ],
- };
- },
- },
- },
- data() {
- return {
- data: {
- entity: {
- orderBy: {
- field: "id",
- order: "asc",
- },
- },
- isIndex: false,
- showSelect: false,
- select: true,
- row: 1,
- isPage: true, //
- do: [
- {
- font: "鍒犻櫎",
- type: "text",
- },
- ],
- type: [],
- uploadStr: "",
- currentId: "", //褰撳墠楂樹寒鐨処D
- },
- tableHead: [],
- tableData: [],
- multipleSelection: [],
- user: {},
- page: {
- current: 1,
- size: 20,
- },
- total: 0,
- loading: false,
- upDia: false,
- upData: {},
- upHead: [],
- upLoad: false,
- addDia: false,
- addUrl: null,
- addLoad: false,
- dataCopy: {},
- downDia: false,
- uploadDia: false,
- token: null,
- fileList: [],
- init: true,
- spanList: [
- // {
- // arr:[],
- // position:0
- // }
- ],
- specialSpanList: [
- // {
- // arr:[],
- // position:0
- // }
- ],
- param: {},
- specialKey: "table-",
- };
- },
- beforeUpdate() {
- this.$nextTick(() => {
- this.$refs.eltable.doLayout();
- });
- },
- mounted() {
- this.data = this.componentData;
- this.dataCopy = this.HaveJson(this.componentData);
- if (this.data.init === undefined || this.data.init === true) {
- this.selectList();
- }
- this.token = {
- token: sessionStorage.getItem("token"),
- };
- this.specialKey = this.specialKey + Math.random() * 100;
- },
- methods: {
- rowspan(spanArr, position, spanName) {
- this.tableData.forEach((item, index) => {
- if (index === 0) {
- spanArr.push(1);
- position = 0;
- } else {
- if (
- this.tableData[index][spanName] ===
- this.tableData[index - 1][spanName]
- ) {
- spanArr[position] += 1;
- spanArr.push(0);
- } else {
- spanArr.push(1);
- position = index;
- }
- }
- });
- },
- spanMethod({ row, column, rowIndex, columnIndex }) {
- // 涓�鑸殑鍚堝苟琛�
- if (
- this.data.spanConfig != undefined &&
- this.data.spanConfig.rows &&
- this.data.spanConfig.rows.length > 0
- ) {
- let i = null;
- let obj = this.data.spanConfig.rows.find((item, index) => {
- i = index;
- return item.index == columnIndex;
- });
- if (obj) {
- const _row = this.spanList[i].arr[rowIndex];
- const _col = _row > 0 ? 1 : 0;
- return {
- rowspan: _row,
- colspan: _col,
- };
- }
- }
- // 鐗规畩鐨勫悎骞惰
- if (
- this.data.spanConfig != undefined &&
- this.data.spanConfig.special &&
- this.data.spanConfig.special.main &&
- this.data.spanConfig.special.rows &&
- this.data.spanConfig.special.rows.length > 0
- ) {
- let i = null;
- let obj = this.data.spanConfig.special.rows.find((item, index) => {
- i = index;
- return item.index == columnIndex;
- });
- if (obj) {
- const _row = this.specialSpanList[i].arr[rowIndex];
- const _col = _row > 0 ? 1 : 0;
- return {
- rowspan: _row,
- colspan: _col,
- };
- }
- }
- },
- selectChange(val) {
- if (this.data.select) {
- this.multipleSelection = val;
- } else {
- this.multipleSelection = val[val.length - 1];
- }
- if (this.data.selectMethod != undefined) {
- if (this.$parent.$el.className.indexOf("el-") == 0) {
- this.$parent.$parent[this.data.selectMethod](val);
- } else {
- this.$parent[this.data.selectMethod](val);
- }
- }
- },
- select(val, row) {
- if (!this.data.select) {
- this.$refs["eltable"].clearSelection();
- this.$refs["eltable"].toggleRowSelection(row, true);
- }
- },
- rowClick(row, column, event) {
- if (this.data.select) {
- this.$refs["eltable"].toggleRowSelection(row);
- } else {
- this.$refs["eltable"].clearSelection();
- this.$refs["eltable"].toggleRowSelection(row, true);
- }
- },
- sizeChange(val) {
- this.page.size = val;
- this.selectList("page");
- },
- currentChange(val) {
- this.page.current = val;
- this.selectList("page");
- },
- // 璋冨彇琛ㄦ牸鏌ヨ鎺ュ彛
- selectList(val) {
- // console.log('val---', val)
- // console.log('this.page---', this.page)
- // this.loading = true
- if (val === undefined) {
- this.page.current = 1;
- }
- if (val === "lastPage") {
- this.page.current = this.page.current - 1; // 渚嬪鍒犻櫎鏈〉鏈�鍚庝竴鏉℃暟鎹紝灏嗗綋鍓嶉〉闈㈠畾涓轰笂涓�椤碉紝闄ょ涓�椤靛
- }
- // 涓嶈鍒嗛〉灏卞叏鏌�
- if (this.data.isPage != undefined && this.data.isPage != true) {
- this.page = {
- current: -1,
- size: -1,
- };
- }
- this.$axios
- .post(
- this.url,
- {
- page: this.page,
- entity: this.data.entity,
- },
- {
- headers: {
- "Content-Type": "application/json",
- },
- }
- )
- .then((res) => {
- this.total = res.data.body.total;
- this.tableHead = res.data.head;
- this.tableData = res.data.records;
- if (this.data.needSort !== undefined) {
- // 鏍规嵁鐖剁粍浠朵紶鍥炴潵鐨刵eedSort鏁扮粍锛屽垽鏂摢浜涘瓧娈甸渶瑕佹帓搴忓姛鑳�
- for (var i = 0; i < this.data.needSort.length; i++) {
- this.tableHead.forEach((item) => {
- if (item.label === this.data.needSort[i]) {
- item.sort = "custom";
- }
- });
- }
- }
- if (this.isShowZero) {
- // 宸ユ椂绠＄悊-宸ユ椂缁熻娌℃湁鏃堕棿鐨勫氨灞曠ず0
- this.tableData.map((item) => {
- Object.keys(item).forEach((val) => {
- if (
- item[val] === null &&
- (val.includes("Hours") || val === "total")
- ) {
- item[val] = 0;
- }
- });
- });
- }
- if (this.tableData.length === 0 && this.page.current > 1) {
- this.selectList("lastPage");
- }
- // if (this.isColumnWidth) {
- // this.tableHead.forEach(item => {
- // if(!item.width){
- // if (item.value.length === 4) {
- // item.width = 120
- // } else if (item.value.length === 3){
- // item.width = item.label.includes('Hours') ? 50 : 100
- // } else if (item.value.length === 5){
- // item.width = 130
- // } else if (item.value.length === 7){
- // item.width = 160
- // } else if (item.value.length === 6){
- // item.width = 150
- // } else if (item.value.length === 2){
- // item.width = item.label.includes('Hours') ? 52 : 86
- // } else {
- // item.width = item.label.includes('Hours') ? 46 : 86
- // }
- // }
- // })
- // }
-
- // console.log(JSON.stringify(this.tableHead)+"---------"+JSON.stringify(this.tableData))
- for (var a in this.data.selectField) {
- if (this.data.selectField[a].choose == true) {
- this.tableData.map((b) => {
- try {
- b[a] = JSON.parse(b[a]);
- } catch (e) { }
- });
- }
- }
- // 涓�鑸殑鍚堝苟琛�
- if (
- this.data.spanConfig != undefined &&
- this.data.spanConfig.rows &&
- this.data.spanConfig.rows.length > 0
- ) {
- this.spanList = [];
- this.data.spanConfig.rows.forEach((item, index) => {
- this.spanList.push({
- arr: [],
- position: 0,
- });
- this.rowspan(
- this.spanList[index].arr,
- this.spanList[index].position,
- item.name
- );
- });
- }
- // 鐗规畩鐨勫悎骞惰
- if (
- this.data.spanConfig != undefined &&
- this.data.spanConfig.special &&
- this.data.spanConfig.special.main &&
- this.data.spanConfig.special.rows &&
- this.data.spanConfig.special.rows.length > 0
- ) {
- this.specialSpanList = [];
- this.data.spanConfig.special.rows.forEach((item, index) => {
- this.specialSpanList.push({
- arr: [],
- position: 0,
- });
- this.rowspan(
- this.specialSpanList[index].arr,
- this.specialSpanList[index].position,
- this.data.spanConfig.special.main
- );
- });
- }
- this.loading = false;
- })
- .catch((e) => {
- console.log("璇峰埛鏂伴〉闈㈠啀灏濊瘯---", e);
- this.loading = false;
- this.$message.error("璇峰埛鏂伴〉闈㈠啀灏濊瘯");
- });
- },
- sortChange(ob) {
- this.data.entity.orderBy = {};
- this.data.entity.orderBy.field = ob.prop;
- if (ob.order == "ascending") {
- this.data.entity.orderBy.order = "asc";
- } else if (ob.order == "descending") {
- this.data.entity.orderBy.order = "desc";
- } else {
- if (this.componentData.entity.orderBy != undefined) {
- this.data.entity.orderBy = this.HaveJson(
- this.dataCopy.entity.orderBy
- );
- }
- }
- this.selectList();
- },
- // 灞曠ずtag
- showType(val, ob) {
- var str = ob[val];
- return str == undefined ? null : ob[val].select;
- },
- // 灞曠ず鎿嶄綔鏍�
- showLink(val, ob) {
- var str = ob[val];
- return str == undefined ? null : ob[val].method;
- },
- showAddReq(label) {
- if (this.data.requiredAdd == undefined) {
- return;
- }
- for (var i = 0; i < this.data.requiredAdd.length; i++) {
- if (label == this.data.requiredAdd[i]) {
- return true;
- }
- }
- return false;
- },
- showUpReq(label) {
- if (this.data.requiredUp == undefined) {
- return;
- }
- for (var i = 0; i < this.data.requiredUp.length; i++) {
- if (label == this.data.requiredUp[i]) {
- return true;
- }
- }
- return false;
- },
- showUpload(label) {
- if (this.data.addUpload && this.data.addUpload.find((m) => m == label)) {
- return true;
- } else {
- return false;
- }
- },
- showCascader(label) {
- if (this.data.cascaderField && this.data.cascaderField[label]) {
- return true;
- } else {
- return false;
- }
- },
- handleTree(arr, value) {
- let label = "";
- for (let i = 0; i < arr.length; i++) {
- if (arr[i].id == value) {
- label = arr[i].name;
- return label;
- } else if (arr[i].children) {
- label = this.handleTree(arr[i].children, value);
- }
- }
- return label;
- },
- main(row, val) {
- if (val.method == undefined) return;
- else if (val.method == "doDiy") {
- if (val.id == "update") {
- // 缂栬緫鎿嶄綔
- (this.upDia = true), (this.upData = this.HaveJson(row));
- this.upHead = this.HaveJson(this.tableHead);
- this.upHead.forEach((item, index) => {
- if (
- this.data.cascaderField &&
- this.data.cascaderField[item.label]
- ) {
- if (this.upData[item.label]) {
- this.upData[item.label] = JSON.parse(this.upData[item.label]);
- } else {
- this.upData[item.label] = [];
- }
- }
- });
- this.upHead = this.upHead.filter(
- (a) => a.label != "createTime" && a.label != "updateTime"
- );
- delete this.upData.orderBy;
- delete this.upData.createTime;
- delete this.upData.updateTime;
- delete this.upData.createUser;
- delete this.upData.updateUser;
- val.field.forEach((a) => {
- if (this.upData[a] === undefined) {
- this.upHead.push({
- value: a.split("=")[0],
- label: a.split("=")[1],
- });
- } else {
- delete this.upData[a];
- for (var i = 0; i < this.upHead.length; i++) {
- if (this.upHead[i].label == a) {
- this.upHead.splice(i, 1);
- i--;
- break;
- }
- }
- }
- });
- } else if (val.id == "delete") {
- // 鍒犻櫎鎿嶄綔
- if (this.delUrl == null) {
- this.$message.error("璇风粰鍒犻櫎璇锋眰鍦板潃");
- return;
- }
- this.$confirm("鏄惁鍒犻櫎褰撳墠鏁版嵁?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- this.$axios
- .post(this.delUrl, {
- id: row.id,
- })
- .then((res) => {
- this.$message.success("鍒犻櫎鎴愬姛");
- this.selectList("page");
- this.$emit("delete");
- })
- .catch((e) => {
- this.$message.error("鍒犻櫎澶辫触");
- });
- })
- .catch(() => { });
- }
- } else if (val.id === "parent") {
- delete row.orderBy;
- this.$parent.$parent[val.method](row);
- } else {
- delete row.orderBy;
- this.$parent[val.method](row);
- }
- },
- saveUpData() {
- if (this.upUrl == null) {
- this.$message.error("璇风粰淇敼璇锋眰鍦板潃");
- return;
- }
- for (var i = 0; i < this.data.requiredUp.length; i++) {
- // 蹇呭～鏍￠獙
- if (
- this.upData[this.data.requiredUp[i]] === null ||
- this.upData[this.data.requiredUp[i]] === ""
- ) {
- var list = this.upHead.filter((a) => {
- if (a.label == this.data.requiredUp[i]) return a;
- });
- if (list[0].value == undefined) continue;
- this.$message.error(list[0].value + "鏄繀濉」");
- return;
- }
- }
- for (var a in this.data.selectField) {
- if (this.data.selectField[a].choose == true) {
- this.upData[a] = JSON.stringify(this.upData[a]);
- }
- }
- for (var i = 0; i < this.upHead.length; i++) {
- if (this.upHead[i].label == "password") {
- if (this.upData[this.upHead[i].label]) {
- const reg2 =
- /^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?])[a-zA-Z\d~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?]*$/;
- if (!reg2.test(this.upData[this.upHead[i].label])) {
- this.$message.error("瀵嗙爜蹇呴』鍖呮嫭鏁板瓧銆佸ぇ灏忓啓瀛楁瘝浠ュ強鐗规畩瀛楃");
- return;
- }
- }
- }
- if (
- this.data.cascaderField &&
- this.data.cascaderField[this.upHead[i].label]
- ) {
- if (this.upData[this.upHead[i].label]) {
- this.upData[this.upHead[i].label] = JSON.stringify(
- this.upData[this.upHead[i].label]
- );
- } else {
- this.upData[this.upHead[i].label] = "";
- }
- }
- }
- this.upLoad = true;
- this.$axios
- .post(this.upUrl, this.upData, {
- headers: {
- "Content-Type": "application/json",
- },
- })
- .then((res) => {
- this.$message.success("淇敼鎴愬姛");
- this.upDia = false;
- this.selectList("page");
- this.$refs.eltable.doLayout();
- this.upLoad = false;
- })
- .catch((e) => {
- this.$message.error("淇敼澶辫触");
- this.upDia = false;
- this.upLoad = false;
- });
- },
- // 鎵撳紑鏂板寮规鍥炶皟
- openAddDia(addUrl, param) {
- this.addDia = true;
- this.addUrl = addUrl;
- this.param = param;
- this.upData = {};
- this.tableHead.forEach((k, v) => {
- if (
- k.label != "orderBy" &&
- k.label != "createTime" &&
- k.label != "updateTime" &&
- k.label != "createUser" &&
- k.label != "updateUser"
- )
- this.upData[k.label] = null;
- });
- this.upData = this.HaveJson(this.upData);
- this.upHead = this.HaveJson(this.tableHead);
- this.upHead = this.upHead.filter(
- (a) => a.label != "createTime" && a.label != "updateTime"
- );
- var val = this.data.do.filter((a) => a.id == "update")[0];
- if (val == undefined) {
- val = {
- field: [],
- };
- }
- val.field.forEach((a) => {
- if (JSON.stringify(this.upData[a]) === undefined) {
- this.upHead.push({
- value: a.split("=")[0],
- label: a.split("=")[1],
- });
- } else {
- delete this.upData[a];
- for (var i = 0; i < this.upHead.length; i++) {
- if (this.upHead[i].label == a) {
- this.upHead.splice(i, 1);
- i--;
- break;
- }
- }
- }
- });
- },
- // 鏂板鍥炶皟
- saveAddData() {
- if (this.addUrl == null) {
- this.$message.error("璇风粰娣诲姞璇锋眰鍦板潃");
- return;
- }
- for (var i = 0; i < this.data.requiredAdd.length; i++) {
- if (
- this.upData[this.data.requiredAdd[i]] === null ||
- this.upData[this.data.requiredAdd[i]] === ""
- ) {
- var list = this.upHead.filter((a) => {
- if (a.label == this.data.requiredAdd[i]) return a;
- });
- if (list[0].value == undefined) continue;
- this.$message.error(list[0].value + "鏄繀濉」");
- return;
- }
- }
- this.addLoad = true;
- for (var a in this.data.selectField) {
- if (this.data.selectField[a].choose == true) {
- this.upData[a] = JSON.stringify(this.upData[a]);
- }
- }
- this.upHead.forEach((item, index) => {
- if (this.data.cascaderField && this.data.cascaderField[item.label]) {
- if (this.upData[item.label]) {
- this.upData[item.label] = JSON.stringify(this.upData[item.label]);
- } else {
- this.upData[item.label] = "";
- }
- }
- });
- if (this.param !== undefined && this.param !== null) {
- for (let i in this.param) {
- this.upData[i] = this.param[i];
- }
- }
- this.$axios
- .post(this.addUrl, this.upData, {
- headers: {
- "Content-Type": "application/json",
- },
- })
- .then((res) => {
- this.$message.success("娣诲姞鎴愬姛");
- this.addDia = false;
- this.selectList("page");
- this.addLoad = false;
- })
- .catch((e) => {
- this.addDia = false;
- this.addLoad = false;
- });
- },
- openDownDia() {
- this.downDia = true;
- },
- downFile(type) {
- if (this.downUrl == null) {
- this.$message.error("璇风粰瀵煎嚭璇锋眰鍦板潃");
- return;
- }
- var page = this.HaveJson(this.page);
- if (!type) {
- page.current = 0;
- page.size = this.total;
- }
- this.loading = true;
- this.$axios
- .post(
- this.downUrl,
- {
- page: page,
- entity: this.data.entity,
- },
- {
- headers: {
- "Content-Type": "application/json",
- },
- }
- )
- .then((res) => {
- this.downDia = false;
- this.loading = false;
- this.$message.success("瀵煎嚭鎴愬姛");
- let eleLink = document.createElement("a");
- eleLink.style.display = "none";
- eleLink.download = res.data;
- eleLink.href = this.javaApi + "/outPath/" + res.data;
- document.body.appendChild(eleLink);
- eleLink.click();
- document.body.removeChild(eleLink);
- })
- .catch((e) => {
- console.log(e);
- this.loading = false;
- this.$message.error("璇峰埛鏂伴〉闈㈠啀灏濊瘯");
- });
- },
- openUpload() {
- if (this.inputUrl == null) {
- this.$message.error("璇风粰瀵煎叆璇锋眰鍦板潃");
- return;
- }
- this.uploadDia = true;
- },
- beforeUpload(file, fileList) {
- console.log(file.raw.type);
- if (
- file.raw.type !=
- (this.data.inputType === undefined ? "text/csv" : this.data.inputType)
- ) {
- this.$message.error("涓婁紶鏂囦欢鏍煎紡涓嶆纭�");
- this.$refs.upload.clearFiles();
- return false;
- }
- },
- submitUpload() {
- if (this.$refs.upload.uploadFiles.length == 0) {
- this.$message.error("鏈�夋嫨鏂囦欢");
- return;
- }
- this.uploading = true;
- this.$refs.upload.submit();
- },
- onSuccess(response, file, fileList) {
- this.$refs.upload.clearFiles();
- this.uploadDia = false;
- this.uploading = false;
- if (response.code != 200) {
- this.$message.error(response.message);
- return;
- }
- this.$message.success("涓婁紶鎴愬姛");
- this.selectList();
- },
- onError(err, file, fileList) {
- this.$message.error("涓婁紶澶辫触");
- this.$refs.upload.clearFiles();
- this.uploading = false;
- },
- // 鎿嶄綔鎸夐挳缃伆鍒ゆ柇
- isDisabled(label) {
- if (this.data.disabledUp == undefined) {
- return;
- }
- for (var i = 0; i < this.data.disabledUp.length; i++) {
- if (label == this.data.disabledUp[i]) {
- return true;
- }
- }
- return false;
- },
- getSummaries(param) {
- const { columns, data } = param;
- const sums = [];
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = "鍚堣";
- return;
- }
- const values = data.map((item) => Number(item[column.property]));
- if (this.data.countFleid == undefined) {
- sums[index] = "";
- return;
- }
- if (
- this.data.countFleid.filter((str) => {
- return str === column.property;
- }).length > 0
- ) {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0);
- sums[index] += "";
- } else {
- sums[index] = "";
- }
- });
- return sums;
- },
- handleLinkEvent(row, val) {
- if (val.method == "doDiy") {
- this.main(row, val);
- } else {
- this.$parent[val.method](row);
- }
- },
- getWidth() {
- let count = 0;
- this.data.do.forEach((a) => {
- count += a.font.length;
- });
- return count * 15 + 60 + "px";
- },
- handleSuccessUp(response, label) {
- if (typeof label === "string") {
- if (response.code == 200) {
- this.upData[label] = response.data.url;
- }
- } else {
- if (response.code == 200) {
- this.$message.success("涓婁紶鎴愬姛");
- this.selectList();
- }
- }
- },
- handleCascader(e, label) {
- this.upData[label] = e;
- },
- // 鎵归噺鍒犻櫎
- batchDelete() {
- if (this.multipleSelection && this.multipleSelection.length > 0) {
- this.$confirm("鏄惁鍒犻櫎閫変腑鐨勬暟鎹�?", "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- this.$axios
- .post(this.delUrl, {
- ids: JSON.stringify(
- this.multipleSelection.map((item) => item.id)
- ),
- })
- .then((res) => {
- this.$message.success("鍒犻櫎鎴愬姛");
- this.selectList("page");
- })
- .catch((e) => {
- this.$message.error("鍒犻櫎澶辫触");
- });
- })
- .catch(() => { });
- } else {
- this.$message.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
- }
- },
- // 鏃ュ伐鏃剁鐞嗚緟鍔╁伐鏃�--鎵归噺瀹℃牳鍜屾壒鍑�
- batchCheck(e) {
- if (this.multipleSelection && this.multipleSelection.length > 0) {
- const list = JSON.parse(JSON.stringify(this.multipleSelection));
- const state = e === 0 ? "涓嶆壒鍑�" : "宸叉壒鍑�";
- let auxiliaryWorkingHoursDays = [];
- list.forEach((item) => {
- delete item.orderBy;
- item.state = state;
- auxiliaryWorkingHoursDays.push(item);
- });
- this.$axios
- .post(
- this.$api.auxiliaryWorkingHoursDay.approve,
- { auxiliaryWorkingHoursDays: auxiliaryWorkingHoursDays },
- {
- headers: {
- "Content-Type": "application/json",
- },
- }
- )
- .then((res) => {
- this.$parent.submitBatchCheckDialog();
- this.$message.success("鎿嶄綔鎴愬姛");
- });
- } else {
- this.$message.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
- }
- },
- getRedColor(label, row) {
- if (
- this.data.cellSpecialStyle &&
- this.data.cellSpecialStyle.redColorByKey &&
- label.includes(this.data.cellSpecialStyle.redColorByKey) &&
- row[label.replace(this.data.cellSpecialStyle.redColorByKey, "")]
- ) {
- return true;
- } else {
- return false;
- }
- },
- },
-};
-</script>
diff --git a/src/components/echarts/DataComparison.vue b/src/components/echarts/DataComparison.vue
index b69b49d..19d65e7 100644
--- a/src/components/echarts/DataComparison.vue
+++ b/src/components/echarts/DataComparison.vue
@@ -4,7 +4,7 @@
<el-row class="title">
<el-col :span="6" style="padding-left: 20px;text-align: left;">鏁版嵁鍒嗘瀽</el-col>
<el-col :span="18" style="text-align: right;">
- <el-button size="medium" @click="$emit('goBack')">杩斿洖</el-button>
+ <el-button size="small" @click="$emit('goBack')">杩斿洖</el-button>
</el-col>
</el-row>
</div>
@@ -441,9 +441,6 @@
},
noQs: true
}).then(res => {
- if (res.code === 201) {
- return
- }
this.comparisonData1 = res.data
this.getInfo1()
})
diff --git a/src/plugins/download.js b/src/plugins/download.js
index 36db93e..e5a7d57 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -81,37 +81,40 @@
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
+ async saveAs(text, name, opts) {
+ if (typeof text === "string") {
+ try {
+ let state = /\.(jpg|jpeg|png|gif)$/i.test(text) // 鍒ゆ柇鏄惁涓哄浘鐗�
+ let url1 = ''
+ if (state) {
+ url1 = Vue.prototype.javaApi + '/img/' + text;
+ } else {
+ url1 = Vue.prototype.javaApi + '/word/' + text
+ }
+ // 浣跨敤 fetch 鑾峰彇鏂囦欢
+ const response = await fetch(url1);
+ if (!response.ok) {
+ throw new Error('鏂囦欢涓嬭浇澶辫触: ' + response.statusText);
+ }
+ // 灏嗘枃浠惰浆鎹负 Blob
+ const blob = await response.blob();
+ // 浣跨敤 saveAs 淇濆瓨鏂囦欢
+ saveAs(blob, name);
+ Message.success("鏁版嵁瀵煎嚭鎴愬姛");
+ } catch (error) {
+ Message.error(error);
}
- // 浣跨敤 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);
+ } else {
+ // 娴佷笅杞�
+ blobToText(text)
+ .then((result) => {
+ Message.error(result.msg);
+ })
+ .catch(() => {
+ saveAs(text, name, opts);
+ Message.success("鏁版嵁瀵煎嚭鎴愬姛");
+ });
}
- },
- saveAs(text, name, opts) {
- // 娴佷笅杞�
- 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/externalService/serviceAndSupplyPro/component/Store.vue b/src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue
index 9ddb399..aa5d8c4 100644
--- a/src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue
+++ b/src/views/CNAS/externalService/serviceAndSupplyPro/component/Store.vue
@@ -337,7 +337,6 @@
if (type === 'edit') {
this.dialogType = "update";
selectStoreById({ id: row.id }).then(res => {
- if (res.code === 201) return
this.consumables = res.data.consumables
this.form = { ...res.data.store }
}).catch(err => {
diff --git a/src/views/CNAS/externalService/supplierManage/index.vue b/src/views/CNAS/externalService/supplierManage/index.vue
index ec7cba1..f035865 100644
--- a/src/views/CNAS/externalService/supplierManage/index.vue
+++ b/src/views/CNAS/externalService/supplierManage/index.vue
@@ -14,7 +14,7 @@
</div>
<div>
<!-- <el-button size="medium" @click="exportExcel">瀵� 鍑�</el-button>-->
- <el-button size="medium" type="primary" @click="showDialog('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="showDialog('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
diff --git a/src/views/CNAS/process/complaint/index.vue b/src/views/CNAS/process/complaint/index.vue
index 5a998b3..aadc61c 100644
--- a/src/views/CNAS/process/complaint/index.vue
+++ b/src/views/CNAS/process/complaint/index.vue
@@ -348,40 +348,9 @@
...mapGetters(["userId"]),
},
mounted() {
- // this.entityCopy = this.HaveJson(this.componentData.entity);
this.getList()
},
methods: {
- // 鏉冮檺鍒嗛厤
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- let out = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'doProcessComplain') {
- up = true
- }
- if (power[i].menuMethod == 'addProcessComplain') {
- add = true
- }
- if (power[i].menuMethod == 'delProcessComplain') {
- del = true
- }
- if (power[i].menuMethod == 'exportProcessComplain') {
- out = true
- }
- }
- if (!up) {
- this.componentData.do.splice(2, 1)
- }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- this.outPower = out
- this.addPower = add
- },
openAdd() {
this.addInfo = {}
this.addDialogVisible = true
@@ -390,13 +359,6 @@
this.addLoading = true
addProcessComplain(this.addInfo).then((res) => {
this.addLoading = false
- if (res.code == 201) {
- this.$message({
- type: 'error',
- message: '鏂板澶辫触'
- })
- return
- }
this.$message({
type: 'success',
message: '鏂板鎴愬姛'
@@ -428,13 +390,6 @@
}
doProcessComplain(this.currentInfo0).then((res) => {
this.addLoading = false
- if (res.code == 201) {
- this.$message({
- type: 'error',
- message: '鎻愪氦澶辫触'
- })
- return
- }
this.$message({
type: 'success',
message: '鎻愪氦鎴愬姛'
@@ -497,18 +452,12 @@
this.outLoading = true
exportProcessComplain(this.queryParams).then(res => {
this.outLoading = false
- if (res.code == 201) {
- return
- }
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '鎶曡瘔鎯呭喌姹囨�昏〃.xlsx');
})
},
handleOut(row) {
getProcessComplain({ id: row.id }).then((res) => {
- if (res.code == 201) {
- return
- }
this.currentInfo = res.data
this.currentInfo0 = this.HaveJson(res.data)
this.title = '瀵煎嚭'
@@ -531,7 +480,6 @@
})
.then(() => {
delProcessComplain({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index da42835..2674424 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -25,7 +25,7 @@
</el-form>
</div>
<div style="text-align: right; margin-bottom: 20px">
- <el-button size="medium" type="primary" @click="goAdd">鏂板</el-button>
+ <el-button size="small" type="primary" @click="goAdd">鏂板</el-button>
</div>
<div class="table">
<el-table v-loading="tableListLoading" :data="tableList" height="530" style="width: 100%">
@@ -477,7 +477,6 @@
};
},
mounted() {
- // this.getPower()
this.getAuthorizedPerson()
this.refreshTable()
},
@@ -595,7 +594,6 @@
this.buttonLoading = true
updateInspectionOrder(this.currentInfo).then(res => {
this.buttonLoading = false
- if (res.code === 201) return
this.$message.success('鏂板鎴愬姛')
this.detailDialogVisible = false
this.orderRowsVisible = false
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
index 7da7493..8f666c5 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/ViewRecord.vue
@@ -6,7 +6,7 @@
:action="fileAction"
:auto-upload="true"
:before-upload="fileBeforeUpload" :data="{detailsEvaluateId: info.detailsEvaluateId}"
- :headers="headers" :on-error="onError"
+ :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="width: 80px !important;">
@@ -32,6 +32,11 @@
import file from '@/utils/file';
import filePreview from '@/components/Preview/filePreview.vue';
import limsTable from "@/components/Table/lims-table.vue";
+import {
+ delVerifyEvaluateFileList,
+ getEvaluateFileList
+} from '@/api/cnas/process/ensureResults/qualityMonitor'
+
export default {
name: 'ViewRecord',
@@ -96,10 +101,11 @@
// 鏌ヨ闄勪欢鍒楄〃
searchTableList () {
this.tableLoading = true
- this.$axios.get(this.$api.qualityMonitor.getEvaluateFileList + '?detailsEvaluateId=' + this.info.detailsEvaluateId).then(res => {
+ getEvaluateFileList({detailsEvaluateId:this.info.detailsEvaluateId}).then(res => {
this.tableLoading = false
- if (res.code === 201) return
- this.tableData = res.data
+ if (res.code === 200){
+ this.tableData = res.data
+ }
}).catch(err => {
this.tableLoading = false
console.log('err---', err);
@@ -125,9 +131,8 @@
// 鍒犻櫎
delete (row) {
this.tableLoading = true
- this.$axios.get(this.$api.qualityMonitor.delVerifyEvaluateFileList + '?evaluateFileId=' + row.evaluateFileId).then(res => {
+ delVerifyEvaluateFileList({evaluateFileId : row.evaluateFileId}).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchTableList()
}).catch(err => {
@@ -156,6 +161,8 @@
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
this.searchTableList()
+ } else {
+ this.$message.error(response.msg);
}
},
// 鏌ョ湅鏂囦欢
@@ -165,13 +172,8 @@
},
},
computed: {
- headers() {
- return {
- 'token': sessionStorage.getItem('token')
- }
- },
fileAction() {
- return this.javaApi + this.$api.qualityMonitor.uploadEvaluateFile
+ return this.javaApi + '/qualityMonitor/uploadEvaluateFile'
}
},
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
index 051b17b..e568f28 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/carryOutDialog.vue
@@ -230,7 +230,6 @@
addInfo() {
addQualityMonitorRatify(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeCarryOutDia()
}).catch(err => {
@@ -242,7 +241,6 @@
editInfo() {
addQualityMonitorRatifyOpinion(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeCarryOutDia()
}).catch(err => {
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue
index 3089e9b..dbbe70d 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/detailFormDialog.vue
@@ -113,7 +113,6 @@
this.upLoad = true
addQualityMonitorDetail(entity).then(res => {
this.upLoad = false
- if (res.code === 201) return
this.$message.success('鏂板鎴愬姛')
this.closeDia()
}).catch(err => {
@@ -127,7 +126,6 @@
this.upLoad = true
updateQualityMonitorDetail(entity).then(res => {
this.upLoad = false
- if (res.code === 201) return
this.$message.success('淇敼鎴愬姛')
this.closeDia()
}).catch(err => {
diff --git a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue
index 78d618b..bd3bd9b 100644
--- a/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue
+++ b/src/views/CNAS/process/ensureResults/ensureResultsValidity/components/evaluateDialog.vue
@@ -5,7 +5,7 @@
title="璐ㄩ噺鐩戞帶璇勪环"
width="60%" @close="closeEvaDia">
<div style="text-align: right">
- <el-button size="small" type="primary" @click="viewTestRecord">闄勪欢涓婁紶</el-button>
+ <el-button size="small" type="primary" @click="viewTestRecord" :disabled="currentStep === 0">闄勪欢涓婁紶</el-button>
</div>
<el-steps :active="currentStep" align-center finish-status="success">
<el-step title="鐩戞帶璁″垝瀹炴柦鎯呭喌" @click.native="setStep(0)"></el-step>
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
index 3734365..fe26f2c 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/detailFormDialog.vue
@@ -143,7 +143,6 @@
this.upLoad = true
updateQualitySuperviseDetail(entity).then(res => {
this.upLoad = false
- if (res.code === 201) return
this.$message.success('淇敼鎴愬姛')
this.closeDia()
}).catch(err => {
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
index 253a812..a337f53 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/processingSheet.vue
@@ -426,7 +426,6 @@
if (this.currentStep === 0) {
addEquipSuperviseDetailAccording(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.closeProcessingDia()
}).catch(err => {
@@ -436,7 +435,6 @@
} else {
approverEquipSuperviseDetailAccording(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎵瑰噯鎴愬姛')
this.closeProcessingDia()
}).catch(err => {
diff --git a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue
index 0f650e5..2ee9c46 100644
--- a/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue
+++ b/src/views/CNAS/process/ensureResults/qualityControlPlan/components/rectifyDialogNew.vue
@@ -380,7 +380,6 @@
if (this.currentStep === 0) {
addEquipSuperviseDetailCorrect(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.closeRectifyDia()
}).catch(err => {
@@ -390,7 +389,6 @@
} else {
approveEquipSuperviseDetailCorrect(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎵瑰噯鎴愬姛')
this.closeRectifyDia()
}).catch(err => {
diff --git a/src/views/CNAS/process/method/methodVerification/component/formDIa.vue b/src/views/CNAS/process/method/methodVerification/component/formDIa.vue
index fef565e..de19a32 100644
--- a/src/views/CNAS/process/method/methodVerification/component/formDIa.vue
+++ b/src/views/CNAS/process/method/methodVerification/component/formDIa.vue
@@ -5,7 +5,7 @@
:visible.sync="formDia"
width="90%" @close="closeDia">
<div v-if="operationType === 'edit'" style="text-align: right">
- <el-button :disabled="form.confirmDate" size="medium" type="primary" @click="validation">楠岃瘉纭</el-button>
+ <el-button :disabled="form.confirmDate" size="small" type="primary" @click="validation">楠岃瘉纭</el-button>
</div>
<table border="1" cellspacing="10" class="tables">
<tr>
diff --git a/src/views/CNAS/process/method/methodVerification/index.vue b/src/views/CNAS/process/method/methodVerification/index.vue
index 48b43b0..950abcd 100644
--- a/src/views/CNAS/process/method/methodVerification/index.vue
+++ b/src/views/CNAS/process/method/methodVerification/index.vue
@@ -13,7 +13,7 @@
</el-form>
</div>
<div>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
diff --git a/src/views/CNAS/process/method/standardMethod/index.vue b/src/views/CNAS/process/method/standardMethod/index.vue
index ead5404..03f64ba 100644
--- a/src/views/CNAS/process/method/standardMethod/index.vue
+++ b/src/views/CNAS/process/method/standardMethod/index.vue
@@ -276,30 +276,6 @@
this.queryParams = {};
this.getList();
},
- // 鏉冮檺鍒嗛厤
- getPower() {
- let power = JSON.parse(sessionStorage.getItem("power"));
- let up = false;
- let del = false;
- let add = false;
- let inPower = false;
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == "addStandardMethod") {
- add = true;
- }
- if (power[i].menuMethod == "delStandardMethod") {
- del = true;
- }
- if (power[i].menuMethod == "upStandardMethod") {
- up = true;
- }
- if (power[i].menuMethod == "importStandardDetails") {
- inPower = true;
- }
- }
- this.addPower = add;
- this.inPower = inPower;
- },
openAdd() {
this.title = "鏂板";
this.addForm = {};
diff --git a/src/views/CNAS/process/method/standardMethodsChange/component/formDIaChange.vue b/src/views/CNAS/process/method/standardMethodsChange/component/formDIaChange.vue
index a63023a..7b443f3 100644
--- a/src/views/CNAS/process/method/standardMethodsChange/component/formDIaChange.vue
+++ b/src/views/CNAS/process/method/standardMethodsChange/component/formDIaChange.vue
@@ -5,7 +5,7 @@
:visible.sync="formDia"
width="90%" @close="closeDia">
<div v-if="operationType === 'edit'" style="text-align: right">
- <el-button :disabled="form.confirmDate !== '' && form.confirmDate !== null && form.confirmDate !== undefined" size="medium" type="primary" @click="validation">楠岃瘉纭</el-button>
+ <el-button :disabled="form.confirmDate !== '' && form.confirmDate !== null && form.confirmDate !== undefined" size="small" type="primary" @click="validation">楠岃瘉纭</el-button>
</div>
<table border="1" cellspacing="10" class="tables">
<tr>
diff --git a/src/views/CNAS/process/method/standardMethodsChange/index.vue b/src/views/CNAS/process/method/standardMethodsChange/index.vue
index ec0b8fd..3e4a30d 100644
--- a/src/views/CNAS/process/method/standardMethodsChange/index.vue
+++ b/src/views/CNAS/process/method/standardMethodsChange/index.vue
@@ -13,7 +13,7 @@
</el-form>
</div>
<div>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/component/FormDialog.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/component/FormDialog.vue
index 6ce226e..05dddd8 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/component/FormDialog.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/component/FormDialog.vue
@@ -97,7 +97,6 @@
this.editLoad = true
addMethodSearchNew(this.form.taskRel).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeDia()
}).catch(err => {
diff --git a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
index 59d2b8c..d7b606c 100644
--- a/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
+++ b/src/views/CNAS/process/method/standardNoveltyRetrieval/index.vue
@@ -13,14 +13,14 @@
</el-form>
</div>
<div>
- <el-button size="medium" type="primary" @click="openApprovalDialog1">寤� 妗�</el-button>
+ <el-button size="small" type="primary" @click="openApprovalDialog1">寤� 妗�</el-button>
<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;">
- <el-button :loading="upLoading" size="medium" type="primary">瀵煎叆</el-button>
+ <el-button :loading="upLoading" size="small" type="primary">瀵煎叆</el-button>
</el-upload>
- <el-button size="medium" style="margin-left: 10px;" type="primary" @click="openFormDia">鏂� 澧�</el-button>
+ <el-button size="small" style="margin-left: 10px;" type="primary" @click="openFormDia">鏂� 澧�</el-button>
</div>
</div>
<div>
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/components/formDia.vue b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/components/formDia.vue
index 84509e0..aba00a3 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/components/formDia.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/components/formDia.vue
@@ -119,7 +119,6 @@
this.diaLoading = true
getInconsistentDistributionOne({ distributionId: row.distributionId }).then(res => {
this.diaLoading = false
- if (res.code === 201) return
this.form = res.data
this.distributionDetailList = this.form.distributionDetailList
this.distributionProportion = this.form.distributionProportion
@@ -139,7 +138,6 @@
if (this.operationType === 'add') {
addInconsistentDistribution(internalPlan).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeDia()
}).catch(err => {
@@ -149,7 +147,6 @@
} else if (this.operationType === 'edit') {
updateInconsistentDistribution(internalPlan).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeDia()
}).catch(err => {
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
index 8a39ebc..4a54eb8 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingDistribution/index.vue
@@ -13,11 +13,11 @@
<el-input v-model="searchForm.distributionYear" clearable size="small"></el-input>
</span>
<span class="search-group">
- <el-button size="medium" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<div class="btn">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
@@ -135,7 +135,6 @@
this.tableLoading = true
pageInconsistentDistribution({ ...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 => {
@@ -153,7 +152,6 @@
this.tableLoading = true
delInconsistentDistribution({ distributionId: row.distributionId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/process/nonconformingWork/nonconformingItem/components/qualityInfo.vue b/src/views/CNAS/process/nonconformingWork/nonconformingItem/components/qualityInfo.vue
index 7ef970d..83d660c 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingItem/components/qualityInfo.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingItem/components/qualityInfo.vue
@@ -257,7 +257,6 @@
searchInfo(row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
getSuperviseDetailAccording({ 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/process/nonconformingWork/nonconformingItem/index.vue b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
index 4c0e60b..97e8aa8 100644
--- a/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
+++ b/src/views/CNAS/process/nonconformingWork/nonconformingItem/index.vue
@@ -7,8 +7,8 @@
<el-input v-model="searchForm.occurrenceDepartment" clearable size="small"></el-input>
</span>
<span class="search-group">
- <el-button size="medium" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
</div>
<div class="table">
@@ -129,7 +129,6 @@
this.tableLoading = true
pageSuperviseDetailAccording({ ...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/process/reportResults/index.vue b/src/views/CNAS/process/reportResults/index.vue
index 695cdc1..fcc583a 100644
--- a/src/views/CNAS/process/reportResults/index.vue
+++ b/src/views/CNAS/process/reportResults/index.vue
@@ -11,8 +11,8 @@
<el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</div>
<div class="btn">
- <el-button size="medium" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower">瀵煎嚭</el-button>
- <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
+ <el-button size="small" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower">瀵煎嚭</el-button>
+ <el-button size="small" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
</div>
</div>
<div class="table">
@@ -185,35 +185,6 @@
this.getAuthorizedPerson()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- let out = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'doProcessReport') {
- up = true
- }
- if (power[i].menuMethod == 'addProcessReport') {
- add = true
- }
- if (power[i].menuMethod == 'delProcessReport') {
- del = true
- }
- if (power[i].menuMethod == 'exportProcessReport') {
- out = true
- }
- }
- if (!up) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.outPower = out
- this.addPower = add
- },
handleDown() {
if (this.mutilSelect.length == 0) {
this.$message.warning('璇烽�夋嫨瑕佸鍑虹殑鏁版嵁')
@@ -222,7 +193,7 @@
this.outLoading = true
exportProcessReport({ ids: this.mutilSelect.map(m => m.id) }).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.data, "鎶ュ憡缁撴灉");
+ this.$download.saveAs(res.data, "鎶ュ憡缁撴灉");
})
},
openAdd() {
@@ -290,9 +261,6 @@
if (this.title == '鏂板') {
addProcessReport(addInfo).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -303,9 +271,6 @@
} else {
doProcessReport(addInfo).then(res => {
this.addLoading = false
- if (res.code == 201) {
- return
- }
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -333,7 +298,6 @@
})
.then(() => {
delProcessReport({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/process/sampleDisposal/index.vue b/src/views/CNAS/process/sampleDisposal/index.vue
index c534d45..94b45b9 100644
--- a/src/views/CNAS/process/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/sampleDisposal/index.vue
@@ -5,6 +5,7 @@
<el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;">鏂板</el-button>
<div class="table" style="height: calc(100% - 200px)" v-if="activeName == '濉啓'">
<lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading"
+ key="tableData"
:height="'calc(100vh - 290px)'" :page="page" @pagination="pagination"></lims-table>
</div>
</el-tab-pane>
@@ -25,6 +26,7 @@
</div>
<div class="table">
<lims-table :tableData="tableData0" :column="column0" :tableLoading="tableLoading"
+ key="tableData0"
:height="'calc(100vh - 300px)'" :page="page0" @pagination="pagination0"></lims-table>
</div>
</el-tab-pane>
@@ -249,51 +251,11 @@
};
},
mounted() {
- // this.entityCopy = this.HaveJson(this.componentData.entity);
this.getCustomPageList()
this.getList()
this.getList0()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let out = false
- let submitProcessTotaldeal = false
- let checkProcessTotaldeal = false
- let ratifyProcessTotaldeal = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addProcessDeal') {
- add = true
- }
- // if (power[i].menuMethod == 'exportProcessEvaluate') {
- // out = true
- // }
- if (power[i].menuMethod == 'submitProcessTotaldeal') {
- submitProcessTotaldeal = true
- }
- if (power[i].menuMethod == 'checkProcessTotaldeal') {
- checkProcessTotaldeal = true
- }
- if (power[i].menuMethod == 'ratifyProcessTotaldeal') {
- ratifyProcessTotaldeal = true
- }
- }
- if (!ratifyProcessTotaldeal) {
- this.componentData.do.splice(4, 1)
- }
- if (!checkProcessTotaldeal) {
- this.componentData.do.splice(3, 1)
- }
- if (!submitProcessTotaldeal) {
- this.componentData.do.splice(2, 1)
- }
- if (!add) {
- this.componentData0.do.splice(1, 1)
- this.componentData0.do.splice(0, 1)
- }
- this.addPower = add
- },
// 鑾峰彇閫佹牱鍗曚綅鍒楄〃
getCustomPageList() {
selectCustomPageList({
@@ -381,7 +343,6 @@
...this.addInfo
}).then(res => {
this.addLoading = false
- if (res.code === 201) return
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -398,7 +359,6 @@
...this.addInfo
}).then(res => {
this.addLoading = false
- if (res.code === 201) return
this.addDialogVisible = false
this.$message({
type: 'success',
@@ -419,7 +379,6 @@
submitProcessTotaldeal({
id: row.id
}).then(res => {
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎻愪氦鎴愬姛!'
@@ -430,13 +389,10 @@
},
// 鏌ョ湅
handleLook(row) {
- // console.log(row)
- // this.title0 = '鏌ョ湅'
- // this.commonFun(row)
this.activeName = '濉啓'
this.queryParams.totaldealId = row.id
this.$nextTick(() => {
- this.page.current = 0;
+ this.page.current = 1;
this.getList();
})
},
@@ -478,7 +434,6 @@
}).then(res => {
this.checkLoading = false
this.noCheckLoading = false
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎿嶄綔鎴愬姛!'
@@ -493,7 +448,6 @@
}).then(res => {
this.checkLoading = false
this.noCheckLoading = false
- if (res.code === 201) return
this.$message({
type: 'success',
message: '鎿嶄綔鎴愬姛!'
@@ -510,7 +464,7 @@
return
}
// 鍚庣涓嬭浇
- this.$download.downloadFileFromUrl(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
+ this.$download.saveAs(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
},
handleDelete(row) {
this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
@@ -520,7 +474,6 @@
})
.then(() => {
delProcessDeal({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.page.current = 0;
this.getList();
diff --git a/src/views/CNAS/process/uncertainty/index.vue b/src/views/CNAS/process/uncertainty/index.vue
index 8aca44f..f5dc83f 100644
--- a/src/views/CNAS/process/uncertainty/index.vue
+++ b/src/views/CNAS/process/uncertainty/index.vue
@@ -144,40 +144,10 @@
this.getList()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- let out = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'doProcessEvaluate') {
- up = true
- }
- if (power[i].menuMethod == 'addProcessEvaluate') {
- add = true
- }
- if (power[i].menuMethod == 'delProcessEvaluate') {
- del = true
- }
- if (power[i].menuMethod == 'exportProcessEvaluate') {
- out = true
- }
- }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- if (!up) {
- this.componentData.do.splice(0, 1)
- }
- this.outPower = out
- this.addPower = add
- },
handleDown0() {
this.outLoading = true
exportProcessEvaluate(this.queryParams).then(res => {
this.outLoading = false
- if (res.code === 201) return
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '娴嬮噺涓嶇‘瀹氬害鐨勮瘎瀹�.xlsx');
})
@@ -187,7 +157,7 @@
this.$message.warning('鏆傛棤鏂囦欢')
return
}
- this.$download.downloadFileFromUrl(row.reportUrl, row.reportName);
+ this.$download.saveAs(row.reportUrl, row.reportName);
},
beforeUpload(file) {
if (file.size > 1024 * 1024 * 10) {
@@ -223,10 +193,6 @@
evaluateUser: this.userId
}).then((res) => {
this.addLoading = false;
- if (res.code == 201) {
- this.$message.error('璇勪环澶辫触');
- return;
- }
this.$message.success('璇勪环鎴愬姛');
this.addDialogVisible = false;
this.refreshTable()
@@ -274,7 +240,6 @@
})
.then(() => {
delProcessEvaluate({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index dd15d62..99d88ac 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -4,8 +4,8 @@
<el-row class="title">
<el-col :span="6" style="padding-left: 20px;text-align: left;">鏁伴噰閰嶇疆</el-col>
<el-col :span="18" style="text-align: right;">
- <el-button size="medium" type="primary" @click="fileConfiguration">鏂囦欢閰嶇疆</el-button>
- <el-button size="medium" @click="$parent.closeDataVue()">
+ <el-button size="small" type="primary" @click="fileConfiguration">鏂囦欢閰嶇疆</el-button>
+ <el-button size="small" @click="$parent.closeDataVue()">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
</el-col>
diff --git a/src/views/CNAS/resourceDemand/device/component/borrow.vue b/src/views/CNAS/resourceDemand/device/component/borrow.vue
index a3e98ee..662574d 100644
--- a/src/views/CNAS/resourceDemand/device/component/borrow.vue
+++ b/src/views/CNAS/resourceDemand/device/component/borrow.vue
@@ -565,7 +565,6 @@
})
.then(() => {
deleteDeviceBorrow({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/resourceDemand/device/component/calibration.vue b/src/views/CNAS/resourceDemand/device/component/calibration.vue
index 10954a3..f11b502 100644
--- a/src/views/CNAS/resourceDemand/device/component/calibration.vue
+++ b/src/views/CNAS/resourceDemand/device/component/calibration.vue
@@ -416,7 +416,7 @@
})
},
handleAttachmentClick(row) {
- this.$download.downloadFileFromUrl(row.systemFileName, row.systemFileName)
+ this.$download.saveAs(row.systemFileName, row.systemFileName)
},
//瀵煎嚭
handleDown() {
diff --git a/src/views/CNAS/resourceDemand/device/component/check.vue b/src/views/CNAS/resourceDemand/device/component/check.vue
index 362cbfd..5dfe6b9 100644
--- a/src/views/CNAS/resourceDemand/device/component/check.vue
+++ b/src/views/CNAS/resourceDemand/device/component/check.vue
@@ -245,13 +245,10 @@
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
import file from '@/utils/file';
import { mapGetters } from "vuex";
export default {
- components: {
- ValueTable
- },
+ components: {},
props: {
clickNodeVal: {
type: Object,
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
index 49004f4..1bea84b 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentAcceptance.vue
@@ -177,7 +177,6 @@
this.tableLoading = true
getDeviceAcceptanceFileList({ acceptanceId: this.acceptanceId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data
}).catch(err => {
this.tableLoading = false
@@ -197,7 +196,7 @@
},
// 涓嬭浇
upload(row) {
- this.$download.downloadFileFromUrl(row.fileUrl, row.fileName)
+ this.$download.saveAs(row.fileUrl, row.fileName)
},
// 鍒犻櫎
delete(row) {
@@ -209,7 +208,6 @@
this.tableLoading = true
delDeviceAcceptanceFileList({ acceptanceFileId: row.acceptanceFileId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchTableList()
}).catch(err => {
diff --git a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
index 236ca34..6e234a5 100644
--- a/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
+++ b/src/views/CNAS/resourceDemand/device/component/equipmentVerificationPlan.vue
@@ -605,7 +605,7 @@
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
this.getYearTableData()
- } else if (response.code == 201) {
+ } else {
this.$message.error(response.message)
}
},
diff --git a/src/views/CNAS/resourceDemand/device/component/failureForm.vue b/src/views/CNAS/resourceDemand/device/component/failureForm.vue
index 70d0cf4..08cf257 100644
--- a/src/views/CNAS/resourceDemand/device/component/failureForm.vue
+++ b/src/views/CNAS/resourceDemand/device/component/failureForm.vue
@@ -170,9 +170,6 @@
},
getUserList() {
selectUserCondition().then(res => {
- if (res.code === 201) {
- return
- }
this.userList = res.data
})
},
diff --git a/src/views/CNAS/resourceDemand/device/component/files.vue b/src/views/CNAS/resourceDemand/device/component/files.vue
index c28facd..bd297c4 100644
--- a/src/views/CNAS/resourceDemand/device/component/files.vue
+++ b/src/views/CNAS/resourceDemand/device/component/files.vue
@@ -446,7 +446,6 @@
<script>
import { MessageBox } from 'element-ui'
-import ValueTable from "@/components/Table/value-table.vue";
import fileDownload from '@/utils/file'
import vueQr from 'vue-qr'
import PrintJS from 'print-js'
@@ -484,7 +483,6 @@
}
},
components: {
- ValueTable,
vueQr
},
data() {
@@ -618,7 +616,7 @@
handleAttachmentClick(row) {
console.log(row)
if (row.fileName) {
- this.$download.downloadFileFromUrl(row.fileName)
+ this.$download.saveAs(row.fileName)
} else {
this.$message.warning('鏈笂浼犳枃浠讹紒')
}
@@ -780,10 +778,6 @@
}
this.upLoad = true;
upDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.getList(this.clickNodeVal.value)
diff --git a/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue b/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue
index 5e33adc..36da44e 100644
--- a/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue
+++ b/src/views/CNAS/resourceDemand/device/component/inspectionForm.vue
@@ -249,9 +249,6 @@
},
getUserList() {
selectUserCondition().then(res => {
- if (res.code === 201) {
- return
- }
this.userList = res.data
})
},
diff --git a/src/views/CNAS/resourceDemand/device/component/management.vue b/src/views/CNAS/resourceDemand/device/component/management.vue
index d090b6e..ee38855 100644
--- a/src/views/CNAS/resourceDemand/device/component/management.vue
+++ b/src/views/CNAS/resourceDemand/device/component/management.vue
@@ -554,13 +554,10 @@
}
},
mounted() {
- // this.entityCopy = this.HaveJson(this.componentData.entity)
- // this.getPower()
this.selectEnumByCategory()
this.selectDevicePrincipal()
this.obtainItemParameterList()
this.getInsProductIds()
- // this.$customEvents.$on('largeCategory', this.handleNotification);
// 鍒濆鍖�
this.clickSidebar(this.clickNodeVal)
},
@@ -619,38 +616,6 @@
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '璁惧浠櫒涓�瑙堣〃.doc')
})
- },
- // 鏉冮檺鍒嗛厤
- getPower(radio) {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- let config = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'upDeviceParameter') {
- up = true
- }
- if (power[i].menuMethod == 'delDeviceParameter') {
- del = true
- }
- if (power[i].menuMethod == 'addDeviceParameter') {
- add = true
- }
- if (power[i].menuMethod == 'saveDataAcquisitionConfiguration') {
- config = true
- }
- }
- if (!config) {
- this.componentData.do.splice(2, 1)
- }
- if (!up) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
},
// 鑾峰彇瀛楀吀
selectEnumByCategory() {
@@ -838,10 +803,6 @@
}
this.upLoad = true;
upDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad = false
- return
- }
this.$message.success('淇敼鎴愬姛')
this.upLoad = false
this.refreshTable('page')
@@ -891,10 +852,6 @@
}
this.upLoad2 = true;
addDeviceParameter(formData).then(res => {
- if (res.code === 201) {
- this.upLoad2 = false
- return
- }
this.$message.success('鎻愪氦鎴愬姛')
this.upLoad2 = false
this.refreshTable('page')
@@ -962,9 +919,6 @@
this.upLoad3 = true
numberCollect(this.configForm).then(res => {
this.upLoad3 = false
- if (res.code === 201) {
- return
- }
this.$message.success('鎿嶄綔鎴愬姛')
this.refreshTable('page')
this.dialogVisible3 = false
@@ -1011,7 +965,6 @@
})
.then(() => {
delDeviceParameter({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/resourceDemand/device/component/scrapApplicationForm.vue b/src/views/CNAS/resourceDemand/device/component/scrapApplicationForm.vue
index 62fcbbc..51a6439 100644
--- a/src/views/CNAS/resourceDemand/device/component/scrapApplicationForm.vue
+++ b/src/views/CNAS/resourceDemand/device/component/scrapApplicationForm.vue
@@ -181,9 +181,6 @@
},
getUserList() {
selectUserCondition().then(res => {
- if (res.code === 201) {
- return
- }
this.userList = res.data
})
},
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
index 04a2e27..faf3b3b 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management.vue
@@ -15,8 +15,8 @@
</el-form>
</div>
<div>
- <el-button size="medium" @click="handleDown">瀵� 鍑�</el-button>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" @click="handleDown">瀵� 鍑�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
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 71a7c67..c753f94 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
@@ -241,7 +241,6 @@
},
handleRemove(file) {
this.$axios.delete(this.$api.personnel.deleteCNASFile + "?fileName=" + file.name).then(res => {
- if (res.code === 201) return;
this.$message.success('鍒犻櫎鎴愬姛锛�')
let index = this.form.fileList.indexOf(fileName)
if (index != -1) {
@@ -254,7 +253,7 @@
this.$message.warning('鏆傛棤鏂囦欢')
return
}
- this.$download.downloadFileFromUrl(row.systemFileName, row.fileName)
+ this.$download.saveAs(row.systemFileName, row.fileName)
}
}
}
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
index ba593ac..24606ba 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
@@ -279,7 +279,6 @@
feMeasuredQuantityListDelete(row, index) {
if (row.measuredQuantityId) {
deleteFeMeasuredQuantity({ measuredQuantityId: row.measuredQuantityId }).then(res => {
- if (res.code === 201) return
this.form.feMeasuredQuantityList.splice(index, 1)
this.$message.success('鍒犻櫎鎴愬姛锛�')
})
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
index 1075ed4..095a61f 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/three-wastes-treatment.vue
@@ -14,7 +14,7 @@
</el-form>
</div>
<div>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</div>
diff --git a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue b/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
index dd59ccd..1a38083 100644
--- a/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterailRequistion/index.vue
@@ -12,8 +12,8 @@
@keyup.enter.native="searchList"></el-input>
</el-form-item>
<el-form-item>
- <el-button size="medium" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</el-form-item>
</el-form>
</div>
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/component/formDia.vue b/src/views/CNAS/resourceDemand/standardMaterial/component/formDia.vue
index 1741ffd..09c9140 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/component/formDia.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/component/formDia.vue
@@ -156,7 +156,6 @@
this.loading = true
addStandardSubstance(this.form).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
diff --git a/src/views/CNAS/resourceDemand/standardMaterial/index.vue b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
index 2ad23f6..f6378d0 100644
--- a/src/views/CNAS/resourceDemand/standardMaterial/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterial/index.vue
@@ -18,8 +18,8 @@
</el-form>
</div>
<div>
- <el-button size="medium" @click="exportFun">瀵� 鍑�</el-button>
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" @click="exportFun">瀵� 鍑�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</div>
</div>
<div class="table">
diff --git a/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue b/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue
index 1e281d6..a209069 100644
--- a/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue
+++ b/src/views/CNAS/systemManagement/correctiveAction/components/ViewTestRecord.vue
@@ -110,7 +110,7 @@
},
// 涓嬭浇
upload(row) {
- this.$download.downloadFileFromUrl(row.fileUrl, row.fileName);
+ this.$download.saveAs(row.fileUrl, row.fileName);
},
// 鍒犻櫎
delete(row) {
diff --git a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
index 6ea9848..8e371d5 100644
--- a/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
+++ b/src/views/CNAS/systemManagement/customerSatisfaction/index.vue
@@ -304,7 +304,7 @@
},
// 涓嬭浇瀹㈡埛绂忓缓
upload(row) {
- this.$download.downloadFileFromUrl(row.fileUrl, row.fileName);
+ this.$download.saveAs(row.fileUrl, row.fileName);
},
// 鍒犻櫎瀹㈡埛鍒嗘瀽闄勪欢
delFile(row) {
diff --git a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
index d6cc6d9..deab03b 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
@@ -314,37 +314,6 @@
this.page.current = 1;
this.getList();
},
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- // let check = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageDocumentControlled') {
- up = true
- }
- if (power[i].menuMethod == 'addManageDocumentControlled') {
- add = true
- }
- if (power[i].menuMethod == 'delManageDocumentControlled') {
- del = true
- }
- // if (power[i].menuMethod == 'checkManageDocumentControlled') {
- // check = true
- // }
- }
- // if (!check) {
- // this.componentData.do.splice(2, 1)
- // }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- if (!up) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- },
getAuthorizedPerson() {
selectUserCondition().then(res => {
let data = []
@@ -461,7 +430,7 @@
},
handleDown(row) {
if (!row.url) return this.$message.warning('鏂囦欢鏈笂浼�')
- this.$download.downloadFileFromUrl(row.url, row.url);
+ this.$download.saveAs(row.url, row.url);
},
async uploadPDF(pdfBlob) {
const formData = new FormData();
diff --git a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
index 879f070..647782b 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/DistributionCollectionRecord.vue
@@ -288,38 +288,6 @@
this.selectEnumByCategory()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let out = false
- let del = false
- let add = false
- // let check = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'exportManageDocumentIssueRecycle') {
- out = true
- }
- if (power[i].menuMethod == 'addManageDocumentIssueRecycle') {
- add = true
- }
- if (power[i].menuMethod == 'delManageDocumentIssueRecycle') {
- del = true
- }
- // if (power[i].menuMethod == 'checkManageDocumentControlled') {
- // check = true
- // }
- }
- // if (!check) {
- // this.componentData.do.splice(2, 1)
- // }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- if (!add) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- },
getList() {
this.tableLoading = true;
let param = { ...this.queryParams, ...this.page };
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
index 8f9d12a..17be48c 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileChangeRequest.vue
@@ -369,35 +369,6 @@
this.selectEnumByCategory()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let del = false
- let add = false
- let out = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageDocumentAlter') {
- up = true
- }
- if (power[i].menuMethod == 'addManageDocumentAlter') {
- add = true
- }
- if (power[i].menuMethod == 'delManageDocumentAlter') {
- del = true
- }
- if (power[i].menuMethod == 'exportManageDocumentAlter') {
- out = true
- }
- }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- if (!up) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- },
getList() {
this.tableLoading = true;
let param = { ...this.queryParams, ...this.page };
@@ -568,7 +539,7 @@
// 涓嬭浇闄勪欢
handleDown(row) {
if (!row.alterAfterUrl) return this.$message.warning('鏂囦欢鏈笂浼�')
- this.$download.downloadFileFromUrl(row.alterAfterUrl, row.alterAfterUrl)
+ this.$download.saveAs(row.alterAfterUrl, row.alterAfterUrl)
},
// 鎵撳紑瀹℃牳寮规
handleCheck(row) {
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
index 4696f3e..51b4a27 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileList.vue
@@ -252,37 +252,13 @@
// 涓嬭浇鏂囦欢
handleDown(row) {
if (!row.url) return this.$message.warning('鏂囦欢鏈笂浼�')
- this.$download.downloadFileFromUrl(row.url, row.url);
+ this.$download.saveAs(row.url, row.url);
},
// 鏌ョ湅鏂囦欢
handleLook(row) {
if (!row.url) return this.$message.warning('鏂囦欢鏈笂浼�')
this.currentInfo = row
this.lookDialogVisible = true
- },
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let up = false
- let upFile = false
- let add = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'doManageDocumentList') {
- up = true
- }
- if (power[i].menuMethod == 'exportManageDocumentList') {
- add = true
- }
- if (power[i].menuMethod == 'uploadFileManageDocumentList') {
- upFile = true
- }
- }
- if (!upFile) {
- this.componentData.do.splice(1, 1)
- }
- if (!up) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
},
// 涓婁紶鏂囦欢
handleUp(row) {
diff --git a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
index 0cb20d9..4ffb93a 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/FileObsoletionRequest.vue
@@ -229,38 +229,6 @@
this.selectEnumByCategory()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let out = false
- let del = false
- let add = false
- // let check = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'exportManageDocumentCancel') {
- out = true
- }
- if (power[i].menuMethod == 'addManageDocumentCancel') {
- add = true
- }
- if (power[i].menuMethod == 'delManageDocumentCancel') {
- del = true
- }
- // if (power[i].menuMethod == 'checkManageDocumentControlled') {
- // check = true
- // }
- }
- // if (!check) {
- // this.componentData.do.splice(2, 1)
- // }
- if (!del) {
- this.componentData.do.splice(1, 1)
- }
- if (!add) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- },
getList() {
this.tableLoading = true;
let param = { ...this.queryParams, ...this.page };
diff --git a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
index d64c541..2b0c02c 100644
--- a/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/approvalRecord.vue
@@ -193,50 +193,6 @@
this.getAuthorizedPerson()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let up = false;
- let out = false;
- let check = false
- let ratify = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordCheck') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordCheck') {
- del = true
- }
- if (power[i].menuMethod == 'exportInManageRecordCheck') {
- up = true
- }
- if (power[i].menuMethod == 'checkManageRecordCheck') {
- check = true
- }
- if (power[i].menuMethod == 'ratifyManageRecordCheck') {
- ratify = true
- }
- if (power[i].menuMethod == 'exportOutManageRecordCheck') {
- out = true
- }
- }
- if (!ratify) {
- this.componentData.do.splice(3, 1)
- }
- if (!check) {
- this.componentData.do.splice(2, 1)
- }
- if (!add) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- this.upPower = up
- },
getList() {
this.tableLoading = true;
let param = { ...this.queryParams, ...this.page };
@@ -283,7 +239,7 @@
// queryParams
exportOutManageRecordCheck(this.queryParams).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.data, '鏂囦欢瀹℃壒璁板綍')
+ this.$download.saveAs(res.data, '鏂囦欢瀹℃壒璁板綍')
})
},
getAuthorizedPerson() {
diff --git a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
index 3ab5cc0..73e419d 100644
--- a/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/cancellationRecord.vue
@@ -191,43 +191,6 @@
this.getFileList()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let up = false;
- let out = false;
- let ratify = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordCancel') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordCancel') {
- del = true
- }
- if (power[i].menuMethod == 'exportInManageRecordCancel') {
- up = true
- }
- if (power[i].menuMethod == 'ratifyManageRecordCancel') {
- ratify = true
- }
- if (power[i].menuMethod == 'exportOutManageRecordCancel') {
- out = true
- }
- }
- if (!ratify) {
- this.componentData.do.splice(2, 1)
- }
- if (!add) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- this.upPower = up
- },
openAdd() {
this.addInfo = {}
this.title = '鏂板'
@@ -243,7 +206,7 @@
this.outLoading = true
exportOutManageRecordCancel(this.queryParams).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.data, "浣滃簾鏂囦欢閿�姣佽褰�");
+ this.$download.saveAs(res.data, "浣滃簾鏂囦欢閿�姣佽褰�");
})
},
getList() {
diff --git a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
index cf9982a..4da0bf3 100644
--- a/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/distributionCollectionRecord.vue
@@ -246,43 +246,6 @@
// this.selectTreeList()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let up = false;
- let out = false;
- let edit = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordIssueRecycle') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordIssueRecycle') {
- del = true
- }
- if (power[i].menuMethod == 'exportInManageRecordIssueRecycle') {
- up = true
- }
- if (power[i].menuMethod == 'doManageRecordIssueRecycle') {
- edit = true
- }
- if (power[i].menuMethod == 'exportOutManageRecordIssueRecycle') {
- out = true
- }
- }
- if (!add) {
- this.componentData.do.splice(2, 1)
- }
- if (!add) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- this.upPower = up
- },
// 鏂板
openAdd() {
// this.$refs.ValueTable.openAddDia(this.$api.manageRecordIssueRecycle.addManageRecordIssueRecycle);
@@ -300,7 +263,7 @@
this.outLoading = true
exportOutManageRecordIssueRecycle(this.queryParams).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.data, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
+ this.$download.saveAs(res.data, '鏂囦欢鍙戞斁涓庡洖鏀惰褰�')
})
},
getList() {
diff --git a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
index cc13d08..b00e8cb 100644
--- a/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/outDocumenRecordt.vue
@@ -249,45 +249,6 @@
this.getList0()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let up = false;
- let sub = false
- let ratify = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordVerify') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordVerify') {
- del = true
- }
- if (power[i].menuMethod == 'exportManageRecordVerify') {
- up = true
- }
- if (power[i].menuMethod == 'submitManageRecordTotal') {
- sub = true
- }
- if (power[i].menuMethod == 'ratifyManageRecordTotal') {
- ratify = true
- }
- }
- if (!ratify) {
- this.componentData.do.splice(3, 1)
- }
- if (!sub) {
- this.componentData.do.splice(2, 1)
- }
- if (!del) {
- this.componentData0.do.splice(1, 1)
- }
- if (!add) {
- this.componentData0.do.splice(0, 1)
- }
- this.addPower = add
- this.upPower = up
- },
openAdd(title, row) {
this.title = title;
if (row) {
@@ -393,7 +354,7 @@
}).catch(err => { });
},
handleDown0(row) {
- this.$download.downloadFileFromUrl(row.url, '澶栨潵鏂囦欢纭璁板綍')
+ this.$download.saveAs(row.url, '澶栨潵鏂囦欢纭璁板綍')
},
// 鎻愪氦
handleSubmit(row) {
diff --git a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
index 60eafd1..2df716e 100644
--- a/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/regularReviewsRecord.vue
@@ -281,61 +281,14 @@
}
},
mounted() {
- // this.entityCopy = this.HaveJson(this.componentData.entity);
- // this.entityCopy0 = this.HaveJson(this.componentData0.entity);
this.getList()
this.getList0()
this.getFileList()
this.selectEnumByCategory()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let up = false;
- let out = false;
- let submit = false
- let ratify = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordIntervals') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordIntervals') {
- del = true
- }
- if (power[i].menuMethod == 'exportInManageRecordIntervals') {
- up = true
- }
- if (power[i].menuMethod == 'exportOutManageRecordIntervals') {
- out = true
- }
- if (power[i].menuMethod == 'submitManageRecordIntervalsTotal') {
- submit = true
- }
- if (power[i].menuMethod == 'ratifyManageRecordIntervalsTotal') {
- ratify = true
- }
- }
- if (!ratify) {
- this.componentData0.do.splice(3, 1)
- }
- if (!submit) {
- this.componentData0.do.splice(2, 1)
- }
- if (!add) {
- this.componentData.do.splice(1, 1)
- }
- if (!del) {
- this.componentData.do.splice(0, 1)
- }
- this.addPower = add
- this.outPower = out
- this.upPower = up
- },
// 鏂板
openAdd() {
- // this.$refs.ValueTable.openAddDia(this.$api.manageRecordIssueRecycle.addManageRecordIssueRecycle);
this.addInfo = {}
this.title = '鏂板'
this.addDialogVisible = true;
@@ -345,7 +298,7 @@
this.outLoading = true
exportOutManageRecordIntervals(this.queryParams).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.message, "鏂囦欢瀹氭湡瀹℃煡璁板綍");
+ this.$download.saveAs(res.message, "鏂囦欢瀹氭湡瀹℃煡璁板綍");
})
},
getList() {
@@ -532,7 +485,7 @@
}
},
handleDown0(row) {
- this.$download.downloadFileFromUrl(row.url, "鎵�鏈夋枃浠跺畾鏈熸鏌ヨ褰�");
+ this.$download.saveAs(row.url, "鎵�鏈夋枃浠跺畾鏈熸鏌ヨ褰�");
},
// 鎻愪氦
handleSubmit(row) {
diff --git a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue b/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
index 47d4106..b0c4471 100644
--- a/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
+++ b/src/views/CNAS/systemManagement/documentRecords/revisionRecord.vue
@@ -484,59 +484,6 @@
this.selectTreeList()
},
methods: {
- getPower() {
- let power = JSON.parse(sessionStorage.getItem('power'))
- let add = false
- let del = false
- let out = false;
- let ratify = false
- let audit1 = false
- let audit2 = false
- let audit3 = false
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == 'addManageRecordAudit') {
- add = true
- }
- if (power[i].menuMethod == 'delManageRecordAudit') {
- del = true
- }
- if (power[i].menuMethod == 'ratifyManageRecordAudit') {
- ratify = true
- }
- if (power[i].menuMethod == 'exportOutManageRecordAudit') {
- out = true
- }
- if (power[i].menuMethod == 'manageRecordAudit1') {
- audit1 = true
- }
- if (power[i].menuMethod == 'manageRecordAudit2') {
- audit2 = true
- }
- if (power[i].menuMethod == 'manageRecordAudit3') {
- audit3 = true
- }
- }
- if (!audit3) {
- this.componentData.do.splice(8, 1)
- }
- if (!audit2) {
- this.componentData.do.splice(7, 1)
- }
- if (!audit1) {
- this.componentData.do.splice(6, 1)
- }
- if (!ratify) {
- this.componentData.do.splice(5, 1)
- }
- if (!add) {
- this.componentData.do.splice(4, 1)
- }
- if (!del) {
- this.componentData.do.splice(3, 1)
- }
- this.addPower = add
- this.outPower = out
- },
openAdd() {
this.addInfo = {
method: '淇',
@@ -550,7 +497,7 @@
this.outLoading = true
exportOutManageRecordAudit(this.queryParams).then(res => {
this.outLoading = false
- this.$download.downloadFileFromUrl(res.data, "鏂囦欢淇琛�");
+ this.$download.saveAs(res.data, "鏂囦欢淇琛�");
})
},
getList() {
@@ -746,7 +693,6 @@
})
.then(() => {
delManageRecordAudit({ id: row.id }).then((res) => {
- if (res.code == 201) return;
this.$message.success("鍒犻櫎鎴愬姛");
this.refresh();
});
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue
index a96569d..1e18c9d 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/ViewTestRecord.vue
@@ -99,7 +99,6 @@
this.tableLoading = true
getInternalCorrectFileList({ correctId: this.info.correctId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data
}).catch(err => {
this.tableLoading = false
@@ -116,14 +115,13 @@
},
// 涓嬭浇
upload(row) {
- this.$download.downloadFileFromUrl(row.fileUrl, row.fileName)
+ this.$download.saveAs(row.fileUrl, row.fileName)
},
// 鍒犻櫎
delete(row) {
this.tableLoading = true
delInternalCorrectFile({ correctFileId: row.correctFileId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchTableList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
index 8fd7254..5638155 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspection.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">鍙楀閮ㄩ棬锛�</span>
<el-input v-model="searchForm.department" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -204,7 +204,6 @@
this.tableLoading = true
delInternalCheck({ checkId: row.checkId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
index 8295da4..3a03a61 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditInspectionDia.vue
@@ -155,7 +155,6 @@
if (this.operationType === 'add') {
addInternalCheck(internalCheckDto).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
@@ -165,7 +164,6 @@
} else if (this.operationType === 'edit') {
updateInternalCheck(internalCheckDto).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
index 116cbce..b0caa51 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSign.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">鏃堕棿锛�</span>
<el-input v-model="searchForm.meetingDate" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -152,7 +152,6 @@
this.tableLoading = true
delInternalMeeting({ meetingId: row.meetingId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue
index 892d098..b8168a4 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditMeetingSignDia.vue
@@ -118,7 +118,6 @@
if (this.operationType === 'add') {
addInternalMeeting(internalMeeting).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
@@ -128,7 +127,6 @@
} else if (this.operationType === 'edit') {
updateInternalMeeting(internalMeeting).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
index a29da33..38bdaeb 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReport.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">瀹℃牳鐩殑锛�</span>
<el-input v-model="searchForm.purposes" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -262,7 +262,6 @@
this.tableLoading = true
delInternalReport({ reportId: row.reportId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReportDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReportDia.vue
index b2dd1fa..4571a88 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReportDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/auditReportDia.vue
@@ -229,7 +229,6 @@
this.diaLoading = true
getInternalReportOne({ reportId: row.reportId }).then(res => {
this.diaLoading = false
- if (res.code === 201) return
this.form = res.data
}).catch(err => {
console.log(err)
@@ -245,7 +244,6 @@
if (this.operationType === 'add') {
addInternalReport(internalReport).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
@@ -255,7 +253,6 @@
} else if (this.operationType === 'edit') {
updateInternalReport(internalReport).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
index 58b1b4b..bc317a8 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveAction.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 200px">涓嶅悎鏍兼弿杩帮細</span>
<el-input v-model="searchForm.raiseResult" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -117,7 +117,6 @@
this.tableLoading = true
pageInternalCorrect({ ...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/correctiveActionDIa.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveActionDIa.vue
index 267fa52..7beed5f 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveActionDIa.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/correctiveActionDIa.vue
@@ -261,7 +261,6 @@
searchInfo(row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
getInternalCorrect({ correctId: row.correctId }).then(res => {
- if (res.code === 201) return
if (res.data.superviseDetailsCorrectId === null) {
this.showStep = 0
this.currentStep = 0
@@ -329,7 +328,6 @@
this.form.flowType = this.currentStep
addInternalCorrect(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎻愪氦鎴愬姛')
this.closeRectifyDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue
index 5a94ebe..a07f3f5 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementPlanDia.vue
@@ -201,7 +201,6 @@
this.diaLoading = true
getInternalImplementOne({ implementId: row.implementId }).then(res => {
this.diaLoading = false
- if (res.code === 201) return
this.form = res.data
this.implementDetailList = this.form.implementDetailList
}).catch(err => {
@@ -223,7 +222,6 @@
if (this.operationType === 'add') {
addInternalImplement(internalImplementDto).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
@@ -233,7 +231,6 @@
} else if (this.operationType === 'edit') {
updateInternalImplement(internalImplementDto).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue
index e1810e9..98ddec0 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/implementationPlan.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">瀹℃牳鐩殑锛�</span>
<el-input v-model="searchForm.purposes" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -209,7 +209,6 @@
this.tableLoading = true
pageInternalImplement({ ...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 => {
@@ -243,7 +242,6 @@
this.tableLoading = true
delInternalImplement({ implementId: row.implementId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
index edd31a9..2c37944 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlan.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">鍐呭鐩殑锛�</span>
<el-input v-model="searchForm.purpose" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -231,7 +231,6 @@
this.tableLoading = true
pageInternalPlan({ ...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 => {
@@ -249,7 +248,6 @@
this.tableLoading = true
delInternalPlan({ planId: row.planId }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue
index 0c1eba1..024ef3f 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue
@@ -192,7 +192,6 @@
this.diaLoading = true
getInternalPlanOne({ planId: row.planId }).then(res => {
this.diaLoading = false
- if (res.code === 201) return
this.form = res.data
this.planDetailList = this.form.planDetailList
}).catch(err => {
@@ -210,7 +209,6 @@
if (this.operationType === 'add') {
addInternalPlan(internalPlan).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
@@ -220,7 +218,6 @@
} else if (this.operationType === 'edit') {
updateInternalPlan(internalPlan).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/managementReview/components/managementFormDIa.vue b/src/views/CNAS/systemManagement/managementReview/components/managementFormDIa.vue
index 5f1d57a..713d1c9 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/managementFormDIa.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/managementFormDIa.vue
@@ -154,18 +154,6 @@
this.form.participants = row.participants ? row.participants.split(',').map(m => Number(m)) : []
}
},
- // 鏌ヨ璇︽儏
- // searchInfo (row) {
- // this.diaLoading = true
- // this.$axios(this.$api.internalReport.getInternalReportOne + '?reportId=' + row.reportId).then(res => {
- // this.diaLoading = false
- // if (res.code === 201) return
- // this.form = res.data
- // }).catch(err => {
- // console.log(err)
- // this.diaLoading = false
- // })
- // },
// 鎻愪氦寮规鏁版嵁
handleEdit() {
this.$refs['form'].validate((valid) => {
@@ -176,7 +164,6 @@
if (this.operationType === 'add') {
addReviewProgram(internalReport).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
@@ -186,7 +173,6 @@
} else if (this.operationType === 'edit') {
modifyReviewProgram(internalReport).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeImplementDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue b/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
index b5f1c61..056045b 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/managementReviewPlan.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">璇勫鍦扮偣锛�</span>
<el-input v-model="searchForm.judgingLocation" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -215,7 +215,6 @@
size: this.page.size
}).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
@@ -249,7 +248,6 @@
this.tableLoading = true
deleteReviewProgram({ id: row.id }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
@@ -282,7 +280,7 @@
},
handleDown0(url, name) {
if (!url) return this.$message.warning('鏂囦欢鏈笂浼�')
- this.$download.downloadFileFromUrl(url, name);
+ this.$download.saveAs(url, name);
}
}
};
diff --git a/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue b/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
index 890ae93..dc89b07 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/meetingRecords.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">浼氳鍦扮偣锛�</span>
<el-input v-model="searchForm.place" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -112,7 +112,6 @@
this.tableLoading = true
getPageMeeting({ place: this.searchForm.place, pages: this.page.current, size: this.page.size }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
@@ -146,7 +145,6 @@
this.tableLoading = true
deleteMeeting({ id: row.id }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
@@ -167,10 +165,6 @@
},
handleDown(row) {
exportMeeting({ id: row.id }).then(res => {
- if (res.code == 201) {
- this.$message.error(res.message)
- return
- }
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '浼氳璁板綍.docx');
})
diff --git a/src/views/CNAS/systemManagement/managementReview/components/meetingRecordsDia.vue b/src/views/CNAS/systemManagement/managementReview/components/meetingRecordsDia.vue
index 835e5e4..2f83ee8 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/meetingRecordsDia.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/meetingRecordsDia.vue
@@ -110,7 +110,6 @@
if (this.operationType === 'add') {
addMeeting(internalMeeting).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
@@ -120,7 +119,6 @@
} else if (this.operationType === 'edit') {
modifyMeeting(internalMeeting).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue b/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue
index b9a2d96..45b2994 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/reviewReport.vue
@@ -4,11 +4,11 @@
<span class="search-group">
<span style="width: 160px">鍦扮偣锛�</span>
<el-input v-model="searchForm.place" clearable size="small"></el-input>
- <el-button size="medium" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
- <el-button size="medium" type="primary" @click="searchList">鏌� 璇�</el-button>
+ <el-button size="small" style="margin-left: 10px" @click="resetSearchForm">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="searchList">鏌� 璇�</el-button>
</span>
<span class="search-group">
- <el-button size="medium" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
+ <el-button size="small" type="primary" @click="openFormDia('add')">鏂� 澧�</el-button>
</span>
</div>
<div class="table">
@@ -171,7 +171,6 @@
this.tableLoading = true
getPageReviewReport({ place: this.searchForm.place, pages: this.page.current, size: this.page.size }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.tableData = res.data.records
this.page.total = res.data.total
}).catch(err => {
@@ -205,7 +204,6 @@
this.tableLoading = true
deleteReviewReport({ id: row.id }).then(res => {
this.tableLoading = false
- if (res.code === 201) return
this.$message.success('鍒犻櫎鎴愬姛')
this.searchList()
}).catch(err => {
@@ -226,10 +224,6 @@
},
handleDown(row) {
exportReviewReport({ id: row.id }).then(res => {
- if (res.code == 201) {
- this.$message.error(res.message)
- return
- }
const blob = new Blob([res], { type: 'application/octet-stream' });
this.$download.saveAs(blob, '璇勫鎶ュ憡.docx');
})
@@ -238,7 +232,6 @@
let obj = row
obj[type] = this.nickName;
modifyReviewReport(obj).then(res => {
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.searchList()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/managementReview/components/reviewReportDia.vue b/src/views/CNAS/systemManagement/managementReview/components/reviewReportDia.vue
index b8afafc..bd3e5e8 100644
--- a/src/views/CNAS/systemManagement/managementReview/components/reviewReportDia.vue
+++ b/src/views/CNAS/systemManagement/managementReview/components/reviewReportDia.vue
@@ -202,7 +202,6 @@
if (this.operationType === 'add') {
addReviewReport(internalMeeting).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
@@ -212,7 +211,6 @@
} else if (this.operationType === 'edit') {
modifyReviewReport(internalMeeting).then(res => {
this.loading = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeYearDia()
}).catch(err => {
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
index cdc0c7a..b0da2ca 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/hazardIdentificationRiskAssessment.vue
@@ -167,7 +167,6 @@
initData() {
this.tableData = []
getPageResults(this.page).then(res => {
- if (res.code === 201) return;
this.tableData = res.data.records;
this.page.total = res.data.total;
});
@@ -197,7 +196,6 @@
// 瀹℃壒鎺ュ彛
approvalApi(userId, status) {
dangerousRiskApproval({ approval: userId, status: status }).then(res => {
- if (res.code === 201) return;
this.initData()
this.$message({
type: 'success',
@@ -230,7 +228,6 @@
// 鎵瑰噯鎺ュ彛
approveApi(userId, status) {
hazardIdentificationAndRiskApproval({ approve: userId, status: status }).then(res => {
- if (res.code === 201) return;
this.initData()
this.$message({
type: 'success',
@@ -247,7 +244,7 @@
},
// 鏂囦欢涓婁紶鎴愬姛
onSuccess(response) {
- if (response.code == 201) {
+ if (response.code != 200) {
this.$message({
type: 'error',
message: response.message,
@@ -272,7 +269,6 @@
type: 'warning'
}).then(() => {
removeRiskFactors({ id: row.id }).then(res => {
- if (res.code === 201) return;
this.initData()
this.$message({
type: 'success',
@@ -289,7 +285,6 @@
addApi() {
this.loading = true
addNewRiskFactors(this.form).then(res => {
- if (res.code === 201) return;
this.dialogVisible = false
this.loading = false
this.initData()
diff --git a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
index 988e8e2..5f3358f 100644
--- a/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
+++ b/src/views/CNAS/systemManagement/measuresDealRisks/components/listRiskAnalysisControlPlans.vue
@@ -236,7 +236,6 @@
type: 'warning'
}).then(() => {
deleteSignificantRiskFactorAnalysis({ id: row.id }).then(res => {
- if (res.code === 201) return;
this.initData()
this.$message({
type: 'success',
@@ -253,7 +252,6 @@
addApi() {
this.loading = true
analysisOfMajorRiskFactorsAdded(this.form).then(res => {
- if (res.code === 201) return;
this.dialogVisible = false
this.loading = false
this.initData()
diff --git a/src/views/business/costStatistics/index.vue b/src/views/business/costStatistics/index.vue
new file mode 100644
index 0000000..6243ee8
--- /dev/null
+++ b/src/views/business/costStatistics/index.vue
@@ -0,0 +1,118 @@
+<template>
+ <div class="capacity-scope">
+ <div class="search">
+ <div>
+ <el-form :model="entity" ref="entity" size="small" :inline="true">
+ <el-form-item label="鏍峰搧鍚嶇О" prop="sample">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.sample"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item label="濮旀墭鍗曚綅" prop="company">
+ <el-select @focus="getCompanyOptions" @change="refreshTable()" clearable
+ size="small" v-model="entity.company" style="width: 100%">
+ <el-option v-for="item in companyOptions" :key="item.value"
+ :label="item.label" :value="item.label">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ <div>
+ <lims-table :tableData="tableData" :column="column"
+ :height="'calc(100vh - 250px)'" @pagination="pagination"
+ :page="page" :tableLoading="tableLoading"></lims-table>
+ </div>
+ </div>
+</template>
+
+<script>
+import limsTable from "@/components/Table/lims-table.vue";
+import {selectRatesPage} from "@/api/business/insOrderRates";
+import {selectCustomPageList} from "@/api/system/customer";
+
+export default {
+ components: {limsTable},
+ data() {
+ return {
+ entity: {
+ sample: null,
+ company: null,
+ },
+ tableData: [],
+ tableLoading: false,
+ column: [
+ { label: '涓嬪崟鏃堕棿', prop: 'createTime', width: 150 },
+ { label: '濮旀墭缂栧彿', prop: 'entrustCode', width: 160 },
+ { label: '鏍峰搧鍚嶇О', prop: 'sample', width: 160 },
+ { label: '鏍峰搧鏁伴噺', prop: 'sampleNum' },
+ { label: '濮旀墭鍗曚綅', prop: 'company' },
+ { label: '濮旀墭浜�', prop: 'prepareUser' },
+ { label: '鐢熶骇鍗曚綅', prop: 'production' },
+ { label: '宸ョ▼鍚嶇О', prop: 'engineering' },
+ { label: '宸ユ椂', prop: 'cost' }
+ ],
+ page: {
+ total: 0,
+ size: 10,
+ current: 1
+ },
+ companyOptions: []
+ }
+ },
+ mounted() {
+ this.refreshTable()
+ this.getCompanyOptions()
+ },
+ methods :{
+ refreshTable() {
+ this.tableLoading = true
+ selectRatesPage({ ...this.page, ...this.entity }).then(res => {
+ this.tableLoading = false
+ this.tableData = res.data.records
+ this.page.total = res.data.total
+ }).catch(err => {
+ this.tableLoading = false
+ })
+ },
+ // 閲嶇疆
+ refresh() {
+ this.resetForm('entity')
+ this.refreshTable()
+ },
+ // 鏌ヨ濮旀墭鍗曚綅涓嬫媺妗嗘暟鎹�
+ getCompanyOptions () {
+ selectCustomPageList({
+ current: -1,
+ size: -1
+ }).then(res => {
+ const list = res.data.records
+ this.companyOptions = []
+ list.map((item) => {
+ const obj = Object.assign({
+ value: item.id,
+ label: item.company,
+ })
+ this.companyOptions.push(obj)
+ })
+ }).catch(err => { });
+ },
+ // 鍒嗛〉鍒囨崲
+ pagination(page) {
+ this.page.size = page.limit
+ this.refreshTable()
+ },
+ }
+}
+</script>
+<style scoped>
+.search {
+ height: 46px;
+ display: flex;
+ justify-content: space-between;
+}
+</style>
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 3a169e1..620a42f 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -241,8 +241,6 @@
</template>
<script>
-// import ValueTable from '../../tool/value-table.vue'
-import file from '@/utils/file'
import excelFunction from '@/utils/excelFountion'
import UnPassDialog from "@/views/business/unpass/components/unPassDialog.vue";
import AddUnPass from "@/views/business/unpass/components/addUnPass.vue";
@@ -2033,7 +2031,7 @@
downFile({
id: row.id,
}).then(res => {
- this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
}).catch(error => {
})
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 5e64e73..0894796 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -788,7 +788,6 @@
this.getInsStateDicts();
this.getComparisonList();
this.getAuthorizedPerson();
- // this.getPower();
this.startWorker();
// this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
@@ -798,7 +797,6 @@
this.getInsStateDicts();
this.getComparisonList();
this.getAuthorizedPerson();
- // this.getPower();
this.startWorker();
// this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
@@ -1500,34 +1498,6 @@
a.download = "table.png";
a.click();
});
- },
- // 鏉冮檺鑾峰彇
- getPower() {
- let power = JSON.parse(sessionStorage.getItem("power"));
- let fileDel = false;
- let fileAdd = false;
- let collected = false;
- let temDataAcquisition = false;
- for (var i = 0; i < power.length; i++) {
- if (power[i].menuMethod == "uploadFile") {
- fileAdd = true;
- }
- if (power[i].menuMethod == "delfile") {
- fileDel = true;
- }
- if (power[i].menuMethod == "isItAllowedToModifyTheCollectedValues") {
- collected = true;
- }
- if (power[i].menuMethod == "temDataAcquisition") {
- temDataAcquisition = true;
- }
- }
- if (!fileDel) {
- // this.componentData0.do.splice(1, 1);
- }
- this.fileAdd = fileAdd;
- this.collected = collected;
- this.temDataAcquisition = temDataAcquisition;
},
uploadSample() {
doInsOrder({
@@ -2879,7 +2849,7 @@
},
handleDown(row) {
downFile({ id: row.id }).then((res) => {
- this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName)
+ this.$download.saveAs(res.data.fileUrl, row.fileName)
})
.catch((error) => { });
},
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 8227fdd..a78b5cd 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -396,7 +396,6 @@
</template>
<script>
-// import ValueTable from '../../tool/value-table.vue'
import Vue from 'vue'
import {
addRawCopperOrder,
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 51b698e..ce2ca45 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -849,7 +849,7 @@
// 寰呬笅鍗曟煡璇�
getPurchaseOrderList() {
this.tableLoading = true
- const params = { ...this.entity, isInspect: 1, state: 0 }
+ const params = { ...this.entity, isInspect: 1, state: 0, ...this.page }
getWarehouseSubmit(params).then(res => {
this.tableLoading = false
if (res.code === 200) {
@@ -863,7 +863,7 @@
// 妫�楠屼腑鏌ヨ
getIfsByStateOneList() {
this.tableLoading1 = true
- const params = { ...this.entity, orderState: 1, state: 1 }
+ const params = { ...this.entity, orderState: 1, state: 1, ...this.page1 }
getIfsByStateOne(params).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
@@ -877,7 +877,14 @@
// 宸叉楠屾煡璇�
getIfsByOverList() {
this.tableLoading2 = true
- const params = { ...this.entity, orderState: 4, state: 2 }
+ if(null != this.entity.date){
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, orderState: 4, state: 2, ...this.page2 }
getIfsByOver(params).then(res => {
this.tableLoading2 = false
if (res.code === 200) {
@@ -891,7 +898,14 @@
// 鏌ヨ瀛ｅ害妫�楠�
getIfsByQuarterList() {
this.tableLoading4 = true
- const params = { ...this.entity }
+ if(null != this.entity.date){
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, ...this.page4 }
getIfsByOver(params).then(res => {
this.tableLoading4 = false
if (res.code === 200) {
@@ -905,7 +919,14 @@
// 鍏ㄩ儴
getIfsByAllList() {
this.tableLoading3 = true
- const params = { ...this.entity, isInspect: 1 }
+ if(null != this.entity.date){
+ this.entity.beginDeclareDate = this.entity.date[0]
+ this.entity.endDeclareDate = this.entity.date[1]
+ } else {
+ this.entity.beginDeclareDate = ''
+ this.entity.endDeclareDate = ''
+ }
+ const params = { ...this.entity, isInspect: 1, ...this.page3 }
getIfsByAll(params).then(res => {
this.tableLoading3 = false
if (res.code === 200) {
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index 3eb9521..9e063f1 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -15,7 +15,6 @@
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
import UnPassRetestResult from "./unPassRetestResult.vue";
import limsTable from "@/components/Table/lims-table.vue";
import {getRetestResult, selectSampleAndProductByOrderId} from "@/api/business/rawMaterialOrder";
@@ -23,7 +22,7 @@
export default {
name: "dataLookVisible",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {limsTable, UnPassRetestResult, ValueTable},
+ components: {limsTable, UnPassRetestResult},
props: {
dataDialogVisible: {
type: Boolean,
@@ -139,7 +138,7 @@
this.entity.id = this.dataLookInfo.quarterOrderId
}
this.tableLoading = true
- const params = {...this.entity}
+ const params = {...this.entity, ...this.page}
selectSampleAndProductByOrderId(params).then(res => {
this.tableLoading = false
if (res.code === 200) {
diff --git a/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue b/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
index 6ff5627..63b475c 100644
--- a/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
@@ -20,12 +20,10 @@
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
-
export default {
name: "downFileDialog",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {ValueTable},
+ components: {},
props: {
downFileDialogVisible: {
type: Boolean,
diff --git a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
index ef642c2..bfbebb4 100644
--- a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
@@ -23,14 +23,12 @@
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
-import file from "@/utils/file";
import limsTable from "@/components/Table/lims-table.vue";
-import { delfile, downFile, getFileList } from "@/api/business/rawMaterialOrder";
+import { delFile, downFile, getFileList } from "@/api/business/rawMaterialOrder";
export default {
name: "filesLookVisible",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: { limsTable, ValueTable },
+ components: { limsTable },
props: {
filesDialogVisible: {
type: Boolean,
@@ -154,7 +152,7 @@
// 涓嬭浇
handleDown(row) {
downFile({ id: row.id, }).then(res => {
- this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
}).catch(error => {
})
@@ -164,6 +162,8 @@
if (response.code == 200) {
this.$message.success('涓婁紶鎴愬姛');
this.getFileList()
+ } else {
+ this.$message.error(response.msg);
}
},
beforeUpload(file) {
@@ -195,14 +195,9 @@
cancelButtonText: "鍙栨秷",
type: "warning"
}).then(() => {
- delfile({ id: row.id }).then(res => {
- if (res.code === 500) {
- return
- }
+ delFile({ id: row.id }).then(res => {
this.$message.success('鍒犻櫎鎴愬姛')
- this.getList()
- }).catch(e => {
- this.$message.error('鍒犻櫎澶辫触')
+ this.getFileList()
})
}).catch(() => { })
}
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 2a65236..9c8b31e 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -1338,10 +1338,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
@@ -1675,9 +1671,6 @@
delInsOrderTemplate({
id: row.id
}).then(res => {
- if (res.code === 201) {
- return
- }
this.$message.success('鍒犻櫎鎴愬姛')
this.selectInsOrderTemplate()
}).catch(e => {
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 0d97704..46d1445 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -15,17 +15,11 @@
<el-input v-model="entity.sampleModel" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
- <el-form-item>
- <el-button :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text"
- @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
- </el-form-item>
- <el-form-item label="鏍峰搧缂栧彿" prop="sampleCode" v-if="more">
- <el-input v-model="entity.sampleCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="refreshTable">
- </el-input>
- </el-form-item>
+<!-- <el-form-item label="鏍峰搧缂栧彿" prop="sampleCode" v-if="more">-->
+<!-- <el-input v-model="entity.sampleCode" clearable placeholder="璇疯緭鍏�" size="small"-->
+<!-- @keyup.enter.native="refreshTable">-->
+<!-- </el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="涓嬪崟鏃堕棿" prop="createTime" v-if="more">
<el-date-picker v-model="entity.createTime" clearable format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡" size="small"
style="width:100%" type="date" value-format="yyyy-MM-dd HH:mm:ss">
@@ -40,6 +34,12 @@
<el-input v-model="entity.company" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter.native="refreshTable">
</el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text"
+ @click="more = !more">{{ !more ? '鏇村' : '鏀惰捣' }}</el-button>
+ <el-button size="small" @click="refresh()">閲� 缃�</el-button>
+ <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
</el-form-item>
</el-form>
</div>
@@ -151,7 +151,7 @@
</el-row>
</span>
</el-dialog>
- <el-dialog :visible.sync="dataDialogVisible" title="鏁版嵁鏌ョ湅" width="80%">
+ <el-dialog :visible.sync="dataDialogVisible" title="鏁版嵁鏌ョ湅" width="80%" @close="closeDia">
<div v-if="dataDialogVisible">
<lims-table :tableData="tableDataLook" :column="tableDataLookColumn" @pagination="tableDataLookPagination"
height="500px" key="tableDataLook" :page="tableDataLookPage"
@@ -547,6 +547,7 @@
quashDialogVisible: false,
issuedDialogVisible: false,
dataDialogVisible: false, // 鏁版嵁鏌ョ湅寮规
+ currentRow: {}, // 鏁版嵁鏌ョ湅寮规
tableDataLookTableLoading: false, // 鏁版嵁鏌ョ湅寮规
tableDataLook: [],
tableDataLookPage: {
@@ -762,7 +763,7 @@
}
const params = { ...this.entity, state: this.tabList[this.tabIndex].value }
this.tableLoading = true
- selectInsOrderParameter(params).then(res => {
+ selectInsOrderParameter({...this.page,...params}).then(res => {
this.upIndex++
this.tableLoading = false
if (res.code === 200) {
@@ -941,12 +942,13 @@
// 鏁版嵁鏌ョ湅
handleDataLook(row) {
this.dataDialogVisible = true;
- this.getDataTableList(row)
+ this.currentRow = row;
+ this.getDataTableList(this.currentRow)
},
// 鏌ヨ鏁版嵁鏌ョ湅鍒楄〃鏁版嵁
getDataTableList(row) {
this.tableDataLookTableLoading = true
- selectSampleAndProductByOrderId({ id: row.id }).then(res => {
+ selectSampleAndProductByOrderId({ id: row.id, ...this.tableDataLookPage }).then(res => {
this.tableDataLookTableLoading = false
if (res.code === 200) {
this.tableDataLook = res.data.records
@@ -958,7 +960,15 @@
},
tableDataLookPagination(page) {
this.tableDataLookPage.size = page.limit
- this.getDataTableList()
+ this.getDataTableList(this.currentRow)
+ },
+ closeDia () {
+ this.tableDataLookPage = {
+ total: 0,
+ size: 10,
+ current: 1
+ }
+ this.dataDialogVisible = false
},
// 闄勪欢鏌ョ湅
handleFileLook(row) {
@@ -986,7 +996,7 @@
downFile({
id: row.id,
}).then(res => {
- this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
}).catch(error => {
})
@@ -995,7 +1005,7 @@
download(row) {
let url = row.urlS ? row.urlS : row.url;
if (url) {
- this.$download.downloadFileFromUrl(url, this.downLoadInfo.fileName);
+ this.$download.saveAs(url, row.entrustCode);
}
},
// 鎾ら攢
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index c1bf5c8..d0f8df2 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -94,7 +94,7 @@
</el-dialog>
<!-- 纭鎶ユ -->
<el-dialog :close-on-click-modal="false" :title="declareType === 'add' ? '鏂板鎶ユ淇℃伅' : '鍘熸潗鏂欐姤妫�'"
- :visible.sync="declareDialogVisible" width="800px" @close="resetForm">
+ :visible.sync="declareDialogVisible" width="800px" @close="resetFormData">
<el-form ref="declareObj" :inline="true" :model="declareObj" :rules="declareObjRules" label-width="130px"
label-position="right">
<el-form-item class="declareObj-form-item" label="璁㈠崟鍙�:" prop="orderNo">
@@ -446,7 +446,7 @@
partNo: null,
partDesc: null,
supplierName: null,
- date: '',
+ date: null,
entrustCode: '',
inspectStatus: '',
},
@@ -560,6 +560,13 @@
// 宸插畬鎴愰儴鏌ヨ
getIfsByFinishList() {
this.tableLoading1 = true
+ if(null != this.componentData.date){
+ this.componentData.beginDeclareDate = this.componentData.date[0]
+ this.componentData.endDeclareDate = this.componentData.date[1]
+ } else {
+ this.componentData.beginDeclareDate = ''
+ this.componentData.endDeclareDate = ''
+ }
getIfsByFinish({ ...this.componentData, ...this.page1 }).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
@@ -573,6 +580,13 @@
// 鍏ㄩ儴鏌ヨ
getIfsByAllList() {
this.tableLoading1 = true
+ if(null != this.componentData.date){
+ this.componentData.beginDeclareDate = this.componentData.date[0]
+ this.componentData.endDeclareDate = this.componentData.date[1]
+ } else {
+ this.componentData.beginDeclareDate = ''
+ this.componentData.endDeclareDate = ''
+ }
getIfsByAll({ ...this.componentData, ...this.page1 }).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
@@ -748,7 +762,7 @@
});
}
},
- resetForm() {
+ resetFormData() {
this.$refs['declareObj'].resetFields();
this.declareDialogVisible = false
},
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 3ff9d9c..88a3833 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -547,7 +547,7 @@
downFile({
id: row.id,
}).then(res => {
- this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
+ this.$download.saveAs(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 d7de2a8..c2f06e0 100644
--- a/src/views/business/unpass/components/unPassDialog.vue
+++ b/src/views/business/unpass/components/unPassDialog.vue
@@ -180,7 +180,7 @@
downFile({
id: row.id,
}).then(res => {
- this.$download.downloadFileFromUrl(res.data.fileUrl, row.fileName);
+ this.$download.saveAs(res.data.fileUrl, row.fileName);
}).catch(error => {
})
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index a7de5dd..e478a36 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -65,13 +65,12 @@
import OAProcess from "./components/OAProcess.vue";
import limsTable from "@/components/Table/lims-table.vue";
import {deleteUnqualifiedHandler, page, pushOA} from "@/api/business/unqualifiedHandler";
-import ValueTable from "@/components/Table/value-table.vue";
+
export default {
components: {
limsTable,
OAProcess,
UnPassDialog,
- ValueTable
},
data() {
return {
diff --git a/src/views/performance/class/index.vue b/src/views/performance/class/index.vue
index 209139c..0934b6f 100644
--- a/src/views/performance/class/index.vue
+++ b/src/views/performance/class/index.vue
@@ -444,7 +444,6 @@
this.monthList.push(i);
}
this.monthList.reverse();
- // this.getPower();
},
methods: {
refresh() {
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index 8be8062..60eaac8 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -220,7 +220,6 @@
</template>
<script>
-import ValueTable from "@/components/Table/value-table.vue";
import { getYearAndMonthAndDays } from "@/utils/date";
import {
selectAuxiliaryWorkingHoursDay,
@@ -238,7 +237,6 @@
import limsTable from "@/components/Table/lims-table.vue";
export default {
components: {
- ValueTable,
limsTable,
},
dicts: ["sys_class_type"],
diff --git a/src/views/statisticalCharts/qualificationRateStatistics/index.vue b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
index 6b03b09..17fd9a9 100644
--- a/src/views/statisticalCharts/qualificationRateStatistics/index.vue
+++ b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
@@ -374,7 +374,6 @@
// 鑾峰彇鏈湀妫�楠岀被鍨嬫暟閲�
getOrderType() {
getOrderTypeCookie().then((res) => {
- if (res.code === 201) return
this.materialPieSeries1[0].data[0].value = res.data.customer // 濮旀墭
this.materialPieSeries1[0].data[1].value = res.data.enter // 杩涘巶
this.materialPieSeries1[0].data[2].value = res.data.quarterly // 瀛ｅ害
diff --git a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue b/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
index ad3396d..4e20b20 100644
--- a/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/laboratory/index.vue
@@ -332,7 +332,7 @@
this.$message.warning('鏆傛棤闄勪欢')
return;
}
- this.$download.downloadFileFromUrl(row.fileUrl, row.fileUrl);
+ this.$download.saveAs(row.fileUrl, row.fileUrl);
},
openAdd() {
this.qualificationsConnectVisible = true;
--
Gitblit v1.9.3