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

Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

Browse Source
This commit was merged in pull request #96.
This commit is contained in:
hhlxayunmei
2023-11-13 15:12:29 +08:00
committed by Gitea
parent 83162a2268 93d68459e0
commit e55674aad9
3 changed files with 42 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/awardManagement/components/MailawardDialog.vue
+6 -15
View File
@@ -30,6 +30,7 @@
<el-input
v-model="formData.appEmail"
placeholder="请输入电子邮件"
disabled
/>
</el-form-item>
</el-col>
@@ -54,6 +55,7 @@
<el-input
v-model="formData.resEmail"
placeholder="请输入电子邮件"
disabled
/>
</el-form-item>
</el-col>
@@ -61,13 +63,6 @@
<el-form-item
label="申请人快递单号："
prop="apptrackingNum"
:rules="[
{
required: true,
message: '快递单号不能为空',
trigger: 'blur',
},
]"
>
<el-input
v-model="formData.apptrackingNum"
@@ -79,13 +74,6 @@
<el-form-item
label="被申请人快递单号："
prop="restrackingNum"
:rules="[
{
required: true,
message: '快递单号不能为空',
trigger: 'blur',
},
]"
>
<el-input
v-model="formData.restrackingNum"
@@ -115,7 +103,10 @@ export default {
openMailawardDialog: {
handler(val) {
if (val) {
this.formData = {};
this.formData = {
appEmail: "3118891075@qq.com",//申请人邮箱
resEmail: "1129801211@qq.com",//被申请人邮箱
};
}
},
},
src/views/caseManagement/components/formateCourtDialog.vue
+25 -70
View File
@@ -2,7 +2,7 @@
<div>
<!-- 组庭界面 -->
<el-dialog
title="组庭审核"
title="组庭建议"
:visible="showformateCourt"
v-if="showformateCourt"
@close="cancel"
@@ -24,73 +24,32 @@
<!-- <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 v-if="isAgreePendTral == 0">
请选择仲裁员
</div>
<div v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName">
当前案件仲裁员
</div>
</div>
<div v-if="isAgreePendTral == 1" class="nowarbitrator">
<div v-if="isAgreePendTral == 1 && formateCourtData.arbitratorName" class="nowarbitrator">
<el-tag size="medium">
{{ formateCourtData.arbitratorName }}
</el-tag>
</div>
<div v-if="noArbitrator || isAgreePendTral == 0">
<el-table
:data="dataList"
ref="selectTable"
style="width: 100%"
@selection-change="handleSelectionChange"
>
<!-- v-if="isAgreePendTral == 0 || noArbitrator" -->
<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-column
label="当前案件数量"
align="center"
prop="currentCaseNum"
:show-overflow-tooltip="true"
/>
<el-table-column
label="已结案数量"
align="center"
prop="closedCaseNum"
: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"
/>
<el-form>
<el-form-item label="仲裁员：">
<el-select placeholder="请选择仲裁员" @change="changeArbitor" v-model="Arbitor">
<el-option v-for="item in dataList" :key="item.value" :label="item.nickName" :value="item.userId"></el-option>
</el-select>
</el-form-item>
</el-form>
</div>
<!-- </el-form> -->
<div slot="footer" class="dialog-footer">
<el-button
type="primary"
@click="submitForm"
:disabled="!this.arbitrators.length > 0 && isAgreePendTral == 0"
:disabled="noArbitrator && isAgreePendTral == 0"
class="endbutton"
><span>确 定</span></el-button
>
@@ -109,7 +68,6 @@ export default {
data() {
return {
dataList: [],
total: 0,
queryParams1: {
pageNum: 1,
pageSize: 10,
@@ -118,6 +76,7 @@ export default {
isAgreePendTral: 1,
paramsdata: {},
noArbitrator: false,
Arbitor: ""
};
},
created() {
@@ -144,22 +103,18 @@ export default {
getarbitrAtor() {
arbitrAtor({}).then((res) => {
this.dataList = res.rows;
this.total = res.total;
});
},
// 勾选仲裁员
handleSelectionChange(val) {
if (val.length > 1) {
this.$refs.selectTable.clearSelection();
this.$refs.selectTable.toggleRowSelection(val.pop());
}
changeArbitor(val) {
this.arbitrators = [];
val.forEach((item) => {
this.arbitrators.push({
id: item.userId,
arbitratorName: item.nickName,
});
});
this.dataList.forEach((item) => {
if (item.userId == val) {
this.arbitrators.push({
id: item.userId,
arbitratorName: item.nickName,
});
}
})
},
// 确认
submitForm() {
src/views/caseManagement/components/trialincourtDialog.vue
+11 -6
View File
@@ -119,9 +119,9 @@
<el-button @click="cancel" class="endbutton1"><span>关 闭</span></el-button>
</div>
</el-dialog>
<el-dialog title="生成庭审笔录" :visible="showArbitrationresults" @close="closeArbitrationresults" center>
<el-dialog title="庭审笔录" :visible="showArbitrationresults" @close="closeArbitrationresults" center>
<el-form ref="form2" :model="form2" label-width="150px">
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="申请人是否缺席：" prop="isAbsence" :rules="[
{
required: true,
@@ -133,8 +133,8 @@
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
</el-col> -->
<el-col :span="24">
<el-form-item label="被申请人是否缺席：" prop="appliIsAbsen" :rules="[
{
required: true,
@@ -147,7 +147,12 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="笔录内容：" prop="responCrossOpin">
<el-input type="textarea" :autosize="{ minRows: 6 }" v-model="form2.responCrossOpin" placeholder="请输入" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="被申请人质证意见：" prop="responCrossOpin" :rules="[
{
required: true,
@@ -239,7 +244,7 @@
<el-input type="textarea" autosize placeholder="请输入" v-model="form2.rulingFollows">
</el-input>
</el-form-item>
</el-col>
</el-col> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="submitForm" class="endbutton">