Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 3 years ago
parent
commit
e887826ca3
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java
  2. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java
  3. 14
      anrui-buscenter/anrui-buscenter-ui/src/api/vehicleconfiguration/vehicleconfiguration.js
  4. 4
      anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue
  5. 357
      anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
  6. 24
      anrui-buscenter/anrui-buscenter-ui/src/components/pagination/index.vue
  7. 85
      anrui-buscenter/anrui-buscenter-ui/src/components/tab-search/index.vue
  8. 2
      anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue
  9. 4
      anrui-buscenter/anrui-buscenter-ui/src/layout/components/AppMain.vue
  10. 23
      anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss
  11. 328
      anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss
  12. 51
      anrui-buscenter/anrui-buscenter-ui/src/styles/sidebar.scss
  13. 47
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
  14. 399
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue
  15. 21
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue
  16. 18
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue
  17. 47
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
  18. 33
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue
  19. 13
      anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue
  20. 13
      anrui-buscenter/anrui-buscenter-ui/src/views/hetongguanli/hetongshenheguanli/hetongshenheguanli.vue
  21. 18
      anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue
  22. 24
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue
  23. 42
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
  24. 19
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
  25. 20
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
  26. 18
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue
  27. 29
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue
  28. 61
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
  29. 36
      anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js
  30. 1
      anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue
  31. 1
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
  32. 172
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue
  33. 173
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue
  34. 2
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue
  35. 29
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  36. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue
  37. 6
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue
  38. 21
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  39. 697
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  40. 18
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
  41. 19
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
  42. 6
      anrui-system-ui/src/components/flow/flowRecord.vue

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java

@ -47,6 +47,8 @@ public class BaseVehicleReturnQuery implements Query {
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "orgSid")
private String orgSid;
}

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java

@ -109,6 +109,7 @@ public class BaseModelModpriceRest implements BaseModelModpriceFeign {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
bv.setModelId(ProcDefEnum.BASEMODELMODPRICE.getProDefId());
bv.setFormVariables(BeanUtil.beanToMap(query));
return baseModelModpriceService.complete(bv);
}

14
anrui-buscenter/anrui-buscenter-ui/src/api/vehicleconfiguration/vehicleconfiguration.js

@ -0,0 +1,14 @@
import request from '@/utils/request'
// 车型配置详细信息
export function selectExiCarConfig(data) {
return request({
url: '/base/v1/basevehicle/selectExiCarConfig',
method: 'post',
params: {
modelSid:data.modelSid,
configSid:data.configSid,
vehModelConfigSid:data.vehModelConfigSid,
},
})
}

4
anrui-buscenter/anrui-buscenter-ui/src/components/ButtonBar/index.vue

@ -112,8 +112,8 @@ export default {
<style scoped>
.svg-icon {
width: 1.2em;
height: 1.2em;
width: 1em;
height: 1em;
vertical-align: -0.16em;
fill: currentColor;
overflow: hidden;

357
anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue

@ -0,0 +1,357 @@
<template>
<div class="app-container">
<div class="listconadd">
<el-form ref="dataForm" :model="formobj" class="formaddcopy02">
<!-- <div class="headtitle"><span>系列{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力{{ formobj.powerValue }}</span></span></span></span></div>-->
<div class="headtitle_con">
<div class="headtitle">
{{ formobj.vehicleAlias }}
<div class="headtitle_jia">销售指导价:<span>{{guidedPrice}} 万元</span></div>
<div class="icon_sty" @click="changeDown(false)" v-show="isDown">
<i class="el-icon-arrow-down"/>
<span>展开</span>
</div>
<div class="icon_sty" @click="changeUp(true)" v-show="!isDown">
<i class="el-icon-arrow-up"/>
<span>收起</span>
</div>
</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>品牌</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>功能</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>系列</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.productLineValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>驱动</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.driveFormValue }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>马力</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.powerValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>版本</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleVersionValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>燃料</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="14">
<div class="span-sty"><span>变速箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item>
</el-col>
</el-row>
</div>
<div class="more_content" v-show="!isDown">
<div class="headline">车型信息</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>排放标准</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.emissionStandardValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>发动机型号</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>细分市场</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.marketSegmentsValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>规格型号</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>系别</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.departmentValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="headline">常用配置</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>颜色</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>缓速器</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>后视镜</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>轮胎</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>驾驶室</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>后桥速比</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>空调</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>轮毂材质</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>导流罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>悬架</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>座椅</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>护轮罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>鞍座</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>轴距</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>保险杠</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>配置包</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>独立热源</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>燃料箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>多媒体</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.multimedia }}</span></el-form-item>
</el-col>
<el-col :span="4">
<!-- <div class="span-sty"><span>货箱</span></div>-->
<!-- <el-form-item><span class="addinputInfo">{{ formobj.packingCase }}</span></el-form-item>-->
</el-col>
</el-row>
<div class="headline">
更多配置
<div class="icon_sty" @click="changeDownOtherConfig(false)" v-show="isDownOther">
<i class="el-icon-arrow-down"/>
<span>展开</span>
</div>
<div class="icon_sty" @click="changeUpOtherConfig(true)" v-show="!isDownOther">
<i class="el-icon-arrow-up"/>
<span>收起</span>
</div>
</div>
<el-row v-show="!isDownOther">
<el-col :span="24">
<el-form-item>{{ formobj.otherConfig }}</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
</div>
</template>
<script>
import { selectExiCarConfig } from '@/api/vehicleconfiguration/vehicleconfiguration.js'
export default {
name: 'chexingpeizhibiaozhun',
props:{
params: {
type: Object,
}
},
data() {
return {
FormLoading: false,
priceValidity: '',
guidedPrice:'',
formobj: {},
isDown: true,
isDownOther: true,
sid_list: {
modelSid: '',
configSid: '',
vehModelConfigSid:'',
userSid: window.sessionStorage.getItem('userSid')
}
}
},
watch:{
params: {
deep: true,
immediate: false,
handler(newVal, oldVal) {
if (newVal.configSid !== '' && newVal.modelSid !== ''){
if (newVal.guidedPrice !== '' || newVal.guidedPrice !== null){
const guidedPrice_two = parseFloat(Number(newVal.guidedPrice) / 10000).toFixed(2)
this.guidedPrice = guidedPrice_two
}
selectExiCarConfig({
modelSid:newVal.modelSid,
configSid:newVal.configSid,
vehModelConfigSid:newVal.vehModelConfigSid
}).then((response) => {
this.FormLoading = false
if (response.success) {
this.formobj = response.data
} else {
this.$message({
showClose: true,
message: '查看失败!',
type: 'error'
});
}
})
}else {
this.formobj = {}
this.guidedPrice = ''
}
}
}
},
methods: {
//
changeDown(val) {
this.isDown = val
},
changeUp(val) {
this.isDown = val
},
//
changeDownOtherConfig(val) {
this.isDownOther = val
},
changeUpOtherConfig(val) {
this.isDownOther = val
}
}
}
</script>
<style scoped>
/* 标题头部的样式 */
.headtitle {
padding: 9px;
font-weight: bold;
font-size: 20px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
position: relative;
}
/* 内容头部的样式 */
.headline {
padding: 9px;
/*font-weight: bold;*/
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
position: relative;
}
/* 标题中内容的样式 */
.formaddcopy02 .headtitle_con .span-sty {
font-size: 16px;
width: 88px;
}
.formaddcopy02 .headtitle_con .addinputInfo {
font-size: 16px;
}
/* 内容部分中内容的样式 */
.formaddcopy02 .more_content .span-sty {
font-size: 16px;
width: 88px;
}
.formaddcopy02 .more_content /deep/ .el-form-item__content {
font-size: 16px;
}
.formaddcopy02 .headtitle_con .headtitle .icon_sty .el-icon-arrow-down, .el-icon-arrow-up {
font-size: 14px;
text-align: center;
}
/* 标题部分的展开与收起按钮*/
.formaddcopy02 .headtitle_con .headtitle .icon_sty {
display: inline-block;
position: absolute;
font-size: 14px;
top: 14px;
right: 10px;
text-align: center;
cursor: pointer;
}
/* 销售指导价的样式 */
.formaddcopy02 .headtitle_con .headtitle .headtitle_jia {
display: inline-block;
position: absolute;
right: 70px;
color: #d00000;
}
/* 内容部分的展开与收起按钮 */
.formaddcopy02 .headline .icon_sty {
display: inline-block;
position: absolute;
font-size: 14px;
font-weight: bolder;
right: 10px;
text-align: center;
cursor: pointer;
}
/* 更多配置一行的内边距 */
.formaddcopy02 .more_content /deep/ .el-col-24 {
padding: 20px;
}
/* 更多配置一行的行高 */
.formaddcopy02 .more_content .el-col-24 /deep/ .el-form-item__content {
line-height: 28px;
}
</style>

24
anrui-buscenter/anrui-buscenter-ui/src/components/pagination/index.vue

@ -99,8 +99,8 @@ export default {
<style lang="scss">
.pagination-container.pagesize{
float: right;
padding: 0;
float: right;
padding: 0;
}
.pagination-container {
background: #fff;
@ -110,20 +110,26 @@ export default {
.pagination-container.hidden {
display: none;
}
.el-pagination {
white-space: nowrap;
color: #303133;
font-weight: bold;
height: 28px;
}
.el-pagination.is-background .btn-next, .el-pagination.is-background .btn-prev{
padding: 0 20px;
border: 1px solid #ccc;
border-radius: 2px;
background-color: #FFFFFF;
padding: 0 20px;
border: 1px solid #ccc;
border-radius: 2px;
background-color: #FFFFFF;
}
.e-pagination{
.el-icon-arrow-left:before,
.el-icon-arrow-right:before{
content: '下一页';
color: #727272;
content: '下一页';
color: #727272;
}
.el-icon-arrow-left:before{
content: '上一页';
content: '上一页';
}
}

85
anrui-buscenter/anrui-buscenter-ui/src/components/tab-search/index.vue

@ -35,47 +35,48 @@
<style lang="scss">
@import "~@/styles/variables.scss";
.tab-header {
background-color: $search-bg;
padding: 8px 20px;
margin-bottom: 15px;
.tab-search{
padding: 8px 0px;
}
.tab-btn{
.search-from{
float: left;
padding-bottom: 10px;
}
.search-bth{
float: right;
.tab-header {
background-color: $search-bg;
padding: 5px 20px;
.tab-search{
padding: 9px 0;
}
.tab-btn{
.search-from{
float: left;
padding-bottom: 10px;
}
.search-bth{
float: right;
}
}
.el-form-item{
margin-bottom: 0px;
.el-input__icon,
.el-form-item__content{
line-height: 32px;
/*margin-left: 0!important;*/
}
.el-input__inner,
.el-form-item__label{
height: 32px;
line-height: 32px;
color: $text-color;
}
.el-select .el-input.is-focus .el-input__inner{
border-color: $border-color;
}
}
.el-button{
padding: 8px 20px;
// background-color: $color-primary;
// color: $text-color-inverse;
}
.el-select{
width: 150px;
}
}
}
}
.el-form-item{
margin-bottom: 0px;
.el-input__icon,
.el-form-item__content{
line-height: 32px;
}
.el-input__inner,
.el-form-item__label {
height: 36px;
line-height: 36px;
color: $text-color;
}
.el-select .el-input.is-focus .el-input__inner {
border-color: $border-color;
}
}
//.el-button{
// padding: 8px 20px;
// background-color: $color-primary;
// color: $text-color-inverse;
//}
.el-select {
width: 150px;
}
}
</style>

2
anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue

@ -111,7 +111,7 @@
this.files.splice(0, 1);
}
}
console.log('aaaa2', this.files)
console.log('aaaa2this.files', this.files)
},
},
},

4
anrui-buscenter/anrui-buscenter-ui/src/layout/components/AppMain.vue

@ -29,9 +29,9 @@ export default {
position: relative;
background-color: #FFFFFF;
/* margin-left:10px; */
padding: 0 10px;
/*padding: 0 20px;*/
overflow-x: hidden;
overflow-y: auto;
overflow-y: hidden;
}
.fixed-header+.app-main {
padding-top: 50px;

23
anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss

@ -1,19 +1,30 @@
.el-table {
.el-table__header{
tr th{
.el-table__header {
tr th {
background: #edf1f7;
color: #333333;
padding: 8px 0;
font-size: 16px;
}
}
}
.table-describe{
.el-table {
.el-table__body {
tr td {
padding: 6px 0 !important;
}
}
}
.table-describe {
border: 1px solid #dfe4ed;
border-bottom: 0px solid #dfe4ed;
h4{
border-bottom: 0 solid #dfe4ed;
h4 {
float: left;
margin: 0;
line-height: 34px;
padding:0 15px;
padding: 0 15px;
}
}

328
anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss

@ -86,54 +86,139 @@ div:focus {
color: red !important;
}
.pd-b10{
.pd-b10 {
padding-bottom: 10px;
}
.pd-y40{
.pd-y40 {
padding: 40px 0;
}
.pd-y20{
.pd-y20 {
padding: 20px 0;
}
.fs20{
.fs20 {
font-size: 20px;
}
// 页面上的button按钮
.app-container {
.el-button--medium {
padding: 10px 14px;
font-size: 16px;
}
.el-button--small {
padding: 8px 12px;
font-size: 14px;
}
.el-button--mini {
padding: 7px 10px;
font-size: 12px;
}
}
// 添加样式
.app-container {margin: 5px;
.app-container {
margin: 5px 0 5px 0;
background-color: #fff;
}
.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);}
.webcon{height: calc(100vh - 220px);overflow-y: auto;overflow-x: hidden;}
// 设置了列表页面滚动区域的样式
.main-content {
overflow-x: hidden;
overflow-y: auto;
height: calc(100vh - 200px);
padding: 0 20px;
}
.webcon {
overflow-x: hidden;
overflow-y: auto;
height: calc(100vh - 200px);
padding: 0 20px;
}
// .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;}
.listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;}
.listconsubjxs{height: calc(100vh - 300px);overflow-y: auto;overflow-x: hidden;}
// 搜索的
.listconadd {
height: calc(100vh - 200px);
overflow-y: auto;
overflow-x: hidden;
}
.listconadd{
.titwu {
font-size: 28px;
text-align: center;
padding: 30px 0 20px 0;
}
}
.listconsubjxs {
height: calc(100vh - 300px);
overflow-y: auto;
overflow-x: hidden;
}
// 搜索条件部分的样式
.webtop {
// position: fixed;top: 110px;width: calc(100% - 240px);z-index: 6000;
background-color: #fff;
display: flex !important;
flex-direction: row;
justify-content: space-between !important;
align-items: center; margin-bottom: 0px !important;
align-items: center;
margin-bottom: 0px !important;
font-size: 20px;
}
.tab-header {
font-size: 20px;
font-weight: bold;
}
.filter-item {
padding: 0 10px;
padding-right: 10px;
width: 220px;
display: inline-block;
}
.search {
.tab-header {
.el-form-item {
margin-right: 30px;
.el-form-item__label {
font-size: 16px;
font-weight: 500;
}
}
}
}
.listtop {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 0px 0px 10px 15px;
padding: 0 0 0 15px;
margin-top: 0;
border: 1px solid #dfe4ed;
height: 42px;
line-height: 42px;
}
.listtop .tit {
font-weight: bold;
font-size: 16px
}
.listtop .pagination {
margin: 0;
padding: 0;
}
.listtop .tit{font-weight: bold;}
.listtop .pagination{margin: 0;padding: 0;}
.pages {
display: flex;
flex-direction: row;
@ -141,84 +226,169 @@ div:focus {
align-items: flex-end;
padding: 0px 0px 15px 15px;
}
.pages .tit{font-weight: bold;}
.pages .pagination{margin: 0;}
.pages .tit {
font-weight: bold;
}
.pages .pagination {
margin: 0;
}
// .formadd{padding: 20px ;}
// .listeltable{overflow-y: auto;height: calc(100vh - 420px);}
.formadd {
padding: 20px 0;
padding: 10px 40px 0 40px;
font-size: 16px;
// height: calc(100vh - 200px);overflow-y: auto;
.tit{font-size: 32px;border-bottom: 1px solid #e0e3eb;text-align: center;margin: 0 0 20px 0;padding: 20px 0;}
.titwu{font-size: 32px;text-align: center;margin: 0 0 20px 0;padding: 20px 0;}
.title {
padding: 10px;font-weight: bold;
font-size: 20px;
.title {
padding: 12px;
font-weight: bold;
font-size: 16px;
background-color: $header-bg;
text-align: center;
text-align: left;
color: #ffffff;
}
.titleleft {
padding: 10px;font-weight: bold;
}
.tit {
font-size: 32px;
border-bottom: 1px solid #e0e3eb;
text-align: center;
margin: 0 0 20px 0;
padding: 20px 0;
}
.titleleft {
padding: 10px;
font-weight: bold;
font-size: 20px;
background-color: $header-bg;
text-align: left;
color: #ffffff;
}
.titlehui {
padding: 10px;
}
.titlehui {
padding: 10px;
font-size: 18px;
background-color: $table-border-color;
text-align: left;
}
}
.el-row {
display:flex;
flex-wrap: wrap;
border-left: 1px solid $table-border-color;
.el-col{
border-right: 1px solid $table-border-color;
border-bottom: 1px solid $table-border-color;
padding: 5px 15px 5px 15px !important;
min-height: 50px;
line-height: 1;
.el-form-item{
margin-bottom: 0;
// .addinputw{width: 400px;}
.addinputw{width: 80%;}
display: flex;
flex-wrap: wrap;
border-left: 1px solid $table-border-color;
.el-col {
border-right: 1px solid $table-border-color;
border-bottom: 1px solid $table-border-color;
padding: 0 15px;
min-height: 42px;
line-height: 1;
.el-form-item {
margin-bottom: 0;
line-height: 42px;
// .addinputw{width: 400px;}
.addinputw {
width: 80%;
line-height: 42px;
}
.el-input__inner {
height: 36px;
}
}
}
.footer{margin: 20px;}
}
}
.footer{margin: 20px;}
}
.formaddcopy02 {
padding: 10px 40px 0 40px;
.title {
padding: 12px;
font-weight: bold;
font-size: 16px;
background-color: #0294d7;
color: #ffffff;
text-align: left;
}
.el-row {
display: flex;
flex-wrap: wrap;
border-left: 1px solid $table-border-color;
.el-col {
border-right: 1px solid $table-border-color;
border-bottom: 1px solid $table-border-color;
min-height: 42px;
padding: 0 15px;
line-height: 42px;
position: relative;
.span-sty {
position: absolute;
top: 0;
bottom: 0;
left: 0;
line-height: 42px;
text-align: right;
font-size: 14px;
color: #606266;
font-weight: 600;
width: 70px;
padding-right: 5px;
border-right: 1px solid #e0e3eb;
}
.el-form-item {
margin-bottom: 0;
line-height: 42px;
.addinputw {
//padding: 5px 0;
width: 65%;
margin-left: 80px;
line-height: 42px;
}
.addinputInfo {
margin-left: 80px;
line-height: 42px;
}
.el-input__inner {
height: 36px;
}
}
}
}
.footer {
margin: 20px;
}
}
.forminfo {
padding: 20px 0;
.title {
padding: 10px;font-weight: bold;
padding: 20px 0;
.title {
padding: 10px;font-weight: bold;
font-size: 20px;
background-color: $header-bg;
text-align: center;
color: #ffffff;
}
}
.el-row {
display:flex;
flex-wrap: wrap;
border-left: 1px solid $table-border-color;
.trightb{ text-align: right;font-weight: bold;color: #606266; }
.tleft{ text-align: left; }
.el-col{
border-right: 1px solid $table-border-color;
border-bottom: 1px solid $table-border-color;
padding: 0px 15px 0px 15px !important;
min-height: 50px;
line-height: 50px;
font-size: 14px;
}
display:flex;
flex-wrap: wrap;
border-left: 1px solid $table-border-color;
.trightb{ text-align: right;font-weight: bold;color: #606266; }
.tleft{ text-align: left; }
.el-col{
border-right: 1px solid $table-border-color;
border-bottom: 1px solid $table-border-color;
padding: 0 15px 0 15px !important;
min-height: 50px;
line-height: 50px;
font-size: 14px;
}
}
.footer{margin: 20px;}
}
.footer{margin: 20px;}
}
.el-form-item__error {
@ -238,10 +408,24 @@ div:focus {
}
.titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;}
.addinputwda{width: 600px;}
.searchcon{margin: 0px 0 10px 0;}
.searchcon .searchbtn{margin: 10px 0;}
//.searchcon{margin: 0px 0 10px 0;}
//.searchcon .searchbtn{margin: 10px 0;}
// 隐藏显示按钮
.main-content {
.searchcon {
.searchbtn {
margin: 5px 0;
border: #2cab69 1px solid;
color: #2cab69;
}
}
}
.search .btn {
padding: 5px 0;
border: 1px solid #e0e3eb;
text-align: center;
margin-bottom: 5px;
}
// 弹出窗口按钮
.btnCancel{
background: #e84026 !important;outline: none;border: none;color: #fff !important;
@ -265,7 +449,7 @@ div:focus {
.lookimg img{width: 250px;margin: 10px;}
.listimg{width: 80px;}
// 搜索样式
.searchlist{margin: 10px 0;}
//.searchlist{margin: 10px 0;}
.searchbtns{margin: 10px 0;text-align: center;}
.mw{margin: 0 10px;display: inline-block;}
.widthxiao{width: 95%;margin: 0 auto;}

51
anrui-buscenter/anrui-buscenter-ui/src/styles/sidebar.scss

@ -9,32 +9,32 @@
position: relative;
overflow: hidden;
}
.TagsView{
height: 50px;
}
//.TagsView{
// height: 50px;
//}
.home-box{
position: fixed;
top: 60px;
left: 0;
background-color: $menuBg;
position: fixed;
top: 60px;
left: 0;
background-color: $menuBg;
border: 1px solid $menuHover;
line-height: 40px;
width: 210px;
line-height: 40px;
width: 210px;
z-index: 1000;
a{
display: inline-block;
line-height: 40px;
box-sizing: border-box;
a{
display: inline-block;
line-height: 40px;
box-sizing: border-box;
width: 50%;
text-align: center;
font-size: 16px;
font-weight: 500;
font-size: 16px;
font-weight: 500;
color: #FFFFFF;
}
a:last-child{
border:0;
}
a:last-child{
border:0;
background-color: $menuHover;
}
}
}
.sidebar-container {
transition: width 0.28s;
@ -56,6 +56,7 @@
}
.scrollbar-wrapper {
height: calc(100% - 40px) ; //此高度是100%减去页面底部的栏高
overflow-x: hidden !important;
}
@ -105,9 +106,9 @@
background-color: $menuHover !important;
}
}
.el-submenu__title i{
color: #FFFFFF;
}
.el-submenu__title i{
color: #FFFFFF;
}
.is-active>.el-submenu__title {
color: $subMenuActiveText !important;
}
@ -121,9 +122,9 @@
background-color: $subMenuHover !important;
}
}
& .el-menu-item.is-active {
background-color: $subMenuHover !important;
}
& .el-menu-item.is-active {
background-color: $subMenuHover !important;
}
}
// .hideSidebar {

47
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue

@ -2,12 +2,12 @@
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>车型</div>
<div>车型简介</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="webcon">
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
@ -79,19 +79,19 @@
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</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="handReset">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">列表</div>
<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" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="120px" label="品牌" align="center">
<el-table-column width="80px" label="序号" fixed type="index" :index="indexMethod" align="center"/>
<el-table-column width="140px" label="品牌" align="center">
<template slot-scope="scope">
<span>{{ scope.row.brandName }}</span>
</template>
@ -111,12 +111,12 @@
<span>{{ scope.row.fuelTypeValue }}</span>
</template>
</el-table-column>
<el-table-column width="100px" label="变速箱" align="center">
<el-table-column width="190px" label="变速箱" align="center">
<template slot-scope="scope">
<span>{{ scope.row.gearboxTypeValue }}</span>
</template>
</el-table-column>
<el-table-column width="150px" label="销售指导价(万元)" align="center">
<el-table-column width="170px" label="销售指导价(万元)" align="center">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
@ -422,34 +422,5 @@ export default {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

399
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue

@ -10,378 +10,22 @@
<el-button type="info" size="small" @click="handleReturn">关闭</el-button>
</div>
</div>
<div class="listadd">
<div class="wlInfo">
<div class="topRightCorner">
<span>销售指导价{{ guidedPrice }} 万元</span>
<span style="margin-left: 15px">价格有效期{{ priceValidity }}</span>
</div>
<span>车型配置标准页面</span>
</div>
<el-form ref="dataForm" :model="formobj" label-position="right" class="formadd">
<div class="headtitle"><span>系列{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力{{ formobj.powerValue }}</span></span></span></span></div>
<el-row>
<el-col :span="1">
<el-form-item>
<span>品牌</span>
</el-form-item>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="brandName">
<span>{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
<el-col :span="1">
<el-form-item>
<span>功能</span>
</el-form-item>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="vehicleTypeValue">
<span>{{ formobj.vehicleTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="1">
<el-form-item>
<span>系列</span>
</el-form-item>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="productLineValue">
<span>{{ formobj.productLineValue }}</span>
</el-form-item>
</el-col>
<el-col :span="1">
<el-form-item>
<span>驱动</span>
</el-form-item>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="driveFormValue">
<span>{{ formobj.driveFormValue }}</span>
</el-form-item>
</el-col>
<el-col :span="1">
<el-form-item>
<span>马力</span>
</el-form-item>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="powerValue">
<span>{{ formobj.powerValue }}</span>
</el-form-item>
</el-col>
<el-col :span="1">
<el-form-item>
<span>版本</span>
</el-form-item>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="vehicleVersionValue">
<span>{{ formobj.vehicleVersionValue }}</span>
</el-form-item>
</el-col>
<el-col :span="1">
<el-form-item>
<span>燃料</span>
</el-form-item>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="fuelTypeValue">
<span>{{ formobj.fuelTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<el-form-item>
<span>变速箱</span>
</el-form-item>
</el-col>
<el-col :span="1" class="tleftb">
<el-form-item prop="gearboxTypeValue">
<span>{{ formobj.gearboxTypeValue }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="headline">车型信息</div>
<el-row>
<el-col :span="2">
<span>细分市场</span>
</el-col>
<el-col :span="3">
<el-form-item prop="marketSegmentsValue">
<span>{{ formobj.marketSegmentsValue }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>发动机型号</span>
</el-col>
<el-col :span="3">
<el-form-item prop="engineTypeValue">
<span>{{ formobj.engineTypeValue }}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="2">-->
<!-- <span>公告型号</span>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <el-form-item prop="announcementModel">-->
<!-- <span>{{ formobj.announcementModel }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="2">
<span>规格型号</span>
</el-col>
<el-col :span="3">
<el-form-item prop="specifications">
<span>{{ formobj.specifications }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>排放标准</span>
</el-col>
<el-col :span="3">
<el-form-item prop="emissionStandardValue">
<span>{{ formobj.emissionStandardValue }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>系别</span>
</el-col>
<el-col :span="2">
<el-form-item prop="departmentValue">
<span>{{ formobj.departmentValue }}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="2">-->
<!-- <span>货箱</span>-->
<!-- </el-col>-->
<!-- <el-col :span="2" class="tleftb">-->
<!-- <el-form-item prop="packingCase">-->
<!-- <span>{{ formobj.packingCase }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- </el-col>-->
</el-row>
<el-row>
<vehicleconfiguration ref="divConfig" :params="sid_list"/>
<!-- <el-col :span="2">-->
<!-- <span>内部编码</span>-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- <el-form-item prop="insideCode">-->
<!-- <span>{{ formobj.insideCode }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- </el-col>-->
<!-- <el-col :span="3">-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- </el-col>-->
</el-row>
<div class="headline">常用配置</div>
<el-row>
<el-col :span="2">
<span>颜色</span>
</el-col>
<el-col :span="3">
<el-form-item prop="carColor">
<span>{{ formobj.carColor }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>驾驶室</span>
</el-col>
<el-col :span="3">
<el-form-item prop="specification">
<span>{{ formobj.specification }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>导流罩</span>
</el-col>
<el-col :span="3">
<el-form-item prop="baffleModel">
<span>{{ formobj.baffleModel }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>鞍座</span>
</el-col>
<el-col :span="3">
<el-form-item prop="saddle">
<span>{{ formobj.saddle }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>独立热源</span>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="independentSources">
<span>{{ formobj.independentSources }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="2">
<span>缓速器</span>
</el-col>
<el-col :span="3">
<el-form-item prop="slowMachine">
<span>{{ formobj.slowMachine }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>后速桥比</span>
</el-col>
<el-col :span="3">
<el-form-item prop="rearAxleRatio">
<span>{{ formobj.rearAxleRatio }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>悬架</span>
</el-col>
<el-col :span="3">
<el-form-item prop="suspension">
<span>{{ formobj.suspension }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>轴距</span>
</el-col>
<el-col :span="3">
<el-form-item prop="wheelbase">
<span>{{ formobj.wheelbase }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>燃料箱</span>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="fuelTank">
<span>{{ formobj.fuelTank }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="2">
<span>后视镜</span>
</el-col>
<el-col :span="3">
<el-form-item prop="rearViewMirror">
<span>{{ formobj.rearViewMirror }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>空调</span>
</el-col>
<el-col :span="3">
<el-form-item prop="airConditioner">
<span>{{ formobj.airConditioner }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>座椅</span>
</el-col>
<el-col :span="3">
<el-form-item prop="saddle">
<span>{{ formobj.seat }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>保险杠</span>
</el-col>
<el-col :span="3">
<el-form-item prop="bumper">
<span>{{ formobj.bumper }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>多媒体</span>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="multimedia">
<span>{{ formobj.multimedia }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="2">
<span>轮胎</span>
</el-col>
<el-col :span="3">
<el-form-item prop="tireSize">
<span>{{ formobj.tireSize }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>轮毂材质</span>
</el-col>
<el-col :span="3">
<el-form-item prop="hubMaterial">
<span>{{ formobj.hubMaterial }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>护轮罩</span>
</el-col>
<el-col :span="3">
<el-form-item prop="tireCover">
<span>{{ formobj.tireCover }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>配置包</span>
</el-col>
<el-col :span="3">
<el-form-item prop="configuringBao">
<span>{{ formobj.configuringBao }}</span>
</el-form-item>
</el-col>
<el-col :span="2">
<span>货箱</span>
</el-col>
<el-col :span="2" class="tleftb">
<el-form-item prop="packingCase">
<span>{{ formobj.packingCase }}</span>
</el-form-item>
</el-col>
<!-- <el-col :span="2"/>-->
<!-- <el-col :span="2"/>-->
</el-row>
<div class="headline">更多配置</div>
<el-row>
<el-col :span="24">
<el-form-item prop="otherConfig">
<span style="display: block; text-indent: 2em">{{ formobj.otherConfig }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<modelconfigurationinquiry v-show="viewState == 2" ref="divInquiry" @doback="resetState"/>
</div>
</template>
<script>
import { selectExiCarConfig } from '@/api/chexingchaxun/modelinquire.js'
import vehicleconfiguration from "@/components/VehicleConfigurationSub/vehicleconfiguration";
import modelconfigurationinquiry from './modelconfigurationinquiry'
export default {
name: 'chexingpeizhibiaozhun',
components: {
modelconfigurationinquiry
modelconfigurationinquiry,
vehicleconfiguration
},
data() {
return {
@ -393,7 +37,8 @@ export default {
sid_list: {
modelSid: '',
configSid: '',
userSid: window.sessionStorage.getItem('userSid')
vehModelConfigSid:'',
guidedPrice:''
}
}
},
@ -415,23 +60,25 @@ export default {
},
//
showInfo(sid, row) {
console.log('列表带来的数据',row)
this.FormLoading = true
this.sid_list.modelSid = sid
this.sid_list.modelSid = row.modelSid
this.sid_list.configSid = row.configSid
this.guidedPrice = row.guidedPrice
this.priceValidity = row.priceValidity
selectExiCarConfig(this.sid_list).then((response) => {
this.FormLoading = false
if (response.code === '200') {
this.formobj = response.data
} else {
this.$notify({
title: '失败',
message: '查询失败',
type: 'error'
})
}
})
this.sid_list.vehModelConfigSid = row.vehModelConfigSid
this.sid_list.guidedPrice = row.price
// this.priceValidity = row.priceValidity
// selectExiCarConfig(this.sid_list).then((response) => {
// this.FormLoading = false
// if (response.code === '200') {
// this.formobj = response.data
// } else {
// this.$notify({
// title: '',
// message: '',
// type: 'error'
// })
// }
// })
}
}
}

21
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue

@ -244,31 +244,12 @@ export default {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.formadd{
padding: 0px !important;
}
.tit {
margin-bottom: -10px;
}
.trightb{
text-align: right;
}
.pagination {
margin-bottom: -10px;
}
.line {
display: inline-block;
margin: 0px 15px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
</style>

18
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue

@ -255,23 +255,5 @@ export default {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
</style>

47
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue

@ -7,7 +7,7 @@
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="webcon">
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
@ -113,8 +113,8 @@
</el-form-item>
</el-form>
<div class="btn">
<el-button type="primary" @click="handleFilter">查询</el-button>
<el-button type="primary" @click="handReset">重置</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="handReset">重置</el-button>
</div>
</div>
</div>
@ -145,7 +145,7 @@
<span class="bluezi" @click="handproduction(scope.row)">{{ scope.row.produceCarNum }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(万元)" align="center" width="150">
<el-table-column label="销售指导价(万元)" align="center" width="165">
<template slot-scope="scope">
<span>{{ scope.row.price }}</span>
</template>
@ -327,7 +327,7 @@ export default {
this.rearAxleRatio_list = res.data
}
})
dataDictionary({ type: 'whether' }).then((res) => {
dataDictionary({ type: 'airConditioner' }).then((res) => {
if (res.code === '200') {
this.airConditioner_list = res.data
}
@ -337,7 +337,7 @@ export default {
this.hubMaterial_list = res.data
}
})
dataDictionary({ type: 'whether' }).then((res) => {
dataDictionary({ type: 'baffleModel' }).then((res) => {
if (res.code === '200') {
this.baffleModel_list = res.data
}
@ -352,7 +352,7 @@ export default {
this.seat_list = res.data
}
})
dataDictionary({ type: 'whether' }).then((res) => {
dataDictionary({ type: 'tireCover' }).then((res) => {
if (res.code === '200') {
this.tireCover_list = res.data
}
@ -377,7 +377,7 @@ export default {
this.configuringBao_list = res.data
}
})
dataDictionary({ type: 'whether' }).then((res) => {
dataDictionary({ type: 'independentSources' }).then((res) => {
if (res.code === '200') {
this.independentSources_list = res.data
}
@ -387,7 +387,7 @@ export default {
this.fuelTank_list = res.data
}
})
dataDictionary({ type: 'whether' }).then((res) => {
dataDictionary({ type: 'multimedia' }).then((res) => {
if (res.code === '200') {
this.multimedia_list = res.data
}
@ -487,34 +487,5 @@ export default {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

33
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue

@ -369,37 +369,4 @@ label {
border-bottom: 0px solid #e6ebf5;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.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>

13
anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue

@ -228,19 +228,6 @@ export default {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.line {
display: inline-block;
margin: 0px 15px;

13
anrui-buscenter/anrui-buscenter-ui/src/views/hetongguanli/hetongshenheguanli/hetongshenheguanli.vue

@ -211,17 +211,4 @@ export default {
width: 220px;
display: inline-block;
}
.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>

18
anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue

@ -246,25 +246,9 @@ export default {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.line {
display: inline-block;
margin: 0px 15px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
</style>

24
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiu.vue

@ -493,32 +493,8 @@ export default {
</script>
<style scoped>
/* .search{
margin-left: 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;
}
.line {
display: inline-block;
margin: 0px 15px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
</style>

42
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue

@ -27,38 +27,37 @@
<el-button @click="dialogVisible = false"> </el-button>
</span>
</el-dialog>
<div class="webcon">
<div class="main-content">
<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="80px" class="tab-header">
<el-form-item label="客户名称" class="searchlist">
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.name" maxlength="20" placeholder="请输入客户名称" class="addinputw" clearable/>
</el-form-item>
<el-form-item label="客户类型" class="searchlist">
<el-form-item label="客户类型">
<el-select v-model="listQuery.params.customerTypeKey" class="addinputw" placeholder="请选择">
<el-option v-for="(item, index) in merType" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="联系电话" class="searchlist">
<el-form-item label="联系电话">
<el-input v-model="listQuery.params.mobile" maxlength="20" placeholder="请输入联系电话" class="addinputw" clearable/>
</el-form-item>
<el-form-item label="客户级别" class="searchlist">
<el-form-item label="客户级别">
<el-select v-model="listQuery.params.levelKey" class="addinputw" placeholder="请选择客户级别">
<el-option v-for="(item, index) in induslevel" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="提醒日期" class="searchlist">
<el-form-item label="提醒日期">
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.remindStartDay" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
<div class="line"></div>
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.remindEndDay" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
</el-form-item>
<div class="searchbtns">
<el-button type="primary" icon="el-icon-search" @click="handleReset()">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleFilter()">重置</el-button>
</div>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleReset">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleFilter">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
@ -629,27 +628,6 @@ export default {
margin-bottom: 8px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
/* >>>操作符影响子组件 */
.diaForm >>> .el-form-item__label {
margin-right: 16px;

19
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue

@ -10,8 +10,8 @@
</div>
</div>
<div class="listconadd">
<div class="titwu">客户信息</div>
<el-form ref="dataForm" :model="temp" label-position="top" label-width="190px" class="formadd " :rules="rules">
<div class="titwu">客户信息</div>
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div>基础信息</div>
</div>
@ -1225,27 +1225,10 @@ export default {
}
</script>
<style scoped>
.yulan {
text-align: right;
margin-top: 15px;
}
.tleftb {
text-align: left;
}
.trightb {
text-align: right;
}
.hang {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
padding: 20px 10px;
}
.addinputwduan {
width: 80px;
margin: 0 5px;

20
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue

@ -503,29 +503,9 @@ export default {
width: 40px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.line {
display: inline-block;
margin: 0px 15px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
</style>

18
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue

@ -353,27 +353,9 @@ export default {
.searchcon {
margin: 0px 9px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.listcon {
margin: 0px 9px;
}
.listtop {
margin: 0px 9px;
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
}
.btnColse {
background-color: #cccccc;
}

29
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue

@ -433,34 +433,5 @@ import {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

61
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue

@ -304,13 +304,49 @@ export default {
},
// ------------------
Dictionary() {
dataDictionary({type: 'whether'}).then((res) => {
//
dataDictionary({
type: 'airConditioner'
}).then((res) => {
if (res.code === '200') {
this.airConditioner_list = res.data
console.log('下拉框请求空调', res.data)
}
})
//
dataDictionary({
type: 'baffleModel'
}).then((res) => {
if (res.code === '200') {
this.baffleModel_list = res.data
console.log('下拉框请求导流罩', res.data)
}
})
//
dataDictionary({
type: 'tireCover'
}).then((res) => {
if (res.code === '200') {
this.tireCover_list = res.data
console.log('下拉框请求护轮罩', res.data)
}
})
//
dataDictionary({
type: 'independentSources'
}).then((res) => {
if (res.code === '200') {
this.independentSources_list = res.data
console.log('下拉框请求护独立热源', res.data)
}
})
//
dataDictionary({
type: 'multimedia'
}).then((res) => {
if (res.code === '200') {
this.multimedia_list = res.data
console.log('下拉框请求多媒体', res.data)
}
})
dataDictionary({type: 'bodyColor'}).then((res) => {
@ -520,28 +556,5 @@ export default {
}
</script>
<style scoped>
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
text-align: center;
}
.tab-header {
margin-bottom: 0 !important;
}
</style>

36
anrui-scm/anrui-scm-ui/src/api/ruzhang/scmapplyinbound.js

@ -40,10 +40,7 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/complete',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
// 代办任务驳回任务
@ -51,10 +48,7 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/reject',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
// 代办任务终止任务
@ -62,10 +56,7 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/breakProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
// 代办任务撤回任务
@ -73,31 +64,22 @@ export default {
return request({
url: '/scm/v1/scmapplyinbound/revokeProcess',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
data: params
})
},
getNextNodesForSubmit: function(data) {
return request({
url: '/scm/v1/scmapplyinbound/getNextNodesForSubmit',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
method: 'get',
params: data
})
},
getPreviousNodesForReject(formobj) {
getPreviousNodesForReject(data) {
return request({
url: '/scm/v1/scmapplyinbound/getPreviousNodesForReject',
method: 'post',
data: formobj,
headers: {
'Content-Type': 'application/json'
}
method: 'get',
params: data
})
}
}

1
anrui-scm/anrui-scm-ui/src/components/uploadFile/FaImages.vue

@ -148,6 +148,7 @@ export default {
this.$emit('fileChange', this.files)
},
handlePictureCardPreview(file) {
this.dialogVisible = true
this.dialogImageUrl = file.url
},
//

1
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@ -56,6 +56,7 @@
<el-table-column prop="orderDate" label="采购订单日期" align="center" width="120"/>
<el-table-column prop="orderType" label="采购订单类型" align="center" width="120"/>
<el-table-column prop="applicationCode" label="排产申请编号" align="center" width="200"/>
<el-table-column prop="subscriptionDate" label="认款日期" align="center" width="100"/>
<el-table-column prop="insideCode" label="内部编码" header-align="center" align="left" width="120"/>
<el-table-column prop="vehicleName" label="车型" align="center" width="200"/>
<el-table-column prop="platformNo" label="台数" align="center" width="80"/>

172
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouAdd.vue

@ -1,93 +1,104 @@
<template>
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><el-input v-model="formobj.orderNo" placeholder="" class="addinputw addinputOne addinputTwo" clearable/></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><el-date-picker v-model="formobj.orderDate" class="addinputw addinputOne addinputTwo" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
<div class="app-container">
<div v-show="viewState == 1">
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.expectLaunchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.launchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.offlineDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputOne" clearable/></el-form-item>
</el-col>
</el-row>
</el-form>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item>
<span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span>
<el-button type="primary" size="small" style="margin-left: 10px" @click="handleLook(formobj.purchaseRequisitionSid)">查看</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><el-input v-model="formobj.orderNo" placeholder="" class="addinputw addinputOne addinputTwo" clearable/></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><el-date-picker v-model="formobj.orderDate" class="addinputw addinputOne addinputTwo" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.expectLaunchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.launchDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><el-date-picker v-model="formobj.offlineDate" class="addinputw addinputOne addinputThree" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputOne" clearable/></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!--End 添加修改部分-->
</div>
<!--End 添加修改部分-->
<cheliangpaichanInfo v-show="viewState == 2" ref="divPaiChan" @doback="resetState"/>
</div>
</template>
<script>
import req from '@/api/cheliang/busvehicleorder'
import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
export default {
name: 'cheliangcaigouAdd',
components: {
cheliangpaichanInfo
},
data() {
return {
viewState: 1,
viewTitle: '【编辑】采购订单',
formobj: {
applicationCode: '',
@ -180,6 +191,13 @@ export default {
return false
}
})
},
handleLook(sid) {
this.viewState = 2
this.$refs['divPaiChan'].showInfo(sid)
},
resetState() {
this.viewState = 1
}
}
}

173
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigouInfo.vue

@ -1,91 +1,102 @@
<template>
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderDate }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
<div class="app-container">
<div v-show="viewState == 1">
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.expectLaunchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.launchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.offlineDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
<!--end 添加修改按钮-->
<!--end 详情按钮-->
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="titwu"><span>采购订单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单类型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderType }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排产申请编号</span></div>
<el-form-item>
<span class="addinputInfo addinputOne">{{ formobj.applicationCode }}</span>
<el-button type="primary" size="small" style="margin-left: 10px" @click="handleLook(formobj.purchaseRequisitionSid)">查看</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车型</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modelName }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>台数</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.platformNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单编号</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderNo }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>订单日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orderDate }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>订单进程</div>
</div>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>预计上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.expectLaunchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>上线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.launchDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>下线日期</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.offlineDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>备注</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<!--End 添加修改部分-->
</div>
<!--End 添加修改部分-->
<cheliangpaichanInfo v-show="viewState == 2" ref="divPaiChan" @doback="resetState"/>
</div>
</template>
<script>
import req from '@/api/cheliang/busvehicleorder'
import cheliangpaichanInfo from '../../../views/supplychain/cheliangpaichan/cheliangpaichanInfo'
export default {
name: 'cheliangcaigouAdd',
components: {
cheliangpaichanInfo
},
data() {
return {
viewState: 1,
viewTitle: '采购订单详情',
formobj: {},
rules: {},
@ -104,10 +115,16 @@ export default {
req.fetchBySid(row.sid).then(resp => {
const vdata = resp.data
this.formobj = vdata
}).catch(e => {
this.formobj = row
})
.catch(e => {
this.formobj = row
})
},
handleLook(sid) {
this.viewState = 2
this.$refs['divPaiChan'].showInfo(sid)
},
resetState() {
this.viewState = 1
}
}
}

2
anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/xunjiandan.vue

@ -30,7 +30,7 @@
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>巡检情况说明</span></div>
<el-form-item>
<el-input v-model="formobj.situationExplain" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
<el-input v-model="formobj.situationExplain" class="addinputw addinputwOne" style="width: 80%" type="textarea" resize="none" placeholder="对车辆外观、车辆状态、电瓶情况、箱内燃油情况等进行说明" :autosize="{ minRows: 2, maxRows: 10}" clearable></el-input>
</el-form-item>
</el-col>
</el-row>

29
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@ -97,7 +97,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="5">
@ -111,7 +111,7 @@
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" placeholder="" clearable class="addinputw"/></el-form-item>
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="5">
@ -260,6 +260,17 @@ export default {
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // ."-"
},
UpNumberRatio(e) {
e.target.value = e.target.value.replace(/[^\d.]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // .
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') //
if (e.target.value.indexOf('.') < 0 && e.target.value !== '') {
// 0102
e.target.value = parseFloat(e.target.value)
}
},
inputOnceFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
@ -289,7 +300,6 @@ export default {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
} else {
this.formobj.moneyCount = 0
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
}
@ -325,10 +335,14 @@ export default {
this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
}
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.corrMoneyTwo = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyTwo
},
inputEligibleProportionThree() {
@ -394,10 +408,15 @@ export default {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
}
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.corrMoneyThree = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyThree
},
inputMoneyCount() {

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

@ -10,7 +10,7 @@
<el-form :inline="true" class="tab-header">
<el-form-item class="formItem" label="申请日期">
<el-date-picker
value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd"userSid
v-model="queryParams.params.applyDateStart"
clearable
style="width: 160px;"

6
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/relation/xuanzecheliang.vue

@ -184,7 +184,8 @@ export default {
vehicleState: '',
vehicleType: '',
vehicleVersion: '',
vinNoList:[]
vinNoList:[],
userSid : window.sessionStorage.getItem('userSid')
}
},
selectDate: undefined,
@ -241,7 +242,8 @@ export default {
vehicleState: '',
vehicleType: '',
vehicleVersion: '',
vinNoList: []
vinNoList: [],
userSid : ''
}
}
},

21
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@ -186,16 +186,16 @@
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<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 addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row :class="{'rowClass':!currentLink}">
<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 addinputOne" clearable ></el-input></el-form-item>
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -321,12 +321,12 @@ export default {
}, '*')
},
methods: {
showInfo(sid, row) {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '入账单'
console.log('编辑回显', sid, row)
console.log('编辑回显', sid)
req.fetchBySid(sid).then(resp => {
const data = resp.data
this.formobj = data
@ -351,7 +351,7 @@ export default {
this.policyThreeChecked = false
}
}).catch(e => {
this.formobj = row
this.formobj = {}
})
},
magnify(val) {
@ -509,4 +509,7 @@ export default {
.freight {
color: #FFFFFF;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

697
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@ -1,75 +1,149 @@
<template>
<div class="app-container">
<div>
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存
</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交
</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveEdit()">保存</el-button>
<el-button type="primary" size="small" @click="submitVehicleApply()">提交</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div >
<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" class="el-form-item-right">
<el-form-item label="申请编号:" />
<div class="listconadd">
<div class="titwu"><span>车辆入账申请单</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formadd">
<el-row class="rowStyle">
<el-col :span="20" class="colOneStyle"></el-col>
<el-col :span="4" class="tleftb colOneStyle">
<span style="font-size: 16px">金额单位</span>
</el-col>
</el-row>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="3" class="tleftb"><span>分公司</span></el-col>
<el-col :span="5">
<el-form-item>{{ formobj.useOrgName }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>申请日期</span></el-col>
<el-col :span="5">
<el-form-item>{{ formobj.applicationDate }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>申请人</span></el-col>
<el-col :span="5">
<el-form-item>{{ formobj.applicationName }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>采购订单编号</span></el-col>
<el-col :span="21">
<el-form-item>{{ formobj.purchaseOrderNo }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>车型</span></el-col>
<el-col :span="21">
<el-form-item>{{ formobj.modelName }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>常用配置</span></el-col>
<el-col :span="21">
<el-form-item>{{ formobj.configName }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家合同价</span></el-col>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.applicationCode" readonly />
</el-form-item>
<el-form-item>{{ formobj.contractPrice }}</el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<el-form-item label="采购订单编号:" />
<el-col :span="3" class="tleftb"><span>其中上装价格</span></el-col>
<el-col :span="5">
<el-form-item><el-input v-model="formobj.amongSzPrice" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>上装价格计算依据</span></el-col>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.purchaseOrderNo" readonly />
</el-form-item>
<el-form-item><el-input v-model="formobj.szPriceCalBasis" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="el-form-item-right">
<el-form-item label="申请人:" />
</el-row>
<el-row>
<el-col :span="8" class="tcenterb"><span>其中含运费</span></el-col>
<el-col :span="3" class="tleftb"><span>一次运费</span></el-col>
<el-col :span="5">
<el-form-item><el-input @input="inputOnceFreight" v-model="formobj.onceFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>二次运费</span></el-col>
<el-col :span="5">
<el-form-item>
<el-input v-model="formobj.applicationName" readonly />
</el-form-item>
<el-form-item><el-input @input="inputSecondaryFreight" v-model="formobj.secondaryFreight" placeholder="" clearable @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw"/></el-form-item>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<el-form-item label="车型:" />
<div class="title">
<div>政策详情(含签单折让开票下浮等)</div>
<el-checkbox @change="changeFreight" v-model="freightChecked"><span style="color: #FFFFFF">扣减运费</span></el-checkbox>
</div>
<el-row>
<el-col :span="3" class="tleftb"><span>政策1</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.policyOne" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="21">
<el-form-item>
<el-input v-model="formobj.modelName" readonly />
</el-form-item>
<el-col :span="3" class="tleftb"><span>可享受金额</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleAmountOne" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.eligibleAmountOne" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="10" class="tcenterb"><span>计算政策2时:<el-checkbox @change="changePolicyOne" style="padding-left: 5px" v-model="policyOneChecked">扣减政策1</el-checkbox></span><span style="padding-left: 15px">计算政策3时:<el-checkbox @change="changePolicyTwo" style="padding-left: 5px" v-model="policyTwoChecked">扣减政策1</el-checkbox><el-checkbox @change="changePolicyThree" v-model="policyThreeChecked">扣减政策2</el-checkbox></span></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策2</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.policyTwo" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleProportionTwo" v-model="formobj.eligibleProportionTwo" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-form-item>{{ formobj.corrMoneyTwo }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>政策3</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.policyThree" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>可享受比例%</span></el-col>
<el-col :span="4">
<el-form-item><el-input @input="inputEligibleProportionThree" v-model="formobj.eligibleProportionThree" @keyup.native="UpNumberRatio" @keydown.native="UpNumberRatio" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>对应金额</span></el-col>
<el-col :span="7">
<el-form-item>{{ formobj.corrMoneyThree }}</el-form-item>
</el-col>
</el-row>
<el-row class="linetwo">
<el-col :span="3" class="el-form-item-right">
<el-form-item label="常用配置:" />
<el-row>
<el-col :span="3" class="tleftb"><span>金额合计</span></el-col>
<el-col :span="4">
<el-form-item><el-input v-model="formobj.moneyCount" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
<el-col :span="3" class="tleftb"><span>政策备注</span></el-col>
<el-col :span="14">
<el-form-item><el-input v-model="formobj.policyRemarks" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家政策截图</span></el-col>
<el-col :span="21">
<upload_picture ref="imgUpload" v-model="imgList" bucket="map" :upload-data="{type:'0001'}"/>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家结算价</span></el-col>
<el-col :span="21">
<el-form-item>
<el-input v-model="formobj.configName" readonly />
</el-form-item>
<el-form-item>{{ inputMoneyCount() }}</el-form-item>
</el-col>
</el-row>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.vehicleList" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column fixed width="60px" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column label="车架号" align="left" header-align="center">
<template slot-scope="scope" prop="vehicleName">
<el-input v-model="scope.row.vinNo" placeholder="" class="addinputw" clearable />
@ -81,79 +155,102 @@
</template>
</el-table-column>
</el-table>
<el-row style="margin-top: 10px">
<el-col>
<el-col :span="3" class="el-form-item-right">
<el-form-item label="厂家发车日期:" />
</el-col>
<el-col :span="21">
<el-form-item>
<el-date-picker v-model="formobj.departureDate" value-format="yyyy-MM-dd" clearable type="date" placeholder="开始日期" />
</el-form-item>
</el-col>
<el-row>
<el-col :span="3" class="tleftb"><span>厂家入库日期</span></el-col>
<el-col :span="9">
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.priceDate" clearable type="date" placeholder="开始日期"/></el-form-item>
</el-col>
</el-row>
<el-row class="linethree">
<el-col :span="3" class="el-form-item-right">
<el-form-item label="备注:" />
<el-col :span="3" class="tleftb"><span>厂家发车日期</span></el-col>
<el-col :span="9">
<el-form-item><el-date-picker value-format="yyyy-MM-dd" v-model="formobj.departureDate" clearable type="date" placeholder="开始日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"><span>备注</span></el-col>
<el-col :span="21">
<el-form-item>
<el-input v-model="formobj.remarks" clearable />
</el-form-item>
<el-form-item><el-input v-model="formobj.remarks" placeholder="" clearable class="addinputw"/></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
</div>
</template>
<script>
import req from '@/api/ruzhang/scmapplyinbound'
import upload_picture from '@/components/uploadFile/upload_picture'
import { getPathSidByUserSid, fetchBySid } from '@/api/cheliang/dictcommons'
export default {
name: 'RuzhangAdd',
name: 'ruzhangEdit',
components: {
upload_picture
},
data() {
return {
viewTitle: '',
index: 0,
tableKey: 0,
freightChecked: false, //
policyOneChecked: false, // 2 1
policyTwoChecked: false, // 3 1
policyThreeChecked: false, // 3 2
imgList: [],
//
formobj: {
sid: '', // sid
applicationSid: window.sessionStorage.getItem('userSid'), // sid
applicationName: window.sessionStorage.getItem('name'), //
orgSidPath: window.sessionStorage.getItem('orgSidPath'),
staffSid: window.sessionStorage.getItem('staffSid'),
userSid: window.sessionStorage.getItem('userSid'), // sid
applicationCode: '', //
amongSzPrice: '',
applicationCode: '',
applicationDate: '',
applicationName: '',
applicationSid: '',
configName: '',
configSid: '',
contractPrice: '',
corrMoneyThree: '',
corrMoneyTwo: '',
costPrice: '',
departureDate: '',
eligibleAmountOne: '',
eligibleProportionThree: '',
eligibleProportionTwo: '',
insideCode: '',
modelName: '',
modelSid: '',
moneyCount: '',
nodeState: '',
num: '',
onceFreight: '',
policyOne: '',
policyRemarks: '',
policyThree: '',
policyTwo: '',
priceDate: '',
purchaseOrderNo: '',
remarks: '', //
vehicleOrderSid: '',
businessSid: '', // sid
procInsId: '', // id
taskId: '', // id
vehicleList: []
remarks: '',
secondaryFreight: '',
userSid: '',
useOrgName: '',
useOrgSid: '',
deductionFreight: '',
deductionPolicyThreeOne: '',
deductionPolicyThreeTwo: '',
deductionPolicyTwoOne: '',
scmFiles: [],
vehicleList: [],
vehicleOrderSid: ''
},
rules: {},
submitdisabled: false
}
},
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)
//
this.formobj.businessSid = obj.businessSid
this.formobj.procInsId = obj.instanceId
this.formobj.taskId = obj.taskId
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
@ -164,152 +261,390 @@ export default {
}, '*')
},
methods: {
init() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.formobj.useOrgSid = resp.data
fetchBySid(this.formobj.useOrgSid).then((res) => {
if (res.success) {
this.formobj.useOrgName = res.data.name
}
})
}
})
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // ."-"
},
UpNumberRatio(e) {
e.target.value = e.target.value.replace(/[^\d.]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // .
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') //
if (e.target.value.indexOf('.') < 0 && e.target.value !== '') {
// 0102
e.target.value = parseFloat(e.target.value)
}
},
inputOnceFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
inputSecondaryFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changeFreight() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changePolicyOne() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changePolicyTwo() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
changePolicyThree() {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
},
inputEligibleAmountOne() {
if (this.formobj.eligibleAmountOne !== '') {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
} else {
this.inputEligibleProportionTwo()
this.inputEligibleProportionThree()
}
},
inputEligibleProportionTwo() {
if (this.formobj.eligibleProportionTwo !== '') {
if (this.policyOneChecked) {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
} else {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
} else {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyTwo = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
} else {
this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
} else {
this.formobj.corrMoneyTwo = this.multiplication(parseFloat(this.formobj.contractPrice), (parseFloat(this.formobj.eligibleProportionTwo) / 100))
}
}
} else {
this.formobj.corrMoneyTwo = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyTwo
},
inputEligibleProportionThree() {
if (this.formobj.eligibleProportionThree !== '') {
if (this.policyTwoChecked && this.policyThreeChecked) {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else if (this.policyTwoChecked && !this.policyThreeChecked) {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.eligibleAmountOne) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else if (!this.policyTwoChecked && this.policyThreeChecked) {
if (this.freightChecked) {
if (this.policyOneChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.corrMoneyTwo)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
if (this.freightChecked) {
if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight !== '' && this.formobj.secondaryFreight === '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.onceFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else if (this.formobj.onceFreight === '' && this.formobj.secondaryFreight !== '') {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.secondaryFreight)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
} else {
this.formobj.corrMoneyThree = this.multiplication((parseFloat(this.formobj.contractPrice)), (parseFloat(this.formobj.eligibleProportionThree) / 100))
}
}
} else {
this.formobj.corrMoneyThree = 0
}
if (this.formobj.eligibleAmountOne === '') {
this.formobj.moneyCount = parseFloat(0) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
} else {
this.formobj.moneyCount = parseFloat(this.formobj.eligibleAmountOne) + parseFloat(this.formobj.corrMoneyTwo) + parseFloat(this.formobj.corrMoneyThree)
}
return this.formobj.corrMoneyThree
},
inputMoneyCount() {
if (this.formobj.moneyCount === '') {
this.formobj.moneyCount = 0
}
this.formobj.costPrice = parseFloat(this.formobj.contractPrice) - parseFloat(this.formobj.moneyCount)
return this.formobj.costPrice
},
multiplication(arg1, arg2) {
var m = 0
var s1 = arg1.toString()
var s2 = arg2.toString()
try {
m += s1.split('.')[1].length
} catch (e) {}
try {
m += s2.split('.')[1].length
} catch (e) {}
return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
},
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】入账单'
req.fetchBySid(sid).then((resp) => {
console.log('编辑回显', sid)
req.fetchBySid(sid).then(resp => {
const data = resp.data
this.formobj.applicationCode = data.applicationCode
this.formobj.remarks = data.remarks
this.formobj.sid = sid
this.formobj.configName = data.configName
this.formobj.departureDate = data.departureDate
this.formobj.modelName = data.modelName
this.formobj.modelSid = data.modelSid
this.formobj.purchaseOrderNo = data.purchaseOrderNo
this.formobj.vehicleOrderSid = data.vehicleOrderSid
this.formobj.taskDefKey = data.taskDefKey
this.formobj.taskId = data.taskId
this.formobj.nodeState = data.nodeState
if (data.inboundVehicleList.length > 0) {
data.inboundVehicleList.forEach((e) => {
this.formobj.vehicleList.push({
applySid: e.applySid,
remarks: e.remarks,
modelSid: e.modelSid,
sid: e.sid,
vinNo: e.vinNo
this.formobj = data
this.formobj.userSid = window.sessionStorage.getItem('userSid')
if (this.formobj.scmFiles.length > 0) {
this.formobj.scmFiles.forEach((e) => {
this.imgList.push({
name: e.fileName,
filePath: e.filePath,
size: e.fileSize,
url: e.filePath
})
})
}
if (this.formobj.deductionFreight === '0') {
this.freightChecked = true
} else {
for (var i = 0; i < row[0].vehicleNum; i++) {
this.formobj.vehicleList.push({
applySid: '',
remarks: '',
modelSid: this.formobj.modelSid,
sid: '',
vinNo: ''
})
}
this.freightChecked = false
}
if (this.formobj.deductionPolicyTwoOne === '0') {
this.policyOneChecked = true
} else {
this.policyOneChecked = false
}
if (this.formobj.deductionPolicyTwoOne === '0') {
this.policyTwoChecked = true
} else {
this.policyTwoChecked = false
}
if (this.formobj.deductionPolicyThreeTwo === '0') {
this.policyThreeChecked = true
} else {
this.policyThreeChecked = false
}
}).catch((e) => {
this.$nextTick(() => {
this.init()
})
}).catch(e => {
this.formobj = {}
})
},
getUrl() {
if (this.imgList.length > 0) {
const aa = []
for (var i = 0; i < this.imgList.length; i++) {
aa.push({
attachType: '',
fileName: this.imgList[i].name,
filePath: this.imgList[i].filePath,
fileSize: this.imgList[i].size,
fileType: this.imgList[i].name.substr(this.imgList[i].name.lastIndexOf('.')),
linkSid: '',
name: window.sessionStorage.getItem('name'),
sid: ''
})
}
this.formobj.scmFiles = aa
}
},
saveEdit() {
this.$refs['form_obj'].validate((valid) => {
this.getUrl()
if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!')
return
}
if (this.freightChecked) {
this.formobj.deductionFreight = 0
} else {
this.formobj.deductionFreight = 1
}
if (this.policyOneChecked) {
this.formobj.deductionPolicyTwoOne = 0
} else {
this.formobj.deductionPolicyTwoOne = 1
}
if (this.policyTwoChecked) {
this.formobj.deductionPolicyThreeOne = 0
} else {
this.formobj.deductionPolicyThreeOne = 1
}
if (this.policyThreeChecked) {
this.formobj.deductionPolicyThreeTwo = 0
} else {
this.formobj.deductionPolicyThreeTwo = 1
}
this.$refs['form_obj'].validate(valid => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
req.saveOrUpdate(this.formobj).then(resp => {
this.submitdisabled = false
//
if(resp.success){
/* this.$message({
showClose: true,
type: 'success',
message: resp.msg
})*/
if (resp.success) {
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
}).catch(() => {
this.submitdisabled = false
})
.catch(() => {
this.submitdisabled = false
})
} else {
return false
}
})
},
submitVehicleApply() {
if(this.formobj.departureDate===''){
alert('厂家发车日期不能为空');
return ;
this.getUrl()
if (this.formobj.departureDate === '') {
alert('厂家发车日期不能为空!')
return
}
req.submitVehicleApply(this.formobj).then((res) => {
if (res.code == '200') {
//
window.parent.postMessage(
{
cmd: 'returnHeight',
params: {
//
code: 1
}
},
'*'
)
this.handleReturn('true')
} else {
if (this.freightChecked) {
this.formobj.deductionFreight = 0
} else {
this.formobj.deductionFreight = 1
}
if (this.policyOneChecked) {
this.formobj.deductionPolicyTwoOne = 0
} else {
this.formobj.deductionPolicyTwoOne = 1
}
if (this.policyTwoChecked) {
this.formobj.deductionPolicyThreeOne = 0
} else {
this.formobj.deductionPolicyThreeOne = 1
}
if (this.policyThreeChecked) {
this.formobj.deductionPolicyThreeTwo = 0
} else {
this.formobj.deductionPolicyThreeTwo = 1
}
req.submitVehicleApply(this.formobj).then(res => {
if (res.success) {
this.$message({
showClose: true,
type: 'error',
message: '提交失败'
type: 'success',
message: '提交成功'
})
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj.departureDate = ''
this.formobj.remarks = '' //
this.formobj.vehicleList = []
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
}
.lineone {
border-bottom: 2px solid #e0e3eb;
}
.lineone .el-form-item {
margin-bottom: -10px;
}
.lineone >>> .el-input__inner {
border: 0;
.listconadd {
height: calc(100vh - 0px) !important;
}
.linetwo {
margin-top: 10px;
.title {
display: flex;
justify-content: space-between;
align-items: center;
}
.linetwo .el-form-item {
margin-bottom: 0px !important;
.tcenterb {
text-align: center;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.linetwo >>> .el-input__inner {
border: 0;
.rowStyle {
border-left: 0px;
}
.linethree .el-form-item {
margin-bottom: 0px !important;
.colOneStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.el-form-item-right {
/* padding: 0 10px 0 0; */
text-align: right;
.freight {
color: #FFFFFF;
}
</style>

18
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@ -270,8 +270,6 @@ export default {
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)
},
@ -286,12 +284,12 @@ export default {
}, '*')
},
methods: {
showInfo(sid, row) {
showInfo(sid) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '入账单'
console.log('编辑回显', sid, row)
console.log('编辑回显', sid)
req.fetchBySid(sid).then(resp => {
const data = resp.data
this.formobj = data
@ -316,7 +314,7 @@ export default {
this.policyThreeChecked = false
}
}).catch(e => {
this.formobj = row
this.formobj = {}
})
},
magnify(val) {
@ -356,13 +354,6 @@ export default {
code: 1
}
}, '*')
} else {
this.$notify({
title: '提示',
message: '执行失败',
type: 'error',
duration: 2000
})
}
})
}
@ -371,6 +362,9 @@ export default {
</script>
<style scoped>
.listconadd {
height: calc(100vh - 0px) !important;
}
.title {
display: flex;
justify-content: space-between;

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

@ -79,7 +79,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="24" :class="{'rowClass':!currentLink}">
<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>
@ -170,7 +170,7 @@ export default {
openAgree(val) {
this.operation = val
this.currentLink = true
this.dialogList.comment = ''
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
if (resp.success) {
var arr = resp.data
@ -205,9 +205,17 @@ export default {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
this.handleReject()
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
this.handleStop()
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleStop()
}
}
},
/** 同意任务 */
@ -307,5 +315,8 @@ export default {
border-right: 0px !important;
border-bottom: 0px !important;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

6
anrui-system-ui/src/components/flow/flowRecord.vue

@ -18,9 +18,9 @@
>
<p style="font-weight: 700">{{item.taskName}}</p>
<el-card :body-style="{ padding: '10px' }">
<label v-if="item.assigneeName" style="font-weight: normal;margin-right: 30px;">实际办理
{{item.assigneeName}}
<el-tag type="info" size="mini">{{item.deptName}}</el-tag>
<label v-if="item.taskUserInfos" style="font-weight: normal;margin-right: 30px;">实际办理
<span v-for="(items,indexs ) in item.taskUserInfos" :key="indexs">{{items.assigneeName}},</span>
<!-- <el-tag type="info" size="mini">{{item.deptName}}</el-tag>-->
</label>
<label v-if="item.candidate"
style="font-weight: normal;margin-right: 30px;">候选办理{{item.candidate}}</label><br>

Loading…
Cancel
Save