tanghuan/mediate-manage-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into 'stg'

Browse Source 
Main

See merge request cloud-mediate/mediate-manage-web!121
This commit is contained in:
刘翕 2025-03-04 03:55:54 +00:00
commit 5352de4322
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/uploadFile.vue
View File

@ -256,6 +256,7 @@
} }
// 上传大小 100M // 上传大小 100M
const uploadfileSize = param.file.size const uploadfileSize = param.file.size
console.log('上传文件的大小：', uploadfileSize)
if (uploadfileSize.toFixed(2) > (this.fileSize * 1024 * 1024)) { if (uploadfileSize.toFixed(2) > (this.fileSize * 1024 * 1024)) {
this.$message({message: `请上传大小需在${this.fileSize}MB以内的文件`, type: 'warning'}); this.$message({message: `请上传大小需在${this.fileSize}MB以内的文件`, type: 'warning'});
return return

1
src/pages/mediation-page/components/LayoutContentNew.vue
View File

@ -231,6 +231,7 @@
<el-option label="微信沟通" value="3"></el-option> <el-option label="微信沟通" value="3"></el-option>
</el-select> </el-select>
<span> <span>
<span class="mr-16 cursor-pointer" @click="getmediate_record()"><i class="el-icon-refresh mr-4"></i>刷新</span>
<el-button plain icon="el-icon-plus" @click="visiblemediatRecord = true;visiblemediatRecordObj = null">新增沟通记录</el-button> <el-button plain icon="el-icon-plus" @click="visiblemediatRecord = true;visiblemediatRecordObj = null">新增沟通记录</el-button>
<el-popover <el-popover

5
src/pages/mediation-page/components/caseFileDialog.vue
View File

@ -24,14 +24,14 @@
uploadName="" uploadName=""
accept=".jpg,.png,.jpeg,.pdf" accept=".jpg,.png,.jpeg,.pdf"
:span="6" :span="6"
:fileSize="50" :file-size="50"
@handleUploadFile="handleUploadFile"> @handleUploadFile="handleUploadFile">
</upload-file> </upload-file>
</el-form-item> </el-form-item>
<el-form-item label="上传要求:"> <el-form-item label="上传要求:">
<div style="line-height: 20px;padding-top: 10px"> <div style="line-height: 20px;padding-top: 10px">
<div>请知悉！</div> <div>请知悉！</div>
<div>请上传图片或pdf材料，单个文件需要在0KB以上，50MB以内;文件名称中请勿包含换行符、空格、tab&V:?"#*|&"<>%+'等特色字符。</div> <div>请上传图片或pdf材料，单个文件需要在0KB以上，50MB以内;文件名称中请勿包含换行符、空格、tab&V:?"#*|&"<>%+'等特殊字符。</div>
<div>文件名称不超过45个字</div> <div>文件名称不超过45个字</div>
</div> </div>
</el-form-item> </el-form-item>
@ -110,6 +110,7 @@ export default {
}) })
this.repaymentObj.name = this.fileList.length?this.fileList[0].objectName : ''; this.repaymentObj.name = this.fileList.length?this.fileList[0].objectName : '';
this.repaymentObj.url = this.fileList.length?this.fileList[0].url : ''; this.repaymentObj.url = this.fileList.length?this.fileList[0].url : '';
this.$refs.ruleFormRepayment.clearValidate('url');
}, },
handleClose() { handleClose() {
this.$emit('update:eventDialog', null) this.$emit('update:eventDialog', null)

8
src/pages/mediation-page/components/portraitPerson.vue
View File

@ -688,12 +688,12 @@ export default {
// position_info position_family position_carry position_finance position_risk position_lawsuit // position_info position_family position_carry position_finance position_risk position_lawsuit
.position_info{position:absolute; top: 110px;top: 15%;left: 8px;} .position_info{position:absolute; top: 110px;top: 15%;left: 8px;}
.position_family{position:absolute; top: 300px;top: 38%;left: 8px;} .position_family{position:absolute; top: 300px;top: 40%;left: 8px;}
.position_carry{position:absolute; top: 400px;top: 52%;left: 8px;} .position_carry{position:absolute; top: 400px;top: 54%;left: 8px;}
.position_finance{position:absolute; top: 160px;top: 25%;left: 160px;} .position_finance{position:absolute; top: 160px;top: 25%;left: 160px;}
.position_risk{position:absolute; top: 350px;top: 52%;left: 160px;} .position_risk{position:absolute; top: 350px;top: 54%;left: 160px;}
.position_lawsuit{position:absolute; top: 460px;top: 65%;left: 160px;} .position_lawsuit{position:absolute; top: 460px;top: 67%;left: 160px;}
.theme-blue{ .theme-blue{
.character-info-title{ .character-info-title{

2
src/pages/system-management/area-management/components/addOrEditAreaDialog.vue
View File

@ -138,7 +138,7 @@ import systemManageApi from "@/services/systemManage";
if(Object.keys(this.addOrEditAreaConfig.data).length>0) if(Object.keys(this.addOrEditAreaConfig.data).length>0)
{ {
_this.deptInfo.id = this.addOrEditAreaConfig.data.id _this.deptInfo.id = this.addOrEditAreaConfig.data.id
if(this.deptInfo.directorIds.length == 0){_this.deptInfo.directorId =''} if(this.deptInfo.directorIds.length == 0){_this.deptInfo.directorId ='[]'}
else{_this.deptInfo.directorId ='['+ this.deptInfo.directorIds.toString()+']'} else{_this.deptInfo.directorId ='['+ this.deptInfo.directorIds.toString()+']'}
systemManageApi.updateDeptById(_this.deptInfo).then(res => { systemManageApi.updateDeptById(_this.deptInfo).then(res => {
this.$message({ this.$message({

2
src/pages/system-management/area-management/components/addOrEditDeptDialog.vue
View File

@ -139,7 +139,7 @@ import systemManageApi from "@/services/systemManage";
if(Object.keys(this.addOrEditDeptConfig.data).length>0 && this.addOrEditDeptConfig.data.pid != 0) if(Object.keys(this.addOrEditDeptConfig.data).length>0 && this.addOrEditDeptConfig.data.pid != 0)
{ {
_this.deptInfo.id = this.addOrEditDeptConfig.data.id _this.deptInfo.id = this.addOrEditDeptConfig.data.id
if(this.deptInfo.directorIds.length == 0){_this.deptInfo.directorId =''} if(this.deptInfo.directorIds.length == 0){_this.deptInfo.directorId ='[]'}
else{_this.deptInfo.directorId ='['+ this.deptInfo.directorIds.toString()+']'} else{_this.deptInfo.directorId ='['+ this.deptInfo.directorIds.toString()+']'}
systemManageApi.updateDeptById(_this.deptInfo).then(res => { systemManageApi.updateDeptById(_this.deptInfo).then(res => {
this.$message({ this.$message({