Skip to content

F
founder_vue
Commit 907c59a9 by mr.wang
Options

线索审批bug修复

parent 367f6135
Showing with 345 additions and 91 deletions
src/api/xsspLb/xsspLb.js
......@@ -22,9 +22,13 @@ export const savePzxx = params =>
export const queryPzById = data =>
post(`${base.alyIP13}/queryPzById`, data);
// 选择审批
// 选择审批时调用
export const getApproveUsers = data =>
post(`${base.alyIP13}/getApproveUsers`, data);
post(`${base.alyIP13}/getApproveUsers`, data);
// 点击编辑获取审批详情
export const toEditSqd = data =>
post(`${base.alyIP13}/toEditSqd`, data);
// 提交审批申请
export const saveOrUpdateSpxx = params =>
......@@ -70,6 +74,6 @@ post(`${base.alyIP13}/setSecondAgentRole`, data);
export const querySptjbList = data =>
post(`${base.alyIP13}/querySptjbList?currentPageNo=` + data.currentPageNo + '&pageSize=' + data.pageSize + '&kssj=' + data.kssj + '&jssj=' + data.jssj + '&unitcode=' + data.unitcode + '&orderStatus=' + data.orderStatus);
// 审批统计(饼状图及柱状图数据)
// 审批统计(饼状图及柱状图数据)】
export const querySptjt = data =>
post(`${base.alyIP13}/querySptjt`, data);
src/views/xsspPt/components/ptApproval.vue
<template>
<div class="approval">
<p style="margin: 10px;background: #F5F7FA;color: #ef3333;">审批流程：1.发起审批 2.双签同事 3.领导审批 4.审批完成</p>
<el-steps :active="active" simple>
<el-step title="添加线索" icon="el-icon-edit"></el-step>
<el-step title="选择审批" icon="el-icon-edit"></el-step>
<el-tag type="danger" style="margin-top: 10px; font-size: 15px;">审批流程：1.发起审批 2.双签同事 3.领导审批 4.审批完成</el-tag>
<!-- <p style="margin: 10px;background: #F5F7FA;color: #ef3333;">审批流程：1.发起审批 2.双签同事 3.领导审批 4.审批完成</p> -->
<el-steps :active="active" finish-status="success" simple style="margin-top: 20px">
<el-step title="添加线索"></el-step>
<el-step title="选择审批"></el-step>
</el-steps>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
<div v-show="active == 0">
<div v-show="active == 0" style="border: 1px solid #e3e3e3; margin-top: 20px;">
<el-form-item label="卷宗名称" v-if="type == '1'" >
<el-input v-model="spData.pzTitle" disabled></el-input>
</el-form-item>
......@@ -36,8 +37,8 @@
<el-option label="MAC地址" value="09"></el-option>
<el-option label="银行卡号" value="10"></el-option>
</el-select>
<span style="vertical-align: top;">线索值{{index + 1}}`</span><el-input v-model="item.xsSxz" style="width: 22% !important"></el-input>
<span style="vertical-align: top;">线索备注{{index + 1}}`</span><el-input v-model="item.xsMark" style="width: 22% !important"></el-input>
<span style="vertical-align: top; margin: 0 10px;">线索值{{index + 1}}</span><el-input v-model="item.xsSxz" style="width: 22% !important"></el-input>
<span style="vertical-align: top; margin: 0 10px;">线索备注{{index + 1}}</span><el-input v-model="item.xsMark" style="width: 22% !important"></el-input>
<i v-if="index > 0" class="el-icon-remove" @click="subtractSrmx(index)"></i>
<i v-else class="el-icon-circle-plus" @click="addSrmx"></i>
</el-form-item>
......@@ -45,23 +46,23 @@
<el-input type="textarea" v-model="ruleForm.orderReason"></el-input>
</el-form-item>
</div>
<div v-show="active == 1">
<div v-show="active == 1" style="border: 1px solid #e3e3e3; margin-top: 20px; padding-top: 20px;">
<el-form-item label="双签同事:">
<el-radio-group v-model="ruleForm.orderCounterSignPid">
<el-radio v-for="(item, index) in ruleForm.sqtsList" :key="index" :value="item.id" :label="item.id" >{{item.trueName}}（{{item.id}}）</el-radio>
<el-radio v-for="(item, index) in ruleForm.sqtsList" :key="index" :value="item.id" :label="item.policemanid" >{{item.trueName}}（{{item.policemanid}}）</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="审核领导:">
<el-radio-group v-model="ruleForm.orderOnegradePid">
<el-radio v-for="(item, index) in ruleForm.shldList" :key="index" :value="item.id" :label="item.id" >{{item.trueName}}（{{item.id}}）</el-radio>
<el-radio v-for="(item, index) in ruleForm.shldList" :key="index" :value="item.id" :label="item.policemanid" >{{item.trueName}}（{{item.policemanid}}）</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="审批领导:">
<el-radio-group v-model="ruleForm.orderTwogradePid">
<el-radio v-for="(item, index) in ruleForm.spldList" :key="index" :value="item.id" :label="item.id">{{item.trueName}}（{{item.id}}）</el-radio>
<el-radio v-for="(item, index) in ruleForm.spldList" :key="index" :value="item.id" :label="item.policemanid">{{item.trueName}}（{{item.policemanid}}）</el-radio>
</el-radio-group>
</el-form-item>
<div style="text-align: center"><el-button type="primary" @click="submit">提交申请</el-button></div>
<div style="text-align: center; margin-bottom: 15px;"><el-button type="primary" @click="submit">提交申请</el-button></div>
</div>
</el-form>
<el-button v-if="active == 1" style="margin-top: 12px;" @click="up">上一步</el-button>
......@@ -114,17 +115,21 @@ export default {
spDialogFormVisible: Boolean,
spData: Object,
jzList: Array,
type: String
type: String,
ptspData: Object
},
mounted() {
this.ApproveUsers()
// if(this.ptspData) {
// console.log('this.ptspData', this.ptspData)
// }
},
watch: {
spDialogFormVisible(val) {
if(val) {
this.ApproveUsers()
}
}
},
},
methods: {
ApproveUsers() {
......@@ -182,6 +187,10 @@ export default {
saveOrUpdateSpxx(formData).then(res => {
if(res.code == '200') {
loading.close();
this.$message({
type: "success",
message: "操作成功",
});
this.$emit('closeDialog')
}
})
......@@ -207,14 +216,29 @@ export default {
}
</script>
<style lang="scss" scoped>
.el-icon-circle-plus{
font-size: 22px;
vertical-align: middle;
margin-left: 10px;
}
.el-icon-remove{
font-size: 22px;
vertical-align: middle;
margin-left: 10px;
}
.approval{
padding-bottom: 20px;
::v-deep .el-steps--simple{
width: 30% !important;
margin-top: 10px;
background: #f5f5f5;
border: 1px solid #e3e3e3;
}
::v-deep .el-form-item .el-form-item__content{
width: 85% !important;
}
::v-deep .el-form-item__label{
font-weight: bold;
}
}
</style>
src/views/xsspPt/dwsp/queryDwsp.vue
......@@ -23,7 +23,7 @@
<el-dialog title="审批" :visible.sync="dialogFormVisible" width="80%">
<div class="sqdxq-title">卷宗信息</div>
<el-row :gutter="20">
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzName }}</el-col>
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzTitle }}</el-col>
<el-col :span="12"><span>卷宗编号：</span>{{ jzxx.id }}</el-col>
</el-row>
<el-row :gutter="20">
......@@ -91,13 +91,14 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"><span>审批意见：</span>
<el-input
type="textarea"
:rows="2"
placeholder="请输入内容"
v-model="remark">
</el-input>
<el-col :span="12">
<span>审批意见：</span>
<el-input
type="textarea"
:rows="2"
placeholder="请输入内容"
v-model="remark">
</el-input>
</el-col>
</el-row>
<div style="text-align: center; margin: 30px 0;"><el-button type="primary" @click="submit">确 定</el-button></div>
......@@ -106,7 +107,7 @@
<el-dialog title="详情" :visible.sync="xqDialogFormVisible" width="80%">
<div class="sqdxq-title">卷宗信息</div>
<el-row :gutter="20">
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx2.pzName }}</el-col>
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx2.pzTitle }}</el-col>
<el-col :span="12"><span>卷宗编号：</span>{{ jzxx2.id }}</el-col>
</el-row>
<el-row :gutter="20">
......@@ -172,15 +173,36 @@
<el-timeline style="padding: 20px;">
<el-timeline-item v-for="(item, index) in lcData" :key="index" :timestamp="item.handleTime" placement="top">
<el-card>
<span class="kuang" v-if="item.handleStatus == '1'" style="background: blue;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: blue;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: blue;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: blue;">撤回</span>
<h4 v-if="item.handleStatus == '1'">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '2'">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '3'">驳回</h4>
<h4 v-if="item.handleStatus == '4'">撤回</h4>
<!-- <p>王小虎 提交于 2018/4/12 20:46</p> -->
<span class="kuang" v-if="item.handleStatus == '1'" style="background: #007aff;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: #17ab17;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: #8c938c;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: #8c938c;">撤回</span>
<div v-if="item.handleStatus == '1'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">申请原因：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '2'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">申请原因：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '3'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}驳回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">申请原因：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '4'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}撤回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 2px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
......@@ -214,7 +236,7 @@ export default {
jzxx2: {},
lcData: [],
workFlowName: '1',
remark: '',
remark: '同意，无意见！',
cxFormData: {
page: 1,
rows: 10,
......@@ -457,7 +479,18 @@ export default {
formdata.append('sqfs', this.approveOrder.orderMethod)
formdata.append('spdlx', 'PTSP')
formdata.append('pzId', this.jzxx.id)
formdata.append('orderNextPid', '')
if(this.workFlowName == '1') {
console.log('this.approveOrder.orderStatus', this.approveOrder.orderStatus)
if(this.approveOrder.orderStatus == '2') {
formdata.append('orderNextPid', this.approveOrder.orderOnegradePid)
} else if(this.approveOrder.orderStatus == '5') {
formdata.append('orderNextPid', this.approveOrder.orderTwogradePid)
} else {
formdata.append('orderNextPid', '')
}
} else {
formdata.append('orderNextPid', '')
}
formdata.append('approveUserId', JSON.parse(sessionStorage.getItem("userInfo")).account)
formdata.append('createUserPid',this.createUserPid)
toSpsqxx(formdata).then(res =>{
......@@ -467,6 +500,7 @@ export default {
message: "处理成功",
});
this.dialogFormVisible = false
this.$refs.rightContent.doQuery("yes");
}
})
}
......
src/views/xsspPt/jzLb/newjzAdd.vue
......@@ -66,7 +66,7 @@
placeholder: "请输入",
col: "2",
prop: 'checkEmpty',
disabled: true
// disabled: true
},
{
name: "卷宗名称:",
......@@ -76,7 +76,7 @@
placeholder: "请输入",
col: "2",
prop: 'checkEmpty',
disabled: true
// disabled: true
},
{
name: "案事件名称:",
......@@ -92,7 +92,7 @@
id: "ajlb",
type: "text",
value: "",
placeholder: "请输入",
placeholder: "刑事案件",
col: "2",
disabled: true
},
......
src/views/xsspPt/jzLb/queryJzlb.vue
......@@ -16,7 +16,7 @@
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="ptApproval(scope.scope)">普通审批</span>
<!-- <span class="hbyp" @click="jjApproval(scope.scope)">紧急审批</span> -->
<span class="hbyp" @click="jjApproval(scope.scope)">紧急审批</span>
<span class="hbyp" @click="showDetail(scope.scope)">详情</span>
<span class="hbyp" v-if="scope.scope.row.orderCount == 0" @click="dele(scope.scope)">删除</span>
</template>
......@@ -41,18 +41,23 @@
<el-dialog title="普通审批" :visible.sync="spDialogFormVisible" width="70%" destroy-on-close>
<pt-approval type="1" :spDialogFormVisible="spDialogFormVisible" :spData="spData" @closeDialog="closeDialog"></pt-approval>
</el-dialog>
<el-dialog title="紧急审批" :visible.sync="spDialogFormVisible2" width="70%" destroy-on-close>
<jj-approval type="1" :spDialogFormVisible="spDialogFormVisible2" :spData="spData" @closeDialog="closeDialog2"></jj-approval>
</el-dialog>
</div>
</template>
<script>
import rightContent from "@c/ptCxForm_components.vue";
import ptApproval from "../components/ptApproval.vue";
import jjApproval from "../components/jjApproval.vue";
import { deletePzById, queryPzById, getUserQx } from "@/api/xsspLb/xsspLb.js";
export default {
name: "queryJz",
components: {
rightContent,
ptApproval
ptApproval,
jjApproval
},
data() {
return {
......@@ -70,6 +75,7 @@ export default {
},
dialogFormVisible: false,
spDialogFormVisible: false,
spDialogFormVisible2: false,
formLabelWidth: "120px",
ruleForm: {
region: "",
......@@ -297,6 +303,11 @@ export default {
this.spData = data.row
this.spDialogFormVisible = true
},
// 紧急审批
jjApproval(data) {
this.spData = data.row
this.spDialogFormVisible2 = true
},
// 获取用户权限（控制菜单）
toGetUserQx(scope) {
console.log('scope', scope)
......@@ -329,6 +340,11 @@ export default {
},
closeDialog() {
this.spDialogFormVisible = false
this.$refs.rightContent.doQuery("yes");
},
closeDialog2() {
this.spDialogFormVisible2 = false
this.$refs.rightContent.doQuery("yes");
},
add(){
this.$router.pushToTab({
......
src/views/xsspPt/sptj/querySptj.vue
......@@ -19,7 +19,7 @@
type="date"
align="right"
unlink-panels
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
>
</el-date-picker>
<div class="zhi">至</div>
......@@ -29,7 +29,7 @@
type="date"
align="right"
unlink-panels
value-format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
......@@ -113,7 +113,7 @@
<el-dialog title="详情" :visible.sync="dialogFormVisible" width="60%">
<div class="sqdxq-title">卷宗信息</div>
<el-row :gutter="20">
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzName }}</el-col>
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzTitle }}</el-col>
<el-col :span="12"><span>卷宗编号：</span>{{ jzxx.id }}</el-col>
</el-row>
<el-row :gutter="20">
......@@ -180,15 +180,36 @@
<el-timeline style="padding: 20px;">
<el-timeline-item v-for="(item, index) in lcData" :key="index" :timestamp="item.handleTime" placement="top">
<el-card>
<span class="kuang" v-if="item.handleStatus == '1'" style="background: blue;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: blue;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: blue;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: blue;">撤回</span>
<h4 v-if="item.handleStatus == '1'">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '2'">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '3'">驳回</h4>
<h4 v-if="item.handleStatus == '4'">撤回</h4>
<!-- <p>王小虎 提交于 2018/4/12 20:46</p> -->
<span class="kuang" v-if="item.handleStatus == '1'" style="background: #007aff;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: #17ab17;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: #8c938c;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: #8c938c;">撤回</span>
<div v-if="item.handleStatus == '1'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">申请原因：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '2'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '3'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}驳回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '4'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}撤回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 2px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
......@@ -338,8 +359,8 @@ export default {
form: {
currentPageNo: 1,
pageSize: 10,
kssj: '2021-12-14',
jssj: '2022-01-14',
kssj: '2021-12-18',
jssj: '2022-01-18',
unitcode: '',
orderStatus: 'All'
},
......@@ -387,6 +408,12 @@ export default {
},
// 查询饼状柱状图数据
toQuerySptjt() {
this.loading = this.$loading({
lock: true,
text: "正在加载...",
spinner: "el-icon-loading",
background: "rgba(255, 255, 255, 0.7)",
});
const param = {
kssj: this.form.kssj,
jssj: this.form.jssj,
......@@ -403,6 +430,7 @@ export default {
this.bztData[6].value = res.bzt.ejbhCount
this.zztCount = res.zztCount
this.startMyEcharts();
this.loading.close();
}
})
},
......@@ -573,6 +601,13 @@ export default {
};
</script>
<style scoped lang="scss">
::v-deep .el-dialog__body{
padding: 10px !important;
.el-row{
line-height: 2;
margin: 0 20px !important;
}
}
.Content {
padding: 20px;
/dee/ .el-form-item__content {
......@@ -667,7 +702,7 @@ export default {
.paneDivFoot {
height: 100%;
background: #fff;
padding: 0 20px 14px;
padding: 20px 20px 14px;
margin: 20px 20px 20px 0;
}
.footTitle {
......
src/views/xsspPt/sqdlb/querySqdlb.vue
......@@ -13,19 +13,20 @@
<span class="hbyps" style="margin-right: 10px" @click="ptApproval()">
<i class="el-icon-plus"></i>普通审批</span
>
<!-- <span class="hbyps" @click="add(scope.scope)"> 紧急审批</span> -->
<span class="hbyps" @click="jjApproval(scope.scope)"><i class="el-icon-plus"></i>紧急审批</span>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="showDetail(scope.scope)">详情</span>
<span class="hbyp" @click="showliucheng(scope.scope)">流程</span>
<span class="hbyp" @click="bohui(scope.scope)">驳回</span>
<span class="hbyp" v-if="scope.scope.row.orderStatus == '6' || scope.scope.row.orderStatus == '7'" @click="bianji(scope.scope)">编辑</span>
<span class="hbyp" v-if="scope.scope.row.orderStatus == '1' || scope.scope.row.orderStatus == '2' || scope.scope.row.orderStatus == '3'" @click="bohui(scope.scope)">撤回</span>
</template>
</right-content>
<el-dialog title="详情" :visible.sync="dialogFormVisible" width="60%">
<div class="sqdxq-title">卷宗信息</div>
<el-row :gutter="20">
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzName }}</el-col>
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzTitle }}</el-col>
<el-col :span="12"><span>卷宗编号：</span>{{ jzxx.id }}</el-col>
</el-row>
<el-row :gutter="20">
......@@ -92,41 +93,91 @@
<el-timeline style="padding: 20px;">
<el-timeline-item v-for="(item, index) in lcData" :key="index" :timestamp="item.handleTime" placement="top">
<el-card>
<span class="kuang" v-if="item.handleStatus == '1'" style="background: blue;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: blue;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: blue;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: blue;">撤回</span>
<h4 v-if="item.handleStatus == '1'">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '2'">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '3'">驳回</h4>
<h4 v-if="item.handleStatus == '4'">撤回</h4>
<!-- <p>王小虎 提交于 2018/4/12 20:46</p> -->
<span class="kuang" v-if="item.handleStatus == '1'" style="background: #007aff;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: #17ab17;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: #8c938c;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: #8c938c;">撤回</span>
<div v-if="item.handleStatus == '1'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">申请原因：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '2'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '3'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}驳回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '4'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}撤回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 2px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
</el-dialog>
<el-dialog title="普通审批" :visible.sync="spDialogFormVisible" width="70%" destroy-on-close>
<el-dialog title="普通审批" :visible.sync="spDialogFormVisible" width="900px" destroy-on-close>
<pt-approval :jzList="jzList" type="2" :spDialogFormVisible="spDialogFormVisible" :spData="spData" @closeDialog="closeDialog"></pt-approval>
</el-dialog>
<!-- <el-dialog title="普通审批" :visible.sync="bjptspShow" width="900px" destroy-on-close> -->
<!-- <bjpt-approval :jzList="jzList" type="2" :spDialogFormVisible="bjptspShow" :spData="ptspData" @closeDialog="bjptspCloseDialog"></bjpt-approval> -->
<!-- </el-dialog> -->
<bjpt-approval ref="bjpt" :jzList="jzList" type="2" :spData="ptspData" @queryAgain="queryAgain"></bjpt-approval>
<el-dialog title="紧急审批" :visible.sync="spDialogFormVisible2" width="900px" destroy-on-close>
<jj-approval :jzList="jzList" type="2" :spDialogFormVisible="spDialogFormVisible2" :spData="spData" @closeDialog="closeDialog2"></jj-approval>
</el-dialog>
<!-- <el-dialog title="紧急审批" :visible.sync="bjjjspShow" width="70%" destroy-on-close>
<jj-approval :jzList="jzList" type="2" :spDialogFormVisible="bjjjspShow" :spData="jjspData" @closeDialog="bjjjspCloseDialog"></jj-approval>
</el-dialog> -->
<bjjj-approval ref="bjjj" :jzList="jzList" type="2" :spData="jjspData" @queryAgain="queryAgain"></bjjj-approval>
</div>
</template>
<script>
import { querySqdDteail, queryWorkFlowList, chsqd, queryUserPz } from "@/api/xsspLb/xsspLb.js";
import ptApproval from "../components/ptApproval.vue";
import jjApproval from "../components/jjApproval.vue";
import bjptApproval from "../components/ptChild.vue";
import bjjjApproval from "../components/jjChild.vue";
import rightContent from "@c/ptCxForm_components.vue";
export default {
name: "querySqdlb",
components: {
rightContent,
ptApproval
ptApproval,
jjApproval,
bjptApproval,
bjjjApproval
},
data() {
return {
dialogFormVisible: false,
lcDialogFormVisible: false,
spDialogFormVisible: false,
spDialogFormVisible2: false,
bjptspShow: false,
bjjjspShow: false,
ptspData: {},
jjspData: {},
header: "线索审批管理平台",
pageBs: "querySqdlb",
xqData: {},
......@@ -263,9 +314,53 @@ export default {
})
this.spDialogFormVisible = true
},
// 紧急审批
jjApproval() {
// this.spData = data.row
const data = {
createUserId: JSON.parse(sessionStorage.getItem("userInfo")).account
}
queryUserPz(data).then(res => {
if(res.code == "200") {
this.jzList = res.data
}
})
this.spDialogFormVisible2 = true
},
bianji(scope) {
const data = {
createUserId: JSON.parse(sessionStorage.getItem("userInfo")).account
}
queryUserPz(data).then(res => {
if(res.code == "200") {
this.jzList = res.data
}
})
if(scope.row.spdlx == 'JJSP') {
// this.jjspData = scope.row
// this.bjjjspShow = true
this.$refs.bjjj.showEditDialog(scope.row)
} else {
// this.ptspData = scope.row
// this.bjptspShow = true
this.$refs.bjpt.showEditDialog(scope.row)
}
console.log('scope', scope)
},
closeDialog() {
this.spDialogFormVisible = false
this.$refs.rightContent.doQuery("yes");
},
// bjptspCloseDialog() {
// this.bjptspShow = false
// },
closeDialog2() {
this.spDialogFormVisible2 = false
this.$refs.rightContent.doQuery("yes");
},
// bjjjspCloseDialog() {
// this.bjjjspShow = false
// },
// 申请单详情
showDetail(scope) {
console.log('scope', scope)
......@@ -392,6 +487,9 @@ export default {
});
});
},
queryAgain() {
this.$refs.rightContent.doQuery("yes");
}
},
watch: {},
}
......
src/views/xsspPt/wysp/queryWysp.vue
......@@ -26,7 +26,7 @@
<el-dialog title="详情" :visible.sync="dialogFormVisible" width="80%">
<div class="sqdxq-title">卷宗信息</div>
<el-row :gutter="20">
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzName }}</el-col>
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzTitle }}</el-col>
<el-col :span="12"><span>卷宗编号：</span>{{ jzxx.id }}</el-col>
</el-row>
<el-row :gutter="20">
......@@ -92,15 +92,36 @@
<el-timeline style="padding: 20px;">
<el-timeline-item v-for="(item, index) in lcData" :key="index" :timestamp="item.handleTime" placement="top">
<el-card>
<span class="kuang" v-if="item.handleStatus == '1'" style="background: blue;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: blue;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: blue;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: blue;">撤回</span>
<h4 v-if="item.handleStatus == '1'">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '2'">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '3'">驳回</h4>
<h4 v-if="item.handleStatus == '4'">撤回</h4>
<!-- <p>王小虎 提交于 2018/4/12 20:46</p> -->
<span class="kuang" v-if="item.handleStatus == '1'" style="background: #007aff;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: #17ab17;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: #8c938c;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: #8c938c;">撤回</span>
<div v-if="item.handleStatus == '1'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">申请原因：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '2'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '3'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}驳回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '4'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}撤回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 2px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
......
src/views/xsspPt/xslb/queryXslb.vue
......@@ -22,7 +22,7 @@
<el-dialog title="详情" :visible.sync="dialogFormVisible" width="60%">
<div class="sqdxq-title">卷宗信息</div>
<el-row :gutter="20">
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzName }}</el-col>
<el-col :span="12"><span>卷宗名称：</span>{{ jzxx.pzTitle }}</el-col>
<el-col :span="12"><span>卷宗编号：</span>{{ jzxx.id }}</el-col>
</el-row>
<el-row :gutter="20">
......@@ -88,15 +88,36 @@
<el-timeline style="padding: 20px;">
<el-timeline-item v-for="(item, index) in lcData" :key="index" :timestamp="item.handleTime" placement="top">
<el-card>
<span class="kuang" v-if="item.handleStatus == '1'" style="background: blue;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: blue;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: blue;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: blue;">撤回</span>
<h4 v-if="item.handleStatus == '1'">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '2'">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}更新 Github 模板</h4>
<h4 v-if="item.handleStatus == '3'">驳回</h4>
<h4 v-if="item.handleStatus == '4'">撤回</h4>
<!-- <p>王小虎 提交于 2018/4/12 20:46</p> -->
<span class="kuang" v-if="item.handleStatus == '1'" style="background: #007aff;">提请</span>
<span class="kuang" v-if="item.handleStatus == '2'" style="background: #17ab17;">通过</span>
<span class="kuang" v-if="item.handleStatus == '3'" style="background: #8c938c;">驳回</span>
<span class="kuang" v-if="item.handleStatus == '4'" style="background: #8c938c;">撤回</span>
<div v-if="item.handleStatus == '1'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ `${item.handleUserName}发起申请单，待${item.assigneeUserName}处理`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">申请原因：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '2'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{ item.assigneeUserPid != null ? `${item.handleUserName}通过申请单，待${item.assigneeUserName}处理` : `${item.handleUserName}通过申请单，审批流程结束`}}</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '3'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}驳回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 1px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
<div v-if="item.handleStatus == '4'">
<!-- <i class="el-icon-user-solid"></i> -->
<h3>{{ item.workFlowName }}</h3>
<h4 style="color: #007aff;">{{item.handleUserName}}撤回申请单</h4>
<h4 style="color: #666;"><span style="color: #fff; background: #007aff; border-radius: 50px;padding: 2px 8px; margin-right: 5px;">审批意见：</span>{{ item.handleContent }}</h4>
</div>
</el-card>
</el-timeline-item>
</el-timeline>
......
vue.config.js
......@@ -109,6 +109,7 @@ module.exports = {
"/apiXssp": {
target: "https://39.99.155.173:8006/", // 线索审批管理平台
changeOrigin: true,
secure: false,
pathRewrite: {
"^/apiXssp": "/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment