Browse Source

调车、调账流程

master
Zhao Qiqi 3 years ago
parent
commit
4003622ebf
  1. 7
      anrui-scm/anrui-scm-ui/src/api/flow/tiaochekaipiaoshenqing.js
  2. 7
      anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js
  3. 14
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  4. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue
  5. 70
      anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
  6. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue
  7. 78
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
  8. 31
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing.vue
  9. 414
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut.vue
  10. 97
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
  11. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingInfo.vue
  12. 41
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqing.vue
  13. 397
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut.vue
  14. 100
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue
  15. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingInfo.vue

7
anrui-scm/anrui-scm-ui/src/api/flow/tiaochekaipiaoshenqing.js

@ -9,6 +9,13 @@ export default {
data: params
})
},
agreeTaskCallInToCallOut: function(params) {
return request({
url: '/base/v1/baseshuntinginvoicingapply/callInOrgToCallOutOrg',
method: 'post',
data: params
})
},
// 流程审批(驳回)
rejectTask: function(params) {
return request({

7
anrui-scm/anrui-scm-ui/src/api/flow/tiaozhangshenqing.js

@ -9,6 +9,13 @@ export default {
data: params
})
},
agreeTaskCallInOrCallOut: function(params) {
return request({
url: '/base/v1/baseaccadjapply/InitiatorToAnswer',
method: 'post',
data: params
})
},
// 流程审批(驳回)
rejectTask: function(params) {
return request({

14
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@ -719,6 +719,7 @@ const codemenu = [
import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingInfo.vue'),
name: 'tiaochekaipiaoshenqingInfo'
},
// 调车开票申请审批环节办理页面
{
path: '/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing',
@ -726,6 +727,12 @@ const codemenu = [
import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing.vue'),
name: 'tiaochekaipiaoshenqingHandle'
},
{
path: '/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut',
component: () =>
import('@/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut.vue'),
name: 'tiaochekaipiaoshenqingCallInToCallOut'
},
// 流程审批
// 调账申请驳回到发起人办理编辑页面
{
@ -747,6 +754,13 @@ const codemenu = [
component: () =>
import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqing.vue'),
name: 'tiaozhangshenqingHandle'
},
{
path: '/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut',
component: () =>
import('@/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut.vue'),
name: 'tiaozhangshenqingCallInOrCallOut'
}
]
export default codemenu

2
anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqing.vue

@ -45,7 +45,7 @@
<el-table-column label="操作" fixed align="center" width="160px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!-- :disabled="row.state == '待提交' ? false:row.state == '移库申请'?false : true" -->
<el-button size="mini" type="primary"
:disabled="row.nodeState == '待提交' ? false:row.nodeState == '移库申请'?false : true"
:disabled="row.nodeState == '待提交' ? false:row.nodeState == '调入方开票申请'?false : true"
@click="handleEdit(row)">办理</el-button>
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>

70
anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue

@ -162,7 +162,7 @@
import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
import upload_diaoche from '@/components/uploadFile/upload_diaoche'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import { fetchDetailsBySid, save, selByLinkSid,submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
import { typeValues } from '@/api/supplychain/yancheguanli'
export default {
@ -398,18 +398,27 @@ export default {
}
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (this.list.length > 0) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
_this.handleReturn('true')
if (resp.success) {
_this.handleReturn('true')
}
}
}
}).catch(() => {
this.submitdisabled = false
})
}).catch(() => {
this.submitdisabled = false
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
return
}
} else {
return false
}
@ -450,24 +459,33 @@ export default {
}
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
submitSunInv(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (this.list.length > 0) {
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
submitSunInv(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
_this.handleReturn('true')
if (resp.success) {
_this.handleReturn('true')
}
}
}
}).catch(() => {
this.submitdisabled = false
}).catch(() => {
this.submitdisabled = false
})
})
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
return
}
} else {
return false
}

2
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanli.vue

@ -58,7 +58,7 @@
<el-table-column label="操作" fixed align="center" width="160px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!-- v-show="row.showInspectedBtn" -->
<el-button size="mini" type="primary"
:disabled="row.nodeState == '待提交' ? false:row.nodeState == '移库申请'?false : true"
:disabled="row.nodeState == '待提交' ? false:row.nodeState == '调账申请'?false : true"
@click="handleEdit(row)">办理</el-button>
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>

78
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue

@ -402,20 +402,29 @@ export default {
const _this = this
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.submitdisabled = true
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (this.list.length > 0) {
this.submitdisabled = true
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
_this.handleReturn('true')
if (resp.success) {
_this.handleReturn('true')
}
}
}
}).catch(() => {
this.submitdisabled = false
})
}).catch(() => {
this.submitdisabled = false
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
return
}
} else {
return false
}
@ -445,27 +454,36 @@ export default {
const _this = this
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.submitdisabled = true
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.temp.detailsList = this.list
submitAccAdjApply(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (this.list.length > 0) {
this.submitdisabled = true
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.temp.detailsList = this.list
submitAccAdjApply(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
_this.handleReturn('true')
if (resp.success) {
_this.handleReturn('true')
}
}
}
}).catch(() => {
this.submitdisabled = false
}).catch(() => {
this.submitdisabled = false
})
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
})
return
}
} else {
return false
}

31
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqing.vue

@ -113,6 +113,29 @@
:preview-src-list="dialogUrl">
</el-image>
</el-dialog>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd">
<el-row v-show="currentLink">
<el-col :span="4" class="tleftb">当前环节</el-col>
<el-col :span="20" class="trightb">
<el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-bottom: 1px solid #e0e3eb;">
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
clearable></el-input>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
@ -271,10 +294,10 @@ export default {
openReject(val) {
this.operation = val
this.currentLink = true //
const formVariables = {
businessSid: this.regectList.businessSid
}
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
// const formVariables = {
// businessSid: this.regectList.businessSid
// }
req.getPreviousNodesForReject({taskDefKey: this.current.taskDefKey}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]

414
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingCallInToCallOut.vue

@ -0,0 +1,414 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>调车开票申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" @click="openAgree('同意')"> </el-button>
<el-button type="danger" @click="openReject('驳回')"> </el-button>
<el-button type="danger" @click="openStop('终止')"> </el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class=""><!-- -->
<div class="title">调车开票申请</div> <!--:rules="rules"-->
<el-form ref="dataForm" :model="temp" :inline="true" label-width="120px">
<div class="invoiceadd" style="margin-top: 5px;">
<el-row>
<el-col :span="8">
<el-form-item prop="reason" label="调账类型">
<span>调入</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="money" label="调入分公司">
<span>{{ temp.callInOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="money" label="调出分公司">
<span>{{ temp.callOutOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="addtable">
<div class="tabletitle">
<div class="titlename">
申请车辆列表
</div>
</div>
<template class="tablelist">
<el-table :data="list" border style="width: 100%" :index="index">
<el-table-column align="center" fixed label="序号" type="index" width="50"/>
<el-table-column label="车型名称" align="center" width="190">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center" width="360">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="合格证信息" align="center" width="200">
<template slot-scope="scope" @click="">
<span>{{ scope.row.certificate }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="开票金额" align="center" width="130">
<template slot-scope="scope">
<span>{{ scope.row.invoicinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="开票单位" align="center" width="180">
<template slot-scope="scope">
<span>{{ scope.row.invoicinCompanyName }}</span>
</template>
</el-table-column>
<el-table-column label="开票信息图片" align="center">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="open(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</template>
</div>
</el-form>
</div>
<!--End 添加修改部分-->
</div>
<el-dialog title="开票信息图片" :visible.sync="dialogVisible">
<el-image
v-for="(item,index) in dialogUrl"
:key="index"
:src="item"
style="width: 100px; height: 100px"
:preview-src-list="dialogUrl">
</el-image>
</el-dialog>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd">
<el-row v-show="currentLink">
<el-col :span="4" class="tleftb">当前环节</el-col>
<el-col :span="20" class="trightb">
<el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-bottom: 1px solid #e0e3eb;">
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
clearable></el-input>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { fetchDetailsBySid, selByLinkSid } from '@/api/supplychain/diaochekaipiaoshenqing'
import req from '@/api/flow/tiaochekaipiaoshenqing.js'
export default {
name: 'tiaochekaipiaoshenqing',
data() {
return {
dialogVisible:false,
dialogUrl:[],
index: 0,
list: [],
//
temp: {
sid: '', // sid
applicationCode: '',
name: '',
createTime: '',
money: '',
userSid: '', // sid
detailsList: []
},
// ------------------------------------
currentLink:true, //
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
//
agreeList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid:''
},
//
regectList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
userSid: ''
},
//
stopList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
userSid: ''
}
}
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},
created() {
// ===
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('获取到的obj',obj)
//
this.agreeList.businessSid = obj.businessSid
this.agreeList.instanceId = obj.instanceId
this.agreeList.taskId = obj.taskId
this.agreeList.taskDefKey = obj.taskDefKey
this.agreeList.userSid = window.sessionStorage.getItem('userSid')
this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.regectList.businessSid = obj.businessSid
this.regectList.instanceId = obj.instanceId
this.regectList.taskId = obj.taskId
this.regectList.userSid = window.sessionStorage.getItem('userSid')
//
this.stopList.businessSid = obj.businessSid
this.stopList.instanceId = obj.instanceId
this.stopList.taskId = obj.taskId
this.stopList.userSid = window.sessionStorage.getItem('userSid')
//
this.transactState = obj.transactState
//
this.showInfo(obj.businessSid)
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
methods: {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
fetchDetailsBySid(sid).then(resp => {
if (resp.success) {
const data = resp.data
this.temp = data
this.list = data.baseShuntingInvoicinApplyeVehs
}
}).catch(e => {
this.temp = row
})
},
// ---------- ------------------------------
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true //
// const formVariables = {
// businessSid: this.agreeList.businessSid
// }
req.getNextNodesForSubmit({taskDefKey:this.current.taskDefKey}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true //
// const formVariables = {
// businessSid: this.regectList.businessSid
// }
req.getPreviousNodesForReject({taskDefKey: this.current.taskDefKey}).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false //
this.nodeDialogVisible = true
},
/** 选择代办人确认 */
confirm() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
this.handleReject()
} else if (this.operation === '终止') {
this.handleStop()
}
},
/** 同意任务 */
handleAgree() {
this.agreeList.comment = this.dialogList.comment
req.agreeTaskCallInToCallOut(this.agreeList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.regectList.comment = this.dialogList.comment
req.rejectTask(this.regectList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.stopList.comment = this.dialogList.comment
req.breakTask(this.stopList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
open(row) {
selByLinkSid(row.purchaseSid).then((resp) => {
if (resp.success) {
const data = resp.data
const imgList = []
data.forEach((item) => {
imgList.push(item.fileUrl)
})
this.dialogUrl = imgList
}
})
this.dialogVisible = true
},
}
}
</script>
<style scoped>
.title {
padding: 28px 0;
text-align: center;
}
</style>

97
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue

@ -163,6 +163,7 @@ import upload_diaoche from '@/components/uploadFile/upload_diaoche'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
import { typeValues } from '@/api/supplychain/yancheguanli'
export default {
name: 'tiaochekaipiaoshenqingEdit',
components: {
@ -212,7 +213,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},
@ -412,25 +413,34 @@ export default {
}
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (this.list.length > 0) {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
// _this.handleReturn('true')
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
// _this.handleReturn('true')
}
}
}
}).catch(() => {
this.submitdisabled = false
})
}).catch(() => {
this.submitdisabled = false
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
return
}
} else {
return false
}
@ -447,30 +457,39 @@ export default {
}
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
submitSunInv(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (this.list.length > 0) {
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.submitdisabled = true
this.temp.baseShuntingInvoicinApplyeVehs = this.list
submitSunInv(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}
}
}).catch(() => {
this.submitdisabled = false
}).catch(() => {
this.submitdisabled = false
})
})
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
return
}
} else {
return false
}

2
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingInfo.vue

@ -152,7 +152,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},

41
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqing.vue

@ -99,6 +99,29 @@
</div>
<!--End 添加修改部分-->
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd">
<el-row v-show="currentLink">
<el-col :span="4" class="tleftb">当前环节</el-col>
<el-col :span="20" class="trightb">
<el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-bottom: 1px solid #e0e3eb;">
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
clearable></el-input>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
@ -181,7 +204,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},
@ -251,10 +274,10 @@ export default {
openAgree(val) {
this.operation = val
this.currentLink = true //
const formVariables = {
businessSid: this.agreeList.businessSid
}
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
// const formVariables = {
// businessSid: this.agreeList.businessSid
// }
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
@ -267,10 +290,10 @@ export default {
openReject(val) {
this.operation = val
this.currentLink = true //
const formVariables = {
businessSid: this.regectList.businessSid
}
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, formVariables }).then((resp) => {
// const formVariables = {
// businessSid: this.regectList.businessSid
// }
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]

397
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingCallInOrCallOut.vue

@ -0,0 +1,397 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>分公司间调账申请详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" @click="openAgree('同意')"> </el-button>
<el-button type="danger" @click="openReject('驳回')"> </el-button>
<el-button type="danger" @click="openStop('终止')"> </el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class=""><!-- -->
<div class="title">分公司间调账申请</div> <!--:rules="rules"-->
<el-form ref="dataForm" :model="temp" :rules="rules" :inline="true" label-width="120px">
<div class="invoiceadd" style="margin-top: 5px;">
<el-row>
<el-col :span="8">
<el-form-item prop="accadjTypeValue" label="调账类型">
<span>{{temp.accadjTypeValue}}</span>
</el-form-item>
</el-col>
<el-col :span="8"><!-- :readonly="depositVehicleList[scope.$index].inboundDate" -->
<el-form-item prop="callOutOrgName" label="调出分公司">
<span>{{temp.callOutOrgName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="callInOrgName" label="调入分公司">
<span>{{temp.callInOrgName}}</span>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="addtable">
<div class="tabletitle">
<div class="titlename">
申请车辆列表
</div>
</div>
<template class="tablelist">
<el-table :data="list" border style="width: 100%" :index="index">
<el-table-column align="center" fixed label="序号" type="index" width="50"/>
<el-table-column label="车型名称" align="center" width="190px">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center" width="360">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="120">
<template slot-scope="scope" @click="">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="库存地点" align="center" width="200">
<template slot-scope="scope" @click="">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column label="内销价格" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<el-table-column label="发票类型" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.invoiceTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="运费承担方" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.freightUndertakerName }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="left" header-align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</template>
</div>
</el-form>
</div>
<!--End 添加修改部分-->
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd">
<el-row v-show="currentLink">
<el-col :span="4" class="tleftb">当前环节</el-col>
<el-col :span="20" class="trightb">
<el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-bottom: 1px solid #e0e3eb;">
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
clearable></el-input>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import { fetchDetailsBySid } from '@/api/supplychain/tiaozhangshenqing.js'
import req from '@/api/flow/tiaozhangshenqing'
export default {
name: 'tiaozhangshenqing',
data() {
return {
isXuanche: false,
viewTitle: '',
dialogStatus: '',
index: 0,
list: [],
depositVehicleList: [],
accadjTypeValue_list: [],
//
temp: {
sid:'',
applyDate:'', //
accadjTypeKey:'', // key
accadjTypeValue:'', // value
callOutOrgSid:'', // sid
callOutOrgName:'', //
callInOrgSid:'', // sid
callInOrgName:'', //
baseInternalPurchaseVehicles:[], //
},
rules: {
},
submitdisabled: false, //
disabled: false ,//
// ------------------------------------
currentLink:true, //
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
//
agreeList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid:''
},
//
regectList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
userSid: ''
},
//
stopList: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
userSid: ''
}
}
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},
created() {
// ===
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('获取到的obj',obj)
//
this.agreeList.businessSid = obj.businessSid
this.agreeList.instanceId = obj.instanceId
this.agreeList.taskId = obj.taskId
this.agreeList.taskDefKey = obj.taskDefKey
this.agreeList.userSid = window.sessionStorage.getItem('userSid')
this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.regectList.businessSid = obj.businessSid
this.regectList.instanceId = obj.instanceId
this.regectList.taskId = obj.taskId
this.regectList.userSid = window.sessionStorage.getItem('userSid')
//
this.stopList.businessSid = obj.businessSid
this.stopList.instanceId = obj.instanceId
this.stopList.taskId = obj.taskId
this.stopList.userSid = window.sessionStorage.getItem('userSid')
//
this.transactState = obj.transactState
//
this.showInfo(obj.businessSid)
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
methods: {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
fetchDetailsBySid(sid).then(resp => {
if (resp.success) {
const data = resp.data
this.temp = data
this.list = data.baseInternalPurchaseVehicles
console.log('编辑初始化', this.temp)
}
}).catch(e => {
this.submitdisabled = false
})
},
// ---------- ------------------------------
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true //
// const formVariables = {
// businessSid: this.agreeList.businessSid
// }
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true //
// const formVariables = {
// businessSid: this.regectList.businessSid
// }
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false //
this.nodeDialogVisible = true
},
/** 选择代办人确认 */
confirm() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
this.handleReject()
} else if (this.operation === '终止') {
this.handleStop()
}
},
/** 同意任务 */
handleAgree() {
this.agreeList.comment = this.dialogList.comment
req.agreeTaskCallInOrCallOut(this.agreeList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.regectList.comment = this.dialogList.comment
req.rejectTask(this.regectList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.stopList.comment = this.dialogList.comment
req.breakTask(this.stopList).then((response) => {
if (response.success) {
this.$message({
showClose: true,
message: '执行成功',
type: 'success'
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
}
}
</script>
<style scoped>
.title {
padding: 28px 0;
text-align: center;
}
</style>

100
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue

@ -141,7 +141,6 @@ import tiaozhangcheliangList from '@/views/supplychain/tiaozhangshenqingguanli/r
import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import { typeValues } from '@/api/cheliang/dictcommons'
import req from '@/api/flow/tiaozhangshenqing'
export default {
name: 'tiaozhangshenqingEdit',
@ -188,7 +187,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},
@ -391,43 +390,12 @@ export default {
const _this = this
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.submitdisabled = true
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}
}).catch(() => {
this.submitdisabled = false
})
} else {
return false
}
})
},
handleSubmit() {
const _this = this
this.$refs['dataForm'].validate(valid => {
if (valid) {
this.submitdisabled = true
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.temp.detailsList = this.list
submitAccAdjApply(this.temp).then(resp => {
if (this.list.length > 0) {
this.submitdisabled = true
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
save(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (resp.success) {
@ -443,7 +411,59 @@ export default {
}).catch(() => {
this.submitdisabled = false
})
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
return
}
} else {
return false
}
})
},
handleSubmit() {
const _this = this
this.$refs['dataForm'].validate(valid => {
if (valid) {
if (this.list.length > 0) {
this.submitdisabled = true
this.$confirm('是否确定提交该业务', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.list.forEach(element => {
this.temp.accSids.push(element.sid)
})
this.temp.detailsList = this.list
submitAccAdjApply(this.temp).then(resp => {
this.submitdisabled = false
if (resp.success) {
if (resp.success) {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}
}).catch(() => {
this.submitdisabled = false
})
})
} else {
this.$message({
showClose: true,
message: '请选择申请车辆',
type: 'error'
})
return
}
} else {
return false
}

2
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingInfo.vue

@ -146,7 +146,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: document.body.scrollHeight + 120 + 'px'
}
}, '*')
},

Loading…
Cancel
Save