Merge branch 'main' into 'stg'

修改bug

See merge request cloud-mediate/mediate-manage-web!25
This commit is contained in:
刘翕 2025-02-17 01:22:22 +00:00
commit 9e9ff9cbf3
7 changed files with 13 additions and 12 deletions

View File

@ -19,7 +19,7 @@
<el-col :span="5">
<div class="flex-row-center align-items-center height-40 mb-24">
<span class="tabs__search-criteria-title flex-shrink-0 pr-16">案件编号</span>
<el-input v-model.trim="queryParam.caseNo"
<el-input v-model.trim="queryParam.caseNo" :disabled="queryParam.caseId != undefined ? true:false"
clearable placeholder="请输入案件编号"
@keydown.enter.native="handleSearch">
</el-input>
@ -83,7 +83,7 @@
</template>
</el-table-column>
<el-table-column prop="failureReason" label="失败原因" show-overflow-tooltip ></el-table-column>
<el-table-column prop="createByName" label="操作人" show-overflow-tooltip ></el-table-column>
<el-table-column prop="updateByName" label="操作人" show-overflow-tooltip ></el-table-column>
<el-table-column label="操作时间" show-overflow-tooltip >
<template slot-scope="scope">
<span >{{ scope.row.updateAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>

View File

@ -19,7 +19,7 @@
<el-col :span="5">
<div class="flex-row-center align-items-center height-40 mb-24">
<span class="tabs__search-criteria-title flex-shrink-0 pr-16">案件编号</span>
<el-input v-model.trim="queryParam.caseNo"
<el-input v-model.trim="queryParam.caseNo" :disabled="queryParam.caseId != undefined ? true:false"
clearable placeholder="请输入案件编号"
@keydown.enter.native="handleSearch">
</el-input>

View File

@ -9,7 +9,7 @@
<el-col :span="8">
<div class="flex-row-center align-items-center height-40 mb-24">
<span class="tabs__search-criteria-title flex-shrink-0 pr-16">案件编号</span>
<el-input v-model.trim="queryParam.caseNo"
<el-input v-model.trim="queryParam.caseNo" :disabled="queryParam.caseId != undefined ? true:false"
clearable placeholder="请输入案件编号"
@keydown.enter.native="handleSearch">
</el-input>

View File

@ -9,7 +9,7 @@
<el-col :span="8">
<div class="flex-row-center align-items-center height-40 mb-24">
<span class="tabs__search-criteria-title flex-shrink-0 pr-16">案件编号</span>
<el-input v-model.trim="queryParam.caseNo"
<el-input v-model.trim="queryParam.caseNo" :disabled="queryParam.caseId != undefined ? true:false"
clearable placeholder="请输入案件编号"
@keydown.enter.native="handleSearch">
</el-input>

View File

@ -9,7 +9,7 @@
<el-col :span="8">
<div class="flex-row-center align-items-center height-40 mb-24">
<span class="tabs__search-criteria-title flex-shrink-0 pr-16">案件编号</span>
<el-input v-model.trim="queryParam.caseNo"
<el-input v-model.trim="queryParam.caseNo" :disabled="queryParam.caseId != undefined ? true:false"
clearable placeholder="请输入案件编号"
@keydown.enter.native="handleSearch">
</el-input>
@ -59,7 +59,7 @@
<el-table-column prop="updateByName" label="发起人" show-overflow-tooltip ></el-table-column>
<el-table-column label="操作时间" show-overflow-tooltip >
<template slot-scope="scope">
<span >{{ scope.row.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
<span >{{ scope.row.updateAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
</template>
</el-table-column>
</el-table>

View File

@ -50,7 +50,7 @@
handleBy 操作人
handleTime 操作时间 -->
<a class="color-86909C f12 pt-6 pb-6">{{item.handleBy}}&nbsp;&nbsp;{{ $util.formatDate(item.handleTime, 'YYYY-MM-DD HH:mm:ss')}}</a>
<div class="flex-row justify-content-between align-items-center color-86909C" v-if="item.signList.length > 0 || item.unsignList.length > 0">
<div class="flex-row align-items-center color-86909C" v-if="item.signList.length > 0 || item.unsignList.length > 0">
<div>签字</div>
<div class="flex-row" v-for="(item1, index1) in item.unsignList" :key="index1">
<el-tag v-if="item1.signStatus.code == 2" class="ml-4" size="small" type="success" effect="plain">{{item1.signName}}</el-tag>
@ -78,7 +78,7 @@
<!-- signStatus 0 未发起 1签字中 2签字完成 3签字失败 -->
<a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 0" @click="handleFileGenerate(item)"><i class="el-icon-document"></i>生成文书</a>
<a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 1 || item.documentStaus.code == 3" @click="handleFileAgain(item)"><i class="el-icon-document"></i>重新生成文书</a>
<a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 2 || item.documentStaus.code == 3" @click="handleDelete(item)"><i class="el-icon-delete"></i>删除</a>
<a class="mr-16 cursor-pointer" v-if="(item.documentStaus.code == 2 || item.documentStaus.code == 3) && (item.signStatus == null ? true : (item.signStatus.code != 1))" @click="handleDelete(item)"><i class="el-icon-delete"></i>删除</a>
<a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 2" @click="handlePreview(item)"><i class="el-icon-view"></i>预览</a>
<a class="mr-16 cursor-pointer" v-if="item.documentStaus.code == 0 || item.documentStaus.code == 1" @click="handleTemplateDownload(item)"><i class="el-icon-download"></i>下载模板</a>
<a class="mr-16 cursor-pointer" v-else @click="handleDownload(item)"><i class="el-icon-download"></i>下载文件</a>

View File

@ -22,7 +22,7 @@
<el-col :span="24">
<div class="flex-row-center align-items-center height-40">
<span class="tabs__search-criteria-title flex-shrink-0 pr-16" style="width:100px">签字有效时间</span>
<el-select v-model="ObjectInfo.deadline" size="small"
<el-select v-model="ObjectInfo.deadNum" size="small"
placeholder="请选择签字有效期限" class="width100">
<el-option label="1天" value="1"></el-option>
<el-option label="2天" value="2"></el-option>
@ -69,7 +69,8 @@ import api from "@/services/caseManagement";
ObjectInfo:{
fileTypes:[],
caseId:'',
deadline:'1'
deadline:'1',
deadNum:'1',
},
tableData:[]
@ -111,7 +112,7 @@ import api from "@/services/caseManagement";
let currentDate = new Date();
//
const nextDate = currentDate
currentDate.setDate(currentDate.getDate() + (this.ObjectInfo.deadline*1))
currentDate.setDate(currentDate.getDate() + (this.ObjectInfo.deadNum*1))
const year = nextDate.getFullYear();
const month = (nextDate.getMonth() + 1).toString().padStart(2, '0');
const day = nextDate.getDate().toString().padStart(2, '0');