From 41c285535a7f6f5345b387ba47184d5b74e3eb4c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 23 Mar 2023 17:13:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6=E6=92=A4?= =?UTF-8?q?=E5=9B=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/purchase/companyCert.js | 13 + .../basic/busType/bussinessTypeModify.vue | 6 +- src/views/inout/IoDeliverySearchOrder.vue | 2 +- src/views/purchase/cert/supCertAddDialog.vue | 4 +- src/views/purchase/cert/supCertAudit.vue | 1254 ++++++------ .../company/supCompanyAduditDialog.vue | 96 +- .../purchase/company/supCompanyEditDialog.vue | 2 +- .../supManufacturerAuditDialog.vue | 1693 +++++++++-------- .../product/supProductAuditDialog.vue | 1657 ++++++++-------- .../purchase/product/supProductEditDialog.vue | 2 +- 10 files changed, 2429 insertions(+), 2300 deletions(-) diff --git a/src/api/purchase/companyCert.js b/src/api/purchase/companyCert.js index 52e74a3..3f1570d 100644 --- a/src/api/purchase/companyCert.js +++ b/src/api/purchase/companyCert.js @@ -42,6 +42,19 @@ export function auditSupCert(query) { } + +export function revokeSupCert(query) { + return axios( + { + url: "/sale/sup/cert/revoke", + method: "post", + data: query + } + ); +} + + + export function deleteCompanyCert(query) { return axios( { diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue index 3f15795..9987877 100644 --- a/src/views/basic/busType/bussinessTypeModify.vue +++ b/src/views/basic/busType/bussinessTypeModify.vue @@ -325,7 +325,7 @@ @@ -345,7 +345,7 @@ @@ -366,7 +366,7 @@ diff --git a/src/views/inout/IoDeliverySearchOrder.vue b/src/views/inout/IoDeliverySearchOrder.vue index 9236369..755e06a 100644 --- a/src/views/inout/IoDeliverySearchOrder.vue +++ b/src/views/inout/IoDeliverySearchOrder.vue @@ -810,7 +810,7 @@ export default { this.loading = true; this.currentRow = {billNo: ""}; this.clearDetailList(); - this.filterQuery.busType = 2; //送货出入库单据类型 + // this.filterQuery.busType = 2; //送货出入库单据类型 getOrderList(this.filterQuery) .then((response) => { this.loading = false; diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue index 6f8e299..fd68163 100644 --- a/src/views/purchase/cert/supCertAddDialog.vue +++ b/src/views/purchase/cert/supCertAddDialog.vue @@ -34,7 +34,7 @@
- 有效期: + 生效期:
@@ -46,7 +46,7 @@ :disabled="formData.auditStatus == 1" value-format="yyyy-MM-dd" style="width: 100%" - placeholder="请选择有效期"> + placeholder="请选择生效期"> diff --git a/src/views/purchase/cert/supCertAudit.vue b/src/views/purchase/cert/supCertAudit.vue index 70a3781..a58f31c 100644 --- a/src/views/purchase/cert/supCertAudit.vue +++ b/src/views/purchase/cert/supCertAudit.vue @@ -1,275 +1,289 @@ diff --git a/src/views/purchase/company/supCompanyAduditDialog.vue b/src/views/purchase/company/supCompanyAduditDialog.vue index 2ffb3a7..e2f42b4 100644 --- a/src/views/purchase/company/supCompanyAduditDialog.vue +++ b/src/views/purchase/company/supCompanyAduditDialog.vue @@ -137,11 +137,12 @@ - + - + @@ -160,8 +161,12 @@ @@ -197,7 +202,7 @@ - + + placeholder="请选择生效期"> @@ -251,15 +256,17 @@ 证书预览 - + - - + + @@ -290,14 +297,13 @@ import { CodeToText, TextToCode, } from "element-china-area-data"; -import {filterCompanyCert, deleteCompanyCert, auditSupCert} from "../../../api/purchase/companyCert"; +import {filterCompanyCert, deleteCompanyCert, auditSupCert, revokeSupCert} from "../../../api/purchase/companyCert"; import draggable from "vuedraggable"; import {customerlist} from '@/api/system/role' import store from '@/store' import ElImageViewer from "element-ui/packages/image/src/image-viewer" - export default { name: "supCompanyEdit", @@ -321,8 +327,8 @@ export default { return { BASE_URL: process.env.VUE_APP_BASE_API, headers: {}, - imgViewerVisible:false, - imgList:[], + imgViewerVisible: false, + imgList: [], classesDisplay: false, selectedOptions: [], options: regionDataPlus, @@ -431,7 +437,7 @@ export default { productLoading: false, uuid: null, companyApplyUpdateVisible: false, - isOpen:false, + isOpen: false, companyEditDisabled: true, companyEditButtonStr: "编辑", checkFlag: { @@ -515,35 +521,38 @@ export default { } , isAssetTypeAnImage(ext) { - return [ - 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff']. - indexOf(ext.toLowerCase()) !== -1; - }, - showImgViewer(row){ - var varindex= row.filePath.lastIndexOf("."); - var varext = row.filePath.substring(varindex+1); - var isImage=this.isAssetTypeAnImage(varext); - if(isImage==true){ + return [ + 'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1; + }, + showImgViewer(row) { + var varindex = row.filePath.lastIndexOf("."); + var varext = row.filePath.substring(varindex + 1); + var isImage = this.isAssetTypeAnImage(varext); + if (isImage == true) { this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; - this.imgList=[]; - previewImage({imageUrl:row.filePath,certFileUrl:this.certFileUrl}).then(response => { + this.imgList = []; + previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { if (response.code === 20000) { this.imgList.push(response.data); } }); this.imgViewerVisible = true; - const m = (e) => { e.preventDefault() }; + const m = (e) => { + e.preventDefault() + }; document.body.style.overflow = 'hidden'; document.addEventListener("touchmove", m, false); // 禁止页面滑动 - }else{ + } else { this.toViewCompanyCert(row); } }, - closeImgViewer(){ + closeImgViewer() { this.imgViewerVisible = false; - const m = (e) => { e.preventDefault() }; + const m = (e) => { + e.preventDefault() + }; document.body.style.overflow = 'auto'; document.removeEventListener("touchmove", m, true); }, @@ -584,7 +593,7 @@ export default { auditCert(row) { this.certAuditVisible = true; this.currentAudit = row; - this.isOpen=this.currentAudit.auditStatus; + this.isOpen = this.currentAudit.auditStatus; this.confirmStatus = this.currentAudit.auditStatus; }, @@ -781,6 +790,35 @@ export default { this.notAuditCert(); } }, + + revoke(inputQuery) { + + this.$confirm("是否确定撤回证书状态至未确认?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(() => { + this.certLoading = true; + inputQuery.auditStatus = 6 + revokeSupCert(inputQuery) + .then((response) => { + this.certLoading = false; + if (response.code === 20000) { + this.getCompanyCertList(); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.certLoading = false; + }); + }).catch(() => { + }); + + + }, + + cancel() { this.certAuditVisible = false; }, diff --git a/src/views/purchase/company/supCompanyEditDialog.vue b/src/views/purchase/company/supCompanyEditDialog.vue index 6a132c2..4a30194 100644 --- a/src/views/purchase/company/supCompanyEditDialog.vue +++ b/src/views/purchase/company/supCompanyEditDialog.vue @@ -124,7 +124,7 @@ - +