Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 2 weeks ago
parent
commit
fca32d6de5
  1. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostVo.java
  2. 13
      anrui-buscenter/anrui-buscenter-ui/src/router/index.js
  3. 42
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue
  4. 159
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
  5. 1074
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue
  6. 44
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
  7. 41
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
  8. 6
      anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehiclecost/BusSalesOrderVehicleCostVo.java

@ -30,8 +30,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: anrui-buscenter(业务管理) <br/>
* File: BusSalesOrderVehicle.java <br/>
@ -54,9 +52,9 @@ public class BusSalesOrderVehicleCostVo implements Vo {
@ApiModelProperty("厂家合同(结算)价")
private String manufacturerSettleAmount;
@ApiModelProperty("政策合计金额")
private BigDecimal policyAmount;
private String policyAmount;
@ApiModelProperty("成本价")
private BigDecimal cost;
private String cost;
@ApiModelProperty("政策明细")
private String policyDetails;
@ApiModelProperty("备注")

13
anrui-buscenter/anrui-buscenter-ui/src/router/index.js

@ -684,19 +684,26 @@ export const constantRoutes = [{
import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue'),
name: 'XiaoShouDingDanYiBanInfo'
},
// 销售管理待办详情--销售支出部经理审批环节--选择采购系统
// 销售管理待办详情--销售支出部经理审批环节--选择开票单位、车辆成本信息修改
{
path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByCaiGou',
component: () =>
import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue'),
name: 'xiaoshoudingdanByCaiGou'
name: 'XiaoShouDingDanByCaiGouInfo'
},
// 销售管理待办详情--金融部经理审批环节--金融方案可编辑
{
path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByJinRong',
component: () =>
import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue'),
name: 'xiaoshoudingdanByJinRong'
name: 'XiaoShouDingDanByJinRong'
},
// 销售管理待办详情--运营部经理审批环节--车辆成本信息可编辑
{
path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByCost',
component: () =>
import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue'),
name: 'XiaoShouDingDanByCost'
},
// 销售管理驳回到发起人办理
{

42
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue

@ -177,6 +177,32 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="isCarCost">
<el-row>
<el-col :span="6">
<div class="span-sty">厂家合同(结算)(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.manufacturerSettleAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">政策合计金额(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyAmount }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">成本价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.cost }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">政策明细</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
@ -439,7 +465,7 @@
<script>
import { fetchDetailsBySid, complete, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject, delegate, assignTask } from '@/api/salesManagement/orderManagement'
import financialschemeInfo from '../../publicPage/financialschemeInfo'
import { selectStaffListss } from '@/api/dictcommons/dictcommons'
import { selectStaffListss, getButtonPermissions } from '@/api/dictcommons/dictcommons'
export default {
name: 'XiaoShouDingDanDaiBanInfo',
@ -452,6 +478,7 @@ export default {
viewState: 1,
tableKey: 0,
index: 0,
isCarCost: false, // ()
formobj: {
affiliatedCompany: '',
affiliatedCompanySid: '',
@ -470,6 +497,7 @@ export default {
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
vehicleCostObj: {},
companyInvoicingName: '',
concatNo: '',
createDate: '',
@ -609,6 +637,18 @@ export default {
})
this.formobj.gc2.certFile = ee
}
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: '/xiaoshouguanli/dingdanxinxi', type: 0 }).then((resp) => {
if (resp.success) {
for (var i = 0; i < resp.data.length; i++) {
if (resp.data[i].buttonId === 'car_cost_detail') {
this.isCarCost = false
return
} else {
this.isCarCost = true
}
}
}
})
}
})
selectStaffListss().then((res) => {

159
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue

@ -177,6 +177,32 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="isCarCost">
<el-row>
<el-col :span="6">
<div class="span-sty">厂家合同(结算)(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.manufacturerSettleAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">政策合计金额(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyAmount }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">成本价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.cost }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">政策明细</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
@ -434,19 +460,57 @@
</el-form>
</el-dialog>
<el-dialog :visible.sync="companyInvoicingVisible" width="60%">
<el-form class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="6" class="tleftb">
<span><span class="icon">*</span>开票单位:</span>
</el-col>
<el-col :span="18">
<el-form class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb" v-if="formobj.payTypeKey == '1'">
<el-col :span="24">
<div class="span-sty"><span class="icon">*</span>开票单位</div>
<el-form-item>
<el-select v-model="linkByParameter.companyInvoicingName" placeholder="请选择" @change="changeCompanyInvoicing" clearable class="">
<el-select v-model="linkByParameter.companyInvoicingName" placeholder="请选择" @change="changeCompanyInvoicing" clearable class="addinputInfo addinputw">
<el-option v-for="item in companyInvoicing_list" :key="item.companyInvoicingSid" :label="item.companyInvoicingName" :value="item.companyInvoicingName"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty">厂家合同(结算)(/)</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="linkByParameter.manufacturerSettleAmount" @input="costTotal" @keyup.native="linkByParameter.manufacturerSettleAmount = getNumber(linkByParameter.manufacturerSettleAmount, 0)" clearable placeholder="" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">政策合计金额(/)</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="linkByParameter.policyAmount" @input="costTotal" @keyup.native="linkByParameter.policyAmount = getNumber(linkByParameter.policyAmount, 2)" clearable placeholder="" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">成本价(/)</div>
<el-form-item>
<span class="addinputInfo">{{ linkByParameter.cost }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">政策明细</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="linkByParameter.policyDetails" clearable placeholder="" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="linkByParameter.remarks" clearable placeholder="" />
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm">确定</el-button>
<el-button type="info " size="mini" @click="companyInvoicingVisible = false">取消</el-button>
@ -458,7 +522,7 @@
</template>
<script>
import { fetchDetailsBySid, completeBy, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject, delegate, assignTask } from '@/api/salesManagement/orderManagement'
import { getInvoicingList, selectStaffListss } from '@/api/dictcommons/dictcommons'
import { getInvoicingList, selectStaffListss, getButtonPermissions } from '@/api/dictcommons/dictcommons'
import financialschemeInfo from '../../publicPage/financialschemeInfo'
export default {
@ -474,6 +538,7 @@ export default {
index: 0,
companyInvoicing_list: [],
companyInvoicingVisible: false,
isCarCost: false, // ()
formobj: {
affiliatedCompany: '',
affiliatedCompanySid: '',
@ -492,6 +557,7 @@ export default {
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
vehicleCostObj: {},
concatNo: '',
createDate: '',
customerName: '',
@ -551,7 +617,12 @@ export default {
companyInvoicingName: '',
companyInvoicingSid: '',
purchaseSystemName: '',
purchaseSystemSid: ''
purchaseSystemSid: '',
manufacturerSettleAmount: '',
policyAmount: '',
cost: '',
policyDetails: '',
remarks: ''
},
//
countersign: {
@ -596,6 +667,24 @@ export default {
}, '*')
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showInfo(sid) {
fetchDetailsBySid(sid).then((resp) => {
if (resp.success) {
@ -643,6 +732,18 @@ export default {
this.companyInvoicing_list = res.data
}
})
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: '/xiaoshouguanli/dingdanxinxi', type: 0 }).then((resp) => {
if (resp.success) {
for (var i = 0; i < resp.data.length; i++) {
if (resp.data[i].buttonId === 'car_cost_detail') {
this.isCarCost = false
return
} else {
this.isCarCost = true
}
}
}
})
}
})
selectStaffListss().then((res) => {
@ -651,6 +752,9 @@ export default {
}
})
},
costTotal() {
this.linkByParameter.cost = Math.round((parseFloat(this.linkByParameter.manufacturerSettleAmount !== '' ? this.linkByParameter.manufacturerSettleAmount : 0) - parseFloat(this.linkByParameter.policyAmount !== '' ? this.linkByParameter.policyAmount : 0)) * 100) / 100
},
handleLook() {
this.viewState = 2
this.$refs['divInfo'].showInfo(this.formobj.solutionsDetailsssVo, '03')
@ -733,26 +837,19 @@ export default {
//
openAgree(val) {
this.operation = val
if (this.formobj.payTypeKey === '1') {
this.companyInvoicingVisible = true
this.linkByParameter.companyInvoicingName = this.formobj.companyInvoicingName
this.linkByParameter.companyInvoicingSid = this.formobj.companyInvoicingSid
} else {
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
}
this.companyInvoicingVisible = true
this.currentLink = false
this.countersignLink = false
this.linkByParameter.companyInvoicingName = this.formobj.companyInvoicingName
this.linkByParameter.companyInvoicingSid = this.formobj.companyInvoicingSid
this.linkByParameter.manufacturerSettleAmount = this.formobj.vehicleCostObj.manufacturerSettleAmount
this.linkByParameter.policyAmount = this.formobj.vehicleCostObj.policyAmount
this.linkByParameter.cost = this.formobj.vehicleCostObj.cost
this.linkByParameter.policyDetails = this.formobj.vehicleCostObj.policyDetails
this.linkByParameter.remarks = this.formobj.vehicleCostObj.remarks
},
confirm() {
if (this.linkByParameter.companyInvoicingName === '') {
if (this.linkByParameter.companyInvoicingName === '' && this.formobj.payTypeKey === '1') {
this.$message({ showClose: true, type: 'error', message: '开票单位不能为空' })
return
}
@ -961,10 +1058,14 @@ export default {
border-top: 1px solid #E0E3EB;
}
.span-sty {
width: 140px !important;
width: 160px !important;
}
.addinputInfo {
margin-left: 130px !important;
margin-left: 150px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 150px !important;
width: calc(100% - 145px);
}
.jinrong {
padding: 7px;

1074
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCost.vue

File diff suppressed because it is too large

44
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@ -177,6 +177,32 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="isCarCost">
<el-row>
<el-col :span="6">
<div class="span-sty">厂家合同(结算)(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.manufacturerSettleAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">政策合计金额(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyAmount }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">成本价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.cost }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">政策明细</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
@ -459,10 +485,10 @@
<script>
import { fetchDetailsBySid, completeBy, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject, delegate, assignTask } from '@/api/salesManagement/orderManagement'
import financialschemeEdit from '../../publicPage/financialschemeEdit'
import { selectStaffListss, getInvoicingList } from '@/api/dictcommons/dictcommons'
import { selectStaffListss, getInvoicingList, getButtonPermissions } from '@/api/dictcommons/dictcommons'
export default {
name: 'xiaoshoudingdanByJinRong',
name: 'XiaoShouDingDanByJinRong',
components: {
financialschemeEdit
},
@ -474,6 +500,7 @@ export default {
index: 0,
companyInvoicingVisible: false,
companyInvoicing_list: [],
isCarCost: false, // ()
formobj: {
affiliatedCompany: '',
affiliatedCompanySid: '',
@ -492,6 +519,7 @@ export default {
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
vehicleCostObj: {},
concatNo: '',
createDate: '',
customerName: '',
@ -643,6 +671,18 @@ export default {
this.companyInvoicing_list = res.data
}
})
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: '/xiaoshouguanli/dingdanxinxi', type: 0 }).then((resp) => {
if (resp.success) {
for (var i = 0; i < resp.data.length; i++) {
if (resp.data[i].buttonId === 'car_cost_detail') {
this.isCarCost = false
return
} else {
this.isCarCost = true
}
}
}
})
}
})
selectStaffListss().then((res) => {

41
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue

@ -173,6 +173,32 @@
<el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="isCarCost">
<el-row>
<el-col :span="6">
<div class="span-sty">厂家合同(结算)(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.manufacturerSettleAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">政策合计金额(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyAmount }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">成本价(/)</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.cost }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">政策明细</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.policyDetails }}</span></el-form-item>
</el-col>
<el-col :span="18">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleCostObj.remarks }}</span></el-form-item>
</el-col>
</el-row>
</div>
<div v-if="formobj.isGc">
<div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
<el-row>
@ -392,6 +418,7 @@
<script>
import { fetchDetailsBySid, revokeProcess } from '@/api/salesManagement/orderManagement'
import financialschemeInfo from '../../publicPage/financialschemeInfo'
import { getButtonPermissions } from '@/api/dictcommons/dictcommons'
export default {
name: 'XiaoShouDingDanYiBanInfo',
@ -404,6 +431,7 @@ export default {
viewState: 1,
tableKey: 0,
index: 0,
isCarCost: false, // ()
formobj: {
affiliatedCompany: '',
affiliatedCompanySid: '',
@ -422,6 +450,7 @@ export default {
busSalesVehicleOrderList: [],
gc1: {},
gc2: {},
vehicleCostObj: {},
concatNo: '',
companyInvoicingName: '',
createDate: '',
@ -533,6 +562,18 @@ export default {
})
this.formobj.gc2.certFile = ee
}
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: '/xiaoshouguanli/dingdanxinxi', type: 0 }).then((resp) => {
if (resp.success) {
for (var i = 0; i < resp.data.length; i++) {
if (resp.data[i].buttonId === 'car_cost_detail') {
this.isCarCost = false
return
} else {
this.isCarCost = true
}
}
}
})
}
})
},

6
anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue

@ -270,9 +270,9 @@ export default {
break
case 'toAllot':
this.toAllot()
case 'doExport':
this.doExport()
break
break
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()

Loading…
Cancel
Save