SH-Arbitrate/Arbitrate-Frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hcb' of SH-Arbitrate/Arbitrate-Frontend into dev

Browse Source
This commit was merged in pull request #127.
This commit is contained in:
hanchaobo
2023-12-12 18:10:34 +08:00
committed by Gitea
parent 6fcc2bbdcc 1cabdbeede
commit 7d91729c7d
2 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/awardManagement/components/paymentdetailsDialog.vue
+26 -8
View File
@@ -81,14 +81,16 @@
<el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2 || flag == 4">
<el-input type="textarea" autosize placeholder="请输入内容" v-model="arbitrateRecord.checkOpinion" />
</el-form-item>
<el-form-item label="驳回原因" prop="arbitrateReject" v-if="flag == 2 || flag == 4">
<el-input type="textarea" :rows="2" placeholder="请输入拒绝原因" v-model="arbitrateRecord.arbitrateReject"></el-input>
</el-form-item>
</el-form>
<!-- 画布 -->
<h4 v-if="flag == 3">签名区域</h4>
<!-- <h4 v-if="flag == 3">签名区域</h4>
<div class="esign" v-if="flag == 3">
<vue-esign ref="esign" :width="900" :height="300" bgColor="#ffffff" />
</div>
</div> -->
<!-- 清除画布 -->
<el-button v-if="flag == 3" type="info" @click="handleReset">清除画布</el-button>
<div slot="footer" class="dialog-footer">
<!-- <el-button type="danger" @click="submitForm(4)" v-if="flag == 1">重新生成裁决书</el-button> -->
<el-button type="primary" @click="submitForm(0)" v-if="flag == 1">提 交</el-button>
@@ -173,6 +175,13 @@ export default {
trigger: "blur",
},
],
// arbitrateReject: [
// {
// required: true,
// message: "拒绝原因不能为空",
// trigger: "blur",
// },
// ],
},
applicantFileArr: [], //申请人
applicantPathArr: [], //申请人
@@ -200,7 +209,10 @@ export default {
// this.form.arbitrateRecord.checkOpinion = '同意';
this.arbitrateRecord.checkOpinion = '';
// }
// this.arbitrateRecord = this.form.arbitrateRecord;
this.arbitrateRecord = {};
if (this.form.arbitrateRecord) {
this.arbitrateRecord.id = this.form.arbitrateRecord.id;
}
this.evidenceFile(this.form);
// }, 1000);
}
@@ -306,6 +318,12 @@ export default {
arbitrateRecord: this.arbitrateRecord,
});
} else if (parms == 2) {
if (this.arbitrateRecord.arbitrateReject == "") {
this.$message.error('请输入拒绝原因');
return
}
this.arbitrateRecord.deptorReject = this.arbitrateRecord.arbitrateReject;
delete this.arbitrateRecord.arbitrateReject;
this.checkArbitrateRecordFn({
id: this.form.id,
agreeOrNotCheck: 2,
@@ -327,6 +345,10 @@ export default {
arbitrateRecord: this.arbitrateRecord,
});
} else if (parms == 6) {
if (this.arbitrateRecord.arbitrateReject == "") {
this.$message.error('请输入拒绝原因');
return
}
this.arbitratorCheckArbitrateRecordFn({
id: this.form.id,
agreeOrNotCheck: 2,
@@ -339,10 +361,6 @@ export default {
cancel() {
this.$emit("cancelpaymentdetails");
},
// 清除画布
handleReset() {
this.$refs["esign"].reset(); //清空画布
},
},
};
</script>
src/views/caseManagement/components/filingreviewDialog.vue
+30 -15
View File
@@ -1,27 +1,22 @@
<template>
<div>
<!-- 立案审查 -->
<el-dialog
title="立案审查"
:visible="showfilingreview"
width="500px"
@close="cancel"
:destroy-on-close="true"
>
<el-dialog title="立案审查" :visible="showfilingreview" width="500px" @close="cancel" :destroy-on-close="true">
<div class="radiobox">
<el-radio-group v-model="radio">
<el-radio-group v-model="radio" style="margin-bottom: 20px;">
<el-radio :label="1">同意</el-radio>
<el-radio :label="2">拒绝</el-radio>
</el-radio-group>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
<!-- TODO -->
<el-form-item label="拒绝原因" prop="caseCheckReject" v-if="radio == 2">
<el-input type="textarea" :rows="2" placeholder="请输入拒绝原因" v-model="ruleForm.caseCheckReject"></el-input>
</el-form-item>
</el-form>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" class="endbutton"
><span>提 交</span></el-button
>
<el-button @click="cancel" class="endbutton1"
><span> 取 消</span></el-button
>
<el-button type="primary" @click="submitForm" class="endbutton"><span>提 交</span></el-button>
<el-button @click="cancel" class="endbutton1"><span> 取 消</span></el-button>
</div>
</el-dialog>
</div>
@@ -37,13 +32,26 @@ export default {
data() {
return {
radio: 1,
ruleForm: {},
rules: {
caseCheckReject: [
{
required: true,
message: "拒绝原因不能为空",
trigger: "blur",
},
],
}
};
},
methods: {
submitForm() {
this.$refs["ruleForm"].validate((valid) => {
if (valid) {
let paramsdata = {
agreeOrNotCheck: this.radio,
ids: [this.filingreviewdata.id],
caseCheckReject:this.ruleForm.caseCheckReject
};
submitCaseApplicationCheck(paramsdata)
.then((res) => {
@@ -52,6 +60,8 @@ export default {
this.$emit("getcaseApply", this.queryParams);
})
.catch((err) => { });
}
});
},
cancel() {
this.$emit("cancelFilingreview");
@@ -64,16 +74,19 @@ export default {
.radiobox {
margin-left: 5%;
}
::v-deep .el-dialog {
width: 800px;
background: #ffffff;
border-radius: 20px;
}
.endbutton {
width: 124px;
height: 37px;
background: #0072ff;
border-radius: 19px;
span {
width: 32px;
height: 15px;
@@ -84,12 +97,14 @@ export default {
// line-height: 48px;
}
}
.endbutton1 {
width: 124px;
height: 37px;
background: #ffffff;
border: 1px solid #d0d0d0;
border-radius: 19px;
span {
width: 31px;
height: 13px;