Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yxt_djz 3 years ago
parent
commit
882ee6a2e8
  1. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 15
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
  3. 42
      anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue
  4. 57
      anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue
  5. 2
      anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
  6. 79
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue
  7. 74
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue
  8. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@ -1932,8 +1932,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if (!isDeposit) { if (!isDeposit) {
return rb.setMsg("请完善订金信息"); return rb.setMsg("请完善订金信息");
} }
if(StringUtils.isNotBlank(busSalesOrder.getIsInsurance())){ if(StringUtils.isBlank(busSalesOrder.getIsInsurance())){
return rb.setMsg("请完善保险信息"); return rb.setMsg("请完善保险信息");
}else{ }else{
if("0".equals(busSalesOrder.getIsInsurance())){ if("0".equals(busSalesOrder.getIsInsurance())){
BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid); BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance = busSalesOrderInsuranceService.details(sid);

15
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@ -63,13 +63,22 @@
NULL), NULL),
IF(LENGTH(trim(GROUP_CONCAT(overallDimension))) > 0, GROUP_CONCAT('外廓尺寸:', overallDimension), IF(LENGTH(trim(GROUP_CONCAT(overallDimension))) > 0, GROUP_CONCAT('外廓尺寸:', overallDimension),
NULL), NULL),
IF(LENGTH(trim(GROUP_CONCAT(color))) > 0, GROUP_CONCAT('颜色:', color),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(plateMaterial))) > 0, GROUP_CONCAT('板材材质:', plateMaterial), IF(LENGTH(trim(GROUP_CONCAT(plateMaterial))) > 0, GROUP_CONCAT('板材材质:', plateMaterial),
NULL), NULL),
IF(LENGTH(trim(GROUP_CONCAT(plateThickness))) > 0, GROUP_CONCAT('板材厚度:', plateThickness), IF(LENGTH(trim(GROUP_CONCAT(plateThickness))) > 0, GROUP_CONCAT('板材厚度:', plateThickness),
NULL), NULL),
IF(LENGTH(trim(GROUP_CONCAT(announcementModel))) > 0, GROUP_CONCAT('公告型号:', announcementModel), IF(LENGTH(trim(GROUP_CONCAT(tarpaulinSlide))) > 0, GROUP_CONCAT('篷布滑道:', tarpaulinSlide),
NULL), IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格:', topPrice), NULL),
NULL), IF(LENGTH(trim(GROUP_CONCAT(refirgerator))) > 0, GROUP_CONCAT('冷藏冷机:', refirgerator),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(selfUnHyCoPl))) > 0, GROUP_CONCAT('自卸液压盖版:', selfUnHyCoPl),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(floorHeating))) > 0, GROUP_CONCAT('底板加热:', floorHeating),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(topPrice))) > 0, GROUP_CONCAT('上装价格:', topPrice, '元'),
NULL),
IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置:', moreConfig), IF(LENGTH(trim(GROUP_CONCAT(moreConfig))) > 0, GROUP_CONCAT('更多配置:', moreConfig),
NULL), NULL),
IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注:', remarks), IF(LENGTH(trim(GROUP_CONCAT(remarks))) > 0, GROUP_CONCAT('备注:', remarks),

42
anrui-scm/anrui-scm-ui/src/views/supplychain/diaochekaipiaoshenqingguanli/diaocheshenqingAdd.vue

@ -35,8 +35,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="callOutOrgSid" label="调出分公司"> <el-form-item prop="callOutOrgSid" label="调出分公司">
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" @change="callOutOrgSidChange" :disabled="dialogStatus == 'edit'"> <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw" @change="callOutOrgSidChange" :disabled="dialogStatus == 'edit'">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -145,7 +145,7 @@
<script> <script>
import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList' import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
import upload_diaoche from '@/components/uploadFile/upload_diaoche' import upload_diaoche from '@/components/uploadFile/upload_diaoche'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel' import { getPathSidByUserSid, fetchBySid, getListOrgByBrand } from '@/api/cheliang/dictcommons'
import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js' import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
import { typeValues } from '@/api/supplychain/yancheguanli' import { typeValues } from '@/api/supplychain/yancheguanli'
import req from '@/api/kucunguanli/changjiachuku' import req from '@/api/kucunguanli/changjiachuku'
@ -164,6 +164,7 @@ export default {
dialogVisible: false, dialogVisible: false,
dialogUrl: [], dialogUrl: [],
useOrg: '', useOrg: '',
useOrgName: '',
index: 0, index: 0,
list: [], list: [],
vehicleList: [], vehicleList: [],
@ -233,18 +234,10 @@ export default {
row.invoiceTypeValue = choosetItem[0].dictValue row.invoiceTypeValue = choosetItem[0].dictValue
} }
}, },
//
getListOrgAll() {
getOrg().then((res) => {
if (res.success) {
this.useOrg_list = res.data
this.getPathSid()
}
})
},
callOutOrgSidChange(val) { callOutOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid === val) const choosetItem = this.useOrg_list.filter((item) => item.name === val)
this.temp.callOutOrgName = choosetItem[0].name this.temp.callOutOrgName = choosetItem[0].name
this.temp.callOutOrgSid = choosetItem[0].sid
console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid) console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
}, },
// sid // sid
@ -255,8 +248,17 @@ export default {
this.useOrg = res.data this.useOrg = res.data
this.temp.createOrgSid = res.data this.temp.createOrgSid = res.data
this.temp.callInOrgSid = res.data this.temp.callInOrgSid = res.data
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid) fetchBySid(this.useOrg).then((resp) => {
this.temp.callInOrgName = name[0].name if (resp.success) {
this.useOrgName = resp.data.name
this.temp.callInOrgName = this.useOrgName
}
})
getListOrgByBrand(this.useOrg).then((res) => {
if (res.success) {
this.useOrg_list = res.data
}
})
} }
}) })
}, },
@ -361,7 +363,7 @@ export default {
this.temp.createBySid = window.sessionStorage.getItem('userSid') this.temp.createBySid = window.sessionStorage.getItem('userSid')
this.dialogStatus = 'add' this.dialogStatus = 'add'
this.viewTitle = '【新增】调车开票申请' this.viewTitle = '【新增】调车开票申请'
this.getListOrgAll() this.getPathSid()
this.getType() this.getType()
}, },
showEdit(row) { showEdit(row) {
@ -381,13 +383,13 @@ export default {
}).catch(e => { }).catch(e => {
this.submitdisabled = false this.submitdisabled = false
}) })
this.getListOrgAll() this.getPathSid()
this.getType() this.getType()
}, },
handleCreate() { handleCreate() {
const _this = this const _this = this
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
if (this.list[i].invoiceTypeKey == '02') { if (this.list[i].invoiceTypeKey === '02') {
this.list[i].invoicinMoney = this.list[i].witPinMoney // := this.list[i].invoicinMoney = this.list[i].witPinMoney // :=
this.list[i].invoicinCompanyName = this.temp.callInOrgName // := this.list[i].invoicinCompanyName = this.temp.callInOrgName // :=
this.list[i].invoicinCompanySid = this.temp.callInOrgSid // := this.list[i].invoicinCompanySid = this.temp.callInOrgSid // :=
@ -442,13 +444,15 @@ export default {
baseShuntingInvoicinApplyeVehs: [] baseShuntingInvoicinApplyeVehs: []
} }
this.list = [] this.list = []
this.useOrg = []
this.useOrgName = ''
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.$emit('doback') this.$emit('doback')
}, },
handleSubmit() { handleSubmit() {
const _this = this const _this = this
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
if (this.list[i].invoiceTypeKey == '02') { if (this.list[i].invoiceTypeKey === '02') {
this.list[i].invoicinMoney = this.list[i].witPinMoney // := this.list[i].invoicinMoney = this.list[i].witPinMoney // :=
this.list[i].invoicinCompanyName = this.temp.callInOrgName // := this.list[i].invoicinCompanyName = this.temp.callInOrgName // :=
this.list[i].invoicinCompanySid = this.temp.callInOrgSid // := this.list[i].invoicinCompanySid = this.temp.callInOrgSid // :=

57
anrui-scm/anrui-scm-ui/src/views/supplychain/tiaozhangshenqingguanli/tiaozhangshenqingguanliAdd.vue

@ -30,15 +30,15 @@
</el-col> </el-col>
<el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" --> <el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" -->
<el-form-item prop="callOutOrgSid" label="调出分公司"> <el-form-item prop="callOutOrgSid" label="调出分公司">
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange"> <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="callInOrgSid" label="调入分公司"> <el-form-item prop="callInOrgSid" label="调入分公司">
<el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange"> <el-select v-model="temp.callInOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -122,7 +122,7 @@
<script> <script>
import tiaozhangcheliangList from '@/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList' import tiaozhangcheliangList from '@/views/supplychain/tiaozhangshenqingguanli/relation/tiaozhangcheliangList'
import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js' import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel' import { getPathSidByUserSid, getListOrgByBrand, fetchBySid } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons' import { typeValues } from '@/api/cheliang/dictcommons'
export default { export default {
@ -139,6 +139,7 @@ export default {
list: [], list: [],
vehicleList: [], vehicleList: [],
useOrg: '', useOrg: '',
useOrgName: '',
accadjType_list: [], accadjType_list: [],
useOrg_list: [], useOrg_list: [],
// //
@ -196,9 +197,14 @@ export default {
getPathSid() { getPathSid() {
const userSid = window.sessionStorage.getItem('userSid') const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid: userSid}).then((res) => { getPathSidByUserSid({userSid: userSid}).then((res) => {
if (res.code === '200') { if (res.success) {
this.useOrg = res.data this.useOrg = res.data
this.temp.createOrgSid = res.data this.temp.createOrgSid = res.data
fetchBySid(this.useOrg).then((resp) => {
if (resp.success) {
this.useOrgName = resp.data.name
}
})
} }
}) })
}, },
@ -211,46 +217,51 @@ export default {
} }
}) })
}, },
getListOrgAll() {
getOrg().then((res) => {
if (res.success) {
this.useOrg_list = res.data
}
})
},
accadjTypeKeyChange(val) { accadjTypeKeyChange(val) {
if (val) { if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val) const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val)
this.temp.accadjTypeValue = choosetItem[0].dictValue this.temp.accadjTypeValue = choosetItem[0].dictValue
console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey) console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey)
// //
if (this.temp.accadjTypeKey == '01') { if (this.temp.accadjTypeKey === '01') {
this.temp.callInOrgSid = this.useOrg this.temp.callInOrgSid = this.useOrg
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid) // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
this.temp.callInOrgName = name[0].name this.temp.callInOrgName = this.useOrgName
console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid) console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
this.temp.callOutOrgName = '' this.temp.callOutOrgName = ''
this.temp.callOutOrgSid = '' this.temp.callOutOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {
if (resp.success) {
this.useOrg_list = resp.data
}
})
} }
// //
if (this.temp.accadjTypeKey == '02') { if (this.temp.accadjTypeKey === '02') {
this.temp.callOutOrgSid = this.useOrg this.temp.callOutOrgSid = this.useOrg
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid) // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
this.temp.callOutOrgName = name[0].name this.temp.callOutOrgName = this.useOrgName
console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid) console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
this.temp.callInOrgName = '' this.temp.callInOrgName = ''
this.temp.callInOrgSid = '' this.temp.callInOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {
if (resp.success) {
this.useOrg_list = resp.data
}
})
} }
} }
}, },
callOutOrgSidChange(val) { callOutOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid === val) const choosetItem = this.useOrg_list.filter((item) => item.name === val)
this.temp.callOutOrgName = choosetItem[0].name this.temp.callOutOrgName = choosetItem[0].name
this.temp.callOutOrgSid = choosetItem[0].sid
console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid) console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
}, },
callInOrgSidChange(val) { callInOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid === val) const choosetItem = this.useOrg_list.filter((item) => item.name === val)
this.temp.callInOrgName = choosetItem[0].name this.temp.callInOrgName = choosetItem[0].name
this.temp.callInOrgSid = choosetItem[0].sid
console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid) console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid)
}, },
handletiaozhangcheliang() { handletiaozhangcheliang() {
@ -334,6 +345,8 @@ export default {
accSids: [] // sid accSids: [] // sid
} }
this.list = [] this.list = []
this.useOrg = ''
this.useOrgName = ''
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields()
this.$emit('doback') this.$emit('doback')
}, },
@ -355,7 +368,6 @@ export default {
this.viewTitle = '【新增】分公司间调账申请' this.viewTitle = '【新增】分公司间调账申请'
this.getPathSid() this.getPathSid()
this.getType() this.getType()
this.getListOrgAll()
}, },
showEdit(row) { showEdit(row) {
@ -378,7 +390,6 @@ export default {
}) })
this.getPathSid() this.getPathSid()
this.getType() this.getType()
this.getListOrgAll()
}, },
handleCreate() { handleCreate() {
const _this = this const _this = this

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

@ -260,6 +260,7 @@ export default {
// //
getList() { getList() {
this.listLoading = true this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
req.pageList(this.listQuery).then((response) => { req.pageList(this.listQuery).then((response) => {
this.listLoading = false this.listLoading = false
if (response.success) { if (response.success) {
@ -323,7 +324,6 @@ export default {
} else { } else {
this.listQuery.params.vinNoList = [] this.listQuery.params.vinNoList = []
} }
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.init() this.init()
}, },
// //

79
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaochekaipiaoshenqingFlow/tiaochekaipiaoshenqingEdit.vue

@ -39,11 +39,11 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="money" label="调出分公司"> <el-form-item prop="money" label="调出分公司">
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw"
@change="callOutOrgSidChange" @change="callOutOrgSidChange"
:disabled="dialogStatus == 'edit'"> :disabled="dialogStatus == 'edit'">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name"
:value="item.sid"/> :value="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -164,7 +164,7 @@
<script> <script>
import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList' import diaochecheliangList from '@/views/supplychain/diaochekaipiaoshenqingguanli/relation/diaochecheliangList'
import upload_diaoche from '@/components/uploadFile/upload_diaoche' import upload_diaoche from '@/components/uploadFile/upload_diaoche'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel' import { getPathSidByUserSid, fetchBySid, getListOrgByBrand } from '@/api/cheliang/dictcommons'
import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js' import { fetchDetailsBySid, save, selByLinkSid, submitSunInv } from '@/api/supplychain/diaochekaipiaoshenqing.js'
import { typeValues } from '@/api/supplychain/yancheguanli' import { typeValues } from '@/api/supplychain/yancheguanli'
import req from '@/api/kucunguanli/changjiachuku' import req from '@/api/kucunguanli/changjiachuku'
@ -183,6 +183,7 @@ export default {
dialogVisible: false, dialogVisible: false,
dialogUrl: [], dialogUrl: [],
useOrg: '', useOrg: '',
useOrgName: '',
index: 0, index: 0,
list: [], list: [],
vehicleList: [], vehicleList: [],
@ -227,17 +228,17 @@ export default {
var one = window.location.href.indexOf('&data') + 6 var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使 const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data)) const obj = JSON.parse(decodeURIComponent(data))
this.showEdit(obj.businessSid,obj.instanceId,obj.taskId) this.showEdit(obj.businessSid, obj.instanceId, obj.taskId)
}, },
methods: { methods: {
// //
oninput(val, limit = 0) { oninput(val, limit = 0) {
val = val.replace(/[^\d.]/g, '') // val = val.replace(/[^\d.]/g, '') //
val = val.replace(/^00/, '0.') //0 val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') //0. val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') // val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' //0 /^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$' const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str) const reg = new RegExp(str)
if (limit === 0) { if (limit === 0) {
@ -261,22 +262,14 @@ export default {
invoiceTypeChange(row, val) { invoiceTypeChange(row, val) {
console.log('215545', row, val) console.log('215545', row, val)
if (val) { if (val) {
const choosetItem = this.invoiceType_list.filter((item) => item.dictKey == val) const choosetItem = this.invoiceType_list.filter((item) => item.dictKey === val)
row.invoiceTypeValue = choosetItem[0].dictValue row.invoiceTypeValue = choosetItem[0].dictValue
} }
}, },
//
getListOrgAll() {
getOrg().then((res) => {
if (res.success) {
this.useOrg_list = res.data
this.getPathSid()
}
})
},
callOutOrgSidChange(val) { callOutOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid == val) const choosetItem = this.useOrg_list.filter((item) => item.name === val)
this.temp.callOutOrgName = choosetItem[0].name this.temp.callOutOrgName = choosetItem[0].name
this.temp.callOutOrgSid = choosetItem[0].sid
console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid) console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
}, },
// sid // sid
@ -287,8 +280,17 @@ export default {
this.useOrg = res.data this.useOrg = res.data
this.temp.createOrgSid = res.data this.temp.createOrgSid = res.data
this.temp.callInOrgSid = res.data this.temp.callInOrgSid = res.data
const name = this.useOrg_list.filter((item) => item.sid == this.temp.callInOrgSid) fetchBySid(this.useOrg).then((resp) => {
this.temp.callInOrgName = name[0].name if (resp.success) {
this.useOrgName = resp.data.name
this.temp.callInOrgName = this.useOrgName
}
})
getListOrgByBrand(this.useOrg).then((respsone) => {
if (respsone.success) {
this.useOrg_list = respsone.data
}
})
} }
}) })
}, },
@ -320,7 +322,7 @@ export default {
}, },
// //
handlediaocheliang() { handlediaocheliang() {
if (this.temp.callOutOrgSid == '') { if (this.temp.callOutOrgSid === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
message: '请选择调出分公司', message: '请选择调出分公司',
@ -328,7 +330,7 @@ export default {
}) })
return return
} }
if (this.temp.callInOrgSid == '') { if (this.temp.callInOrgSid === '') {
this.$message({ this.$message({
showClose: true, showClose: true,
message: '请选择调入分公司', message: '请选择调入分公司',
@ -341,7 +343,7 @@ export default {
this.list.forEach(element => { this.list.forEach(element => {
vinNoList.push(element.purchaseSid) vinNoList.push(element.purchaseSid)
}) })
this.$refs['xuanChe'].showCheList( this.temp.callOutOrgSid, this.temp.callInOrgSid, vinNoList) this.$refs['xuanChe'].showCheList(this.temp.callOutOrgSid, this.temp.callInOrgSid, vinNoList)
}, },
// //
dataDelete(row, index) { dataDelete(row, index) {
@ -382,22 +384,10 @@ export default {
remarks: vehicleList[i].remarks, remarks: vehicleList[i].remarks,
isAvailable: isAvailable isAvailable: isAvailable
}) })
} }
console.log('车辆表数据', this.list) console.log('车辆表数据', this.list)
}, },
showAdd() { showEdit(businessSid, instanceId, taskId) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
this.temp.name = window.sessionStorage.getItem('name')
this.temp.createBySid = window.sessionStorage.getItem('userSid')
this.dialogStatus = 'add'
this.viewTitle = '【新增】调车开票申请'
this.getListOrgAll()
this.getType()
},
showEdit(businessSid,instanceId,taskId) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].clearValidate() this.$refs['dataForm'].clearValidate()
}) })
@ -416,13 +406,12 @@ export default {
}).catch(e => { }).catch(e => {
this.submitdisabled = false this.submitdisabled = false
}) })
this.getListOrgAll() this.getPathSid()
this.getType() this.getType()
}, },
handleCreate() { handleCreate() {
const _this = this
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
if (this.list[i].invoiceTypeKey == '02') { if (this.list[i].invoiceTypeKey === '02') {
this.list[i].invoicinMoney = this.list[i].witPinMoney // := this.list[i].invoicinMoney = this.list[i].witPinMoney // :=
this.list[i].invoicinCompanyName = this.temp.callInOrgName // := this.list[i].invoicinCompanyName = this.temp.callInOrgName // :=
this.list[i].invoicinCompanySid = this.temp.callInOrgSid // := this.list[i].invoicinCompanySid = this.temp.callInOrgSid // :=
@ -464,9 +453,8 @@ export default {
}) })
}, },
handleSubmit() { handleSubmit() {
const _this = this
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
if (this.list[i].invoiceTypeKey == '02') { if (this.list[i].invoiceTypeKey === '02') {
this.list[i].invoicinMoney = this.list[i].witPinMoney // := this.list[i].invoicinMoney = this.list[i].witPinMoney // :=
this.list[i].invoicinCompanyName = this.temp.callInOrgName // := this.list[i].invoicinCompanyName = this.temp.callInOrgName // :=
this.list[i].invoicinCompanySid = this.temp.callInOrgSid // := this.list[i].invoicinCompanySid = this.temp.callInOrgSid // :=
@ -512,8 +500,7 @@ export default {
} }
}) })
} }
}
},
} }
</script> </script>

74
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaozhangshenqingFlow/tiaozhangshenqingEdit.vue

@ -36,15 +36,15 @@
</el-col> </el-col>
<el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" --> <el-col :span="8"><!-- :readonly="vehicleList[scope.$index].inboundDate" -->
<el-form-item prop="money" label="调出分公司"> <el-form-item prop="money" label="调出分公司">
<el-select v-model="temp.callOutOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange"> <el-select v-model="temp.callOutOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '02' || dialogStatus == 'edit'" @change="callOutOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="money" label="调入分公司"> <el-form-item prop="money" label="调入分公司">
<el-select v-model="temp.callInOrgSid" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange"> <el-select v-model="temp.callInOrgName" placeholder="请选择" clearable class="addinputw" :disabled="temp.accadjTypeKey == '01' || dialogStatus == 'edit'" @change="callInOrgSidChange">
<el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/> <el-option v-for="item in useOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -128,7 +128,7 @@
<script> <script>
import tiaozhangcheliangList from './relation/tiaozhangcheliangList' import tiaozhangcheliangList from './relation/tiaozhangcheliangList'
import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js' import { fetchDetailsBySid, save, submitAccAdjApply } from '@/api/supplychain/tiaozhangshenqing.js'
import { getOrg, getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel' import { getPathSidByUserSid, getListOrgByBrand, fetchBySid } from '@/api/cheliang/dictcommons'
import { typeValues } from '@/api/cheliang/dictcommons' import { typeValues } from '@/api/cheliang/dictcommons'
export default { export default {
@ -145,6 +145,7 @@ export default {
list: [], list: [],
vehicleList: [], vehicleList: [],
useOrg: '', useOrg: '',
useOrgName: '',
accadjType_list: [], accadjType_list: [],
useOrg_list: [], useOrg_list: [],
// //
@ -208,10 +209,15 @@ export default {
// sid // sid
getPathSid() { getPathSid() {
const userSid = window.sessionStorage.getItem('userSid') const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid: userSid}).then((res) => { getPathSidByUserSid({ userSid: userSid }).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.useOrg = res.data this.useOrg = res.data
this.temp.createOrgSid = res.data this.temp.createOrgSid = res.data
fetchBySid(this.useOrg).then((resp) => {
if (resp.success) {
this.useOrgName = resp.data.name
}
})
} }
}) })
}, },
@ -224,46 +230,51 @@ export default {
} }
}) })
}, },
getListOrgAll() {
getOrg().then((res) => {
if (res.success) {
this.useOrg_list = res.data
}
})
},
accadjTypeKeyChange(val) { accadjTypeKeyChange(val) {
if (val) { if (val) {
const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val) const choosetItem = this.accadjType_list.filter((item) => item.dictKey === val)
this.temp.accadjTypeValue = choosetItem[0].dictValue this.temp.accadjTypeValue = choosetItem[0].dictValue
console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey) console.log('name:', this.temp.accadjTypeValue, 'key:', this.temp.accadjTypeKey)
// //
if (this.temp.accadjTypeKey == '01') { if (this.temp.accadjTypeKey === '01') {
this.temp.callInOrgSid = this.useOrg this.temp.callInOrgSid = this.useOrg
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid) // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callInOrgSid)
this.temp.callInOrgName = name[0].name this.temp.callInOrgName = this.useOrgName
console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid) console.log('name:', this.temp.callInOrgName, 'sid:', this.temp.callInOrgSid)
this.temp.callOutOrgName = '' this.temp.callOutOrgName = ''
this.temp.callOutOrgSid = '' this.temp.callOutOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {
if (resp.success) {
this.useOrg_list = resp.data
}
})
} }
// //
if (this.temp.accadjTypeKey == '02') { if (this.temp.accadjTypeKey === '02') {
this.temp.callOutOrgSid = this.useOrg this.temp.callOutOrgSid = this.useOrg
const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid) // const name = this.useOrg_list.filter((item) => item.sid === this.temp.callOutOrgSid)
this.temp.callOutOrgName = name[0].name this.temp.callOutOrgName = this.useOrgName
console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid) console.log('name:', this.temp.callOutOrgName, 'sid:', this.temp.callOutOrgSid)
this.temp.callInOrgName = '' this.temp.callInOrgName = ''
this.temp.callInOrgSid = '' this.temp.callInOrgSid = ''
getListOrgByBrand(this.useOrg).then((resp) => {
if (resp.success) {
this.useOrg_list = resp.data
}
})
} }
} }
}, },
callOutOrgSidChange(val) { callOutOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid === val) const choosetItem = this.useOrg_list.filter((item) => item.name === val)
this.temp.callOutOrgName = choosetItem[0].name this.temp.callOutOrgName = choosetItem[0].name
this.temp.callOutOrgSid = choosetItem[0].sid
console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid) console.log('name:', this.temp.callOutOrgName, 'key:', this.temp.callOutOrgSid)
}, },
callInOrgSidChange(val) { callInOrgSidChange(val) {
const choosetItem = this.useOrg_list.filter((item) => item.sid === val) const choosetItem = this.useOrg_list.filter((item) => item.name === val)
this.temp.callInOrgName = choosetItem[0].name this.temp.callInOrgName = choosetItem[0].name
this.temp.callInOrgSid = choosetItem[0].sid
console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid) console.log('name:', this.temp.callInOrgName, 'key:', this.temp.callInOrgSid)
}, },
handletiaozhangcheliang() { handletiaozhangcheliang() {
@ -329,26 +340,6 @@ export default {
this.list.splice(index, 1) this.list.splice(index, 1)
}, },
showAdd() {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
})
// this.temp.name = window.sessionStorage.getItem('name')
this.temp.createBySid = window.sessionStorage.getItem('userSid')
// req.detailsInfo(this.temp.sid).then(resp => {
// const data = resp.data
// this.temp.applicationCode = data.applicationCode
// this.temp.createTime = data.createTime
// }).catch(e => {
// this.submitdisabled = false
// })
this.dialogStatus = 'add'
this.viewTitle = '【新增】分公司间调账申请'
this.getPathSid()
this.getType()
this.getListOrgAll()
},
showEdit(businessSid, instanceId, taskId) { showEdit(businessSid, instanceId, taskId) {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].clearValidate() this.$refs['dataForm'].clearValidate()
@ -371,7 +362,6 @@ export default {
}) })
this.getPathSid() this.getPathSid()
this.getType() this.getType()
this.getListOrgAll()
}, },
handleCreate() { handleCreate() {
this.$refs['dataForm'].validate(valid => { this.$refs['dataForm'].validate(valid => {

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

@ -260,6 +260,7 @@ export default {
// //
getList() { getList() {
this.listLoading = true this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
req.pageList(this.listQuery).then((response) => { req.pageList(this.listQuery).then((response) => {
this.listLoading = false this.listLoading = false
if (response.success) { if (response.success) {
@ -323,7 +324,6 @@ export default {
} else { } else {
this.listQuery.params.vinNoList = [] this.listQuery.params.vinNoList = []
} }
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.init() this.init()
}, },
// //

Loading…
Cancel
Save