+
-
- {{ invMsgCount }}
+
+ {{ certMsgCount }}
@@ -81,7 +82,7 @@
重新加载
+ @click.stop="">
更多
@@ -216,7 +217,7 @@ import invSvg from "@/assets/svg/库存预警.svg"
import certSvg from "@/assets/svg/资质预警.svg"
import {getInvRemindMsgList} from "../api/system/invRemindMsg";
import {getUdiInfos} from "../api/basic/udiRelevance";
-import {getSupCertRemindMsgList} from "../api/purchase/supCertRedmindMsg";
+import {getSupCertgetCount, getSupCertRemindMsgList} from "../api/purchase/supCertRedmindMsg";
export default {
name: "Index",
@@ -277,12 +278,13 @@ export default {
status: 1,
ignoreStatus: 0
}
- getSupCertRemindMsgList(param).then(res => {
- this.certMsgCount = res.data?.total || 0
+ getSupCertgetCount(param).then(res => {
+ this.certMsgCount = res.data
})
},
linkPage(path) {
- this.$router.push({path})
+ console.log(path)
+ this.$router.push(path)
},
getSysMsgTodoList() {
this.msgLoading = true
@@ -329,7 +331,7 @@ export default {
this.orderList = [];
this.orderTotal = 0;
});
- }
+ },
},
};
diff --git a/src/views/purchase/cert/supCertAddDialog.vue b/src/views/purchase/cert/supCertAddDialog.vue
index 74d670b..5f82735 100644
--- a/src/views/purchase/cert/supCertAddDialog.vue
+++ b/src/views/purchase/cert/supCertAddDialog.vue
@@ -7,142 +7,143 @@
:loading="loading">提交
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- {{item.columnDesc}}
+ {{ item.columnDesc }}
-
+
- {{item.columnDesc}}
+ {{ item.columnDesc }}
{{dict.label}}
+ >{{ dict.label }}
+
-
+
- {{item.columnDesc}}
+ {{ item.columnDesc }}
-
+
- {{item.columnDesc}}
+ {{ item.columnDesc }}
-
+
- {{item.columnDesc}}
+ {{ item.columnDesc }}
-
+
- {{item.columnDesc}}
+ {{ item.columnDesc }}
{{ choiceFile }}
- 只能上传 jpg,png 文件，且不超过 3 MB
+ 只能上传 jpg,png,pdf,doc 文件，且不超过 10 MB
@@ -270,7 +277,7 @@ import store from "../../../store";
import {insertCompanyCert, updateCompanyCert} from "../../../api/purchase/companyCert";
import ElImageViewer from "element-ui/packages/image/src/image-viewer"
import {
- getHead,executeFuc
+ getHead, executeFuc
} from "@/utils/customConfig";
export default {
@@ -320,10 +327,10 @@ export default {
loading: false,
uploadUrl: "",
fileList: [],
- tableHeader:[],
- queryList:[],
- fromList:[],
- tableObj:[],
+ tableHeader: [],
+ queryList: [],
+ fromList: [],
+ tableObj: [],
headers: {},
choiceFile: "选取文件",
@@ -437,7 +444,11 @@ export default {
let uid = file.uid
let pos = fileName.lastIndexOf(".");
let lastName = fileName.substring(pos, fileName.length);
- if (lastName.toLowerCase() !== ".jpg" && lastName.toLowerCase() !== ".png" && lastName.toLowerCase() !== ".doc") {
+ if (lastName.toLowerCase() !== ".jpg"
+ && lastName.toLowerCase() !== ".png"
+ && lastName.toLowerCase() !== ".doc" && lastName.toLowerCase() !== ".pdf"
+
+ ) {
this.$message.error("上传文件只能是 jpg,png格式");
for (let i = 0; i < fileList.length; i++) {//从list删除
if (fileList[i].uid === uid) {
@@ -478,11 +489,11 @@ export default {
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
window.open(this.certFileUrl + this.formData.filePath);
},
- executeFuc(row,type,clickFuc,value){
- return executeFuc(this,row,type,clickFuc,value);
+ executeFuc(row, type, clickFuc, value) {
+ return executeFuc(this, row, type, clickFuc, value);
},
- executeEval(row,expression,defaultRet){
- if(expression){
+ executeEval(row, expression, defaultRet) {
+ if (expression) {
return eval(expression);
}
return defaultRet;
@@ -497,7 +508,7 @@ export default {
},
created() {
this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
- getHead("basicCompany","1").then((re) => {
+ getHead("basicCompany", "1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
diff --git a/src/views/purchase/cert/supCertificationAdd.vue b/src/views/purchase/cert/supCertificationAdd.vue
index ec96ace..c217010 100644
--- a/src/views/purchase/cert/supCertificationAdd.vue
+++ b/src/views/purchase/cert/supCertificationAdd.vue
@@ -576,7 +576,7 @@
-
+
diff --git a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
index 078e009..49b0c15 100644
--- a/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
@@ -567,6 +567,14 @@ export default {
showImgViewer(row) {
// let newWindow = window.open();
// newWindow.document.write(row.filePath)
+
+ this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+ if (row.filePath.toLowerCase().slice(-5).includes(".pdf")) {
+ window.open(this.certFileUrl + row.filePath.replace(",", ""));
+ return
+ }
+
+
this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
this.imgList = [];
previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
diff --git a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
index d628014..cc4021a 100644
--- a/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
+++ b/src/views/purchase/manufacturer/supManufacturerEditDialog.vue
@@ -306,7 +306,7 @@