Commit e53a5c48 authored by renjintao's avatar renjintao

订单审批数据展示

parent 9ee8c772
...@@ -266,6 +266,7 @@ export default { ...@@ -266,6 +266,7 @@ export default {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu = 3 this.footerStatu = 3
this.$refs.userProcess.load(this.detailId)
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
} }
...@@ -282,6 +283,7 @@ export default { ...@@ -282,6 +283,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -298,6 +300,7 @@ export default { ...@@ -298,6 +300,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.$refs.userProcess.load(this.detailId)
this.footerStatu = 3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
......
<template> <template>
<div style="padding:30px 0"> <div style="padding:30px 0">
<Detail :idVal="detailId" /> <Detail :idVal="detailId" />
<Process ref="userProcess" :idVal="detailId" /> <Process ref="userProcess" :idVal="detailId" />
<div class="footers" v-if="footerStatu === '2'" style="text-align:left;"> <div class="footers" v-if="footerStatu === '2'" style="text-align:left;">
<Form <Form :model="formMyCheck" :label-width="100" :rules="ruleValidate" inline ref="formValidate">
:model="formMyCheck"
:label-width="100"
:rules="ruleValidate"
inline
ref="formValidate"
>
<Row> <Row>
<Col span="18"> <Col span="18">
<FormItem label="审批意见:"> <FormItem label="审批意见:">
...@@ -20,44 +14,20 @@ ...@@ -20,44 +14,20 @@
<Radio label="终止"></Radio> <Radio label="终止"></Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="驳回节点:" v-if="formMyCheck.radioSp === '驳回'" prop="rejectToNodeId">
label="驳回节点:" <Select style="width:200px" clearable transfer placeholder="请选择驳回节点" v-model="formMyCheck.rejectToNodeId">
v-if="formMyCheck.radioSp === '驳回'"
prop="rejectToNodeId"
>
<Select
style="width:200px"
clearable
transfer
placeholder="请选择驳回节点"
v-model="formMyCheck.rejectToNodeId"
>
<Option value class="option-text">请选择驳回节点</Option> <Option value class="option-text">请选择驳回节点</Option>
<Option <Option v-for="(item, index) in nodeList" :value="item.value" :label="item.label" :key="index" :disabled="item.statu > 0 ? false : true"></Option>
v-for="(item, index) in nodeList"
:value="item.value"
:label="item.label"
:key="index"
:disabled="item.statu > 0 ? false : true"
></Option>
</Select> </Select>
<RadioGroup type="button" size="small" @on-change="changeToNode"> <RadioGroup type="button" size="small" @on-change="changeToNode">
<Radio label="1">上一节点</Radio> <Radio label="1">上一节点</Radio>
<Radio label="2">第一节点</Radio> <Radio label="2">第一节点</Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
<FormItem <FormItem label="原因:" v-if="
label="原因:"
v-if="
formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止' formMyCheck.radioSp === '驳回' || formMyCheck.radioSp === '终止'
" " prop="comment">
prop="comment" <Input v-model="formMyCheck.comment" style="width:400px;margin-left:10px" placeholder="请输入原因" />
>
<Input
v-model="formMyCheck.comment"
style="width:400px;margin-left:10px"
placeholder="请输入原因"
/>
</FormItem> </FormItem>
</Col> </Col>
<Col span="6" style="text-align:right;padding-right:40px"> <Col span="6" style="text-align:right;padding-right:40px">
...@@ -66,12 +36,7 @@ ...@@ -66,12 +36,7 @@
</Row> </Row>
</Form> </Form>
</div> </div>
<Modal <Modal v-model="modalCheckNo" title="订单审批" width="800" :scrollable="true">
v-model="modalCheckNo"
title="订单审批"
width="800"
:scrollable="true"
>
<br /> <br />
<h4> <h4>
您确定 <span class="new-red">{{ statuTitle }}</span> 此订单审批? 您确定 <span class="new-red">{{ statuTitle }}</span> 此订单审批?
...@@ -82,8 +47,9 @@ ...@@ -82,8 +47,9 @@
<Button type="primary" @click="checkFalse">确定</Button> <Button type="primary" @click="checkFalse">确定</Button>
</div> </div>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
import Detail from './detail' import Detail from './detail'
...@@ -123,30 +89,29 @@ export default { ...@@ -123,30 +89,29 @@ export default {
preNodeID: null, //上一个节点 preNodeID: null, //上一个节点
nextNodeUserIdList: [], //通过时提交的下一个节点UserId nextNodeUserIdList: [], //通过时提交的下一个节点UserId
ruleValidate: { ruleValidate: {
rejectToNodeId: [ rejectToNodeId: [{
{
required: true, required: true,
message: '请选择驳回节点', message: '请选择驳回节点',
type: 'number', type: 'number',
trigger: 'change' trigger: 'change'
} }],
], comment: [{
comment: [
{
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: 'blur' trigger: 'blur'
} }]
]
} }
} }
}, },
props: {}, props: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.detailId = this.$http.common.getquerystring('id') this.detailId = this.$http.common.getquerystring('id')
this.footerStatu = this.$http.common.getquerystring('statu') this.footerStatu = this.$http.common.getquerystring('statu')
this.getDetailInfos(this.detailId) this.getDetailInfos(this.detailId)
...@@ -161,16 +126,14 @@ export default { ...@@ -161,16 +126,14 @@ export default {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '驳回' this.statuTitle = '驳回'
} else { } else {}
}
}) })
} else { } else {
this.$refs['formValidate'].validate((valid) => { this.$refs['formValidate'].validate((valid) => {
if (valid) { if (valid) {
this.modalCheckNo = true this.modalCheckNo = true
this.statuTitle = '终止' this.statuTitle = '终止'
} else { } else {}
}
}) })
} }
}, },
...@@ -182,8 +145,8 @@ export default { ...@@ -182,8 +145,8 @@ export default {
Api.getdetail(param).then((r) => { Api.getdetail(param).then((r) => {
if (r.success) { if (r.success) {
this.currentNodeID = r.result.currentNodeId this.currentNodeID = r.result.currentNodeId
this.passId=r.result.currentRecordId this.passId = r.result.currentRecordId
this.nextNodeUserIdList=this.$refs.userProcess.immutData//获取下一节点的审核人 this.nextNodeUserIdList = this.$refs.userProcess.immutData //获取下一节点的审核人
this.getNodes(r.result.nodes) this.getNodes(r.result.nodes)
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
...@@ -230,13 +193,13 @@ export default { ...@@ -230,13 +193,13 @@ export default {
Api.pass(param).then((r) => { Api.pass(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('审批通过成功') this.$Message.success('审批通过成功')
this.footerStatu=3 this.footerStatu = 3
} else { } else {
this.$Message.error('审批通过失败') this.$Message.error('审批通过失败')
} }
}) })
this.modalCheckNo = false this.modalCheckNo = false
this.footerStatu=3 this.footerStatu = 3
}, },
//审批驳回 //审批驳回
checkNo() { checkNo() {
...@@ -249,7 +212,7 @@ export default { ...@@ -249,7 +212,7 @@ export default {
Api.reject(param).then((r) => { Api.reject(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('驳回审批成功') this.$Message.success('驳回审批成功')
this.footerStatu=3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
...@@ -267,7 +230,7 @@ export default { ...@@ -267,7 +230,7 @@ export default {
Api.terminate(param).then((r) => { Api.terminate(param).then((r) => {
if (r.success) { if (r.success) {
this.$Message.success('终止审批成功') this.$Message.success('终止审批成功')
this.footerStatu=3 this.footerStatu = 3
} else { } else {
this.$Message.error('加载失败') this.$Message.error('加载失败')
} }
......
<style lang="less" scope> <style lang="less">
@import "./shen.less"; @import "./shen.less";
</style> </style>
<template> <template>
<div class="Design"> <div class="Design">
<h3>{{ processTitle }}</h3> <h3>{{ processTitle }}</h3>
<Divider /> <Divider />
<Timeline> <Timeline>
...@@ -27,29 +27,19 @@ ...@@ -27,29 +27,19 @@
<div v-if="index>cur"> <div v-if="index>cur">
<CheckboxGroup v-model="immutData"> <CheckboxGroup v-model="immutData">
<span>审批人:</span> <span>审批人:</span>
<Checkbox <Checkbox v-for="(item1, index1) in item.defaultUsers.immutable" :key="index1" :label="item1" :disabled="item.isFixed">
v-for="(item1, index1) in item.defaultUsers.immutable"
:key="index1"
:label="item1"
:disabled="item.isFixed"
>
<User :value="item1" style="margin-right:5px;" /> <User :value="item1" style="margin-right:5px;" />
</Checkbox> </Checkbox>
</CheckboxGroup> </CheckboxGroup>
</div> </div>
<div class="wait" v-else> <div class="wait" v-else>
<span>审批人:</span> <span>审批人:</span>
<User <User v-for="(item2, index2) in item.defaultUsers.immutable" :key="index2" :value="item2" class="mr5" />
v-for="(item2, index2) in item.defaultUsers.immutable"
:key="index2"
:value="item2"
class="mr5"
/>
</div> </div>
<div style="width:98%" v-if="com(item.records).length>0"> <div style="width:98%" v-if="com(item.records).length>0">
<!-- <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table> --> <!-- <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table> -->
<p class="shen_row" v-for="(item3, index3) in item.records" :key="index3" :value="item3"> <p class="shen_row" v-for="(item3, index3) in item.records" :key="index3" :value="item3">
<User class="user_span" :value="item3.operatorId"/> <User class="user_span" :value="item3.operatorId" />
<span class="plr row_time">{{item3.operationTime}}</span> <span class="plr row_time">{{item3.operationTime}}</span>
<state code="workflow.record.status" class="row_statu" :value="item3.status" type="text"></state> <state code="workflow.record.status" class="row_statu" :value="item3.status" type="text"></state>
<span class="plr remark" v-if="item3.remark">{{item3.remark}}</span> <span class="plr remark" v-if="item3.remark">{{item3.remark}}</span>
...@@ -60,14 +50,18 @@ ...@@ -60,14 +50,18 @@
</div> </div>
</TimelineItem> </TimelineItem>
</Timeline> </Timeline>
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from './api'
export default { export default {
name: 'process', name: 'process',
components: {}, components: {},
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
data() { data() {
...@@ -78,8 +72,7 @@ export default { ...@@ -78,8 +72,7 @@ export default {
dataImmut: [], dataImmut: [],
creatRows: [], creatRows: [],
cur: 0, cur: 0,
columns: [ columns: [{
{
key: 'status', key: 'status',
title: '结果', title: '结果',
align: 'left', align: 'left',
...@@ -101,7 +94,11 @@ export default { ...@@ -101,7 +94,11 @@ export default {
easy: true, easy: true,
high: true, high: true,
render: (h, params) => { render: (h, params) => {
return h('User', { attrs: { value: params.row.operatorId } }) return h('User', {
attrs: {
value: params.row.operatorId
}
})
} }
}, },
{ {
...@@ -123,8 +120,11 @@ export default { ...@@ -123,8 +120,11 @@ export default {
render: (h, params) => { render: (h, params) => {
if (params.row.contextData.length > 2) if (params.row.contextData.length > 2)
return h( return h(
'a', 'a', {
{ on: { click: () => this.edit(params.row) } }, on: {
click: () => this.edit(params.row)
}
},
'详情' '详情'
) )
return h('span', '') return h('span', '')
...@@ -143,11 +143,16 @@ export default { ...@@ -143,11 +143,16 @@ export default {
} }
}, },
created() { created() {
this.currentUserId=this.$store.state.userInfo.userId this.currentUserId = this.$store.state.userInfo.userId
this.dataImmut = [] this.dataImmut = []
this.dataMut = [] this.dataMut = []
this.load(this.idVal)
Api.getdetail({ Id: this.idVal }).then((r) => { },
methods: {
load(v) {
Api.getdetail({
Id: v
}).then((r) => {
if (r.success) { if (r.success) {
this.dataImmut = r.result.nodes this.dataImmut = r.result.nodes
this.currentNodeId = r.result.currentNodeId this.currentNodeId = r.result.currentNodeId
...@@ -159,12 +164,12 @@ export default { ...@@ -159,12 +164,12 @@ export default {
}; };
// if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){ // if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){
// u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable) // u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable)
u.defaultUsers.immutable=u.defaultUsers.immutable||(u.defaultUsers.mutable)//审核人员bug u.defaultUsers.immutable = u.defaultUsers.immutable || (u.defaultUsers.mutable) //审核人员bug
// } // }
}) })
if (this.dataImmut.length > this.cur + 1) { if (this.dataImmut.length > this.cur + 1) {
// console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length ) // console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable||(this.dataImmut[this.cur + 1].defaultUsers.mutable)//审核人员bug this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable || (this.dataImmut[this.cur + 1].defaultUsers.mutable) //审核人员bug
} }
} else { } else {
...@@ -172,8 +177,6 @@ export default { ...@@ -172,8 +177,6 @@ export default {
} }
}) })
}, },
methods: {
load(v) {},
type(i) { type(i) {
if (i < this.cur) { if (i < this.cur) {
return 'primary' return 'primary'
...@@ -191,7 +194,7 @@ export default { ...@@ -191,7 +194,7 @@ export default {
console.log(record) console.log(record)
}, },
com(items) { com(items) {
if(items) if (items)
return items.filter((u) => { return items.filter((u) => {
return [2, 3, 5, 6].indexOf(u.status) > -1 return [2, 3, 5, 6].indexOf(u.status) > -1
}) })
......
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