From 95576a1f4f78175e06aa7515ef10e630c7986670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Mon, 7 Aug 2023 17:53:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=80=E6=9D=A5=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 3 + src/views/basic/corpMaintain/corpMaintain.vue | 629 ++++++++++++++---- .../basic/corpMaintain/corpRelevance.vue | 476 ++++++------- .../corpMaintain/corpSingleRelevance.vue | 464 ++++++------- src/views/components/cusEditor.vue | 128 ++++ src/views/purchase/cert/supCertAddDialog.vue | 147 ++-- 6 files changed, 1187 insertions(+), 660 deletions(-) create mode 100644 src/views/components/cusEditor.vue diff --git a/src/main.js b/src/main.js index 1c9cf17..872c689 100644 --- a/src/main.js +++ b/src/main.js @@ -38,6 +38,8 @@ import DictTag from '@/components/DictTag' import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' +// 富文本编辑器 +import cusEditor from '@/views/components/cusEditor.vue' // 去除控制台的 Vue warn 警告信息 Vue.config.silent = true; @@ -62,6 +64,7 @@ Vue.component('Editor', Editor) Vue.component('FileUpload', FileUpload) Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) +Vue.component("cusEditor", cusEditor) Vue.use(directive) Vue.use(plugins) diff --git a/src/views/basic/corpMaintain/corpMaintain.vue b/src/views/basic/corpMaintain/corpMaintain.vue index d2e94e3..22d02e7 100644 --- a/src/views/basic/corpMaintain/corpMaintain.vue +++ b/src/views/basic/corpMaintain/corpMaintain.vue @@ -3,19 +3,32 @@ - - - + + + - + + + + + + - - @@ -28,31 +41,33 @@ 显示/隐藏搜索栏 重置 查询 - 新增 - - 选入往来单位信息 + + + + + - - - - - - + + + + + + + - - - + + + @@ -89,8 +104,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
+ + 提交 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
- 取消 - 提交 - -
+ +
+ + + + + 添加资质证书 + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -205,17 +308,73 @@ import selectUnit from "./corpRelevance"; import selectSingleUnit from "./corpSingleRelevance"; import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; import {findConfig} from "@/api/sync/spsSyncStatus"; +import {getSupComapnys, previewImage} from "@/api/purchase/supCompany"; +import {deleteCompanyCert, filterCompanyCert} from "@/api/purchase/companyCert"; +import companyAddCert from "@/views/purchase/cert/supCertAddDialog.vue"; +import {getUUID} from "@/utils/strUtil"; +import {getCompanyList} from "@/api/purchase/supManufacturer"; var pinyin = require("pinyin"); export default { + props: { + closeRegistrationDialog: { + type: Function, + required: true, + }, + inputQuery: { + type: Object, + required: true, + }, + editType: { + type: Object, + required: true, + }, + currentManufacturer: { + type: Object, + required: true, + } + }, data() { return { + pmQuery: { + customerId: null, + companyIdFk: null, + companyName: null, + page: 1, + limit: 10, + }, + cuStatus: 0, + imgViewerVisible: false, + imgList: [], + certTotal: 0, + addCertVisible: false, + addType: "4", //证书类型：1:供应商；2.生产企业；3.产品品种 4：往来单位 + editTye: 1, + certQuery: { + customerId: null, + companyIdFk: null, + manufacturerIdFk: null, + page: 1, + limit: 20 + }, query: { key: "", + corpType: "2", page: 1, limit: 20, }, + checkFlag: { + 0: "草稿", + 1: "已通过", + 2: "已拒绝", + 3: "变更未审核", + 6: "未审核", + }, + statusFlag: { + 0: "有效", + 1: "失效", + }, showSearch: true, erpIdColumn: false, thirdIdColumn: false, @@ -237,7 +396,8 @@ export default { formName: null, formMap: { add: "新增", - update: "编辑" + update: "编辑", + cert: "添加资质证书" }, formLoading: false, formVisible: false, @@ -256,16 +416,19 @@ export default { value: 2, label: "供应商" }, - { - value: 3, - label: "特殊科室" - }, - { - value: 4, - label: "特殊往来" - } + // { + // value: 3, + // // label: "特殊科室" + // label: "内部科室" + // }, + // { + // value: 4, + // label: "特殊往来" + // } ], + certLoading: false, + certList: [], formRules: { name: [ {required: true, message: "请输入名称", trigger: "blur"} @@ -275,6 +438,9 @@ export default { // ], creditNo: [ {required: true, message: "请输入社会信用号", trigger: "blur"} + ], + corpType: [ + {required: true, message: "请选择往来单位类型", trigger: "blur"} ] }, spellUpdate: false, @@ -289,17 +455,36 @@ export default { thirdSys: [], thirdSysFk: null, defaultSys: null, + companyIdFk: null, configParms: {}, + }; }, methods: { + //添加资质证书 + addCert(row) { + console.log(this.row); + if (this.$isNotBlank(row)) { + this.formName = 2 + + this.inputQuery = row; + this.editTye = 2; + this.inputQuery.companyIdFk=row.companyIdFk; + console.log("编辑"+this.inputQuery); + } else { + this.inputQuery=this.list; + this.inputQuery.companyIdFk=this.curProductQuery.companyIdFk; + } + this.addCertVisible = true; + }, onReset() { this.$router.push({ path: "", }); this.query = { key: "", + corpType: "2", page: 1, limit: 20, }; @@ -309,13 +494,42 @@ export default { this.query.page = 1; this.getList(); }, + findPMMethod(key) { + this.fromPMOptions = []; + this.pmQuery.companyName = key; + getCompanyList(this.pmQuery) + .then((response) => { + this.loading = false; + this.fromPMOptions = response.data.list || []; + this.total = response.data.total || 0; + }) + .catch(() => { + this.loading = false; + this.fromPMOptions = []; + this.total = 0; + }); + }, + findMethod(query) { + this.fromOptions = []; + let cQuery = { + companyName: query, + }; + getSupComapnys(cQuery) + .then((response) => { + this.loading = false; + this.fromOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + }, getList() { this.loading = true; this.erpIdColumn = false; this.thirdIdColumn = false; getBasicUnitMaintains(this.query) .then((response) => { - this.getSystemParamConfig(); + //this.getSystemParamConfig(); this.loading = false; this.list = response.data.list || []; this.total = response.data.total || 0; @@ -345,6 +559,96 @@ export default { this.getList(); } }, + closeLocalDialog() { + this.addCertVisible = false; + this.selectCertVisible = false; + this.getCompanyCertList(); + }, + certHandleCurrentChange(val) { + this.certQuery.page = val.page; + this.getCompanyCertList(); + }, + getCompanyCertList() { + this.certLoading = true; + this.certQuery.companyIdFk = this.curProductQuery.companyIdFk; + this.certQuery.type=4; + // this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerIdFk; + // this.certQuery.productIdFk = this.inputQuery.productId; + filterCompanyCert(this.certQuery) + .then((response) => { + this.certLoading = false; + this.certList = response.data.list || []; + this.certTotal = response.data.total + }) + .catch(() => { + this.certLoading = false; + this.certList = []; + }); + }, + + closeImgViewer() { + this.imgViewerVisible = false; + const m = (e) => { + e.preventDefault() + }; + document.body.style.overflow = 'auto'; + document.removeEventListener("touchmove", m, true); + }, + rejectInfo(row) { + this.$confirm(row.auditComment, "拒绝说明", { + confirmButtonText: "确定", + type: "warning", + showCancelButton: false, + }) + .then(() => { + }); + + }, + deleteCompanyCert(row) { + this.$confirm("是否删除?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }).then(() => { + this.certLoading = true; + let tquery = { + id: row.id, + filePath: row.filePath, + }; + deleteCompanyCert(tquery) + .then((response) => { + this.certLoading = false; + if (response.code === 20000) { + this.getCompanyCertList(); + this.$message({ + type: "success", + message: "删除成功！", + }); + } else { + this.$message.error(response.message); + } + }) + .catch(() => { + this.certLoading = false; + }); + }).catch(() => { + }); + }, + showImgViewer(row) { + this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; + this.imgList = []; + previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { + if (response.code === 20000) { + this.imgList=response.data; + } + }); + this.imgViewerVisible = true; + const m = (e) => { + e.preventDefault() + }; + document.body.style.overflow = 'hidden'; + document.addEventListener("touchmove", m, false); // 禁止页面滑动 + }, // 隐藏表单 hideForm() { // 更改值 @@ -352,6 +656,59 @@ export default { this.getList(); return true; }, + handCert(index, row) { + this.registrationId = row.id; + this.curProductQuery = row; + // this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus; + // this.curProductQuery.companyIdFk = + // this.list.companyIdFk; + console.log(this.curProductQuery) + if (this.editType == 0) { + // this.inputQuery.productId = getUUID(""); + this.inputQuery.companyIdFk = this.list.companyIdFk; + + } else { + this.getCompanyCertList(); + + this.pmQuery.companyIdFk = this.curProductQuery.companyIdFk; + console.log("2"+ this.list.companyIdFk); + } + this.cuStatus = this.certList.auditStatus; + this.findMethod(); + this.findPMMethod(); + this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name="; + console.log("666666666666:"+this.cuStatus); + + this.formName = "cert"; + this.editProductType = 1; + + this.formVisible = true; + // this.formName = "add"; + this.spellUpdate = false; + if (index !== null) { + this.index = index; + this.formName = "cert"; + this.spellUpdate = true; + this.editQuery = row; + + } else { + this.editQuery = { + id: "", + thirdId: "", + erpId: "", + name: "", + spell: "", + addr: "", + status: "", + type: "", + creditNo: "", + contact: "", + mobile: "" + }; + } + + //this.getThirdSysDetail(); + }, // 显示表单 handleForm(index, row) { this.formVisible = true; @@ -379,7 +736,7 @@ export default { }; } - this.getThirdSysDetail(); + //this.getThirdSysDetail(); }, formSubmit() { if (this.$isBlank(this.editQuery.corpType)) { @@ -457,7 +814,7 @@ export default { this.editDialogVisible = false; this.selectSingleUnitVisible = false; this.getList(); - this.getThirdSysDetail(); + //this.getThirdSysDetail(); }, closeMain(val) { this.selectDrugDialogVisible = false; @@ -476,7 +833,7 @@ export default { this.editQuery = row; - this.getThirdSysDetail(); + //this.getThirdSysDetail(); }, deleteDialog(rowId) { @@ -607,15 +964,29 @@ export default { } , components: { + companyAddCert, selectUnit, selectSingleUnit } , created() { this.getList(); - this.getSyncConfig(); - this.getBasicThirdSys(); + //this.getSyncConfig(); + //this.getBasicThirdSys(); + + } , + filters: { + statusFilterType(status) { + const statusMap = { + 0: "warning", + 1: "success", + 2: "danger", + 6: "warning", + }; + return statusMap[status]; + }, + }, } ; @@ -642,5 +1013,9 @@ export default { flex-wrap: wrap; } - +.el-card { + margin-right: 20px; + margin-top: 15px; + /*transition: all .5s;*/ +} diff --git a/src/views/basic/corpMaintain/corpRelevance.vue b/src/views/basic/corpMaintain/corpRelevance.vue index 5830b37..51aabae 100644 --- a/src/views/basic/corpMaintain/corpRelevance.vue +++ b/src/views/basic/corpMaintain/corpRelevance.vue @@ -1,98 +1,98 @@ diff --git a/src/views/basic/corpMaintain/corpSingleRelevance.vue b/src/views/basic/corpMaintain/corpSingleRelevance.vue index 8c433c0..2a82ded 100644 --- a/src/views/basic/corpMaintain/corpSingleRelevance.vue +++ b/src/views/basic/corpMaintain/corpSingleRelevance.vue @@ -1,96 +1,96 @@ diff --git a/src/views/components/cusEditor.vue b/src/views/components/cusEditor.vue new file mode 100644 index 0000000..1c1fc23 --- /dev/null +++ b/src/views/components/cusEditor.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue index a624026..bbe861f 100644 --- a/src/views/purchase/cert/supCertAddDialog.vue +++ b/src/views/purchase/cert/supCertAddDialog.vue @@ -97,41 +97,50 @@ - - -
- 文件： -
- - - - - - {{ choiceFile }} - -
只能上传 jpg,png 文件，且不超过 3 MB
- - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -146,6 +155,7 @@ import draggable from "vuedraggable"; import store from "../../../store"; import {insertCompanyCert, updateCompanyCert} from "../../../api/purchase/companyCert"; import ElImageViewer from "element-ui/packages/image/src/image-viewer" +import {lo} from "pinyin/data/dict-zi-web"; export default { name: "supCompanyCertAdd", @@ -181,6 +191,7 @@ export default { code: null, name: null, manufacturerIdFk: null, + companyIdFk: null, auditStatus: 6 }, formRules: { @@ -205,7 +216,6 @@ export default { }, methods: { submitUpload() { - this.$refs["dataForm"].validate(valid => { if (valid) { if (this.formData.auditStatus == 1) { @@ -230,22 +240,23 @@ export default { onConfirmSubmit(val) { this.formData.repeatUpload = val; console.log(this.formData) - if (this.$isNotBlank(this.formData.filePath)) { - if (this.$refs.upload.uploadFiles.length > 0) { - this.$refs.upload.submit(); - this.onSubmit(); - } else { - this.onSubmit(); - } - - } else { - console.log(this.$refs.upload.uploadFiles.length); - if (this.$refs.upload.uploadFiles.length > 0) { - this.$refs.upload.submit(); - } else { - this.$message.warning(`请选择文件`); - } - } + this.onSubmit(); + // if (this.$isNotBlank(this.formData.filePath)) { + // if (this.$refs.upload.uploadFiles.length > 0) { + // this.$refs.upload.submit(); + // this.onSubmit(); + // } else { + // this.onSubmit(); + // } + // + // } else { + // console.log(this.$refs.upload.uploadFiles.length); + // if (this.$refs.upload.uploadFiles.length > 0) { + // this.$refs.upload.submit(); + // } else { + // this.$message.warning(`请选择文件`); + // } + // } }, @@ -255,18 +266,21 @@ export default { this.formData.customerId = store.getters.customerId } this.formData.type = this.addType; - //证书类型：1:供应商；2.生产企业；3.产品品种 + //证书类型：1:供应商；2.生产企业；3.产品品种 4：往来单位 if (this.addType == 2) { this.formData.manufacturerIdFk = this.inputQuery.manufacturerId; } else if (this.addType == 3) { this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk; this.formData.productIdFk = this.inputQuery.productId; + }else if (this.addType==4){ + this.formData.companyIdFk = this.inputQuery.companyIdFk; + console.log(this.inputQuery.companyIdFk); } + if (this.formData.auditStatus != 1) this.formData.auditStatus = "6"; - + this.formData.filePath = this.$refs.editorRef.html if (this.editTye == 1) { - //isertCert insertCompanyCert(this.formData).then(response => { this.loading = false; if (response.code === 20000) { @@ -363,14 +377,20 @@ export default { ADMIN_ID: store.getters.adminId, ADMIN_TOKEN: store.getters.token, }; - if (this.inputQuery.formData == null) { - this.formData = {} - } else if (this.inputQuery.formData != null && this.inputQuery.formData.addType == 1) { - this.formData = {} - } else { - this.formData = this.inputQuery.formData; - console.log(this.inputQuery.formData); + console.log(this.inputQuery) + if (this.inputQuery.type==4){ + this.formData = this.inputQuery; + }else { + if (this.inputQuery.formData == null) { + this.formData = {} + } else if (this.inputQuery.formData != null && this.inputQuery.formData.addType == 1) { + this.formData = {} + } else { + this.formData = this.inputQuery.formData; + console.log(this.inputQuery.formData); + } } + console.log("66"+this.inputQuery.formData); if (this.formData.filePath != null) { this.choiceFile = "更换文件"; this.isCleck = true; @@ -380,7 +400,8 @@ export default { }, }; -