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

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

Browse Source
This commit was merged in pull request #45.
This commit is contained in:
hhlxayunmei
2024-02-21 17:44:30 +08:00
committed by Gitea
parent 3715985d12 6d4d948fb5
commit d417e6dd65
4 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/components/paymentdetailsDialog.vue
+2 -2
View File
@@ -1,7 +1,7 @@
<template>
<div>
<el-dialog :title="title" :visible="openDialog" @close="cancel" :destroy-on-close="true" center>
<el-form ref="form" :model="form" label-width="180px" :disabled="true">
<el-form ref="form" :model="form" label-width="180px">
<el-form-item label="案件编号：" prop="caseNum">
<el-input v-model="form.caseNum" placeholder="" :disabled="true"/>
</el-form-item>
@@ -12,7 +12,7 @@
<el-input v-model="form.applicationName" placeholder="" />
</el-form-item> -->
<el-form-item label="缴费金额：" prop="feePayable">
<el-input v-model="form.feePayable" />
<el-input v-model="form.feePayable" :disabled="true"/>
</el-form-item>
<el-form-item label="申请人缴费凭证：" v-if="form.caseAttachList.length > 0">
<div style="color: #104fad;cursor:pointer" v-for="(item, index) in form.caseAttachList" :key="index"
src/views/officialSeal/components/addTemplate.vue
+22 -2
View File
@@ -19,10 +19,15 @@
</el-select>
</el-form-item>
</el-form>
<el-upload class="avatar-uploader" :on-success="handleSuccessC" ref="upload" :action="UploadUrl()"
:headers="headers" :data="filedataC" :on-remove="handleRemoveC" :on-change="handleChangeC" accept=".doc,.docx"
:file-list="fileListC" :limit="1">
<el-button size="small" type="primary">选择自然人调解申请书模板</el-button>
</el-upload>
<el-upload class="avatar-uploader" :on-success="handleSuccess" ref="upload" :action="UploadUrl()"
:headers="headers" :data="filedata" :on-remove="handleRemove" :on-change="handleChange" accept=".doc,.docx"
:file-list="fileList" :limit="1">
<el-button size="small" type="primary">选择调解申请书模板</el-button>
<el-button size="small" type="primary">选择机构调解申请书模板</el-button>
</el-upload>
<el-upload class="avatar-uploader" :on-success="handleSuccessA" ref="uploadA" :action="UploadUrl()"
:headers="headers" :data="filedataA" :on-remove="handleRemoveA" :on-change="handleChangeA"
@@ -55,6 +60,7 @@ export default {
fileList: [],
fileListA: [],
fileListB: [],
fileListC: [],
data: [],
tempList: [],
isImg: false,
@@ -70,6 +76,9 @@ export default {
filedataB: {
annexType: 3
},
filedataC: {
annexType: 4
},
flagBtn: false,
ruleForm: {},
rules: {
@@ -123,10 +132,21 @@ export default {
console.log(res, "OOOOOOOOOOOOOOOOO");
this.submitForm.annexIds.push(res.annexId)
},
handleChangeA(file, fileList) {
this.isImg = file.type === '.doc' || '.docx'
},
// 自然人
handleSuccessC(res) {
console.log(res,'自然人上传成功');
this.$message.success('上传成功');
this.submitForm.annexIds[4] = res.annexId;
},
handleRemoveC(file, fileList) {
console.log(file, fileList);
},
handleChangeC(file, fileList) {
this.isImg = file.type === '.doc' || '.docx'
},
UploadUrl() {
return window.location.origin + "/API/deptIdentify/upload";
},
src/views/officialSeal/components/editTemplate.vue
+34 -5
View File
@@ -1,7 +1,7 @@
<template>
<div>
<el-dialog title="修改模板" :visible="editVisable" v-if="editVisable" @close="cancel" width="600px" center>
<el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="90px"
<el-form :model="ruleForm" label-position="left" :rules="rules" ref="ruleForm" label-width="170px"
class="demo-ruleForm">
<el-form-item label="模板名称" prop="temName">
<el-input v-model="ruleForm.temName"></el-input>
@@ -12,7 +12,12 @@
:value="dict.value"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="调节申请书模板" v-if="ruleForm.applicationFile.fileName">
<el-form-item label="自然人调解申请书模板" v-if="ruleForm.personApplicationFile && ruleForm.personApplicationFile.fileName">
<span style="color: #0e5ce3;cursor:pointer" @click="openUrl(ruleForm.personApplicationFile.temOrigPath)">{{
ruleForm.personApplicationFile.fileName ? ruleForm.personApplicationFile.fileName : ""
}}</span>
</el-form-item>
<el-form-item label="机构调解申请书模板" v-if="ruleForm.applicationFile.fileName">
<span style="color: #0e5ce3;cursor:pointer" @click="openUrl(ruleForm.applicationFile.temOrigPath)">{{
ruleForm.applicationFile.fileName ? ruleForm.applicationFile.fileName : ""
}}</span>
@@ -30,10 +35,15 @@
}}</span>
</el-form-item>
</el-form>
<el-upload class="avatar-uploader" :on-success="handleSuccessC" ref="upload" :action="UploadUrl()"
:headers="headers" :data="filedataC" :on-remove="handleRemoveC" :on-change="handleChangeC" accept=".doc,.docx"
:file-list="fileListC" :limit="1">
<el-button size="small" type="primary">选择自然人调解申请书模板</el-button>
</el-upload>
<el-upload class="avatar-uploader" :on-success="handleSuccess" ref="upload" :action="UploadUrl()"
:headers="headers" :data="filedata" :on-remove="handleRemove" :on-change="handleChange" accept=".doc,.docx"
:file-list="fileList" :limit="1">
<el-button size="small" type="primary">选择调解申请书模板</el-button>
<el-button size="small" type="primary">选择机构调解申请书模板</el-button>
</el-upload>
<el-upload class="avatar-uploader" :on-success="handleSuccessA" ref="uploadA" :action="UploadUrl()"
:headers="headers" :data="filedataA" :on-remove="handleRemoveA" :on-change="handleChangeA"
@@ -63,6 +73,7 @@ export default {
fileList: [],
fileListA: [],
fileListB: [],
fileListC: [],
data: [],
headers: {
Authorization: "Bearer " + getToken(),
@@ -77,6 +88,9 @@ export default {
filedataB: {
annexType: 3
},
filedataC: {
annexType: 4
},
flagBtn: false,
ruleForm: {
agreementFile:{},
@@ -136,7 +150,7 @@ export default {
this.submitForm.identifyId = this.ruleForm.identifyId;
this.submitForm.temName = this.ruleForm.temName;
this.submitForm.id = this.ruleForm.id;
console.log(this.submitForm.annexIds,'ooooooooooooooooooooooooooooo');
console.log(this.submitForm,'ooooooooooooooooooooooooooooo');
updateTemplate(this.submitForm).then(res => {
this.$message.success('修改成功');
this.$emit("cancelEdit");
@@ -156,12 +170,25 @@ export default {
handleRemove(file, fileList) {
console.log(file, fileList);
},
// 机构
handleSuccess(res) {
console.log(res,'机构上传成功');
this.$message.success('上传成功');
// this.submitForm.annexIds.push(res.annexId);
this.submitForm.annexIds[1] = res.annexId;
},
// 自然人
handleSuccessC(res) {
console.log(res,'自然人上传成功');
this.$message.success('上传成功');
this.submitForm.annexIds[4] = res.annexId;
},
handleRemoveC(file, fileList) {
console.log(file, fileList);
},
handleChangeC(file, fileList) {
this.isImg = file.type === '.doc' || '.docx'
},
handleChangeA(file, fileList) {
this.isImg = file.type === '.doc' || '.docx'
},
@@ -171,6 +198,7 @@ export default {
handleRemoveA(file, fileList) {
console.log(file, fileList);
},
// 和解协议
handleSuccessA(res) {
this.$message.success('上传成功');
// this.submitForm.annexIds.push(res.annexId);
@@ -186,6 +214,7 @@ export default {
handleRemoveB(file, fileList) {
console.log(file, fileList);
},
// 调解书
handleSuccessB(res) {
this.$message.success('上传成功');
// this.submitForm.annexIds.push(res.annexId);
vue.config.js
+2 -4
View File
@@ -12,13 +12,11 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口
// const API = 'http://121.40.189.20:9001' //生产
// const API = 'http://121.40.189.20:6001' //测试
const API = 'http://121.40.189.20:6001' //测试
// const API = 'http://192.168.3.18:6001' //B
// const API = 'http://172.16.0.237:6001' //Q
// const API = 'http://172.16.1.43:6001' //w
// const API = 'http://172.16.1.30:6001' //Q
// const API = 'http://172.16.1.43:6001' //w
// const API = 'http://172.16.1.17:6001' //w
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
// 这里只列一部分，具体配置参考文档