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 #93.
This commit is contained in:
hanchaobo
2023-11-02 14:32:47 +08:00
committed by Gitea
parent 5d98a52f26 434d6e186f
commit b9911107ad
10 changed files with 258 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/awardManagement/components/paymentdetailsDialog.vue
+16 -2
View File
@@ -41,6 +41,11 @@
<a href="#">{{ item }}</a>
</p>
</el-descriptions-item>
<el-descriptions-item label="庭审笔录附件">
<p v-for="(item, index) in bookFileArr" :key="index" @click="toFile(index, 7)">
<a href="#">{{ item }}</a>
</p>
</el-descriptions-item>
</el-descriptions>
<el-form ref="form" :model="arbitrateRecord" label-width="300px" label-position="left" :rules="rules"
:disabled="flag == 3">
@@ -161,8 +166,10 @@ export default {
applicantPathArr: [], //申请人
respondentFileArr: [], //被申请人
respondenPathArr: [], //被申请人
awardFileArr: [], //裁决书
awardPathArr: [], //裁决书
awardFileArr: [], //庭审笔录文件
awardPathArr: [], //庭审笔录路径
bookFileArr: [], //裁决书文件
bookPathArr: [], //庭审笔录路径
};
},
watch: {
@@ -188,6 +195,8 @@ export default {
// 申请人裁决书
evidenceFile(val) {
if (val) {
this.bookFileArr = [];
this.bookPathArr = [];
val.caseAttachList.forEach((item) => {
if (item.annexType == 2) {
this.applicantFileArr.push(item.annexName);
@@ -200,6 +209,9 @@ export default {
this.awardPathArr = [];
this.awardFileArr.push(item.annexName);
this.awardPathArr.push(item.annexPath);
} else if (item.annexType == 7) {
this.bookFileArr.push(item.annexName);
this.bookPathArr.push(item.annexPath);
}
});
}
@@ -213,6 +225,8 @@ export default {
window.open(headPath + this.respondenPathArr[index], "_blank");
} else if (val == 3) {
window.open(headPath + this.awardPathArr[index], "_blank");
} else if (val == 7) {
window.open(headPath + this.bookPathArr[index], "_blank");
}
},
// 校验裁决书
src/views/caseManagement/caseList.vue
+3 -3
View File
@@ -381,7 +381,7 @@ export default {
this.operateTitle = '批量删除';
this.operateStatus = 1;
} else if (type == 2) {
this.operateTitle = '批量立案申请';
this.operateTitle = '批量立案审查';
this.operateStatus = 2;
}
},
@@ -458,7 +458,7 @@ export default {
handleQuery() {
this.queryParams.caseStatusList = [];
if (!this.queryParams.caseStatus) {
this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10]
this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10,31]
}
if(this.queryParams.selectCaseStatus == 1){
this.queryParams.caseStatus = null;
@@ -474,7 +474,7 @@ export default {
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
(this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10]),
(this.queryParams.caseStatusList = [0, 1, 2, 5, 6, 7, 8, 9, 10,31]),
(this.queryParams.applicantName = ""),
(this.queryParams.nameId = ""),
this.getcaseApply(this.queryParams);
src/views/caseManagement/components/caseentryDialog.vue
+34 -2
View File
@@ -220,6 +220,18 @@
<el-input v-model="item.contactAddress" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请人住所：" :prop="'paymentArr.' + index + '.residenAffili'" :rules="[
{
required: true,
message: '申请人住所不能为空',
trigger: 'blur',
},
{ max: 50, message: '长度应小于50个字符', trigger: 'blur' }
]">
<el-input v-model="item.residenAffili" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="法定代表人：" :prop="'paymentArr.' + index + '.compLegalPerson'" :rules="[
{
@@ -412,6 +424,18 @@
<el-input v-model="itm.contactAddress" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被申请人住所：" :prop="'paymentArr1.' + index + '.residenAffili'" :rules="[
{
required: true,
message: '被申请人住所不能为空',
trigger: 'blur',
},
{ max: 50, message: '长度应小于50个字符', trigger: 'blur' }
]">
<el-input v-model="itm.residenAffili" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="被申请人性别：" :prop="'paymentArr1.' + index + '.responSex'" :rules="[
{
@@ -432,7 +456,8 @@
trigger: 'blur',
},
]">
<el-date-picker v-model="itm.responBirth" type="datetime" placeholder="被申请人出生年月日">
<el-date-picker v-model="itm.responBirth" :picker-options="pickerOptions" type="datetime"
placeholder="被申请人出生年月日">
</el-date-picker>
</el-form-item>
</el-col>
@@ -557,6 +582,7 @@ export default {
nameAgent: "",
contactTelphoneAgent: "",
contactAddressAgent: "",
residenAffili: ""
},
],
}, //申请人主体信息
@@ -574,7 +600,8 @@ export default {
contactTelphoneAgent: "",
contactAddressAgent: "",
responSex: 1,
responBirth: ""
responBirth: "",
residenAffili: ""
},
],
}, //被申请人主体信息
@@ -669,6 +696,11 @@ export default {
fileList: [],
applicateArr: [],
quiltArr: [],
pickerOptions: {
disabledDate(time) {
return time.getTime() > Date.now() - 8.64e6;
}
}
};
},
watch: {
src/views/caseManagement/components/courtReviewDialog.vue
+124 -36
View File
@@ -1,42 +1,57 @@
<template>
<div>
<!-- 组庭确认页面 -->
<el-dialog
title="组庭确认"
:visible="showcourtReview"
@close="cancel"
:destroy-on-close="true"
center
>
<el-dialog title="组庭确认" :visible="showcourtReview" @close="cancel" :destroy-on-close="true" center>
<el-form ref="courtReviewform" :model="courtReviewform">
<el-form-item
label="开庭日期："
prop="hearDate"
:rules="[
{
required: true,
message: '请选择开庭日期',
trigger: 'blur',
},
]"
>
<el-form-item label="开庭日期：" prop="hearDate" :rules="[
{
required: true,
message: '请选择开庭日期',
trigger: 'blur',
},
]">
<div class="reviewbox">
<el-date-picker
v-model="courtReviewform.hearDate"
type="datetime"
placeholder="选择日期"
>
<el-date-picker v-model="courtReviewform.hearDate" :picker-options="pickerOptions" type="datetime"
placeholder="选择日期">
</el-date-picker>
</div>
</el-form-item>
<el-form-item label="是否同意组庭：">
<el-radio-group v-model="isAgreePendTral">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<el-tag type="warning" v-if="noArbitrator">当前案件未指定仲裁员，请先指定仲裁员！</el-tag>
<p></p>
<!-- <el-form ref="form"> -->
<!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
<div style="display: inline-flex; margin-bottom: 8px">
<div class="infoIcon"></div>
<div>
<span v-if="isAgreePendTral == 1">当前案件</span>仲裁员<span v-if="isAgreePendTral !== 1">信息列表</span>
</div>
</div>
<div v-if="isAgreePendTral == 1" class="nowarbitrator">
<el-tag size="medium">
{{ form.arbitratorName }}
</el-tag>
</div>
<div v-if="noArbitrator || isAgreePendTral == 0">
<el-table :data="dataList" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" v-if="noArbitrator || isAgreePendTral == 0">
</el-table-column>
<el-table-column label="仲裁员姓名" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="介绍" align="center" prop="remark" :show-overflow-tooltip="true" />
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams1.pageNum"
:limit.sync="queryParams1.pageSize" @pagination="getarbitrAtor" v-if="isAgreePendTral == 0" />
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" class="endbutton"
><span>确 定</span>
<el-button type="primary" @click="submitForm" class="endbutton"><span>确 定</span>
</el-button>
<el-button @click="cancel" class="endbutton1"
><span> 取 消</span></el-button
>
<el-button @click="cancel" class="endbutton1"><span> 取 消</span></el-button>
</div>
</el-dialog>
</div>
@@ -44,6 +59,7 @@
<script>
import { pendTralSure } from "@/api/caseManagement/caseManagement.js";
import { arbitrAtor, pendTralCheck } from "@/api/formationCourt/formationCourt";
import moment from "moment";
export default {
name: "courtReviewDialog",
@@ -52,25 +68,93 @@ export default {
return {
hearDate: "",
courtReviewform: {},
noArbitrator: false,
isAgreePendTral: 1,
total: 0,
queryParams1: {
pageNum: 1,
pageSize: 10,
},
paramsdata: {},
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
},
};
},
created() {
this.getarbitrAtor();
},
watch: {
showformateCourt(val) {
if (val) {
this.isAgreePendTral = 1;
}
},
form: {
handler(val) {
if (val.arbitratorName == null) {
this.noArbitrator = true;
} else {
this.noArbitrator = false;
}
},
},
},
methods: {
// 获取仲裁员信息
getarbitrAtor() {
arbitrAtor({}).then((res) => {
this.dataList = res.rows;
this.total = res.total;
});
},
// 勾选仲裁员
handleSelectionChange(val) {
this.arbitrators = [];
val.forEach((item) => {
this.arbitrators.push({
id: item.userId,
arbitratorName: item.nickName,
});
});
},
submitForm() {
if (this.noArbitrator) {
this.paramsdata = {
id: this.form.id,
arbitrators: this.arbitrators,
};
} else {
if (this.isAgreePendTral == 0) {
this.paramsdata = {
isAgreePendTral: 0,
id: this.form.id,
arbitrators: this.arbitrators,
};
} else {
this.paramsdata = {
isAgreePendTral: 1,
id: this.form.id,
};
}
}
this.$refs["courtReviewform"].validate((valid) => {
if (valid) {
this.courtReviewform.hearDate = moment(
this.courtReviewform.hearDate
).format("YYYY-MM-DD HH:mm:ss");
pendTralSure({
id: this.form.id,
hearDate: this.courtReviewform.hearDate,
})
this.paramsdata.hearDate = this.courtReviewform.hearDate;
pendTralSure(
this.paramsdata
)
.then((res) => {
this.$modal.msgSuccess("确认成功");
this.cancel();
this.$emit("getcaseApply",this.queryParams);
this.$emit("getcaseApply", this.queryParams);
})
.catch((err) => {});
.catch((err) => { });
}
});
},
@@ -83,19 +167,20 @@ export default {
<style lang="scss" scoped>
::v-deep .el-dialog {
width: 422px;
height: 245px;
background: #ffffff;
border-radius: 20px;
}
.el-form-item {
margin-left: 10%;
}
.endbutton {
width: 124px;
height: 37px;
background: #0072ff;
border-radius: 19px;
span {
width: 32px;
height: 15px;
@@ -106,12 +191,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;
@@ -122,6 +209,7 @@ export default {
// line-height: 48px;
}
}
::v-deep .el-form-item__error {
left: 90px;
}
src/views/caseManagement/components/evidenceDialog.vue
+14 -6
View File
@@ -16,8 +16,8 @@
</el-descriptions-item>
</el-descriptions>
<div style="margin-top: 30px;">
<el-upload class="upload-demo" ref="upload" action="" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
:auto-upload="false" :http-request="uploadFile" :on-change="beforeAvatarUpload" multiple>
<el-upload class="upload-demo" ref="upload" action="" :file-list="fileList" accept=".png,.jpg,.doc,.docx,.txt,.pdf"
:auto-upload="false" :http-request="uploadFile" :on-change="beforeAvatarUpload" :before-remove="beforeRemove" multiple>
<el-button type="primary"><span>修改证据</span></el-button>
</el-upload>
</div>
@@ -44,6 +44,7 @@ export default {
info: {
annexType: 2,
},
fileList:[]
// headers: {
// Authorization: "Bearer " + getToken(),
// },
@@ -51,6 +52,7 @@ export default {
},
watch: {
evidenceVisable(val) {
this.fileList = []
if (val) {
this.getEvidenceList({ caseAppliId: this.evidenceData.id, annexTypeList: "2" })
}
@@ -72,14 +74,20 @@ export default {
cancel() {
this.$emit("cancelEvidence");
},
// // 修改当前文件列表长度
// 修改当前文件列表长度
// changeFileLength(file, fileList) {
// this.filesLength = fileList.length
// this.uploadFiles.push(file)
// },
// 删除文件
beforeRemove(file, fileList){
this.uploadFiles = fileList
},
// 文件上传之前处理
beforeAvatarUpload(file) {
beforeAvatarUpload(file,fileList) {
console.log(file,fileList,"before");
this.uploadFiles = [];
this.uploadFiles.push(file)
// this.uploadFiles.push(file)
this.uploadFiles = fileList
},
// 用户点击上传调用
async upload() {
src/views/caseManagement/components/operateDialog.vue
+1
View File
@@ -72,6 +72,7 @@ export default {
},
watch: {
operateVisable(val) {
this.radio = 1;
if (val) {
this.getcaseApply(this.queryParamsData)
}
src/views/caseManagement/components/timeDialog.vue
+8 -2
View File
@@ -10,7 +10,8 @@
</el-descriptions-item>
<el-descriptions-item label="仲裁方式">{{ timeData.arbitratMethodName }}</el-descriptions-item>
<el-descriptions-item label="开庭时间">
<el-date-picker v-model="loanStartDate" type="datetime" placeholder="开庭时间">
<el-date-picker v-model="loanStartDate" :picker-options="pickerOptions" type="datetime"
placeholder="开庭时间">
</el-date-picker>
</el-descriptions-item>
@@ -31,7 +32,12 @@ export default {
props: ["timeVisable", "timeData"],
data() {
return {
loanStartDate: ""
loanStartDate: "",
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
}
}
};
},
watch: {
src/views/caseManagement/components/uploadCaseDialog.vue
+35 -9
View File
@@ -3,11 +3,17 @@
<el-dialog title="上传证据目录" :visible="uploadCaseVisable" @close="cancel" center :distroy-on-close="true">
<el-upload class="upload-demo" :before-upload="beforeUpload" ref="upload" accept=".zip"
action="https://jsonplaceholder.typicode.com/posts/" :action="UploadUrl()" :headers="headers"
:data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSuccess" :file-list="fileList"
:auto-upload="false">
:data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :on-success="handleSuccess"
:file-list="fileList" :auto-upload="false">
<el-button slot="trigger" size="small" type="primary" :disabled="flagBtn">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload" :disabled="flagBtn">上传压缩包</el-button>
<div slot="tip" class="el-upload__tip">只能上传zip文件，并且格式为一级目录上传申请书证据材料，二级目录为申请书和证据材料</div>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload"
:disabled="flagBtn">上传压缩包</el-button>
<div slot="tip" class="el-upload__tip">
<div>结构示例</div>
<el-tree :data="dataTip"></el-tree>
<div>说明:1、压缩包目录结构为三级目录，
2、第2级目录名称应为“申请书”或“证据材料”。</div>
</div>
</el-upload>
<div class="title">证据目录结构</div>
<el-tree :data="data" @node-click="handleNodeClick"></el-tree>
@@ -28,9 +34,25 @@ export default {
Authorization: "Bearer " + getToken(),
},
filedata: {
id:this.uploadCaseData.id
id: this.uploadCaseData.id
},
flagBtn:false
flagBtn: false,
dataTip: [{
label: '压缩包名称',
children: [{
label: '申请书',
children: [{
label: '申请书名称.pdf'
}]
}, {
label: '证据材料',
children: [{
label: '证据1.pdf'
}, {
label: '证据2.pdf'
}]
}]
},],
};
},
watch: {
@@ -62,6 +84,10 @@ export default {
},
handleNodeClick(data) {
console.log(data);
let headPath = window.location.origin + "/API";
if(data.annexPath){
window.open(headPath + data.annexPath, "_blank")
}
},
// 递归替换key
setData(data) {
@@ -75,14 +101,14 @@ export default {
evidenceTree(data).then(res => {
this.setData(res.data);
this.data = res.data;
if(this.data.length > 0){
if (this.data.length > 0) {
this.flagBtn = true;
}else{
} else {
this.flagBtn = false;
}
})
},
handleSuccess(){
handleSuccess() {
this.evidenceTreeFn({ caseId: this.uploadCaseData.id })
},
beforeUpload(file) {
src/views/officialSeal/officialSealList.vue
+1 -4
View File
@@ -69,12 +69,9 @@ export default {
methods: {
// 启用认证按钮
changeStatus(row) {
enableDept({ id: row.id }).then(res => {
this.getList(this.queryParams);
})
this.$modal.confirm('是否进行启用？')
.then(function () {
})
.then(() => {
enableDept({ id: row.id }).then(res => {
src/views/system/dept/index.vue
+22 -7
View File
@@ -103,13 +103,21 @@
<el-input v-model="form.deptType" placeholder="请输入部门编码" maxlength="50" />
</el-form-item>
</el-col> -->
<el-col :span="12">
<el-form-item label="部门类型" prop="deptType">
<el-select v-model="form.deptType" placeholder="请选择部门类型">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="部门状态">
<el-radio-group v-model="form.status">
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
:label="dict.value">{{ dict.label }}</el-radio>
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -134,7 +142,7 @@ export default {
components: { Treeselect },
data() {
return {
flag:false,
flag: false,
// 遮罩层
loading: true,
// 显示搜索条件
@@ -186,7 +194,14 @@ export default {
trigger: "blur"
}
]
}
},
options: [{
value: 1,
label: '仲裁机构'
}, {
value: 2,
label: '金融公司'
},],
};
},
created() {
@@ -242,10 +257,10 @@ export default {
},
/** 新增按钮操作 */
handleAdd(row) {
console.log(row,"LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL");
if(row == 1){
console.log(row, "LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL");
if (row == 1) {
this.flag = false;
}else{
} else {
this.flag = true;
}
this.reset();