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 #150.
This commit is contained in:
hanchaobo
2024-05-31 15:24:52 +08:00
committed by Gitea
parent d58fb3582c 987000d5af
commit a4baf32f92
3 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/caseList.vue
-1
View File
@@ -1047,7 +1047,6 @@ export default {
},
// model框显示
showModel(row, type) {
switch (type) {
case 0:
selectSignSealUrl({ id: row.id }).then(res => {
src/views/caseManagement/components/caseentryDialog.vue
+7 -11
View File
@@ -820,7 +820,7 @@ export default {
"initpaymentArr",
"initpaymentArr1",
"queryParams",
// "caseAttachList",
"caseAttachList",
"columnValues",
"detailsAwardForm"
],
@@ -1090,6 +1090,10 @@ export default {
this.activeName = "first"
this.formGrab.list = this.columnValues
this.caseAttachListArr = []
this.getTemplateFn({
pageNum: 1,
pageSize: 10000000,
})
if (val) {
this.applicateArr = [];
this.quiltArr = [];
@@ -1193,20 +1197,14 @@ export default {
}
}
if (val && (this.flag == "0" || this.flag == "1")) {
setTimeout(() => {
this.detailsAwardNum = this.detailsAwardForm;
}, 2000)
this.getTemplateFn({
pageNum: 1,
pageSize: 10000000,
})
let params = {
id: this.form.id,
version: this.form.version
}
selectCaseApply(params).then(res => {
let data = res.data;
this.detailsAwardNum = data;
data.affiliate.applicant.forEach(item => {
if (!item.applicant) {
item.applicant = {}
@@ -1253,8 +1251,6 @@ export default {
this.formData = data;
this.form2 = data.affiliate;
})
// this.detailsAwardNum = this.detailsAwardForm;
// console.log(this.detailsAwardNum.caseAttachList,"PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP");
}
}
},
src/views/caseManagement/components/judgmentInformation.vue
+13 -25
View File
@@ -139,12 +139,12 @@
<!-- 清除画布 -->
<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>
<el-button type="primary" @click="submitForm(1)" v-if="flag == 2">提交</el-button>
<el-button type="primary" @click="submitForm(0)" v-if="flag == 1" :loading="buttonFlag">提 交</el-button>
<el-button type="primary" @click="submitForm(1)" v-if="flag == 2" :loading="buttonFlag">提交</el-button>
<!-- <el-button type="danger" @click="submitForm(2)" v-if="flag == 2">驳 回</el-button> -->
<!-- <el-button type="primary" @click="submitForm(3)" v-if="flag == 3">提 交</el-button> -->
<!-- <el-button type="primary" @click="submitForm(5)" v-if="flag == 4">同 意</el-button> -->
<el-button type="primary" @click="submitForm(6)" v-if="flag == 4">提交</el-button>
<el-button type="primary" @click="submitForm(6)" v-if="flag == 4" :loading="buttonFlag">提交</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@@ -164,6 +164,7 @@ export default {
props: ["openDialogInfor", "title", "flag", "awardDetailform","queryParams"],
data() {
return {
buttonFlag:false,
// key: value
arbitrateRecordt: {},
agreeOrNotCheck:1,
@@ -327,8 +328,10 @@ export default {
},
// 校验裁决书
verificationArbitrateRecordFn(parms) {
this.buttonFlag = true;
verificationArbitrateRecord(parms).then((res) => {
this.cancel();
this.buttonFlag = false;
// this.$emit("updataList");
this.$emit("getcaseApply", this.queryParams);
// this.$message("成功");
@@ -337,8 +340,10 @@ export default {
},
//审核裁决书
checkArbitrateRecordFn(parms) {
this.buttonFlag = true;
checkArbitrateRecord(parms).then((res) => {
this.cancel();
this.buttonFlag = false;
// this.$emit("updataList");
this.$emit("getcaseApply", this.queryParams);
// this.$message("成功");
@@ -347,9 +352,11 @@ export default {
},
// 仲裁员审核裁决书
arbitratorCheckArbitrateRecordFn(parms) {
this.buttonFlag = true;
console.log(parms)
arbitratorCheckArbitrateRecord(parms).then((res) => {
this.cancel();
this.buttonFlag = false;
// this.$emit("updataList");
this.$emit("getcaseApply", this.queryParams);
// this.$message("成功");
@@ -358,8 +365,10 @@ export default {
},
// 签名
adjudicationSignatureFn(parms) {
this.buttonFlag = true;
adjudicationSignature(parms).then((res) => {
this.cancel();
this.buttonFlag = false;
// this.$emit("updataList");
this.$emit("getcaseApply", this.queryParams);
this.$message("成功");
@@ -408,18 +417,7 @@ export default {
});
}
} else if (parms == 2) {
// if (!that.arbitrateRecord.arbitrateReject == "") {
// this.$message.error('请输入拒绝原因');
// return
// } else {
// this.arbitrateRecord.deptorReject = this.arbitrateRecord.arbitrateReject;
// delete this.arbitrateRecord.arbitrateReject;
// this.checkArbitrateRecordFn({
// id: this.form.id,
// agreeOrNotCheck: 2,
// arbitrateRecord: this.arbitrateRecord,
// });
// }
} else if (parms == 3) {
this.adjudicationSignatureFn({
id: this.form.id,
@@ -440,16 +438,6 @@ export default {
arbitrateRecord: this.arbitrateRecord,
});
}
// if (!that.arbitrateRecord.arbitrateReject) {
// this.$message.error('请输入拒绝原因');
// return
// } else {
// this.arbitratorCheckArbitrateRecordFn({
// id: this.form.id,
// agreeOrNotCheck: 2,
// arbitrateRecord: this.arbitrateRecord,
// });
// }
}
}
});