Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
commit
576197ecce
  1. 7
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  2. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
  3. 372
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue
  4. 6
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue
  5. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
  6. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue

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

@ -588,6 +588,13 @@ const codemenu = [
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue'),
name: 'neigouDaiBanInfo'
},
// 车辆内购待办详情
{
path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo',
component: () =>
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue'),
name: 'neigouDaiBanByVinNoInfo'
},
// 车辆内购已办详情
{
path: '/cheliangneigouFlow/neigouguanli/neigouYiBanInfo',

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue

@ -62,7 +62,7 @@
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">

372
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue

@ -0,0 +1,372 @@
<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>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>内购申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row class="lineone">
<el-col :span="3">
<span>申请编号:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyNo }}</span>
</el-col>
<el-col :span="3">
<span>申请人:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
</el-col>
<el-col :span="3">
<span>申请日期:</span>
</el-col>
<el-col :span="5">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<span>购方机构:</span>
</el-col>
<el-col :span="9">
<el-form-item>
{{ formobj.buyerOrgName }}
</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<span>售方机构:</span>
</el-col>
<el-col :span="9">
<el-form-item>
{{ formobj.sellerOrgName }}
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">内购车型列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="车型" align="center" header-align="center" width="250">
<template slot-scope="scope" prop="vehicleName">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" header-align="center" width="200">
<template slot-scope="scope">
<span v-if="current.taskName !== '售方销售支持部经理审批'">{{ scope.row.vinNo }}</span>
<el-input v-else v-model="scope.row.vinNo" placeholder="" clearable></el-input>
</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>
</div>
</div>
<!--End 添加修改部分-->
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
<!--End 添加修改部分-->
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<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>
<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="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/supplychain/cheliangneigou'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'neigouDaiBanByVinNoInfo',
components: {
flow
},
data() {
return {
index: 0,
tableKey: 0,
//
formobj: {},
operation: '', //
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
formVariables: {},
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
rules: {}
}
},
created() {
console.log('url:' + window.location.href)
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.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
/** 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
this.dialogList.comment = ''
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
this.dialogList.comment = ''
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.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
this.handleReject()
} else if (this.operation === '终止') {
this.handleStop()
}
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
this.linkByParameter.formVariables = this.formobj
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
/deep/ .el-col-5 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
}
.linetwo {
margin-top: 10px;
}
</style>

6
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue

@ -154,7 +154,6 @@ export default {
comment: '',
instanceId: '',
taskId: '',
formVariables: {},
orgSidPath: '',
taskDefKey: '',
userSid: ''
@ -261,11 +260,6 @@ export default {
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
if (this.current.taskName === '售方销售支持部经理审批') {
this.linkByParameter.formVariables = this.formobj
} else {
this.linkByParameter.formVariables = {}
}
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({

2
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue

@ -64,7 +64,7 @@
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">

2
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue

@ -62,7 +62,7 @@
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">

Loading…
Cancel
Save