Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!111
This commit is contained in:
刘翕 2025-02-28 07:43:19 +00:00
commit 274c70b726
4 changed files with 16 additions and 15 deletions

View File

@ -88,12 +88,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="220"> <el-table-column label="操作" width="160">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flex-row align-items-center"> <div class="flex-row align-items-center">
<el-button size="mini" @click="handleDetail(scope)">明细</el-button> <el-button size="mini" @click="handleDetail(scope)">明细</el-button>
<el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleAgain(scope.row)">重试</el-button> <el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleAgain(scope.row)">重试</el-button>
<el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleCancel(scope.row)">取消</el-button> <!-- <el-button size="mini" v-if="scope.row.status.code !== 4 && scope.row.status.code !== 2" @click="handleCancel(scope.row)">取消</el-button> -->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -113,7 +113,7 @@
</div> </div>
</div> </div>
<!-- 追踪明细 --> <!-- 追踪明细 -->
<officeDeliveryDialogDetail v-else :DialogDetail.sync="officeDeliveryDialogDetail" /> <officeDeliveryDialogDetail v-else :DialogDetail.sync="DialogDetail" />
</div> </div>
</template> </template>

View File

@ -56,9 +56,9 @@
<el-table-column prop="receiver" label="文书接收人" show-overflow-tooltip ></el-table-column> <el-table-column prop="receiver" label="文书接收人" show-overflow-tooltip ></el-table-column>
<el-table-column label="文书类型" show-overflow-tooltip> <el-table-column label="文书类型" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="(item,index) in JSON.parse(scope.row.documentType)" :key="index"> <span>
{{ index > 0 ? ',':''}}{{ item }} {{ scope.row.documentType.desc}}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
@ -120,7 +120,8 @@ import api from "@/services/eventTracingApi";
pkgName:'', pkgName:'',
size:10, size:10,
current:1, current:1,
traceId:'' traceId:'',
caseId:''
}, },
tableData:[], tableData:[],
total:0, total:0,
@ -132,7 +133,9 @@ import api from "@/services/eventTracingApi";
}, },
methods: { methods: {
initializeQuery(){ initializeQuery(){
this.queryParam.caseNo = this.DialogDetail.caseNo if (this.DialogDetail.caseNo != undefined && this.DialogDetail.caseNo != '') {
this.queryParam.caseNo = this.DialogDetail.caseNo
}
if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') { if (this.DialogDetail.caseId != undefined && this.DialogDetail.caseId != '') {
this.queryParam.caseId = this.DialogDetail.caseId this.queryParam.caseId = this.DialogDetail.caseId
} }
@ -170,10 +173,8 @@ import api from "@/services/eventTracingApi";
this.queryParam.startTime = this.queryParam.beginTime this.queryParam.startTime = this.queryParam.beginTime
this.queryParam.current = val this.queryParam.current = val
api.posttrace_served_detail(this.queryParam).then(res => { api.posttrace_served_detail(this.queryParam).then(res => {
if (!res.code) { this.tableData = res.records;
this.tableData = res.records; this.total = res.total;
this.total = res.total;
}
}) })
}, },
} }

View File

@ -64,7 +64,7 @@
<span v-else>{{ scope.row.status.desc }}</span> <span v-else>{{ scope.row.status.desc }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="失败原因" show-overflow-tooltip > <el-table-column label="执行结果" show-overflow-tooltip >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.resultMsg }}</span> <span>{{ scope.row.resultMsg }}</span>
</template> </template>

View File

@ -14,7 +14,7 @@
<el-col :span="24"> <el-col :span="24">
<div class="mb-24 officelist"> <div class="mb-24 officelist">
<el-checkbox-group v-model="ObjectInfo.documentTypes"> <el-checkbox-group v-model="ObjectInfo.documentTypes">
<el-checkbox border v-for="(item,index) in officeOptions" :label="item.type" :key="index" :disabled="item.documentStaus.code != 2 ? true : false">{{ item.documentType.desc }}</el-checkbox> <el-checkbox border v-for="(item,index) in officeOptions" :label="item.type" :key="index" :disabled="(item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 3) ? false : true">{{ item.documentType.desc }}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</el-col> </el-col>
@ -74,7 +74,7 @@ import api from "@/services/caseManagement";
} }
this.ObjectInfo.caseId = this.caseId this.ObjectInfo.caseId = this.caseId
api.traceServedCreate(this.ObjectInfo).then((res) => { api.traceServedCreate(this.ObjectInfo).then((res) => {
this.$message.success("发起签字成功"); this.$message.success("发起文书电子送达成功");
this.handleClose() this.handleClose()
this.$parent.getWritCaseList() this.$parent.getWritCaseList()
}); });