Browse Source

调整排产管理、调价管理

master
yunuo970428 3 years ago
parent
commit
472945d0f0
  1. 8
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
  2. 163
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
  3. 141
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
  4. 41
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
  5. 7
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
  6. 19
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue
  7. 7
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
  8. 7
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
  9. 19
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue
  10. 8
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
  11. 200
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
  12. 182
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
  13. 175
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue

8
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue

@ -21,8 +21,8 @@
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" @click="handresetting">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handresetting">重置</el-button>
</div>
</div>
</div>
@ -30,12 +30,12 @@
<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">
<el-table-column label="车型" align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>

163
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue

@ -17,78 +17,68 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules">
<el-row>
<el-col :span="4">
<span>调价申请日期:</span>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</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.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</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>
<el-input v-model="formobj.modpriceReason" clearable style="width: 30%"/>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><el-input v-model="formobj.modpriceReason" clearable class="addinputw addinputOne" placeholder=""/></el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
<div style="margin-left: 15px">
<div class="title">
<div>车辆列表</div>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<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 prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<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 prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
@ -273,39 +263,26 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
}
.tableStyle {
background-color: #FFFFFF;
.title {
padding: 7px;
display: flex;
justify-content: flex-start;
flex-direction: row;
justify-content: space-between;
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;
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.addinputOne {
margin-left: 200px !important;
}
.icon {
color: #e84026;
margin-right: 4px;
.rowStyle {
border-left: 0px;
}
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

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

@ -13,69 +13,61 @@
<!--标题按钮部分结束-->
<!--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>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</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.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</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>
<span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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" width="250">
<template slot-scope="scope">
<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 prop="applyForDeposit" label="成本价" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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">
<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 prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
@ -121,34 +113,19 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
.addinputOne {
margin-left: 200px !important;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.rowStyle {
border-left: 0px;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

41
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue

@ -9,18 +9,14 @@
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="申请日期">
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
<div style="float: left;margin: 0px 10px"></div>
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</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>
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
@ -291,31 +287,4 @@ export default {
}
</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>

7
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue

@ -216,13 +216,6 @@ export default {
</script>
<style scoped>
.title {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.spanOneWidth {
border-right: 0px !important;
width: 150px !important;

19
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue

@ -137,18 +137,13 @@ export default {
},
//
handresetting() {
this.listQuery = {
current: 1,
size: 10,
params: {
vehicleAlias: '',
configName: '',
useOrgSid: '',
vehicleStateValue: '',
sidList: []
},
total: 1
}
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 10
this.listQuery.params.vehicleAlias = ''
this.listQuery.params.configName = ''
this.listQuery.params.useOrgSid = ''
this.listQuery.params.vehicleStateValue = ''
this.getPathSid()
},
handleSelectionChange(row) {

7
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@ -404,13 +404,6 @@ export default {
.listconadd {
height: calc(100vh - 0px) !important;
}
.title {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.spanOneWidth {
border-right: 0px !important;
width: 150px !important;

7
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue

@ -264,13 +264,6 @@ export default {
.listconadd {
height: calc(100vh - 0px) !important;
}
.title {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.spanOneWidth {
border-right: 0px !important;
width: 150px !important;

19
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

@ -137,18 +137,13 @@ export default {
},
//
handresetting() {
this.listQuery = {
current: 1,
size: 10,
params: {
vehicleAlias: '',
configName: '',
useOrgSid: '',
vehicleStateValue: '',
sidList: []
},
total: 1
}
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 10
this.listQuery.params.vehicleAlias = ''
this.listQuery.params.configName = ''
this.listQuery.params.useOrgSid = ''
this.listQuery.params.vehicleStateValue = ''
this.getPathSid()
},
handleSelectionChange(row) {

8
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue

@ -21,8 +21,8 @@
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" @click="handresetting">重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="handresetting">重置</el-button>
</div>
</div>
</div>
@ -30,12 +30,12 @@
<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">
<el-table-column label="车型" align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>

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

@ -7,94 +7,81 @@
<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>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </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>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</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.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</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>
<span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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" width="250">
<template slot-scope="scope">
<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 prop="applyForDeposit" label="成本价" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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">
<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 prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
<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-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo addinputTwo">{{ 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 :span="24">
<div class="span-sty spanTwoWidth"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputTwo" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -108,13 +95,9 @@
<script>
import req from '@/api/kucunguanli/price'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'tiaojiaInfo',
components: {
flow
},
data() {
return {
dialogStatus: '',
@ -124,8 +107,6 @@ export default {
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
@ -166,8 +147,6 @@ export default {
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
@ -175,7 +154,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 450 + 'px'
}
}, '*')
},
@ -187,19 +166,6 @@ export default {
}
})
},
/** 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
@ -318,34 +284,28 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.listconadd {
height: calc(100vh - 0px) !important;
}
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
.addinputOne {
margin-left: 200px !important;
}
.spanTwoWidth {
width: 150px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
.addinputTwo {
margin-left: 150px !important;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.rowStyle {
border-left: 0px;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

182
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue

@ -15,79 +15,69 @@
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules">
<el-row>
<el-col :span="4">
<span>调价申请日期:</span>
<div class="listconadd">
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</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.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</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>
<el-input v-model="formobj.modpriceReason" clearable style="width: 30%"/>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><el-input v-model="formobj.modpriceReason" clearable class="addinputw addinputOne" placeholder=""/></el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
<div style="margin-left: 15px">
<div class="title">
<div>车辆列表</div>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<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 prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<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 prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
@ -141,25 +131,11 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 450 + 'px'
}
}, '*')
},
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
}
this.formobj.createTime = year + '-' + month + '-' + day
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d.-]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
@ -282,39 +258,29 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.listconadd {
height: calc(100vh - 0px) !important;
}
.tableStyle {
background-color: #FFFFFF;
.title {
padding: 7px;
display: flex;
justify-content: flex-start;
flex-direction: row;
justify-content: space-between;
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;
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.addinputOne {
margin-left: 200px !important;
}
.icon {
color: #e84026;
margin-right: 4px;
.rowStyle {
border-left: 0px;
}
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

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

@ -10,96 +10,77 @@
<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>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</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.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</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>
<span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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" width="250">
<template slot-scope="scope">
<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 prop="applyForDeposit" label="成本价" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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">
<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 prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
</div>
</template>
<script>
import req from '@/api/kucunguanli/price'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'tiaojiaInfo',
components: {
flow
},
name: 'tiaojianYibanInfo',
data() {
return {
dialogStatus: '',
index: 0,
tableKey: 0,
xmlData: '', // xml
taskList: [],
//
formobj: {},
//
@ -129,9 +110,6 @@ export default {
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
@ -139,7 +117,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 450 + 'px'
}
}, '*')
},
@ -151,19 +129,6 @@ export default {
}
})
},
/** 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('是否确认执行撤回操作', '提示', {
@ -205,34 +170,22 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.listconadd {
height: calc(100vh - 0px) !important;
}
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
.addinputOne {
margin-left: 200px !important;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.rowStyle {
border-left: 0px;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

Loading…
Cancel
Save