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

Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

Browse Source
This commit was merged in pull request #114.
This commit is contained in:
gaogaoyujie
2024-04-30 13:45:14 +08:00
committed by Gitea
parent 278a041a8a 4b32e754c0
commit 9b3145944d
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/components/addCase.vue
+2 -2
View File
@@ -405,7 +405,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="buttonFlag"> <el-col :span="12" v-if="buttonFlag">
<el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;' <el-button v-if="index >=1?true:false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
@click='deleteApplicant(item)'>删除</el-button> @click='deleteApplicant(item)'>删除</el-button>
</el-col> </el-col>
</div> </div>
@@ -694,7 +694,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="buttonFlag"> <el-col :span="12" v-if="buttonFlag">
<el-button type="primary" icon="el-icon-delete" style='margin-bottom: 40px;' <el-button v-if="index >=1?true:false" type="primary" icon="el-icon-delete" style='margin-bottom: 40px;'
@click='deleteRes(item)'>删除</el-button> @click='deleteRes(item)'>删除</el-button>
</el-col> </el-col>
</div> </div>
src/views/caseManagement/components/payDialog.vue
+6 -2
View File
@@ -23,11 +23,11 @@
{{ formPayDetail.caseStatusName }} {{ formPayDetail.caseStatusName }}
</el-tag> </el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="驳回原因" v-if="formPayDetail.reason"> <!-- <el-descriptions-item label="驳回原因" v-if="formPayDetail.reason">
<el-tag size="mini" type='danger' effect="dark"> <el-tag size="mini" type='danger' effect="dark">
{{ formPayDetail.reason }} {{ formPayDetail.reason }}
</el-tag> </el-tag>
</el-descriptions-item> </el-descriptions-item> -->
</el-descriptions> </el-descriptions>
<div class="paySelectType"> <div class="paySelectType">
<el-radio-group v-model="paySelect" @input="changPayType"> <el-radio-group v-model="paySelect" @input="changPayType">
@@ -56,6 +56,10 @@
<div id="qrcodeImg"></div> <div id="qrcodeImg"></div>
</div> </div>
<div class="payTitle">{{ payMain }}</div> <div class="payTitle">{{ payMain }}</div>
<div v-if="formPayDetail.reason">
<span>驳回原因:</span>
<div style="width:95%;">{{ formPayDetail.reason }}</div>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="payCancel" round><span>取 消</span></el-button> <el-button @click="payCancel" round><span>取 消</span></el-button>
<el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button> <el-button @click="submitUpload" type="primary" :disabled="payFlagSubmit" round><span>确认缴费</span></el-button>