Browse Source

完善厂家采购增加采购系统、厂家销售通路

master
yunuo970428 3 years ago
parent
commit
47c3078a85
  1. 10
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  2. 18
      anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js
  3. 67
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
  4. 15
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
  5. 15
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
  6. 68
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
  7. 15
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue

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

@ -128,3 +128,13 @@ export function selectMiddleList(data) {
})
}
// 获取分公司下所有的部门
export function selectOrgLists(data) {
return request({
url: '/portal/v1/sysorganization/selectOrgLists',
method: 'GET',
params: data
})
}

18
anrui-scm/anrui-scm-ui/src/api/supplychain/busvehicleapply.js

@ -136,18 +136,12 @@ export default {
params: data
})
},
// 读取xml文件
readXml: function(deployId) {
// 获取厂家销售通路
selectNameByOrg: function(data) {
return request({
url: '/flowable/v1/flowable/task/readXml/' + deployId,
method: 'get'
})
},
// 读取image文件
getFlowViewer: function(procInsId) {
return request({
url: '/flowable/v1/flowable/task/flowViewer/' + procInsId,
method: 'get'
url: '/base/v1/basemanufacturer/selectNameByOrg',
method: 'get',
params: data
})
},
}
}

67
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@ -20,15 +20,23 @@
<div class="titwu"><span>厂家采购</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>分公司:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>采购系统:</span></div>
<el-form-item>
<el-select v-model="formobj.orgDeptName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
<el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
@ -119,6 +127,13 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.actualPay" placeholder="请选择" @change="changeActualPay($event, scope.row)" clearable>
<el-option v-for="item in actualPay_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
@ -152,7 +167,7 @@ import req from '@/api/supplychain/busvehicleapply'
import configuration from './chexingbyconfiguration'
import shangzhuangpeizhi from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi'
import shangzhuangpeizhiAdd from '../../../views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd'
import { getPathSidByUserSid, fetchBySid, selectSysUserList } from '@/api/cheliang/dictcommons'
import { getPathSidByUserSid, fetchBySid, selectSysUserList, selectOrgLists } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangpaichanAdd',
@ -169,6 +184,8 @@ export default {
index: 0,
tableKey: 0,
//
orgDept_list: [],
actualPay_list: [],
schedulingType_list: [], // 使
applyType_list: [],
user_list: [],
@ -195,6 +212,8 @@ export default {
createOrgName: '',
userSids: '', // sid
userNames: '', // name
orgDeptName: '',
orgDeptSid: '',
busVehicleApplyDetailList: []
},
rules: {},
@ -220,6 +239,11 @@ export default {
})
},
getUserOrg() {
selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.orgDept_list = res.data
}
})
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
this.formobj.createOrgSid = resp.data
@ -228,6 +252,11 @@ export default {
this.formobj.createOrgName = response.data.name
}
})
req.selectNameByOrg({ useOrgSid: resp.data }).then((res) => {
if (res.success) {
this.actualPay_list = res.data
}
})
}
})
},
@ -315,7 +344,9 @@ export default {
insideCode: e.insideCode, //
vehicleName: e.vehicleAlias,
vehicleSid: e.modelSid,
guidePrice: ''
guidePrice: '',
actualPay: '',
actualSid: ''
})
if (e.insideCode) {
this.isRead = true
@ -325,6 +356,30 @@ export default {
})
}
},
changeOrgDept(value) {
let bb = null
this.orgDept_list.forEach((e) => {
if (e.name === value) {
bb = {
name: e.orgDeptName,
sid: e.orgDeptSid
}
}
})
this.formobj.orgDeptSid = bb.sid
},
changeActualPay(value, row) {
let bb = null
this.actualPay_list.forEach((e) => {
if (e.name === value) {
bb = {
name: e.name,
sid: e.sid
}
}
})
row.actualSid = bb.sid
},
changeApplyType(value) {
let bb = null
this.applyType_list.forEach((e) => {
@ -503,6 +558,8 @@ export default {
this.formobj.createOrgName = ''
this.formobj.userNames = ''
this.formobj.userSids = ''
this.formobj.orgDeptName = ''
this.formobj.orgDeptSid = ''
this.user_list = []
this.formobj.busVehicleApplyDetailList = []
this.$refs['form_obj'].resetFields()

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

@ -16,15 +16,19 @@
<div class="titwu"><span>厂家采购</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>分公司:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>采购系统:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orgDeptName }}</span></el-form-item>
</el-col>
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
@ -96,6 +100,11 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>

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

@ -18,15 +18,19 @@
<div class="titwu"><span>厂家采购</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>分公司:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>采购系统:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orgDeptName }}</span></el-form-item>
</el-col>
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
@ -98,6 +102,11 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>

68
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@ -19,15 +19,23 @@
<div class="titwu"><span>排产申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>分公司:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>采购系统:</span></div>
<el-form-item>
<el-select v-model="formobj.orgDeptName" placeholder="请选择" @change="changeOrgDept" clearable class="addinputInfo addinputOne">
<el-option v-for="item in orgDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
@ -118,6 +126,13 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.actualPay" placeholder="请选择" @change="changeActualPay($event, scope.row)" clearable>
<el-option v-for="item in actualPay_list" :key="item.sid" :label="item.name" :value="item.name"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
@ -151,7 +166,7 @@ import req from '@/api/supplychain/busvehicleapply'
import configuration from './chexingbyconfiguration'
import shangzhuangpeizhi from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi'
import shangzhuangpeizhiAdd from '../../../workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd'
import { selectSysUserList } from '@/api/cheliang/dictcommons'
import { selectSysUserList, selectOrgLists } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangpaichanEdit',
@ -168,6 +183,8 @@ export default {
index: 0,
tableKey: 0,
//
orgDept_list: [],
actualPay_list: [],
schedulingType_list: [], // 使
applyType_list: [],
user_list: [],
@ -194,6 +211,8 @@ export default {
createOrgName: '',
userSids: '', // sid
userNames: '', // name
orgDeptName: '',
orgDeptSid: '',
busVehicleApplyDetailList: []
},
rules: {},
@ -236,6 +255,18 @@ export default {
this.user_list = resp.data
}
})
selectOrgLists({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.orgDept_list = res.data
}
})
},
init() {
req.selectNameByOrg({ useOrgSid: this.formobj.createOrgSid }).then((res) => {
if (res.success) {
this.actualPay_list = res.data
}
})
},
oninput(val, limit = 0) {
val = val.replace(/[^\d]/g, '') //
@ -264,6 +295,7 @@ export default {
showInfo(sid, row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
this.init()
})
this.dialogStatus = 'edit'
this.viewTitle = '【编辑】厂家采购'
@ -294,7 +326,9 @@ export default {
insideCode: e.insideCode, //
vehicleName: e.vehicleAlias,
vehicleSid: e.modelSid,
guidePrice: ''
guidePrice: '',
actualPay: '',
actualSid: ''
})
if (e.insideCode) {
this.isRead = true
@ -304,6 +338,30 @@ export default {
})
}
},
changeOrgDept(value) {
let bb = null
this.orgDept_list.forEach((e) => {
if (e.name === value) {
bb = {
name: e.orgDeptName,
sid: e.orgDeptSid
}
}
})
this.formobj.orgDeptSid = bb.sid
},
changeActualPay(value, row) {
let bb = null
this.actualPay_list.forEach((e) => {
if (e.name === value) {
bb = {
name: e.name,
sid: e.sid
}
}
})
row.actualSid = bb.sid
},
changeApplyType(value) {
let bb = null
this.applyType_list.forEach((e) => {

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

@ -16,15 +16,19 @@
<div class="titwu"><span>厂家采购</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>分公司:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>采购系统:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.orgDeptName }}</span></el-form-item>
</el-col>
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8" class="colOneStyle">
<el-col :span="6" class="colOneStyle">
<div class="span-sty spanOneWidth"><span>申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
@ -96,6 +100,11 @@
<span>{{ scope.row.saleGuPrice }}</span>
</template>
</el-table-column>
<el-table-column label="厂家销售通路" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.actualPay }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>

Loading…
Cancel
Save