diff --git a/src/views/assetsManage2/webZC-info/index.vue b/src/views/assetsManage2/webZC-info/index.vue index b16ab7a..b65775d 100644 --- a/src/views/assetsManage2/webZC-info/index.vue +++ b/src/views/assetsManage2/webZC-info/index.vue @@ -163,16 +163,6 @@ > - - - - + diff --git a/src/views/assetsManage2/xcxZC-info/butongguo.vue b/src/views/assetsManage2/xcxZC-info/butongguo.vue new file mode 100644 index 0000000..4ee52a4 --- /dev/null +++ b/src/views/assetsManage2/xcxZC-info/butongguo.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/src/views/assetsManage2/xcxZC-info/index.vue b/src/views/assetsManage2/xcxZC-info/index.vue index 1285db0..9e00cdb 100644 --- a/src/views/assetsManage2/xcxZC-info/index.vue +++ b/src/views/assetsManage2/xcxZC-info/index.vue @@ -183,6 +183,7 @@ import { unitEdit, assetAudit, lookInfo, + miniProgramsUnitEdit } from "@/api/auditPagesApi/index"; import { ref } from "vue"; @@ -204,11 +205,10 @@ const type = ref(route.query.type); let loading = ref(false); const xcxZCinfoRef = ref(); -const liebiaoDialogRef = ref(); const ruleFormRef = ref(); const sendBack = () => { - router.push({ name: route.query.name, params: queryData.value }); + router.go(-1); }; const newAssets = async (typeButtom1) => { @@ -221,7 +221,7 @@ const newAssets = async (typeButtom1) => { } console.log(typeButtom, "typeButtom"); - if (!Object.is(typeButtom, undefined)) { + if (!Object.is(typeButtom,'')) { console.log(typeButtom, "typeButtom"); if (typeButtom === 1) { loading.value = true; @@ -236,8 +236,8 @@ const newAssets = async (typeButtom1) => { // 关停 if (typeButtom === 0) { - console.log(typeButtom, "typeButtom"); - baofeiRef.value?.open(); + xcxZCinfoRef.value.liebiaoDialog?.open(); + return; } // 暂存 @@ -274,12 +274,13 @@ const newAssets = async (typeButtom1) => { } } } else { + console.log(typeButtom, "typeButtom"); try { await xcxZCinfoRef.value.ruleFormRef.validate(); - + console.log(typeButtom, "typeButtom"); loading.value = true; if (pageType.value === "change") { - await unitEdit(ruleForm); + await miniProgramsUnitEdit(ruleForm); ElMessage.success("提交成功,待管理员审核通过后完成修改"); } else { ruleForm.xzType = 1; @@ -287,10 +288,11 @@ const newAssets = async (typeButtom1) => { if (pageType.value === "add" && name.value == "XcxZC") { ElMessage.success("新增成功"); } else if (pageType.value === "add") { + console.log(typeButtom, "typeButtom"); ElMessage.success("提交成功,待管理员审核通过后完成新增"); } } - router.push({ name: name.value, params: queryData.value }); + router.go(-1); } catch (err) { console.error(err); } finally { @@ -341,77 +343,87 @@ const btnReject = () => { xcxZCinfoRef.value.butongguoRef.open(); }; -const submitReject = () => { - // 校验弹框表单 - xcxZCinfoRef.value.dialogruleFormRef?.validate(async (valid) => { - if (valid) { - // 根据不同的name使用不同的接口 - if (name.value === "TaskManagement-info") { - // 使用assetTasksh接口 - let tijioaobj = { - taskId: route.query.taskId, - assetId: route.query.assetId, - xtmc: xcxZCinfoRef.value.ruleForm.xcxmc, - btgyy: xcxZCinfoRef.value.dialogruleForm.auditYy, - status: 4, - type: route.query.type, - assetMiniProgramsCpPo: xcxZCinfoRef.value.ruleForm, - }; +const submitReject = (formData) => { + console.log("submitReject called in parent", formData); + + // 根据不同的name使用不同的接口 + if (name.value === "TaskManagement-info") { + // 使用assetTasksh接口 + let tijioaobj = { + taskId: route.query.taskId, + assetId: route.query.assetId, + xtmc: xcxZCinfoRef.value.ruleForm.xcxmc, + btgyy: formData.auditYy, + status: 4, + type: route.query.type, + assetMiniProgramsCpPo: xcxZCinfoRef.value.ruleForm, + }; - try { - loading.value = true; - const res = await assetTasksh(tijioaobj); - if (res.code == 200) { - ElMessage.success("审核成功"); - xcxZCinfoRef.value.butongguoRef.close(); - router.go(-1); - } - } catch (e) { - ElMessage.error("操作失败"); - } finally { - loading.value = false; - } - } else if (name.value === "Mytask-info") { - xcxZCinfoRef.value.ruleForm.bfyy = xcxZCinfoRef.value.dialogruleForm?.auditYy; - loading.value = true; - - try { - const res = await assetTaskxcxzc(xcxZCinfoRef.value.ruleForm); - console.log(res, "res"); - ElMessage({ - type: "info", - message: "已关停", - }); + try { + loading.value = true; + assetTasksh(tijioaobj).then(res => { + if (res.code == 200) { + ElMessage.success("审核成功"); + xcxZCinfoRef.value.liebiaoDialog?.close(); router.go(-1); - xcxZCinfoRef.value.ruleForm.bfyy = ""; - } catch (error) { - console.error(error); - ElMessage.error("操作失败"); - } finally { - loading.value = false; } - } else { - // 其他页面使用原来的assetAudit接口 - let tijioaobj = { - auditState: "3", - auditYy: xcxZCinfoRef.value.dialogruleForm.auditYy, - currentId: Number(id.value), - xzType: 1, - }; + }).catch(e => { + ElMessage.error("操作失败"); + }).finally(() => { + loading.value = false; + }); + } catch (e) { + loading.value = false; + ElMessage.error("操作失败"); + } + } else if (name.value === "Mytask-info") { + xcxZCinfoRef.value.ruleForm.bfyy = formData.auditYy; + loading.value = true; + + try { + assetTaskxcxzc(xcxZCinfoRef.value.ruleForm).then(res => { + console.log(res, "res"); + ElMessage({ + type: "info", + message: "已关停", + }); + xcxZCinfoRef.value.liebiaoDialog?.close(); + router.go(-1); + xcxZCinfoRef.value.ruleForm.bfyy = ""; + }).catch(error => { + console.error(error); + ElMessage.error("操作失败"); + }).finally(() => { + loading.value = false; + }); + } catch (error) { + console.error(error); + loading.value = false; + ElMessage.error("操作失败"); + } + } else { + // 其他页面使用原来的assetAudit接口 + let tijioaobj = { + auditState: "3", + auditYy: formData.auditYy, + currentId: Number(id.value), + xzType: 1, + }; - try { - const res = await assetAudit(tijioaobj); - if (res.code == 200) { - ElMessage.success("审核驳回"); - xcxZCinfoRef.value.butongguoRef.close(); - router.push({ name: name.value, params: queryData.value }); - } - } catch (e) { - ElMessage.error("操作失败"); + try { + assetAudit(tijioaobj).then(res => { + if (res.code == 200) { + ElMessage.success("审核驳回"); + xcxZCinfoRef.value.liebiaoDialog?.close(); + router.push({ name: name.value, params: queryData.value }); } - } + }).catch(e => { + ElMessage.error("操作失败"); + }); + } catch (e) { + ElMessage.error("操作失败"); } - }); + } }; const btnPass = async () => { diff --git a/src/views/assetsManage2/xcxZC-info/minxfanhui.js b/src/views/assetsManage2/xcxZC-info/minxfanhui.js new file mode 100644 index 0000000..c9733cc --- /dev/null +++ b/src/views/assetsManage2/xcxZC-info/minxfanhui.js @@ -0,0 +1,35 @@ +// src/mixins/myMixin.js +export default { + data() { + return { + } + }, + created() { + }, + methods: { + sendBack() { + if (localStorage.getItem('ismypaginationTow')) { + let formInline = JSON.parse(localStorage.getItem('ismypaginationTow')) + formInline.isfanhuiTow = true + localStorage.setItem("ismypaginationTow", JSON.stringify(formInline)) + } + console.log(); + + if (this.$route.query.istijiaoshow) { + this.$router.push({ + name: 'TaskInfo', query: { + // pageType: "look", + id: this.$route.query.taskId, + assetId: this.$route.query.lookassetId, + lookassetId: this.$route.query.lookassetId, + pageType: this.$route.query.pageTypetow, + istijiaoshow: true + } + }) + } else { + this.$router.go(-1); + + } + }, + } +}; diff --git a/src/views/assetsManage2/xcxZC-info/xcxZCinfo.vue b/src/views/assetsManage2/xcxZC-info/xcxZCinfo.vue index cf36a5f..f626821 100644 --- a/src/views/assetsManage2/xcxZC-info/xcxZCinfo.vue +++ b/src/views/assetsManage2/xcxZC-info/xcxZCinfo.vue @@ -1,385 +1,423 @@ + + + + + + + + + + 取消 + 确定 + + + + + + + + - \ No newline at end of file diff --git a/src/views/myAssets/myOfficialAccount/index.vue b/src/views/myAssets/myOfficialAccount/index.vue index 1a253cb..e63feae 100644 --- a/src/views/myAssets/myOfficialAccount/index.vue +++ b/src/views/myAssets/myOfficialAccount/index.vue @@ -314,7 +314,7 @@ function handleExport() { const handleAdd = () => { proxy.setActiveMenu("/myAssets2/myOfficialAccount"); router.push({ - path: "/assetsManage2/xcxZC-info", + path: "/assetsManage2/xcxZC-info2", query: { pageType: "add", type: 1, @@ -326,7 +326,7 @@ const goInfo = (row, id) => { if (id === 1) { proxy.setActiveMenu("/myAssets2/myOfficialAccount2"); router.push({ - path: "/assetsManage2/xcxZC-info", + path: "/assetsManage2/xcxZC-info2", query: { name: "MyGzhzc", pageType: "look", @@ -337,7 +337,7 @@ const goInfo = (row, id) => { } else if (id === 2) { proxy.setActiveMenu("/myAssets2/myOfficialAccount2"); router.push({ - path: "/assetsManage2/xcxZC-info", + path: "/assetsManage2/xcxZC-info2", query: { name: "MyGzhzc", pageType: "change", diff --git a/src/views/myTask-info/index.vue b/src/views/myTask-info/index.vue index bf36d81..26aa8f8 100644 --- a/src/views/myTask-info/index.vue +++ b/src/views/myTask-info/index.vue @@ -1,18 +1,9 @@