Browse Source

完善分公司间调车

master
yunuo970428 3 years ago
parent
commit
a51e1801e6
  1. 17
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  2. 205
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
  3. 26
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue
  4. 39
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/vehicleselect.vue
  5. 38
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
  6. 38
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
  7. 103
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue
  8. 38
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue
  9. 231
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
  10. 38
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue
  11. 41
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/vehicleselect.vue

17
anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@ -43,6 +43,14 @@ export function getListOrgByBrand(data) {
})
}
// 根据当前登录人的分公司sid和品牌sid信息获取除本公司外的其他分公司
export function getListOrgByBrandSid(orgSid, brandSid) {
return request({
url: '/portal/v1/sysorganization/getListOrgByBrandSid/' + orgSid + '/' + brandSid,
method: 'get'
})
}
// 根据登陆人sid查询分公司 (孟哲写的接口)
export function getPathSidByUserSid(data) {
return request({
@ -137,6 +145,15 @@ export function selectOrgLists(data) {
})
}
// 根据分公司Sid获取分公司下所有的部门
export function getListDeptByOrgSid(data) {
return request({
url: '/portal/v1/sysorganization/getListDeptByOrgSid/' + data,
method: 'GET'
})
}
// 获取厂家回款通路
export function selectNameByOrg(data) {
return request({

205
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue

@ -20,27 +20,41 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item><span class="addinputw addinputwOne">{{ formobj.sellerOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item><span class="addinputw addinputwOne">{{ formobj.shuntingTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item><span class="addinputw addinputwOne">{{ formobj.applyPeoName }}</span></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<el-select v-model="formobj.shuntingTypeValue" placeholder="请选择" clearable class="addinputw addinputwOne" @change="changeShuntingType" :disabled="dialogStatus == 'edit' || dialogStatus == 'add'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
<el-select v-model="formobj.brandName" placeholder="请选择" clearable class="addinputw addinputwOne" @change="changeBrand" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>分公司</span></div>
<el-form-item>
<el-select v-model="formobj.sellerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '02' || dialogStatus == 'edit'" @change="changeSellerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"/>
<el-select v-model="formobj.buyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeBuyerOrg">
<el-option v-for="item in buyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<el-select v-model="formobj.buyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '01' || dialogStatus == 'edit'" @change="changeBuyerOrg">
<el-option v-for="item in buyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
<el-select v-model="formobj.callInBuyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeCallInBuyerOrg">
<el-option v-for="item in callInBuyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
@ -48,8 +62,7 @@
<div class="title">
<div>申请车辆列表</div>
<div>
<el-button type="primary" v-show="formobj.shuntingTypeKey == '01'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
<el-button type="primary" v-show="formobj.shuntingTypeKey == '02'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车辆</el-button>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车辆</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
@ -70,16 +83,11 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column v-if="formobj.shuntingTypeKey == '02'" label="销售指导价(元)" align="center" width="200">
<el-table-column label="销售指导价(元)" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column v-if="formobj.shuntingTypeKey == '01'" label="销售指导价(元)" align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.guidedPrice" placeholder="" @keyup.native="scope.row.guidedPrice = oninput(scope.row.guidedPrice,2)" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
@ -124,22 +132,19 @@
</div>
</div>
<!--End 添加修改部分-->
<!--选择车型和常用配置-->
<configuration v-show="viewState == 2" ref="divconfiguration" @backData="backConfiguration" @doback="closePage"/>
<!--选择车辆-->
<vehicle v-show="viewState == 3" ref="divVehicle" @backData="backVehicle" @doback="closePage"/>
</div>
</template>
<script>
import req from '@/api/supplychain/cheliangneigou'
import {getListOrg, getPathSidByUserSid, typeValues, fetchBySid, getListOrgByBrand} from '@/api/cheliang/dictcommons.js'
import configuration from './chexingselect'
import { getPathSidByUserSid, typeValues, fetchBySid, brandDown, getListOrgByBrandSid, getListDeptByOrgSid } from '@/api/cheliang/dictcommons.js'
import vehicle from './vehicleselect'
export default {
name: 'cheliangneigouAdd',
components: {
configuration,
vehicle
},
data() {
@ -148,9 +153,9 @@ export default {
viewState: 1,
index: 0,
tableKey: 0,
org_list: [],
buyerOrg_list: '',
accadjType_list: [],
brand_list: [],
buyerOrg_list: [],
callInBuyerOrg_list: [],
invoiceType_list: [],
buyer_list: [
{
@ -184,6 +189,10 @@ export default {
deductionPolicyThreeOne: 0,
deductionPolicyThreeTwo: 0,
deductionPolicyTwoOne: 0,
brandName: '',
brandSid: '',
callInBuyerOrgName: '',
callInBuyerOrgSid: '',
baseInternalPurchaseVehicles: []
},
rules: {},
@ -193,11 +202,6 @@ export default {
},
methods: {
init() {
typeValues({ type: 'accadjType' }).then((resp) => {
if (resp.success) {
this.accadjType_list = resp.data
}
})
typeValues({ type: 'invoiceType' }).then((resp) => {
if (resp.success) {
this.invoiceType_list = resp.data
@ -215,18 +219,13 @@ export default {
this.formobj.sellerOrgName = resp.data.name
}
})
getListOrgByBrand(this.formobj.createOrgSid).then((respsone) => {
if (respsone.success) {
this.buyerOrg_list = respsone.data
brandDown({ useOrg: res.data }).then((resp) => {
if (resp.success) {
this.brand_list = resp.data
}
})
}
})
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
}
})
},
//
oninput(val, limit = 0) {
@ -244,6 +243,36 @@ export default {
}
return val
},
changeBrand(value) {
let bb = null
this.brand_list.forEach((e) => {
if (e.brandName === value) {
bb = {
name: e.brandName,
sid: e.sid
}
}
})
this.formobj.brandSid = bb.sid
getListOrgByBrandSid(this.formobj.createOrgSid, this.formobj.brandSid).then((res) => {
if (res.success) {
this.buyerOrg_list = res.data
}
})
},
changeBuyerOrg(val) {
const choosetItem = this.buyerOrg_list.filter((item) => item.name === val)
this.formobj.buyerOrgSid = choosetItem[0].sid
getListDeptByOrgSid(this.formobj.buyerOrgSid).then((res) => {
if (res.success) {
this.callInBuyerOrg_list = res.data
}
})
},
changeCallInBuyerOrg(value) {
const choosetItem = this.callInBuyerOrg_list.filter((item) => item.name === value)
this.formobj.callInBuyerOrgSid = choosetItem[0].sid
},
changeInvoiceType(row) {
let bb = null
this.invoiceType_list.forEach((e) => {
@ -265,69 +294,14 @@ export default {
row.freightUndertakerSid = this.formobj.sellerOrgSid
}
},
changeShuntingType(val) {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictValue === val)
this.formobj.shuntingTypeKey = choosetItem[0].dictKey
//
if (this.formobj.shuntingTypeKey === '01') {
this.formobj.buyerOrgSid = this.formobj.createOrgSid
const name = this.buyerOrg_list.filter((item) => item.sid === this.formobj.buyerOrgSid)
this.formobj.buyerOrgName = name[0].name
this.formobj.sellerOrgName = ''
this.formobj.sellerOrgSid = ''
}
//
if (this.formobj.shuntingTypeKey === '02') {
this.formobj.sellerOrgSid = this.formobj.createOrgSid
const name = this.org_list.filter((item) => item.sid === this.formobj.sellerOrgSid)
this.formobj.sellerOrgName = name[0].name
this.formobj.buyerOrgSid = ''
this.formobj.buyerOrgName = ''
}
}
},
changeSellerOrg(val) {
const choosetItem = this.org_list.filter((item) => item.name === val)
this.formobj.sellerOrgSid = choosetItem[0].sid
},
changeBuyerOrg(val) {
const choosetItem = this.buyerOrg_list.filter((item) => item.name === val)
this.formobj.buyerOrgSid = choosetItem[0].sid
},
//
addCommodity() {
if (this.formobj.shuntingTypeValue === '') {
this.$message({
showClose: true,
message: '请选择调账类型',
type: 'error'
})
return
}
if (this.formobj.sellerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调出分公司',
type: 'error'
})
if (this.formobj.brandName === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
if (this.formobj.buyerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调入分公司',
type: 'error'
})
return
}
if (this.formobj.shuntingTypeValue === '调入') {
this.viewState = 2
this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.sellerOrgSid, this.formobj.buyerOrgSid)
} else {
this.viewState = 3
this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.buyerOrgSid)
}
this.viewState = 3
this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.buyerOrgSid, this.formobj.brandSid)
},
//
dataDelete(index, row) {
@ -336,13 +310,13 @@ export default {
showAdd() {
this.init()
this.getUserOrg()
this.formobj.shuntingTypeKey = '02'
this.formobj.shuntingTypeValue = '调出'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.formobj.applyPeoName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.shuntingTypeKey = '02'
this.formobj.shuntingTypeValue = '调出'
this.viewTitle = '【新增】分公司间调车申请'
this.dialogStatus = 'add'
},
@ -392,35 +366,6 @@ export default {
})
}
},
// --
backConfiguration(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.baseInternalPurchaseVehicles.push({
configName: e.configName, //
configSid: e.configSid, // sid
freight: '', //
guidedPrice: e.guidedPrice,
freightUndertakerName: '', //
freightUndertakerSid: '', // sid
inventoryLocationName: '', //
inventoryLocationSid: '', // sid
invoiceTypeKey: '', // key
invoiceTypeValue: '', // value
isAccadj: '', // 01
isInvoicing: '', // 01
mainSid: '', // sid
vehicleSid: e.modelSid, // sid
remarks: '', //
sid: '',
vehicleAlias: e.vehicleAlias, //
vinNo: '', //
witPinMoney: '' //
})
})
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
@ -481,6 +426,10 @@ export default {
sid: '',
taskId: '',
useOrgSid: '',
brandName: '',
brandSid: '',
callInBuyerOrgName: '',
callInBuyerOrgSid: '',
baseInternalPurchaseVehicles: []
}
this.$refs['form_obj'].resetFields()
@ -505,7 +454,7 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

26
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue

@ -16,6 +16,12 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
@ -23,9 +29,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
<span class="addinputInfo addinputwOne">{{ formobj.applyPeoName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -34,6 +48,12 @@
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>申请车辆列表</div>
@ -139,7 +159,7 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

39
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/vehicleselect.vue

@ -13,11 +13,6 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="品牌:" class="searchlist">
<el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="功能:" class="searchlist">
<el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -124,7 +119,7 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/supplychain/cheliangneigou'
import { typeValues, brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
import { typeValues } from '@/api/cheliang/dictcommons.js'
export default {
name: 'xuanzecheliang',
@ -133,9 +128,6 @@ export default {
},
data() {
return {
useOrg: '',
buyerOrgSid: '',
carBrand_list: [],
vehicleType_list: [],
productLine_list: [],
gearboxType_list: [],
@ -147,14 +139,13 @@ export default {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
showbackState: 30,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
size: 5,
params: {
brandSid: '',
driveForm: '',
@ -186,26 +177,10 @@ export default {
}
},
init() {
this.getPathSid()
this.shujuzidian()
this.getList()
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.useOrg = res.data
}
})
},
shujuzidian() {
// -
brandDown({ useOrg: this.useOrg }).then((res) => {
if (res.success) {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
typeValues({ type: 'vehicleFunction' }).then((res) => {
if (res.success) {
this.vehicleType_list = res.data
@ -260,7 +235,6 @@ export default {
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.buyerOrgSid = this.buyerOrgSid
req.vehiclePurchaseList(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@ -279,7 +253,6 @@ export default {
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.brandSid = ''
this.listQuery.params.driveForm = ''
this.listQuery.params.emissionStandard = ''
this.listQuery.params.fuelType = ''
@ -311,7 +284,7 @@ export default {
})
this.sids = aa
},
showData(value, buyerOrgSid) {
showData(value, buyerOrgSid, brandSid) {
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
@ -321,7 +294,11 @@ export default {
} else {
this.listQuery.params.vinNoList = []
}
this.buyerOrgSid = buyerOrgSid
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.buyerOrgSid = buyerOrgSid
this.listQuery.params.brandSid = brandSid
this.init()
},
//

38
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue

@ -18,6 +18,12 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
@ -25,9 +31,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
<span class="addinputInfo addinputwOne">{{ formobj.applyPeoName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -36,6 +50,12 @@
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>申请车辆列表</div>
@ -72,11 +92,11 @@
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
@ -180,7 +200,7 @@ export default {
params: {
//
code: 2,
data: 360 + 'px'
data: 400 + 'px'
}
}, '*')
},
@ -333,6 +353,6 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

38
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue

@ -18,6 +18,12 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
@ -25,9 +31,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
<span class="addinputInfo addinputwOne">{{ formobj.applyPeoName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -36,6 +50,12 @@
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>申请车辆列表</div>
@ -72,11 +92,11 @@
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
@ -180,7 +200,7 @@ export default {
params: {
//
code: 2,
data: 360 + 'px'
data: 400 + 'px'
}
}, '*')
},
@ -333,7 +353,7 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

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

@ -18,6 +18,12 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
@ -25,9 +31,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
<span class="addinputInfo addinputwOne">{{ formobj.applyPeoName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -36,6 +50,12 @@
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>申请车辆列表</div>
@ -54,28 +74,15 @@
</el-table-column>
<el-table-column label="销售指导价(元)" align="center" width="200">
<template slot-scope="scope">
<span v-if="shuntingVisible">{{ scope.row.guidedPrice }}</span>
<el-input v-if="shuntingTypeVisible" v-model="scope.row.guidedPrice" clearable placeholder=""></el-input>
<el-input v-model="scope.row.guidedPrice" @keyup.native="scope.row.guidedPrice = oninput(scope.row.guidedPrice,2)" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column v-if="shuntingTypeVisible" label="车架号" align="center" width="250">
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column v-if="shuntingTypeVisible" label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
</el-table-column>
<el-table-column v-if="shuntingVisible" label="车架号" align="center" width="250">
<template slot-scope="scope">
<el-select v-model="scope.row.vinNo" placeholder="请选择" @change="changeVinNo(scope.row, this)" filterable>
<el-option v-for="item in vinNo_list" :key="item.vinNo" :label="item.vinNo" :value="item.vinNo"/>
</el-select>
</template>
</el-table-column>
<el-table-column v-if="shuntingVisible" label="库存地点" align="center" width="150">
<el-table-column label="库存地点" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.inventoryLocationName }}</span>
</template>
@ -85,11 +92,11 @@
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
@ -144,10 +151,7 @@ export default {
tableKey: 0,
//
formobj: {},
shuntingTypeVisible: false,
shuntingVisible: false,
operation: '', //
vinNo_list: [],
dialogList: {
comment: ''
},
@ -197,44 +201,33 @@ export default {
params: {
//
code: 2,
data: 360 + 'px'
data: 400 + 'px'
}
}, '*')
},
methods: {
//
oninput(val, limit = 0) {
val = val.replace(/[^\d]/g, '') //
val = val.replace(/^00/, '0'); // 0
/^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) {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.shuntingTypeKey == '01') {
this.shuntingVisible = true
this.shuntingTypeVisible = false
req.purSellVinNoAndLoc({ sellerOrgSid: this.formobj.sellerOrgSid }).then((resp) => {
if (resp.success) {
this.vinNo_list = resp.data
}
})
} else if (this.formobj.shuntingTypeKey == '02') {
this.shuntingTypeVisible = true
this.shuntingVisible = false
}
}
})
},
changeVinNo(row) {
let bb = null
this.vinNo_list.forEach((e) => {
if (e.vinNo === row.vinNo) {
bb = {
location: e.location,
locationName: e.locationName,
vinNo: e.vinNo
}
}
})
row.vinNo = bb.vinNo
row.inventoryLocationName = bb.locationName
row.inventoryLocationSid = bb.location
},
//
openAgree(val) {
@ -378,7 +371,7 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

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

@ -18,6 +18,12 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
@ -25,9 +31,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
<span class="addinputInfo addinputwOne">{{ formobj.applyPeoName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -36,6 +50,12 @@
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>申请车辆列表</div>
@ -72,11 +92,11 @@
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
@ -180,7 +200,7 @@ export default {
params: {
//
code: 2,
data: 360 + 'px'
data: 400 + 'px'
}
}, '*')
},
@ -333,7 +353,7 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

231
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue

@ -19,36 +19,49 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item><span class="addinputw addinputwOne">{{ formobj.sellerOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item><span class="addinputw addinputwOne">{{ formobj.shuntingTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item><span class="addinputw addinputwOne">{{ formobj.applyPeoName }}</span></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<el-select v-model="formobj.shuntingTypeValue" placeholder="请选择" clearable class="addinputw addinputwOne" @change="changeShuntingType" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in accadjType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
<el-select v-model="formobj.brandName" placeholder="请选择" clearable class="addinputw addinputwOne" @change="changeBrand" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>分公司</span></div>
<el-form-item>
<el-select v-model="formobj.sellerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '02' || dialogStatus == 'edit'" @change="changeSellerOrg">
<el-option v-for="item in org_list" :key="item.sid" :label="item.name" :value="item.name"/>
<el-select v-model="formobj.buyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeBuyerOrg">
<el-option v-for="item in buyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入分公司</span></div>
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<el-select v-model="formobj.buyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="formobj.shuntingTypeKey == '01' || dialogStatus == 'edit'" @change="changeBuyerOrg">
<el-option v-for="item in buyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
<el-select v-model="formobj.callInBuyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeCallInBuyerOrg">
<el-option v-for="item in callInBuyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div style="margin-left: 5px;font-weight: bold">申请车辆列表</div>
<div style="margin-right: 5px">
<el-button type="primary" v-show="formobj.shuntingTypeKey == '01'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
<el-button type="primary" v-show="formobj.shuntingTypeKey == '02'" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车辆</el-button>
<div>申请车辆列表</div>
<div>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车辆</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseInternalPurchaseVehicles" :index="index" border style="width: 100%">
@ -69,16 +82,11 @@
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column v-if="formobj.shuntingTypeKey == '02'" label="销售指导价(元)" align="center" width="200">
<el-table-column label="销售指导价(元)" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column v-if="formobj.shuntingTypeKey == '01'" label="销售指导价(元)" align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.guidedPrice" placeholder="" @keyup.native="scope.row.guidedPrice = oninput(scope.row.guidedPrice,2)" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
@ -94,13 +102,13 @@
<el-input v-model="scope.row.witPinMoney" placeholder="" @keyup.native="scope.row.witPinMoney = oninput(scope.row.witPinMoney,2)" class="addinputw" clearable/>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">-->
<!-- <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>-->
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <el-select v-model="scope.row.invoiceTypeValue" placeholder="请选择" clearable class="addinputw" @change="changeInvoiceType(scope.row, this)">-->
<!-- <el-option v-for="item in invoiceType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>-->
<!-- </el-select>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.freight" placeholder="" @keyup.native="scope.row.freight = oninput(scope.row.freight,2)" class="addinputw" clearable/>
@ -123,22 +131,19 @@
</div>
</div>
<!--End 添加修改部分-->
<!--选择车型和常用配置-->
<configuration v-show="viewState == 2" ref="divconfiguration" @backData="backConfiguration" @doback="closePage"/>
<!--选择车辆-->
<vehicle v-show="viewState == 3" ref="divVehicle" @backData="backVehicle" @doback="closePage"/>
</div>
</template>
<script>
import req from '@/api/supplychain/cheliangneigou'
import {getListOrg, getListOrgByBrand, getPathSidByUserSid, typeValues} from '@/api/cheliang/dictcommons.js'
import configuration from './chexingselect'
import { getPathSidByUserSid, typeValues, fetchBySid, brandDown, getListOrgByBrandSid, getListDeptByOrgSid } from '@/api/cheliang/dictcommons.js'
import vehicle from './vehicleselect'
export default {
name: 'neigouEdit',
components: {
configuration,
vehicle
},
data() {
@ -147,9 +152,9 @@ export default {
viewState: 1,
index: 0,
tableKey: 0,
org_list: [],
brand_list: [],
buyerOrg_list: [],
accadjType_list: [],
callInBuyerOrg_list: [],
invoiceType_list: [],
buyer_list: [
{
@ -172,13 +177,21 @@ export default {
createOrgSid: '',
instanceId: '',
num: '',
sellerOrgName: '', // ID
sellerOrgSid: '', // ID
sellerOrgName: '',
sellerOrgSid: '',
shuntingTypeKey: '',
shuntingTypeValue: '',
sid: '',
taskId: '',
useOrgSid: '',
deductionFreight: 0,
deductionPolicyThreeOne: 0,
deductionPolicyThreeTwo: 0,
deductionPolicyTwoOne: 0,
brandName: '',
brandSid: '',
callInBuyerOrgName: '',
callInBuyerOrgSid: '',
baseInternalPurchaseVehicles: []
},
rules: {},
@ -199,41 +212,18 @@ export default {
params: {
//
code: 2,
data: 360 + 'px'
data: 400 + 'px'
}
}, '*')
},
methods: {
init() {
typeValues({ type: 'accadjType' }).then((resp) => {
if (resp.success) {
this.accadjType_list = resp.data
}
})
typeValues({ type: 'invoiceType' }).then((resp) => {
if (resp.success) {
this.invoiceType_list = resp.data
}
})
},
getUserOrg() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.formobj.useOrgSid = res.data
this.formobj.createOrgSid = res.data
getListOrgByBrand(this.formobj.createOrgSid).then((resp) => {
if (resp.success) {
this.buyerOrg_list = resp.data
}
})
}
})
getListOrg().then((res) => {
if (res.success) {
this.org_list = res.data
}
})
},
//
oninput(val, limit = 0) {
val = val.replace(/[^\d]/g, '') //
@ -250,6 +240,36 @@ export default {
}
return val
},
changeBrand(value) {
let bb = null
this.brand_list.forEach((e) => {
if (e.brandName === value) {
bb = {
name: e.brandName,
sid: e.sid
}
}
})
this.formobj.brandSid = bb.sid
getListOrgByBrandSid(this.formobj.createOrgSid, this.formobj.brandSid).then((res) => {
if (res.success) {
this.buyerOrg_list = res.data
}
})
},
changeBuyerOrg(val) {
const choosetItem = this.buyerOrg_list.filter((item) => item.name === val)
this.formobj.buyerOrgSid = choosetItem[0].sid
getListDeptByOrgSid(this.formobj.buyerOrgSid).then((res) => {
if (res.success) {
this.callInBuyerOrg_list = res.data
}
})
},
changeCallInBuyerOrg(value) {
const choosetItem = this.callInBuyerOrg_list.filter((item) => item.name === value)
this.formobj.callInBuyerOrgSid = choosetItem[0].sid
},
changeInvoiceType(row) {
let bb = null
this.invoiceType_list.forEach((e) => {
@ -271,69 +291,14 @@ export default {
row.freightUndertakerSid = this.formobj.sellerOrgSid
}
},
changeShuntingType(val) {
if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictValue === val)
this.formobj.shuntingTypeKey = choosetItem[0].dictKey
//
if (this.formobj.shuntingTypeKey === '01') {
this.formobj.buyerOrgSid = this.formobj.createOrgSid
const name = this.buyerOrg_list.filter((item) => item.sid === this.formobj.buyerOrgSid)
this.formobj.buyerOrgName = name[0].name
this.formobj.sellerOrgName = ''
this.formobj.sellerOrgSid = ''
}
//
if (this.formobj.shuntingTypeKey === '02') {
this.formobj.sellerOrgSid = this.formobj.createOrgSid
const name = this.org_list.filter((item) => item.sid === this.formobj.sellerOrgSid)
this.formobj.sellerOrgName = name[0].name
this.formobj.buyerOrgSid = ''
this.formobj.buyerOrgName = ''
}
}
},
changeSellerOrg(val) {
const choosetItem = this.org_list.filter((item) => item.name === val)
this.formobj.sellerOrgSid = choosetItem[0].sid
},
changeBuyerOrg(val) {
const choosetItem = this.buyerOrg_list.filter((item) => item.name === val)
this.formobj.buyerOrgSid = choosetItem[0].sid
},
//
addCommodity() {
if (this.formobj.shuntingTypeValue === '') {
this.$message({
showClose: true,
message: '请选择调账类型',
type: 'error'
})
return
}
if (this.formobj.sellerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调出分公司',
type: 'error'
})
if (this.formobj.brandName === '') {
this.$message({ showClose: true, type: 'error', message: '请先选择品牌' })
return
}
if (this.formobj.buyerOrgName === '') {
this.$message({
showClose: true,
message: '请选择调入分公司',
type: 'error'
})
return
}
if (this.formobj.shuntingTypeValue === '调入') {
this.viewState = 2
this.$refs['divconfiguration'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.sellerOrgSid, this.formobj.buyerOrgSid)
} else {
this.viewState = 3
this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.buyerOrgSid)
}
this.viewState = 3
this.$refs['divVehicle'].showData(this.formobj.baseInternalPurchaseVehicles, this.formobj.buyerOrgSid, this.formobj.brandSid)
},
//
dataDelete(index, row) {
@ -385,35 +350,6 @@ export default {
})
}
},
// --
backConfiguration(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.baseInternalPurchaseVehicles.push({
configName: e.configName, //
configSid: e.configSid, // sid
freight: '', //
guidedPrice: e.guidedPrice,
freightUndertakerName: '', //
freightUndertakerSid: '', // sid
inventoryLocationName: '', //
inventoryLocationSid: '', // sid
invoiceTypeKey: '', // key
invoiceTypeValue: '', // value
isAccadj: '', // 01
isInvoicing: '', // 01
mainSid: '', // sid
vehicleSid: e.modelSid, // sid
remarks: '', //
sid: '',
vehicleAlias: e.vehicleAlias, //
vinNo: '', //
witPinMoney: '' //
})
})
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
@ -492,6 +428,7 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

38
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue

@ -16,6 +16,12 @@
<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="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调车类型</span></div>
<el-form-item>
@ -23,9 +29,17 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调出分公司</span></div>
<div class="span-sty spanOneWidth"><span>申请人</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sellerOrgName }}</span>
<span class="addinputInfo addinputwOne">{{ formobj.applyPeoName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>品牌</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.brandName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
@ -34,6 +48,12 @@
<span class="addinputInfo addinputwOne">{{ formobj.buyerOrgName }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>
</el-col>
</el-row>
<div class="title">
<div>申请车辆列表</div>
@ -70,11 +90,11 @@
<span>{{ scope.row.witPinMoney }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="发票类型" align="center" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.invoiceTypeValue }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="运费" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.freight }}</span>
@ -145,7 +165,7 @@ export default {
params: {
//
code: 2,
data: 360 + 'px'
data: 400 + 'px'
}
}, '*')
},
@ -213,7 +233,7 @@ export default {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
margin-left: 100px !important;
}
</style>

41
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/vehicleselect.vue

@ -13,11 +13,6 @@
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="品牌:" class="searchlist">
<el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
<el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="功能:" class="searchlist">
<el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -124,18 +119,15 @@
<script>
import Pagination from '@/components/pagination'
import req from '@/api/supplychain/cheliangneigou'
import { typeValues, brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
import { typeValues } from '@/api/cheliang/dictcommons.js'
export default {
name: 'xuanzecheliang',
name: 'vehicleselect',
components: {
Pagination
},
data() {
return {
useOrg: '',
buyerOrgSid: '',
carBrand_list: [],
vehicleType_list: [],
productLine_list: [],
gearboxType_list: [],
@ -147,14 +139,13 @@ export default {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
showbackState: 30,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 10,
size: 5,
params: {
brandSid: '',
driveForm: '',
@ -186,26 +177,10 @@ export default {
}
},
init() {
this.getPathSid()
this.shujuzidian()
this.getList()
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.success) {
this.useOrg = res.data
}
})
},
shujuzidian() {
// -
brandDown({ useOrg: this.useOrg }).then((res) => {
if (res.success) {
this.carBrand_list = res.data
console.log('下拉框请求品牌', res.data)
}
})
typeValues({ type: 'vehicleFunction' }).then((res) => {
if (res.success) {
this.vehicleType_list = res.data
@ -260,7 +235,6 @@ export default {
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.buyerOrgSid = this.buyerOrgSid
req.vehiclePurchaseList(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@ -279,7 +253,6 @@ export default {
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.brandSid = ''
this.listQuery.params.driveForm = ''
this.listQuery.params.emissionStandard = ''
this.listQuery.params.fuelType = ''
@ -311,7 +284,7 @@ export default {
})
this.sids = aa
},
showData(value, buyerOrgSid) {
showData(value, buyerOrgSid, brandSid) {
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
@ -321,7 +294,11 @@ export default {
} else {
this.listQuery.params.vinNoList = []
}
this.buyerOrgSid = buyerOrgSid
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.buyerOrgSid = buyerOrgSid
this.listQuery.params.brandSid = brandSid
this.init()
},
//

Loading…
Cancel
Save