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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Frontend into dev

Browse Source
This commit is contained in:
gyj
2023-12-06 18:06:47 +08:00
parent fae93fdc00 9162a0eb04
commit 2bb57e562d
14 changed files with 827 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/awardManagement/components/paymentdetailsDialog.vue
+39 -15
View File
@@ -74,10 +74,11 @@
v-model="arbitrateRecord.verificaOpinion" />
</el-form-item> -->
<el-form-item label="笔录内容：" prop="responCrossOpin">
<!-- <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" /> -->
<el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin" placeholder="请输入" />
</el-form-item>
<el-form-item label="审核意见：" prop="checkOpinion" v-if="flag == 2">
<!-- <el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecord.responCrossOpin" placeholder="请输入" /> -->
<el-input type="textarea" :autosize="{ minRows: 6 }" v-model="arbitrateRecordt.responCrossOpin"
placeholder="请输入" />
</el-form-item>
<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>
@@ -94,6 +95,8 @@
<el-button type="primary" @click="submitForm(1)" v-if="flag == 2">同 意</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="danger" @click="submitForm(6)" v-if="flag == 4">驳 回</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@@ -105,7 +108,8 @@ import {
verificationArbitrateRecord,
checkArbitrateRecord,
adjudicationSignature,
regenerationDocument
regenerationDocument,
arbitratorCheckArbitrateRecord
} from "@/api/awardManagement/awardManagement";
export default {
props: ["openDialog", "title", "flag", "detailform"],
@@ -116,7 +120,7 @@ export default {
form: {},
arbitrateRecord: {
// checkOpinion:"同意"
checkOpinion:""
checkOpinion: ""
},
// 表单校验
rules: {
@@ -191,14 +195,14 @@ export default {
(this.awardFileArr = []), //裁决书
(this.awardPathArr = []), //裁决书
// setTimeout(() => {
this.form = this.detailform;
// if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
// this.form.arbitrateRecord.checkOpinion = '同意';
this.arbitrateRecord.checkOpinion = '';
// }
// this.arbitrateRecord = this.form.arbitrateRecord;
this.evidenceFile(this.form);
// }, 1000);
this.form = this.detailform;
// if(this.form.arbitrateRecord && this.form.arbitrateRecord.checkOpinion == null ){
// this.form.arbitrateRecord.checkOpinion = '同意';
this.arbitrateRecord.checkOpinion = '';
// }
// this.arbitrateRecord = this.form.arbitrateRecord;
this.evidenceFile(this.form);
// }, 1000);
}
},
},
@@ -210,7 +214,7 @@ export default {
this.applicantFileArr = [];
this.applicantPathArr = [];
this.respondentFileArr = [];
this.respondenPathArr = [];
this.respondenPathArr = [];
this.awardFileArr = [];
this.awardPathArr = [];
this.bookFileArr = [];
@@ -261,6 +265,14 @@ export default {
this.$message("成功");
});
},
// 仲裁员审核裁决书
arbitratorCheckArbitrateRecordFn(parms) {
arbitratorCheckArbitrateRecord(parms).then((res) => {
this.cancel();
this.$emit("updataList");
this.$message("成功");
});
},
// 签名
adjudicationSignatureFn(parms) {
adjudicationSignature(parms).then((res) => {
@@ -308,6 +320,18 @@ export default {
paramsData.arbitrateRecord = this.arbitrateRecord;
paramsData.id = this.form.id
this.getRegenerationDocument(paramsData)
} else if (parms == 5) {
this.arbitratorCheckArbitrateRecordFn({
id: this.form.id,
agreeOrNotCheck: 1,
arbitrateRecord: this.arbitrateRecord,
});
}else if (parms == 6) {
this.arbitratorCheckArbitrateRecordFn({
id: this.form.id,
agreeOrNotCheck: 2,
arbitrateRecord: this.arbitrateRecord,
});
}
}
});
src/views/awardManagement/listofAwards.vue
+18 -9
View File
@@ -7,8 +7,8 @@
<el-form-item label="案件状态" prop="caseStatus">
<el-select :disabled="caseStatusType" v-model="queryParams.caseStatus" placeholder="请选择案件状态" clearable
@keyup.enter.native="handleQuery">
<el-option v-for="dict in caseStatus" :key="dict.dictSort" :label="dict.dictLabel"
:value="dict.dictSort"></el-option>
<el-option v-for="dict in caseStatus" :key="dict.dictValue" :label="dict.dictLabel"
:value="dict.dictValue"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否完成" prop="selectCaseStatus">
@@ -62,11 +62,14 @@
v-if="scope.row.filearbitraUrl && scope.row.filearbitraUrl !== ''"
@click="showModel(scope.row, 0)">查看裁决书</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
v-if="scope.row.caseStatus == 11 && checkPermi(['awardManagement:list:check']) && btnStatus"
@click="showModel(scope.row, 1)">核查</el-button>
v-if="scope.row.caseStatus == 11 && checkPermi(['awardManagement:list:secretarycheck'])"
@click="showModel(scope.row, 1)">秘书确认</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
v-if="scope.row.caseStatus == 18 && checkPermi(['awardManagement:list:check']) && btnStatus"
@click="showModel(scope.row, 4)">仲裁员确认</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
v-if="scope.row.caseStatus == 12 && checkPermi(['awardManagement:list:confirmaward']) && btnStatus"
@click="showModel(scope.row, 2)">确认裁决书</el-button>
@click="showModel(scope.row, 2)">部门长确认</el-button>
<el-button size="mini" type="text" icon="el-icon-edit"
v-if="scope.row.caseStatus == 13 && checkPermi(['awardManagement:list:sign']) && btnStatus"
@click="showModel(scope.row, 3)">签名</el-button>
@@ -202,9 +205,9 @@ export default {
this.caseStatus = res.data;
let params = this.$route.params.status;
if (params) {
this.queryParams.caseStatus = params;
this.queryParams.caseStatus = params + '';
}
this.queryParams.caseStatusList = [11, 12, 13, 14, 15, 16]
this.queryParams.caseStatusList = [11, 12, 13, 14, 15, 16, 18]
this.getList(this.queryParams);
})
// 裁决书列表不显示 生成裁决书
@@ -231,7 +234,7 @@ export default {
} else if (type == 3) {
this.operateTitle = '批量归档';
this.operateStatus = 3;
}else if (type == 5) {
} else if (type == 5) {
this.operateTitle = '批量核查';
this.operateStatus = 5;
}
@@ -296,6 +299,12 @@ export default {
window.open(url)
})
break;
case 4:
this.getDetail({ id: row.id });
this.openDialog = true;
this.title = "审核裁决书";
this.flag = 4;
break;
default:
break;
}
@@ -362,7 +371,7 @@ export default {
},
// 根据案件id查询邮件
emailByCaseIdFn(val) {
emailByCaseId({id: val}).then((res) => {
emailByCaseId({ id: val }).then((res) => {
this.emailobj = res.data
})
},