diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index 765d9b5..dc9bbfc 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -145,4 +145,14 @@ export function attachListByCaseId(data) { params: data, }) } - +// 案件列表 +export function caseApplicationList(data) { + return request({ + url: '/caseApplication/list', + // headers: { + // isToken: false + // }, + method: 'get', + params: data + }) +} diff --git a/src/views/awardManagement/components/batchPrintings.vue b/src/views/awardManagement/components/batchPrintings.vue index 49e78d3..d03085c 100644 --- a/src/views/awardManagement/components/batchPrintings.vue +++ b/src/views/awardManagement/components/batchPrintings.vue @@ -95,13 +95,14 @@ export default { watch: { printingVisable(val) { if (val) { - this.getBatchPrinting(this.queryParamsData) + this.getBatchPrinting(this.queryParamsData); + this.getarbitrAtor() } } }, created(){ this.getBatchPrinting(this.queryParamsData) - this.getarbitrAtor() + // this.getarbitrAtor() }, methods:{ // 列表查询 diff --git a/src/views/awardManagement/components/batchSignatures.vue b/src/views/awardManagement/components/batchSignatures.vue index 7a55b4f..cf583e6 100644 --- a/src/views/awardManagement/components/batchSignatures.vue +++ b/src/views/awardManagement/components/batchSignatures.vue @@ -102,12 +102,13 @@ export default { signatureVisable(val) { if (val) { this.getBatchSignation(this.queryParamsData) + this.getarbitrAtor() } } }, created(){ this.getBatchSignation(this.queryParamsData) - this.getarbitrAtor() + // this.getarbitrAtor() }, methods:{ // 列表查询 diff --git a/src/views/batchManagement/components/batchSignature.vue b/src/views/batchManagement/components/batchSignature.vue index 4bfa6aa..52a5b8a 100644 --- a/src/views/batchManagement/components/batchSignature.vue +++ b/src/views/batchManagement/components/batchSignature.vue @@ -58,13 +58,13 @@ export default { watch: { caseVisableSignature(val) { if (val) { - + this.getarbitrAtor() console.log(this.atoDataList) } } }, created() { - this.getarbitrAtor() + // this.getarbitrAtor() }, methods: { // 获取仲裁员信息 diff --git a/src/views/batchManagement/components/courtReview.vue b/src/views/batchManagement/components/courtReview.vue index 6569b23..55742ce 100644 --- a/src/views/batchManagement/components/courtReview.vue +++ b/src/views/batchManagement/components/courtReview.vue @@ -95,13 +95,14 @@ export default { }; }, created() { - this.getarbitrAtor(); + // this.getarbitrAtor(); }, watch: { caseVisableReview(val){ this.Arbitor = "" if(val){ this.isAgreePendTral = 1; + this.getarbitrAtor({caseId:this.formateCourtData.id}); } }, // formateCourtData: { @@ -117,8 +118,8 @@ export default { }, methods: { // 获取仲裁员信息 - getarbitrAtor() { - arbitrAtor({}).then((res) => { + getarbitrAtor(val) { + arbitrAtor(val).then((res) => { this.dataList = res.rows; // console.log(this.dataList, "this.dataList"); }); diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 2313e5d..684e206 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -7,16 +7,16 @@ - + - - + --> @@ -129,6 +129,8 @@ 缴费 + 确认缴费 + 查看缴费单 证据清单 @@ -226,6 +256,9 @@ + + @@ -250,10 +283,10 @@ + @getcaseApply="getcaseApply"> @@ -263,6 +296,17 @@ + + + + + + + @@ -287,9 +331,19 @@ import evidenceList from './components/evidenceList.vue' import batchConfirmationPaymen from './components/batchConfirmationPaymen.vue' import batchSignature from './components/batchSignature.vue' import batchPrinting from './components/batchPrinting.vue' +import paymentdetailsDialog from "./components/paymentdetailsDialog.vue"; // 秘书审核页面 import caseentryExamineDialog from './components/caseentryExamine.vue'; -import { caseApplicationDetail } from "@/api/pay/pay"; +//裁决书弹框页面 +import judgmentInformation from './components/judgmentInformation.vue'; +//快递弹窗 +import expressDeliveryDialog from './components/expressDeliveryDialog.vue'; +//裁决书弹窗 +import mailawardDialog from './components/mailawardDialog.vue'; +//归档详情弹窗 +import detailsAward from './components/detailsAward.vue'; +import { caseApplicationDetail,selectCaseApplicationConfirm } from "@/api/pay/pay"; +import { videoList } from "@/api/caseFiling/caseFiling"; import { caseApply, removeCaseApply, @@ -303,8 +357,10 @@ import { caseLogRecordList, revoke, selectCompareCase, - updateAudit + updateAudit, + attachListByCaseId } from "@/api/caseManagement/caseManagement"; +import {selectSignSealUrl,selectSignUrl,selectSealUrl,adjudicationLogistics,emailByCaseId,adjudicationCaseFile,} from "@/api/awardManagement/awardManagement"; import { getDicts } from '@/api/system/dict/data.js'; export default { name: "caseList", @@ -330,7 +386,14 @@ export default { evidenceList, batchConfirmationPaymen, batchSignature, - batchPrinting + batchPrinting, + paymentdetailsDialog, + judgmentInformation, + expressDeliveryDialog, + mailawardDialog, + detailsAward + + }, data() { return { @@ -392,6 +455,23 @@ export default { flagLoading: true, //案件日志弹框loading caselogDataArr: [], options: [], //机构数据 + detailform:{},//缴费详情 + awardDetailform:{},//裁决书详情 + openDialog: false, //缴费详情数据弹框 + openDialogInfor:false,//裁决书弹框 + showDelivery:false,//快递弹窗 + flagLoading: true, + deliveryDataArr: [],//快递信息数据 + openMailawardDialog: false, //送达裁决书页面 + mailawardata: {}, //裁决书送达界面数据 + emailobj: {},//邮箱存储 + showarchiveDetails:false,//归档详情弹框 + videoList:"", //视频数据 + flagLoadingS: true, + trialTranscripts:[],//庭审笔录 + detailsAwardNum:{},//归档详情数据 + flag: null, + title: "", payId: null, caseStatus: [], processData: {}, @@ -466,7 +546,10 @@ export default { signatureOperate(){ this.signatureVisable = false; }, - + // 关闭确认缴费弹窗 + cancelpaymentdetails() { + this.openDialog = false; + }, // 上传证据目录弹窗 uploadCase(row) { this.uploadCaseData = row; @@ -688,6 +771,7 @@ export default { editRow(row) { this.flag = "1"; this.form = row; + console.log(this.form) this.visible = true; this.dialogtitle = "立案修改"; this.getInfo(row); @@ -732,12 +816,32 @@ export default { res.data.caseStatusName = "待缴费"; } this.form = res.data; - console.log(this.form) + this.detailform = res.data; + this.awardDetailform = res.data; + this.detailsAwardNum = res.data; + console.log(this.detailsAwardNum) this.payForm.feePayable = res.data.feePayable; this.payForm.caseId = res.data.id; }); }, - + // 缴费确认 + paymentconfirmationRow(row) { + console.log(row) + this.getDetail({ id: row.id,version: row.version }); + this.openDialog = true; + this.title = "缴费确认"; + this.flag = 0; + this.detailform = {} + }, + // 查看缴费单 + viewpaymentformRow(row) { + // console.log("查看缴费单", row); + this.getDetail({ id: row.id,version: row.version}); + this.openDialog = true; + this.title = "缴费单详情"; + this.flag = 1; + this.detailform = {} + }, // 组庭 // formationcourtRow(row) { // console.log(row, "组庭"); @@ -787,7 +891,8 @@ export default { }, // 组庭审核 courtreviewRow(row) { - // console.log(row, "组庭审核"); + console.log(row, "组庭审核"); + this.formateCourtData = row; console.log(row) this.showformateCourt = true; @@ -882,7 +987,7 @@ export default { this.form.requestRule = res.data.requestRule; this.form.properPreser = res.data.properPreser; this.form.facts =res.data.facts; - this.form.applicantIsWrittenHear = 1 + // this.form.applicantIsWrittenHear = 1 }); }, // 删除 @@ -931,7 +1036,130 @@ export default { return 'pendingTrial' } - } + }, + // model框显示 + showModel(row, type) { + + switch (type) { + case 0: + selectSignSealUrl({ id: row.id }).then(res => { + let url = res.data.filearbitraUrl; + window.open(url) + }) + break; + case 1: + this.getDetail({ id: row.id,version: row.version }); + this.openDialogInfor = true; + this.title = "核验裁决书"; + this.flag = 1; + break; + case 2: + this.getDetail({ id: row.id,version: row.version }); + this.openDialogInfor = true; + this.title = "审核裁决书"; + this.flag = 2; + break; + case 3: + selectSignUrl({ id: row.id }).then(res => { + console.log(res) + let url = res.data.signUrl; + window.open(url) + }) + break; + case 4: + this.getDetail({ id: row.id,version: row.version}); + this.openDialogInfor = true; + this.title = "审核裁决书"; + this.flag = 4; + break; + default: + break; + } + }, + // 关闭弹窗 + cancelpaymentdetailsCom() { + this.openDialogInfor = false; + }, + // 用印申请 + showaffixModel(row) { + this.$modal.confirm('是否进行用印申请?') + .then(function () { + selectSealUrl({ id: row.id }).then(res => { + let url = res.data.sealUrl; + window.open(url) + }) + }).catch(function () { + }); + }, + // 快递信息弹框 + showDeliveryModel(row) { + console.log(row, '快递'); + this.showDelivery = true + this.getadjudicationLogistics({ id: row.id }) + }, + closeDeliveryModel() { + this.showDelivery = false + }, + // 查询物流信息 + getadjudicationLogistics(val) { + this.flagLoading = true; + adjudicationLogistics(val).then((res) => { + this.deliveryDataArr = res.data + this.flagLoading = false + }) + }, + // 送达裁决书弹框 + showMailaward(row) { + this.mailawardata = row; + this.emailByCaseIdFn(row.id) + this.openMailawardDialog = true + }, + // 关闭送达裁决书弹框 + closeMailaward(row) { + this.openMailawardDialog = false + }, + // 根据案件id查询邮件 + emailByCaseIdFn(val) { + emailByCaseId({ id: val }).then((res) => { + this.emailobj = res.data + }) + }, + // 案件归档 + showCasefilingModel(row) { + this.$modal.confirm('是否确认立即进行案件扫描?').then( + function () { + // return adjudicationCaseFile({ id: row.id }) + return adjudicationCaseFile({ ids: [row.id] }) + } + ).then(() => { + this.getcaseApply(this.queryParams); + this.$modal.msgSuccess("归档成功!"); + }).catch(function () { }) + }, + // 归档详情 + detailsAwardList(row){ + this.showarchiveDetails = true + this.getDetail({ id: row.id }) + this.getvideoList({ caseId: row.id }) + this.getAttachListByCaseId({caseAppliId:row.id,annexType:11}) + this.flagLoadingS = false + }, + // 根据id查询视频列表 + getvideoList(data){ + videoList(data).then(res => { + this.videoList = res.data; + }) + }, + //根据案件id和类型查询附件 + getAttachListByCaseId(data){ + attachListByCaseId(data).then(res =>{ + this.trialTranscripts = res.data; + }) + }, + // 归档详情关闭弹框 + cancelDetail(){ + this.showarchiveDetails = false; + }, }, }; diff --git a/src/views/caseManagement/components/adjudicaterecordDialog.vue b/src/views/caseManagement/components/adjudicaterecordDialog.vue index a8fada5..cd01e3d 100644 --- a/src/views/caseManagement/components/adjudicaterecordDialog.vue +++ b/src/views/caseManagement/components/adjudicaterecordDialog.vue @@ -260,7 +260,7 @@ --> @@ -278,6 +278,7 @@ export default { form2: {}, applicateArr: [],//申请人案件资料 quiltArr: [],//被申请人案件资料 + loadingSubmit: false, }; }, watch: { @@ -328,6 +329,7 @@ export default { submitForm() { this.$refs["form2"].validate((valid) => { if (valid) { + this.loadingSubmit = true; writtenHear({ ids: [this.formData.id], evidenDetermi: this.form2.evidenDetermi, @@ -340,8 +342,11 @@ export default { this.$modal.msgSuccess("提交成功"); this.cancel(); this.$emit("getcaseApply",this.queryParams); + this.loadingSubmit = false; }) - .catch((err) => {}); + .catch((err) => { + this.loadingSubmit = false; + }); } }); }, diff --git a/src/views/caseManagement/components/batchConfirmationPaymen.vue b/src/views/caseManagement/components/batchConfirmationPaymen.vue index d81c9dd..406381d 100644 --- a/src/views/caseManagement/components/batchConfirmationPaymen.vue +++ b/src/views/caseManagement/components/batchConfirmationPaymen.vue @@ -58,7 +58,7 @@ @@ -89,6 +89,7 @@ export default { submitForm: { ids:[] }, + loadingSubmit: false, } }, watch: { @@ -134,12 +135,14 @@ export default { this.payVisible = false; }, submitUpload() { + this.loadingSubmit = true; this.submitForm.ids = this.batchData; console.log(this.submitForm) confirmPay(this.submitForm).then(res => { this.$modal.msgSuccess("成功"); this.payCancel(); this.getBatchComfirmation(this.queryParamsData); + this.loadingSubmit = false; }) }, cancel() { diff --git a/src/views/caseManagement/components/batchPrinting.vue b/src/views/caseManagement/components/batchPrinting.vue index 74e145b..2f1c87d 100644 --- a/src/views/caseManagement/components/batchPrinting.vue +++ b/src/views/caseManagement/components/batchPrinting.vue @@ -58,7 +58,7 @@ :limit.sync="queryParamsData.pageSize" /> @@ -72,6 +72,7 @@ export default { return { // 遮罩层 loading: true, + loadingSubmit: false, // 总条数 total:0, // 查询参数 @@ -96,12 +97,13 @@ export default { printingVisable(val) { if (val) { this.getBatchPrinting(this.queryParamsData) + this.getarbitrAtor() } } }, created(){ this.getBatchPrinting(this.queryParamsData) - this.getarbitrAtor() + // this.getarbitrAtor() }, methods:{ // 列表查询 @@ -138,15 +140,19 @@ export default { confirmSeals(){ this.$refs["courtReviewform"].validate((valid) => { if (valid) { + this.loadingSubmit = true; selectBatchSealUrl(this.paramsdata).then((res) => { this.$modal.msgSuccess("确认成功"); this.cancel(); this.getBatchPrinting(this.queryParamsData) window.open(res.data.signUrl) + this.loadingSubmit = false; // this.$emit("getcaseApply", this.queryParams); }) - .catch((err) => {}); + .catch((err) => { + this.loadingSubmit = false; + }); } }); }, diff --git a/src/views/caseManagement/components/batchSignature.vue b/src/views/caseManagement/components/batchSignature.vue index 4d9fba1..45ea41b 100644 --- a/src/views/caseManagement/components/batchSignature.vue +++ b/src/views/caseManagement/components/batchSignature.vue @@ -63,7 +63,7 @@ type="primary" class="endbutton" :disabled="dataList.length == 0 || batchData.length == 0" - @click="witnessing">确认签名 + @click="witnessing" :loading="loadingSubmit">确认签名 @@ -77,6 +77,7 @@ export default { return { // 遮罩层 loading: true, + loadingSubmit: false, // 总条数 total:0, // 查询参数 @@ -102,12 +103,13 @@ export default { signatureVisable(val) { if (val) { this.getBatchSignation(this.queryParamsData) + this.getarbitrAtor() } } }, created(){ this.getBatchSignation(this.queryParamsData) - this.getarbitrAtor() + // this.getarbitrAtor() }, methods:{ // 列表查询 @@ -143,16 +145,18 @@ export default { witnessing(){ this.$refs["courtReviewform"].validate((valid) => { if (valid) { - console.log(this.paramsdata) + this.loadingSubmit = true; selectBatchSignUrl(this.paramsdata).then((res) => { this.$modal.msgSuccess("确认成功"); this.cancel(); this.getBatchSignation(this.queryParamsData) window.open(res.data.signUrl) - + this.loadingSubmit = false; // this.$emit("getcaseApply", this.queryParams); }) - .catch((err) => {}); + .catch((err) => { + this.loadingSubmit = false; + }); } }); }, diff --git a/src/views/caseManagement/components/caseentryDialog.vue b/src/views/caseManagement/components/caseentryDialog.vue index 3b20780..a988be8 100644 --- a/src/views/caseManagement/components/caseentryDialog.vue +++ b/src/views/caseManagement/components/caseentryDialog.vue @@ -623,7 +623,7 @@ @@ -673,6 +673,7 @@ export default { data() { return { activeName: 'first', + loadingSubmit: false, fileURL: window.location.origin + "/API", formData: this.form, templateList: [], @@ -1069,6 +1070,7 @@ export default { "YYYY-MM-DD HH:mm:ss" ); if (valid) { + this.loadingSubmit = true; this.$refs["form2"].validate((valid) => { if (valid) { this.$refs["form3"].validate((vail) => { @@ -1091,7 +1093,10 @@ export default { this.$modal.msgSuccess("修改成功"); this.$emit("cancel"); this.getcaseApply(this.queryParams); + this.loadingSubmit = false; } + }).catch((err) => { + this.loadingSubmit = false; }); } else { addCaseApply({ @@ -1102,7 +1107,10 @@ export default { this.$modal.msgSuccess("新增成功"); this.$emit("cancel"); this.getcaseApply(this.queryParams); + this.loadingSubmit = false; } + }).catch((err) => { + this.loadingSubmit = false; }); } } diff --git a/src/views/caseManagement/components/choosetrialmethodDaiog.vue b/src/views/caseManagement/components/choosetrialmethodDaiog.vue index 49e55ba..a3f40f9 100644 --- a/src/views/caseManagement/components/choosetrialmethodDaiog.vue +++ b/src/views/caseManagement/components/choosetrialmethodDaiog.vue @@ -8,7 +8,7 @@ @close="cancel" :destroy-on-close="true" > -
+
{{ @@ -53,7 +53,7 @@ - 确定 + 确定 取消 @@ -70,6 +70,7 @@ export default { data() { return { form:{}, + loadingSubmit: false, rules:{ arbitratMethod: [ { required: true, message: '请选择开庭方式', trigger: 'change' } @@ -98,6 +99,7 @@ export default { determine(val){ this.$refs["form"].validate((valid) => { if (valid) { + this.loadingSubmit = true; let paramsdata = { opinion: val, arbitratMethod:this.form.arbitratMethod @@ -110,8 +112,11 @@ export default { this.$modal.msgSuccess("提交成功"); this.cancel(); this.$emit("getcaseApply", this.queryParams); + this.loadingSubmit = false; }) - .catch((err) => {}); + .catch((err) => { + this.loadingSubmit = false; + }); } else { return false; } diff --git a/src/views/caseManagement/components/courtReviewDialog.vue b/src/views/caseManagement/components/courtReviewDialog.vue index 94c60b5..bce0965 100644 --- a/src/views/caseManagement/components/courtReviewDialog.vue +++ b/src/views/caseManagement/components/courtReviewDialog.vue @@ -60,7 +60,7 @@ @@ -33,6 +33,7 @@ export default { return { radio: 1, ruleForm: {}, + loadingSubmit: false, rules: { caseCheckReject: [ { @@ -48,6 +49,7 @@ export default { submitForm() { this.$refs["ruleForm"].validate((valid) => { if (valid) { + this.loadingSubmit = true; let paramsdata = { agreeOrNotCheck: this.radio, ids: [this.filingreviewdata.id], @@ -58,8 +60,11 @@ export default { this.$modal.msgSuccess("提交成功"); this.cancel(); this.$emit("getcaseApply", this.queryParams); + this.loadingSubmit = false; }) - .catch((err) => { }); + .catch((err) => { + this.loadingSubmit = false; + }); } }); }, diff --git a/src/views/caseManagement/components/formateCourtDialog.vue b/src/views/caseManagement/components/formateCourtDialog.vue index 0915e00..ff9fd87 100644 --- a/src/views/caseManagement/components/formateCourtDialog.vue +++ b/src/views/caseManagement/components/formateCourtDialog.vue @@ -68,7 +68,7 @@
{{ payMain }}
+
+ 驳回原因: +
{{ form.payRejectReason }}
+
@@ -78,6 +82,7 @@ export default { payMain: "", timer: null, paySelect: 1,//支付线上/线下 + loadingSubmit: false, fileList: [], headers: { Authorization: "Bearer " + getToken(), @@ -119,11 +124,15 @@ export default { this.$modal.msgError("请上传缴费凭证"); return } + this.loadingSubmit = true; confirmPayDig(this.submitForm).then(res=>{ this.$modal.msgSuccess("成功"); this.payCancel() this.$emit("getcaseApply", this.queryParams); - }) + this.loadingSubmit = false; + }).catch((err) => { + this.loadingSubmit = false; + }); }, handleRemove(file, fileList) { (this.submitForm.payOrderList = []), diff --git a/src/views/caseManagement/components/paymentdetailsDialog.vue b/src/views/caseManagement/components/paymentdetailsDialog.vue new file mode 100644 index 0000000..a66c550 --- /dev/null +++ b/src/views/caseManagement/components/paymentdetailsDialog.vue @@ -0,0 +1,198 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManagement/components/timeDialog.vue b/src/views/caseManagement/components/timeDialog.vue index 27b902c..2b67a5a 100644 --- a/src/views/caseManagement/components/timeDialog.vue +++ b/src/views/caseManagement/components/timeDialog.vue @@ -1,116 +1,147 @@ \ No newline at end of file diff --git a/src/views/caseManagement/components/trialincourtDialog.vue b/src/views/caseManagement/components/trialincourtDialog.vue index f31cc5d..a8c0102 100644 --- a/src/views/caseManagement/components/trialincourtDialog.vue +++ b/src/views/caseManagement/components/trialincourtDialog.vue @@ -310,7 +310,7 @@ --> @@ -356,7 +356,8 @@ export default { annexPath: "", //笔录文件地址 roomId:null, startTime:"", - fileList:[] + fileList:[], + loadingSubmit: false, }; }, watch: { @@ -457,7 +458,7 @@ export default { submitForm() { this.$refs["form2"].validate((valid) => { if (valid) { - + this.loadingSubmit = true; creatTrialRecordnew({ caseAppliId: this.formData.id, // evidenDetermi: this.form2.evidenDetermi, @@ -493,9 +494,12 @@ export default { console.log(this.form2) this.form2.respondentOpinion =""; this.form2.applicantOpinion = ""; + this.loadingSubmit = false; }) - .catch((err) => { }); + .catch((err) => { + this.loadingSubmit = false; + }); } }); }, diff --git a/src/views/formationCourt/components/formateCourtDialog.vue b/src/views/formationCourt/components/formateCourtDialog.vue index cffc914..a3f6cbd 100644 --- a/src/views/formationCourt/components/formateCourtDialog.vue +++ b/src/views/formationCourt/components/formateCourtDialog.vue @@ -80,12 +80,19 @@ export default { }; }, created() { - this.getarbitrAtor(); + // this.getarbitrAtor(); + }, + watch:{ + showformateCourt(val){ + if(val){ + this.getarbitrAtor({caseId:this.formateCourtData.id}); + } + } }, methods: { // 获取仲裁员信息 - getarbitrAtor() { - arbitrAtor({}).then((res) => { + getarbitrAtor(val) { + arbitrAtor(val).then((res) => { this.dataList = res.rows; this.total = res.total; }); diff --git a/src/views/index.vue b/src/views/index.vue index 5a271bb..acfa6f3 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -194,13 +194,15 @@ export default { }, // 点击代办案件按钮 pushPage(status) { - if (status == 0 || status == 1 || status == 2 || status == 5 || status == 6 || status == 7 || status == 31 || status == 8 || status == 9) { + if (status == 0 || status == 1 || status == 2 || status == 5 || status == 6 || status == 7 || status == 31 || status == 8 || status == 9||status == 3||status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16 || status == 18) { this.$router.push({ name: 'CaseManagement/caseList', params: { status: status + '' } }) - } else if (status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16 || status == 18) { - this.$router.push({ name: 'AwardManagement/listofAwards', params: { status: status + '' } }) - } else if (status == 3){ - this.$router.push({ name: 'PaymentManagement/paymentList', params: { status: status + ''} }) - } + } + // else if (status == 11 || status == 12 || status == 13 || status == 14 || status == 15 || status == 16 || status == 18) { + // this.$router.push({ name: 'AwardManagement/listofAwards', params: { status: status + '' } }) + // } + // else if (status == 3){ + // this.$router.push({ name: 'PaymentManagement/paymentList', params: { status: status + ''} }) + // } } // goTarget(href) { // window.open(href, "_blank"); diff --git a/src/views/paymentManagement/components/paymentdetailsDialog.vue b/src/views/paymentManagement/components/paymentdetailsDialog.vue index 1b3e4f4..e294e11 100644 --- a/src/views/paymentManagement/components/paymentdetailsDialog.vue +++ b/src/views/paymentManagement/components/paymentdetailsDialog.vue @@ -1,18 +1,28 @@