Browse Source

完善未售买断流程相关功能

master
yunuo970428 3 years ago
parent
commit
9b2dacaf24
  1. 34
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  2. 19
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue
  3. 10
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue
  4. 16
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue
  5. 9
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
  6. 371
      anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue
  7. 118
      anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
  8. 239
      anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue
  9. 117
      anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue

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

@ -528,14 +528,14 @@ const codemenu = [
import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue'),
name: 'tiaojiaEdit'
},
// 调价管理详情
// 调价管理待办详情
{
path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo',
component: () =>
import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue'),
name: 'tiaojiaInfo'
},
// 调价管理详情
// 调价管理已办详情
{
path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo',
component: () =>
@ -549,12 +549,19 @@ const codemenu = [
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue'),
name: 'neigouEdit'
},
// 车辆内购详情
// 车辆内购待办详情
{
path: '/cheliangneigouFlow/neigouguanli/neigouInfo',
path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo',
component: () =>
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouInfo.vue'),
name: 'neigouInfo'
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue'),
name: 'neigouDaiBanInfo'
},
// 车辆内购已办详情
{
path: '/cheliangneigouFlow/neigouguanli/neigouYiBanInfo',
component: () =>
import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue'),
name: 'neigouYiBanInfo'
},
// 未售买断编辑
{
@ -563,12 +570,19 @@ const codemenu = [
import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue'),
name: 'maiduanEdit'
},
// 未售买断详情
// 未售买断待办详情
{
path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo',
component: () =>
import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue'),
name: 'weishoumaiduanDaiBanInfo'
},
// 未售买断已办详情
{
path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo',
path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo',
component: () =>
import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue'),
name: 'maiduanInfo'
import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue'),
name: 'weishoumaiduanYiBanInfo'
},
// 采购退库驳回到发起人办理编辑页面
{

19
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue

@ -58,22 +58,22 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="300">
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center">
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center" width="150">
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>
</template>
</el-table-column>
<el-table-column label="入库价" align="center" width="200">
<el-table-column label="入库价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundPrice }}</span>
</template>
@ -157,15 +157,8 @@ export default {
this.viewTitle = '【编辑】车辆未售买断申请'
console.log('编辑回显', row.sid)
req.fetchBySid(row.sid).then((resp) => {
const data = resp.data
this.formobj.applicationName = data.applicationName
this.formobj.sid = data.sid
this.formobj.reason = data.reason
this.formobj.createTime = data.createTime
this.formobj.instanceId = data.procInstId
this.formobj.userSid = data.userSid
this.formobj.taskId = data.taskId
this.formobj.detailsList = data.voList
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId
}).catch((e) => {
this.formobj = row
})

10
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue

@ -43,24 +43,24 @@
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.voList" :index="index" border style="width: 100%">
<el-table :key="tableKey" :data="formobj.detailsList" :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">
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center">
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" header-align="center" align="center" width="150">
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>
</template>
</el-table-column>
<el-table-column label="入库价" header-align="center" align="center" width="200">
<el-table-column label="入库价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundPrice }}</span>
</template>

16
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue

@ -40,21 +40,21 @@
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column label="操作" width="180px" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='未售买断申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="状态" align="center" width="120">
<el-table-column label="状态" align="center" width="180">
<template slot-scope="scope">
<span>{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" width="120">
<el-table-column label="申请人" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.applicationName }}</span>
</template>
</el-table-column>
<el-table-column label="申请日期" align="center" width="120">
<el-table-column label="申请日期" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
@ -64,7 +64,7 @@
<span>{{ scope.row.reason }}</span>
</template>
</el-table-column>
<el-table-column label="台数" align="center" width="100">
<el-table-column label="台数" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.num }}</span>
</template>
@ -178,12 +178,6 @@ export default {
case 'doDel':
this.doDel()
break
case 'doImport':
this.doImport()
break
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()
break

9
anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue

@ -170,17 +170,13 @@ export default {
vehicleAlias: '',
vehicleType: '',
vehicleVersion: '',
userSid: window.sessionStorage.getItem('userSid'),
userSid: '',
vinNoList: []
},
total: 1
}
}
},
created() {
//
this.init()
},
methods: {
//
clicksearchShow() {
@ -325,7 +321,8 @@ export default {
} else {
this.listQuery.params.vinNoList = []
}
this.getList()
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.init()
},
//
AddUpdateReturn() {

371
anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue

@ -0,0 +1,371 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择车辆页面</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-row>
<el-form-item label="品牌:" class="searchlist">
<el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="功能:" class="searchlist">
<el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="系列:" class="searchlist">
<el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
<el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="变速箱:" class="searchlist">
<el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
<el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="驱动:" class="searchlist">
<el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
<el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="排放标准:" class="searchlist">
<el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
<el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="马力:" class="searchlist">
<el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
<el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="燃料:" class="searchlist">
<el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
<el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="版本:" class="searchlist">
<el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="车型:" class="searchlist">
<el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable style="width: 150px"/>
</el-form-item>
<el-form-item label="快捷检索:" class="searchlist">
<el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
</el-form-item>
</el-row>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">现车库存列表</div>
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="颜色" align="center">
<template slot-scope="scope">
<span>{{ scope.row.color }}</span>
</template>
</el-table-column>
<el-table-column label="存放地点" align="center">
<template slot-scope="scope">
<span>{{ scope.row.location }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(万元)" align="center">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import req from '@/api/weishoumaiduan/unsold'
import { typeValues, brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
export default {
name: 'vehicle',
components: {
Pagination
},
data() {
return {
useOrg: '',
carBrand_list: [],
vehicleType_list: [],
productLine_list: [],
gearboxType_list: [],
driveForm_list: [],
emissionStandard_list: [],
power_list: [],
fuelType_list: [],
vehicleVersion_list: [],
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
showbackState: 30,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
brandSid: '',
driveForm: '',
emissionStandard: '',
fuelType: '',
gearboxType: '',
modelName: '',
power: '',
productLine: '',
vehicleAlias: '',
vehicleType: '',
vehicleVersion: '',
userSid: '',
vinNoList: []
},
total: 1
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
init() {
this.getPathSid()
this.shujuzidian()
this.getList()
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.useOrg = res.data
}
})
},
shujuzidian() {
// -
brandDown({ useOrg: this.useOrg }).then((res) => {
if (res.success) {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
typeValues({ type: 'vehicleFunction' }).then((res) => {
if (res.success) {
this.vehicleType_list = res.data
}
})
typeValues({ type: 'productLine' }).then((res) => {
if (res.code === '200') {
this.productLine_list = res.data
}
})
typeValues({ type: 'driver' }).then((res) => {
if (res.code === '200') {
this.driveForm_list = res.data
}
})
typeValues({ type: 'horsepower' }).then((res) => {
if (res.code === '200') {
this.power_list = res.data
}
})
typeValues({ type: 'vehicleVersion' }).then((res) => {
if (res.code === '200') {
this.vehicleVersion_list = res.data
}
})
typeValues({ type: 'fuelType' }).then((res) => {
if (res.code === '200') {
this.fuelType_list = res.data
}
})
typeValues({ type: 'gearbox' }).then((res) => {
if (res.code === '200') {
this.gearboxType_list = res.data
}
})
typeValues({ type: 'emissionStandard' }).then((res) => {
if (res.code === '200') {
this.emissionStandard_list = res.data
}
})
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
handleReturn() {
this.$emit('doback')
},
//
getList() {
this.listLoading = true
req.pageList(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
this.listQuery.params.vinNoList = []
},
//
handleFilter() {
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 10,
params: {
brandSid: '',
driveForm: '',
emissionStandard: '',
fuelType: '',
gearboxType: '',
modelName: '',
power: '',
productLine: '',
vehicleAlias: '',
vehicleType: '',
vehicleVersion: '',
userSid: window.sessionStorage.getItem('userSid'),
vinNoList: []
},
total: 0
}
this.getList()
},
handleSelectionChange(row) {
this.sids = []
const aa = []
row.forEach((element) => {
aa.push({
vinNo: element.vinNo,
vehicleAlias: element.vehicleAlias,
priceDate: element.priceDate,
priced: element.priced
})
})
this.sids = aa
},
showData(value) {
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].vinNo)
}
this.listQuery.params.vinNoList = aa
} else {
this.listQuery.params.vinNoList = []
}
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.init()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请选择至少一条车型记录!',
type: 'error',
duration: 2000
})
}
}
}
}
</script>
<style scoped>
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
</style>

118
anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue → anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue

@ -7,11 +7,9 @@
<div>车辆未售买断详情</div>
<!--start 添加修改按钮-->
<div>
<el-button v-show="transactState=='00'" type="primary" @click="openAgree('同意')"> </el-button>
<el-button v-show="transactState=='00'" type="danger" @click="openReject('驳回')"> </el-button>
<el-button v-show="transactState=='00'" type="danger" @click="openStop('终止')"> </el-button>
<el-button v-show="transactState=='01' && current.taskName !== '排产申请'" type="danger" @click="openRevoke()"> </el-button>
<el-button type="info"> </el-button>
<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>
<!--标题按钮部分结束-->
@ -47,24 +45,24 @@
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.voList" :index="index" border style="width: 100%">
<el-table :key="tableKey" :data="formobj.detailsList" :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="left" header-align="center">
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center">
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" header-align="center" width="150">
<el-table-column label="入库日期" align="center"">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>
</template>
</el-table-column>
<el-table-column label="入库价" header-align="center" width="200">
<el-table-column label="入库价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundPrice }}</span>
</template>
@ -79,7 +77,7 @@
<!-- 选择待办人 的弹出框-->
<el-dialog title="选择待办人" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd" >
<el-row>
<el-row 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>
@ -105,7 +103,7 @@ import req from '@/api/weishoumaiduan/unsold'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'maiduanInfo',
name: 'weishoumaiduanDaiBanInfo',
components: {
flow
},
@ -132,7 +130,6 @@ export default {
//
formobj: {},
rules: {},
transactState: '', //
//
linkByParameter: {
businessSid: '',
@ -147,29 +144,21 @@ export default {
},
created() {
console.log('url:' + window.location.href)
var a = window.location.href.indexOf('?') + 1 // ?
var b = window.location.href.indexOf('#data') // #data
const info = window.location.href.slice(a, b)
var sid = info.substr(info.indexOf('=') + 1)
this.showInfo(sid)
// ===
var one = window.location.href.lastIndexOf('#') + 1
var two = window.location.href.lastIndexOf('}') + 1
const data = decodeURI(window.location.href.slice(one, two)) // urlunescape()web,使
var tar = data.substr(data.indexOf('=') + 1)
const obj = JSON.parse(tar)
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('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = sid
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = obj.orgSidPath
this.linkByParameter.userSid = obj.userSid
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.transactState = obj.transactState
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
@ -185,8 +174,8 @@ export default {
}, '*')
},
methods: {
showInfo(row) {
req.fetchBySid(row.sid).then((res) => {
showInfo(sid) {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
@ -241,21 +230,6 @@ export default {
this.submitdisabled = false
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
@ -285,13 +259,6 @@ export default {
code: 1
}
}, '*')
} else {
this.$notify({
title: '提示',
message: '执行失败',
type: 'error',
duration: 2000
})
}
})
},
@ -315,20 +282,12 @@ export default {
code: 1
}
}, '*')
} else {
this.$notify({
title: '提示',
message: '执行失败',
type: 'error',
duration: 2000
})
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
console.log(this.stopList, 99999)
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
@ -346,43 +305,6 @@ export default {
code: 1
}
}, '*')
} else {
this.$notify({
title: '提示',
message: '执行失败',
type: 'error',
duration: 2000
})
}
})
},
/** 撤回任务 */
handleRevoke() {
this.linkByParameter.comment = this.dialogList.comment
req.revokeProcess(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
}
}, '*')
} else {
this.$notify({
title: '提示',
message: '执行失败',
type: 'error',
duration: 2000
})
}
})
}

239
anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue

@ -0,0 +1,239 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>车辆未售买断详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="danger" @click="openRevoke()"> </el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>车辆未售买断申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row>
<el-col :span="4">
<span>申请日期:</span>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
<el-col :span="4">
<span>申请人:</span>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.applicationName }}</span>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="el-form-item-right">
<span>买断原因:</span>
</el-col>
<el-col :span="20">
<el-form-item>
{{ formobj.reason }}
</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.detailsList" :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">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>
</template>
</el-table-column>
<el-table-column label="入库价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundPrice }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
<!--End 添加修改部分-->
</div>
</template>
<script>
import req from '@/api/weishoumaiduan/unsold'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'weishoumaiduanYiBanInfo',
components: {
flow
},
data() {
return {
dialogStatus: '',
viewState: 1,
index: 0,
tableKey: 0,
list1: [],
xmlData: '', // xml
taskList: [],
//
formobj: {},
rules: {},
transactState: '', //
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
}
}
},
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('iframe页面获取的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.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
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
/** 撤回任务 */
handleRevoke() {
req.revokeProcess(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-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.icon {
color: #e84026;
margin-right: 4px;
}
</style>

117
anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue

@ -15,7 +15,7 @@
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="">
<div class="wlInfo"><span>车辆未售买断申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row>
@ -57,22 +57,22 @@
</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="300">
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center">
<el-table-column label="车型" align="center">
<template slot-scope="scope">
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="入库日期" align="center" width="150">
<el-table-column label="入库日期" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundDate }}</span>
</template>
</el-table-column>
<el-table-column label="入库价" align="center" width="200">
<el-table-column label="入库价" align="center">
<template slot-scope="scope">
<span>{{ scope.row.inboundPrice }}</span>
</template>
@ -82,18 +82,18 @@
</div>
<!--End 添加修改部分-->
<!--选择车型和常用配置-->
<!-- <vehicle v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="closePage"/>-->
<vehicle v-show="viewState == 2" ref="divVehicle" @backData="backData" @doback="closePage"/>
</div>
</template>
<script>
import req from '@/api/weishoumaiduan/unsold'
// import vehicle from './vehicle.vue'
import vehicle from './vehicle.vue'
export default {
name: 'maiduanAdd',
components: {
// vehicle
vehicle
},
data() {
return {
@ -116,21 +116,24 @@ export default {
submitdisabled: false
}
},
methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() + 1 //
let day = date.getDate() //
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
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))
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
}
this.formobj.createTime = year + '-' + month + '-' + day
},
}, '*')
},
methods: {
//
addCommodity() {
this.viewState = 2
@ -140,33 +143,17 @@ export default {
dataDelete(index, row) {
this.formobj.detailsList.splice(index, 1)
},
showAdd() {
this.newDate()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.formobj.applicationName = window.sessionStorage.getItem('name')
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.viewTitle = '【新增】车辆未售买断申请'
},
showEdit(row) {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】车辆未售买断申请'
console.log('编辑回显', row.sid)
req.fetchBySid(row.sid).then((resp) => {
const data = resp.data
this.formobj.applicationName = data.applicationName
this.formobj.sid = data.sid
this.formobj.reason = data.reason
this.formobj.createTime = data.createTime
this.formobj.instanceId = data.procInstId
this.formobj.userSid = data.userSid
this.formobj.taskId = data.taskId
this.formobj.detailsList = data.voList
console.log('编辑回显', sid)
req.fetchBySid(sid).then((resp) => {
this.formobj = resp.data
this.formobj.instanceId = resp.data.procInstId
}).catch((e) => {
this.formobj = row
this.formobj = {}
})
},
// --
@ -195,7 +182,14 @@ export default {
type: 'success',
message: resp.msg
})
this.handleReturn('true')
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}).catch(() => {
this.submitdisabled = false
@ -213,34 +207,17 @@ export default {
type: 'success',
message: '提交成功'
})
this.handleReturn('true')
} else {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
//
this.formobj = {
sid: '', // sid
applicationName: '',
createTime: '',
reason: '',
instanceId: '', // ID
taskId: '', // ID
userSid: '',
detailsList: []
}
this.$refs['form_obj'].resetFields()
this.$refs['divVehicle'].getList()
this.$emit('doback')
},
closePage() {
this.viewState = 1
}

Loading…
Cancel
Save