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 #61.
This commit is contained in:
hhlxayunmei
2023-10-08 11:29:29 +08:00
committed by Gitea
parent 755ebf9684 08aef12740
commit d7dd69fa78
4 changed files with 61 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/awardManagement/listofAwards.vue
+14 -1
View File
@@ -44,7 +44,7 @@
v-hasPermi="['monitor:online:forceLogout']">确认裁决书</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 13" @click="showModel(scope.row, 3)"
v-hasPermi="['monitor:online:forceLogout']">签名</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showModel(scope.row, 4)"
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 14" @click="showaffixModel(scope.row, 4)"
v-hasPermi="['monitor:online:forceLogout']">用印申请</el-button>
<!-- v-if="scope.row.caseStatus == 15" 送达裁决书 -->
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseStatus == 15" @click="showMailaward(scope.row)"
@@ -180,6 +180,19 @@ export default {
cancelpaymentdetails() {
this.openDialog = false;
},
// 用印申请
showaffixModel(row) {
this.$modal.confirm('是否进行用印申请？')
.then(function () {
// return changeJobStatus(row.jobId, row.status);
})
.then(() => {
// this.$modal.msgSuccess(text + "成功");
})
.catch(function () {
// row.status = row.status === "0" ? "1" : "0";
});
},
// 送达裁决书弹框
showMailaward(row) {
this.mailawardata = row;
src/views/caseManagement/components/caseentryDialog.vue
+34 -5
View File
@@ -17,7 +17,10 @@
label-width="150px"
:disabled="flag == '0'"
>
<p>案件信息：</p>
<div style="display:inline-flex">
<div class="infoIcon"></div>
<div class="caseInfo">案件信息：</div>
</div>
<el-divider></el-divider>
<el-row>
<el-col :span="12">
@@ -197,7 +200,11 @@
>
<div v-for="(item, index) in form2.paymentArr" :key="index">
<div style="display: flex; justify-content: space-between">
<p>申请人主体信息：</p>
<div style="display:inline-flex">
<div class="infoIcon"></div>
<div class="caseInfo">申请人主体信息：</div>
</div>
<!-- <p>申请人主体信息：</p> -->
<el-button
type="danger"
icon="el-icon-delete"
@@ -309,7 +316,11 @@
</el-form-item>
</el-col>
</el-row>
<p>代理人信息：</p>
<div style="display:inline-flex">
<div class="infoIcon"></div>
<div class="caseInfo">代理人信息：</div>
</div>
<!-- <p>代理人信息：</p> -->
<el-row>
<el-col :span="12">
<el-form-item
@@ -413,7 +424,11 @@
:key="index + form2.paymentArr.length"
>
<div style="display: flex; justify-content: space-between">
<p>被申请人主体信息：</p>
<div style="display:inline-flex">
<div class="infoIcon"></div>
<div class="caseInfo">被申请人主体信息：</div>
</div>
<!-- <p>被申请人主体信息：</p> -->
<el-button
type="danger"
icon="el-icon-delete"
@@ -525,7 +540,11 @@
</el-form-item>
</el-col>
</el-row>
<p>代理人信息：</p>
<div style="display:inline-flex">
<div class="infoIcon"></div>
<div class="caseInfo">代理人信息：</div>
</div>
<!-- <p>代理人信息：</p> -->
<el-row>
<el-col :span="12">
<el-form-item
@@ -1041,6 +1060,16 @@ export default {
background: #ffffff;
border-radius: 20px;
}
.caseInfo {
font-size: 17px;
font-weight: 600;
}
.infoIcon {
width: 4px;
// height: 17px;
background-color: #0072ff;
margin-right: 5px;
}
.el-date-editor {
width: 100%;
}
src/views/paymentManagement/components/paymentdetailsDialog.vue
+11 -19
View File
@@ -3,40 +3,35 @@
<el-dialog
:title="title"
:visible="openDialog"
width="800px"
@close="cancel"
:destroy-on-close="true"
center
>
<el-form ref="form" :model="form" label-width="150px" :disabled="true">
<el-form ref="form" :model="form" label-width="90px" :disabled="true">
<el-form-item label="案件编号：" prop="caseNum">
<el-input v-model="form.caseNum" placeholder="" />
</el-form-item>
<el-form-item label="案件标的：" prop="caseSubjectAmount">
<el-input-number
v-model="form.caseSubjectAmount"
controls-position="right"
:min="0"
/>
<el-input v-model="form.caseSubjectAmount" />
</el-form-item>
<el-form-item label="缴费人：" prop="caseNum">
<el-input v-model="form.caseNum" placeholder="" />
</el-form-item>
<el-form-item label="缴费金额：" prop="feePayable">
<el-input-number
v-model="form.feePayable"
controls-position="right"
:min="0"
/>
<el-input v-model="form.feePayable" />
</el-form-item>
<!-- <el-form-item label="缴费截图：" prop="respondent">
<el-input v-model="form.Respondent" placeholder="" />
</el-form-item> -->
<el-form-item label="案件状态：" prop="caseStatusName">
<el-input v-model="form.caseStatusName" placeholder="" />
<!-- <el-input v-model="form.caseStatusName" placeholder="" /> -->
<el-tag>{{ form.caseStatusName }}</el-tag>
</el-form-item>
<el-form-item label="支付状态：" prop="paymentStatusName">
<el-input v-model="form.paymentStatusName" placeholder="" />
<!-- <el-input v-model="form.paymentStatusName" placeholder="" /> -->
<el-tag effect="dark" type="success">
{{ form.paymentStatusName }}
</el-tag>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -67,10 +62,7 @@ export default {
detailform: {
handler(val) {
if (val) {
setTimeout(() => {
this.form = this.detailform;
console.log(this.form, "this.form");
}, 1000);
this.form = val;
}
},
},
@@ -98,7 +90,7 @@ export default {
<style lang="scss" scoped>
::v-deep .el-dialog {
width: 800px;
width: 50%;
background: #ffffff;
border-radius: 20px;
}
src/views/paymentManagement/paymentList.vue
+2
View File
@@ -222,6 +222,7 @@ export default {
this.openDialog = true;
this.title = "缴费确认";
this.flag = 0;
this.detailform = {}
},
// 查看缴费单
viewpaymentformRow(row) {
@@ -230,6 +231,7 @@ export default {
this.openDialog = true;
this.title = "缴费单详情";
this.flag = 1;
this.detailform = {}
},
// 关闭弹窗
cancelpaymentdetails() {