diff --git a/src/views/components/myAssetsType/index.vue b/src/views/components/myAssetsType/index.vue index 6e09da1..66425eb 100644 --- a/src/views/components/myAssetsType/index.vue +++ b/src/views/components/myAssetsType/index.vue @@ -28,7 +28,10 @@ }" prop="xtmc" > - + @@ -6086,6 +6089,7 @@ export default { auditState: "3", auditYy: this.dialogruleForm.auditYy, currentId: Number(this.id), + xzType: 1, }; assetAudit(tijioaobj).then((res) => { if (res.code == 200) { @@ -6103,7 +6107,7 @@ export default { // 通过按钮 btnPass() { this.loading = true; - assetAudit({ currentId: Number(this.id), auditState: "2" }) + assetAudit({ currentId: Number(this.id), auditState: "2", xzType: 1 }) .then((res) => { this.$modal.msgSuccess("审核通过"); // this.$router.go(-1); diff --git a/src/views/components/myAssetsType/index_v1.vue b/src/views/components/myAssetsType/index_v1.vue index 9121a86..ee1eac4 100644 --- a/src/views/components/myAssetsType/index_v1.vue +++ b/src/views/components/myAssetsType/index_v1.vue @@ -32,6 +32,7 @@ @@ -685,6 +686,7 @@ export default { auditState: "3", auditYy: this.dialogruleForm.auditYy, currentId: Number(this.id), + xzType: 1, }; miniProgramsAudit(tijioaobj).then((res) => { if (res.code == 200) { @@ -702,7 +704,11 @@ export default { // 通过按钮 btnPass() { this.loading = true; - miniProgramsAudit({ currentId: Number(this.id), auditState: "2" }) + miniProgramsAudit({ + currentId: Number(this.id), + auditState: "2", + xzType: 1, + }) .then((res) => { this.$modal.msgSuccess("审核通过"); // this.$router.go(-1); diff --git a/src/views/components/myAssetsType/index_v2.vue b/src/views/components/myAssetsType/index_v2.vue index d4fa91e..2e9cdb3 100644 --- a/src/views/components/myAssetsType/index_v2.vue +++ b/src/views/components/myAssetsType/index_v2.vue @@ -29,7 +29,11 @@ - + { if (res.code == 200) { @@ -1038,7 +1043,7 @@ export default { // 通过按钮 btnPass() { this.loading = true; - gzhAudit({ currentId: Number(this.id), auditState: "2" }) + gzhAudit({ currentId: Number(this.id), auditState: "2", xzType: 1 }) .then((res) => { this.$modal.msgSuccess("审核通过"); // this.$router.go(-1); diff --git a/src/views/components/myAssetsType/index_v3.vue b/src/views/components/myAssetsType/index_v3.vue index 56165bd..851e10b 100644 --- a/src/views/components/myAssetsType/index_v3.vue +++ b/src/views/components/myAssetsType/index_v3.vue @@ -32,6 +32,7 @@ @@ -558,6 +559,7 @@ export default { auditState: "3", auditYy: this.dialogruleForm.auditYy, currentId: Number(this.id), + xzType: 1, }; EmailAudit(tijioaobj).then((res) => { if (res.code == 200) { @@ -575,7 +577,7 @@ export default { // 通过按钮 btnPass() { this.loading = true; - EmailAudit({ currentId: Number(this.id), auditState: "2" }) + EmailAudit({ currentId: Number(this.id), auditState: "2", xzType: 1 }) .then((res) => { this.$modal.msgSuccess("审核通过"); // this.$router.go(-1); diff --git a/src/views/components/myAssetsType/index_v4.vue b/src/views/components/myAssetsType/index_v4.vue index f2da36e..7edde48 100644 --- a/src/views/components/myAssetsType/index_v4.vue +++ b/src/views/components/myAssetsType/index_v4.vue @@ -32,6 +32,7 @@ @@ -542,6 +543,7 @@ export default { auditState: "3", auditYy: this.dialogruleForm.auditYy, currentId: Number(this.id), + xzType: 1, }; AppAudit(tijioaobj).then((res) => { if (res.code == 200) { @@ -559,7 +561,7 @@ export default { // 通过按钮 btnPass() { this.loading = true; - AppAudit({ currentId: Number(this.id), auditState: "2" }) + AppAudit({ currentId: Number(this.id), auditState: "2", xzType: 1 }) .then((res) => { this.$modal.msgSuccess("审核通过"); // this.$router.go(-1); diff --git a/src/views/components/myUpload/index.vue b/src/views/components/myUpload/index.vue index 173826c..dcab66f 100644 --- a/src/views/components/myUpload/index.vue +++ b/src/views/components/myUpload/index.vue @@ -17,17 +17,33 @@ > - - -
  • - + +
  • + {{ getFileName(file.name) }} -
    - 删除 +
    + 删除
    • @@ -60,17 +76,17 @@ export default { // 是否显示提示 isShowTip: { type: Boolean, - default: true - } + default: true, + }, }, data() { return { number: 0, uploadList: [], - // baseUrl: process.env.VUE_APP_BASE_API, - baseUrl: location.origin + '/api', - // uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址 - uploadFileUrl: location.origin + '/api/common/upload', + baseUrl: process.env.VUE_APP_BASE_API, + // baseUrl: location.origin + '/api', + uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址 + // uploadFileUrl: location.origin + '/api/common/upload', headers: { Authorization: "Bearer " + getToken(), }, @@ -83,9 +99,9 @@ export default { if (val) { let temp = 1; // 首先将值转为数组 - const list = Array.isArray(val) ? val : this.value.split(','); + const list = Array.isArray(val) ? val : this.value.split(","); // 然后将数组转为对象数组 - this.fileList = list.map(item => { + this.fileList = list.map((item) => { if (typeof item === "string") { item = { name: item, url: item }; } @@ -98,8 +114,8 @@ export default { } }, deep: true, - immediate: true - } + immediate: true, + }, }, computed: { // 是否显示提示 @@ -112,17 +128,19 @@ export default { handleBeforeUpload(file) { // 校检文件类型 if (this.fileType) { - const fileName = file.name.split('.'); + const fileName = file.name.split("."); const fileExt = fileName[fileName.length - 1]; const isTypeOk = this.fileType.indexOf(fileExt) >= 0; if (!isTypeOk) { - this.$modal.msgError(`文件格式不正确，请上传${this.fileType.join("/")}格式文件!`); + this.$modal.msgError( + `文件格式不正确，请上传${this.fileType.join("/")}格式文件!` + ); return false; } } // 校检文件名是否包含特殊字符 - if (file.name.includes(',')) { - this.$modal.msgError('文件名不正确，不能包含英文逗号!'); + if (file.name.includes(",")) { + this.$modal.msgError("文件名不正确，不能包含英文逗号!"); return false; } // 校检文件大小 @@ -151,14 +169,14 @@ export default { if (res.code === 200) { this.uploadList.push({ name: res.fileName, url: res.fileName }); this.uploadedSuccessfully(); - } else if(res.code == 401) { - this.$store.dispatch('LogOut').then(() => { + } else if (res.code == 401) { + this.$store.dispatch("LogOut").then(() => { // location.href = '/login'; this.$modal.msgError(res.msg); this.$modal.closeLoading(); this.uploadedSuccessfully(); this.$router.replace("/login"); - }) + }); } else { this.number--; this.$modal.closeLoading(); @@ -198,9 +216,9 @@ export default { for (let i in list) { strs += list[i].url + separator; } - return strs != '' ? strs.substr(0, strs.length - 1) : ''; - } - } + return strs != "" ? strs.substr(0, strs.length - 1) : ""; + }, + }, }; diff --git a/src/views/unitPages/myTask/audit copy.vue b/src/views/unitPages/myTask/audit copy.vue index cf392d1..d77db6b 100644 --- a/src/views/unitPages/myTask/audit copy.vue +++ b/src/views/unitPages/myTask/audit copy.vue @@ -53,6 +53,7 @@ +