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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Arbitrate-Frontend into dev

Browse Source
This commit is contained in:
gyj
2023-11-30 18:40:39 +08:00
parent 8113577de5 48a40dcebe
commit 8a0686ea51
11 changed files with 114 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/caseManagement/caseManagement.js
+8 -1
View File
@@ -129,5 +129,12 @@ export function selectCompareCase(data) {
data: data,
})
}
// 根据案件id和类型查询附件
export function attachListByCaseId(data) {
return request({
url: "/video/attachListByCaseId",
method: "get",
params: data,
})
}
src/api/meeting/index.js
+8
View File
@@ -23,4 +23,12 @@ export function reserveConferenceList(data) {
params: data
})
}
// 发送房间号短信
export function sendRoomNoMessage(data) {
return request({
url: '/caseApplication/sendRoomNoMessage',
method: 'post',
data: data
})
}
src/api/officialSeal/officialSeal.js
+1 -1
View File
@@ -78,7 +78,7 @@ export function updateTemplate(data) {
return request({
url: '/deptIdentify/updateTemplate',
method: 'post',
data: data
params: data
})
}
// 删除模板
src/views/caseManagement/components/caseCompressionPackage.vue
+2 -2
View File
@@ -44,7 +44,7 @@
:limit="1"
accept=".zip"
:headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport"
:action="upload.url"
:disabled="upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"
@@ -93,7 +93,7 @@ export default {
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
src/views/caseManagement/components/timeDialog.vue
+12 -1
View File
@@ -27,7 +27,7 @@
<script>
import { updateHeardate } from '@/api/caseManagement/caseManagement'
import { getToken } from "@/utils/auth";
import { createRoomId, reservedConference } from '@/api/meeting/index'
import { createRoomId, reservedConference, sendRoomNoMessage } from '@/api/meeting/index'
import moment from "moment";
export default {
props: ["timeVisable", "timeData", "queryParams"],
@@ -77,6 +77,12 @@ export default {
this.$emit("getcaseApply", this.queryParams);
})
},
// 发送房间号短信
async sendRoomNoMessageFn(data) {
sendRoomNoMessage(data).then(res => {
console.log(res, "PPPPPPPPPPPPPPPPPPPPPPPPP");
})
},
async submitTime() {
this.loanStartDate = moment(
this.loanStartDate
@@ -91,6 +97,11 @@ export default {
id: this.timeData.id,
hearDate: this.loanStartDate
})
await sendRoomNoMessageFn({
id: this.timeData.id,
roomNo: this.roomId,
scheduleStartTime: this.loanStartDate
})
}
},
};
src/views/caseManagement/components/trialincourtDialog.vue
+52 -147
View File
@@ -129,21 +129,8 @@
<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-form-item label="申请人是否缺席：" prop="isAbsence" :rules="[
{
required: true,
message: '请输入',
},
]">
<el-radio-group v-model="form2.isAbsence">
<el-radio :label="1">是</el-radio>
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col> -->
<el-col :span="24">
<el-form-item label="被申请人是否缺席：" prop="appliIsAbsen" :rules="[
{
@@ -162,106 +149,13 @@
<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,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" v-model="form2.responCrossOpin" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请人质证意见：" prop="applicaCrossOpin" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" v-model="form2.applicaCrossOpin" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="被申请人的答辩意见：" prop="responDefenOpini" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" v-model="form2.responDefenOpini" placeholder="请输入" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="经庭审质证，对各方提供的证据认定如下：" prop="evidenDetermi" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入" v-model="form2.evidenDetermi">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="仲裁庭经审理查明(写明仲裁庭认定的事实)：" prop="factDetermi" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" :autosize="{ minRows: 4 }" placeholder="请输入" v-model="form2.factDetermi">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="综上所述：" prop="caseSketch" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" autosize placeholder="请输入" v-model="form2.caseSketch">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="本庭认为：" prop="arbitrateThink" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" autosize placeholder="请输入" v-model="form2.arbitrateThink">
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="裁决如下：" prop="rulingFollows" :rules="[
{
required: true,
message: '请输入',
trigger: 'blur',
},
]">
<el-input type="textarea" autosize placeholder="请输入" v-model="form2.rulingFollows">
</el-input>
</el-form-item>
</el-col> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="submitForm" class="endbutton">
<span>确定</span></el-button>
<el-button @click="closeArbitrationresults" class="endbutton1"><span>取 消</span></el-button>
</div>
</el-dialog>
</el-dialog> -->
</div>
</template>
@@ -271,6 +165,7 @@ import {
writtenHear,
creatTrialRecord,
document,
attachListByCaseId
} from "@/api/caseManagement/caseManagement.js";
import { reserveConferenceList } from '@/api/meeting/index.js'
export default {
@@ -280,7 +175,6 @@ export default {
formData: {},
user: "",
userId:1,
showArbitrationresults: false,
form2: {},
applicateArr: [], //申请人案件资料
quiltArr: [], //被申请人案件资料
@@ -378,47 +272,58 @@ export default {
`https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.roomId}`
);
},
// 提交仲裁结果
// 生成庭申笔录
openArbitrationresults() {
this.showArbitrationresults = true;
},
closeArbitrationresults() {
this.showArbitrationresults = false;
attachListByCaseId({
caseAppliId:this.formData.id,
annexType:7
}).then(res=>{
console.log(res,"llllllll");
if(res.data.length == 0){
this.$modal.msgSuccess("请先进行会议");
}else{
this.recordArr = res.data;
this.$modal.msgSuccess("生成成功");
}
})
},
// closeArbitrationresults() {
// this.showArbitrationresults = false;
// },
// 提交庭审笔录弹框结果
submitForm() {
this.$refs["form2"].validate((valid) => {
if (valid) {
creatTrialRecord({
caseAppliId: this.formData.id,
evidenDetermi: this.form2.evidenDetermi,
factDetermi: this.form2.factDetermi,
caseSketch: this.form2.caseSketch,
arbitrateThink: this.form2.arbitrateThink,
rulingFollows: this.form2.rulingFollows,
isAbsence: this.form2.isAbsence,
appliIsAbsen: this.form2.appliIsAbsen,
responCrossOpin: this.form2.responCrossOpin,
applicaCrossOpin: this.form2.applicaCrossOpin,
responDefenOpini: this.form2.responDefenOpini,
})
.then((res) => {
res.data.caseAttachList.forEach((item) => {
if (item.annexType == 7) {
this.recordArr.push({
annexName: item.annexName,
annexPath: item.annexPath,
});
}
});
this.$modal.msgSuccess("提交成功");
this.showsubmit = false;
this.closeArbitrationresults();
})
.catch((err) => { });
}
});
},
// submitForm() {
// this.$refs["form2"].validate((valid) => {
// if (valid) {
// creatTrialRecord({
// caseAppliId: this.formData.id,
// evidenDetermi: this.form2.evidenDetermi,
// factDetermi: this.form2.factDetermi,
// caseSketch: this.form2.caseSketch,
// arbitrateThink: this.form2.arbitrateThink,
// rulingFollows: this.form2.rulingFollows,
// isAbsence: this.form2.isAbsence,
// appliIsAbsen: this.form2.appliIsAbsen,
// responCrossOpin: this.form2.responCrossOpin,
// applicaCrossOpin: this.form2.applicaCrossOpin,
// responDefenOpini: this.form2.responDefenOpini,
// })
// .then((res) => {
// res.data.caseAttachList.forEach((item) => {
// if (item.annexType == 7) {
// this.recordArr.push({
// annexName: item.annexName,
// annexPath: item.annexPath,
// });
// }
// });
// this.$modal.msgSuccess("提交成功");
// this.showsubmit = false;
// this.closeArbitrationresults();
// })
// .catch((err) => { });
// }
// });
// },
cancel() {
this.$emit("canceltrialincourt");
},
src/views/caseManagement/components/viewprocessDialog.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<el-dialog title="案件流程" :visible="processVisable" @close="cancel" center :distroy-on-close="true">
<div>
<el-steps class="steps" :active="caseStatus">
<el-step :title="item.caseNodeName || item.content" v-for="(item,index) in pageData.allCasenode" :description="(item.createNickName || '') + (item.caseNodeTime || '')"></el-step>
<el-step :title="item.caseNodeName || item.content" v-for="(item,index) in pageData.allCasenode" :key="index" :description="(item.createNickName || '') + (item.caseNodeTime || '')"></el-step>
</el-steps>
</div>
src/views/login.vue
+1 -1
View File
@@ -56,7 +56,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2023 Smart arbitration.vip All Rights Reserved.</span>
<span>Copyright © 2023 乙巢（上海）企业管理服务有限公司</span>
</div>
</div>
</template>
src/views/officialSeal/components/editTemplate.vue
+23 -8
View File
@@ -31,6 +31,7 @@
</template>
<script>
import { getToken } from "@/utils/auth";
import { updateTemplate } from "@/api/officialSeal/officialSeal"
export default {
props: ["editVisable", "editData", "queryParams"],
dicts: ["template_type"],
@@ -41,7 +42,7 @@ export default {
headers: {
Authorization: "Bearer " + getToken(),
},
isImg: false,
isImg: true,
filedata: {},
flagBtn: false,
ruleForm: {},
@@ -59,6 +60,7 @@ export default {
editData(val) {
if (val) {
this.ruleForm = val;
this.fileList = [];
this.ruleForm.temType = this.ruleForm.temType + '';
}
}
@@ -77,19 +79,32 @@ export default {
},
handleChange(file, fileList) {
this.isImg = file.type === '.doc' || '.docx';
this.fileList = fileList;
},
UploadUrl() {
return window.location.origin + "/API/deptIdentify/updateTemplate";
},
submitUpload() {
let that = this;
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
this.filedata.id = this.editData.id;
this.filedata.temName = this.ruleForm.temName;
if (this.isImg) {
this.$refs.upload.submit();
}else{
this.$message.error('只能上传doc,docx格式的文件')
if (that.fileList.length > 0) {
that.filedata.id = that.editData.id;
that.filedata.temName = that.ruleForm.temName;
if (that.isImg) {
that.$refs.upload.submit();
} else {
that.$message.error('只能上传doc,docx格式的文件')
}
} else {
updateTemplate({
id: that.editData.id,
temName: that.ruleForm.temName
}).then(res => {
that.$message.success('修改成功');
that.$emit("cancelEdit");
that.$emit('getList', that.queryParams);
})
}
}
});
@@ -101,7 +116,7 @@ export default {
// this.isImg = file.type === '.doc' || '.docx'
},
handleSuccess() {
this.$message.success('上传成功');
this.$message.success('修改成功');
this.$emit("cancelEdit");
this.$emit('getList', this.queryParams);
}
src/views/officialSeal/components/uploadSeal.vue
+5 -4
View File
@@ -7,7 +7,7 @@
<el-input v-model="ruleForm.sealName"></el-input>
</el-form-item>
</el-form>
<el-upload class="avatar-uploader" :before-upload="beforeUpload" :on-success="handleSuccess" ref="upload"
<el-upload class="avatar-uploader" accept="image/png" :before-upload="beforeUpload" :on-success="handleSuccess" ref="upload"
:action="UploadUrl()" :headers="headers" :data="filedata" :on-remove="handleRemove"
:on-change="handleChange" :show-file-list="false" :file-list="fileList" :auto-upload="false">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
@@ -47,7 +47,8 @@ export default {
watch: {
uploadVisable(val) {
if (val) {
this.imageUrl = ""
this.imageUrl = "",
this.ruleForm = {}
}
}
},
@@ -86,8 +87,8 @@ export default {
},
handleSuccess(response) {
if (response.code == 200) {
this.$message.success('上传成功')
this.$emit("cancelUpload");
this.$message.success('上传成功');
this.cancel()
} else {
this.$message.error(response.msg);
}
src/views/register.vue
+1 -1
View File
@@ -61,7 +61,7 @@
</el-form>
<!-- 底部 -->
<div class="el-register-footer">
<span>Copyright © 2018-2023 Smart arbitration.vip All Rights Reserved.</span>
<span>Copyright © 2023 乙巢（上海）企业管理服务有限公司</span>
</div>
</div>
</template>