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

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

Browse Source
This commit was merged in pull request #130.
This commit is contained in:
gaogaoyujie
2023-12-19 17:19:01 +08:00
committed by Gitea
parent 65acede646 876c34ea8a
commit 02be03ef9d
8 changed files with 119 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/caseAccess/caseEntry.js
+8
View File
@@ -24,6 +24,14 @@ export function selectBatchSignUrl(data) {
data: data
})
}
// 批量签名提交
export function selectBatchSealUrl(data) {
return request({
url: '/adjudication/selectBatchSealUrl',
method: 'post',
data: data
})
}
// 立案申请
export function addCaseApply(data) {
return request({
src/views/caseManagement/caseList.vue
+3 -1
View File
@@ -74,7 +74,9 @@
>
批量签名
</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchPrintings">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="batchPrintings"
v-hasPermi="['caseManagement:list:officialSeal']"
>
批量用印
</el-button>
</el-col>
src/views/caseManagement/components/batchDialog.vue
+1 -1
View File
@@ -63,7 +63,7 @@
</template>
<script>
import { importTemplate } from "@/api/caseAccess/caseEntry";
import { pageSignAdjudicate } from "@/api/caseAccess/caseEntry";
import { getToken } from "@/utils/auth";
export default {
props: ["openbatch","getcaseApply","queryParams"],
src/views/caseManagement/components/batchPrinting.vue
+73 -6
View File
@@ -1,7 +1,35 @@
<template>
<!-- 批量用印 -->
<div>
<el-dialog title="批量用印" :visible="printingVisable" @close="cancel" center :distroy-on-close="true">
<el-dialog title="批量用印" width="60%" :visible="printingVisable" @close="cancel" center :distroy-on-close="true">
<!-- 查询机构信息 -->
<el-form ref="courtReviewform" :model="courtReviewform">
<el-form-item
label="查询机构:"
prop="Arbitor"
:rules="[
{
required: true,
message: '查询机构不能为空',
trigger: 'blur',
},
]"
>
<el-select
placeholder="请选择查询机构"
@change="changeArbitor"
v-model="courtReviewform.Arbitor"
clearable
>
<el-option
v-for="item in atoDataList"
:key="item.id"
:label="item.identifyName"
:value="item.operPhone"
></el-option>
</el-select>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="dataList" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection">
</el-table-column>
@@ -30,13 +58,14 @@
:limit.sync="queryParamsData.pageSize" />
<div slot="footer" class="dialog-footer">
<el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
<el-button type="primary" class="endbutton" :disabled="dataList.length == 0 || batchData.length == 0"><span>确认用印</span></el-button>
<el-button type="primary" class="endbutton" :disabled="dataList.length == 0 || batchData.length == 0" @click="confirmSeals"><span>确认用印</span></el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {caseApply} from '@/api/caseAccess/caseEntry'
import {selectBatchSealUrl,pageSignAdjudicate} from '@/api/caseAccess/caseEntry'
import {deptIdentifyList} from '@/api/officialSeal/officialSeal'
export default {
props:["printingVisable"],
data() {
@@ -47,13 +76,20 @@ export default {
total:0,
// 查询参数
queryParamsData: {
caseStatus: 3, //待定
caseStatus: 14,
pageNum: 1,
pageSize: 10,
},
// 表格数据
dataList: [],
batchData: [],
atoDataList:[],
courtReviewform: {},
Arbitor: "",
paramsdata:{
ids:[],
psnAccount:""
},
}
},
watch: {
@@ -65,12 +101,13 @@ export default {
},
created(){
this.getBatchPrinting(this.queryParamsData)
this.getarbitrAtor()
},
methods:{
// 列表查询
getBatchPrinting(val){
this.loading = true;
caseApply(val).then(res=>{
pageSignAdjudicate(val).then(res=>{
this.dataList = res.rows
this.total = res.total;
this.loading = false;
@@ -80,9 +117,39 @@ export default {
handleSelectionChange(val){
this.batchData = [];
val.forEach(item => {
this.batchData.push(item.id)
this.batchData.push(item.signFlowId)
this.paramsdata.ids = this.batchData
})
},
// 查询机构信息
getarbitrAtor() {
this.atoDataList =[]
deptIdentifyList({}).then((res) => {
console.log(res)
this.atoDataList = res.rows;
// this.total = res.total;
});
},
// 下拉获取电话号码
changeArbitor(val){
this.paramsdata.psnAccount = val
},
// 确认用印
confirmSeals(){
this.$refs["courtReviewform"].validate((valid) => {
if (valid) {
selectBatchSealUrl(this.paramsdata).then((res) => {
this.$modal.msgSuccess("确认成功");
this.cancel();
this.getBatchPrinting(this.queryParamsData)
window.open(res.data.signUrl)
// this.$emit("getcaseApply", this.queryParams);
})
.catch((err) => {});
}
});
},
cancel() {
this.$emit("printingOperate");
},
src/views/caseManagement/components/batchSignature.vue
+2 -1
View File
@@ -131,7 +131,6 @@ export default {
getarbitrAtor() {
this.atoDataList =[]
arbitrAtor({}).then((res) => {
console.log(res)
this.atoDataList = res.rows;
// this.total = res.total;
});
@@ -148,7 +147,9 @@ export default {
selectBatchSignUrl(this.paramsdata).then((res) => {
this.$modal.msgSuccess("确认成功");
this.cancel();
this.getBatchSignation(this.queryParamsData)
window.open(res.data.signUrl)
// this.$emit("getcaseApply", this.queryParams);
})
.catch((err) => {});
src/views/numberManagement/caseNumberList.vue
+20 -1
View File
@@ -1,5 +1,14 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="140px">
<el-form-item label="机构名称首字母拼写" prop="deptNameFirchar">
<el-input v-model="queryParams.deptNameFirchar" placeholder="请输入机构首字母拼写" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addList">新增</el-button>
@@ -22,7 +31,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="deleteTemplate(scope.row)">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="eidtTemplate(scope.row)">修改模板</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="eidtTemplate(scope.row)">编号修改</el-button>
</template>
</el-table-column>
</el-table>
@@ -71,6 +80,16 @@ export default {
eidtTemplate(row){
this.modifyVisable =true;
this.editData =row;
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList(this.queryParams);
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
getList(parm){
this.loading = true;
src/views/numberManagement/components/addOrdered.vue
+3 -3
View File
@@ -5,8 +5,8 @@
class="demo-ruleForm">
<el-form-item label="规则类型:" prop="ruleType">
<el-select placeholder="请选择规则类型" v-model="ruleForm.ruleType">
<el-option label="字符串" value="1"></el-option>
<el-option label="整数" value="2"></el-option>
<el-option label="字符串" :value=1></el-option>
<el-option label="整数" :value=2></el-option>
</el-select>
</el-form-item>
<el-form-item label="前缀:" prop="prefixstr">
@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item label="时间格式:" prop="dateFormat">
<el-select placeholder="请选择时间格式" v-model="ruleForm.dateFormat">
<el-option label="yyyy-MM-dd" value="1"></el-option>
<el-option label="yyyy-MM-dd" :value=1></el-option>
</el-select>
</el-form-item>
<el-form-item label="机构名称:" prop="deptName">
src/views/numberManagement/components/modifyTemplate.vue
+9 -1
View File
@@ -63,6 +63,14 @@ export default {
editData(val) {
if (val) {
this.ruleForm = val;
if(this.ruleForm.dateFormat=="yyyy-MM-dd"){
this.ruleForm.dateFormat=1
}
if(this.ruleForm.ruleType=="整数"){
this.ruleForm.ruleType=2
}else if(this.ruleForm.ruleType=="字符串"){
this.ruleForm.ruleType=1
}
}
}
},
@@ -88,7 +96,7 @@ export default {
this.updateCaseNumRuleFn({
id:this.ruleForm.id,
prefixstr:this.ruleForm.prefixstr,
dateFormat:this.ruleForm.deptName,
dateFormat:this.ruleForm.dateFormat,
deptNameFirchar:this.ruleForm.deptNameFirchar,
deptName:this.ruleForm.deptName,
ruleType:this.ruleForm.ruleType,