java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

修改采购查询流程显示数据

dev
caoyizhong 2 years ago
parent
1d0cd43c5b
commit
34349505ff
4 changed files with 160 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/views/activiti/form/ProcessMaterialsAllotForm.vue
  2. 216
      src/views/activiti/form/ProcessUdgetPlanForm.vue
  3. 2
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  4. 4
      src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

9
src/views/activiti/form/ProcessMaterialsAllotForm.vue
Unescape View File

@ -365,10 +365,10 @@
if (item.merchandiseNewsId === record.row.equipment) { if (item.merchandiseNewsId === record.row.equipment) {
materialName = { materialName = {
name: item.merchandiseName, name: item.merchandiseName,
unit: item.unit, unit: item.materialsUnit,
supplierName: item.supplierName, supplierName: item.supplierName,
price: item.price, price: item.materialPrice,
number : item.number === undefined ? 0 : item.number, number : item.residueNumber === undefined ? 0 : item.residueNumber,
} }
} }
}) })
@ -398,7 +398,7 @@
this.bigIdMerchandiseNewsList.forEach(item => { this.bigIdMerchandiseNewsList.forEach(item => {
if (item.merchandiseNewsId === record.row.equipment) { if (item.merchandiseNewsId === record.row.equipment) {
materialName = { materialName = {
number : item.number === undefined ? 0 : item.number, number : item.residueNumber === undefined ? 0 : item.residueNumber,
} }
} }
}) })
@ -501,6 +501,7 @@
let par = { let par = {
delFlag: 0, delFlag: 0,
accountingAttributes: value, accountingAttributes: value,
sysOrgCode: this.data.sysOrgCode
} }
getAction(this.url.descriptionRake,par).then((res)=>{ getAction(this.url.descriptionRake,par).then((res)=>{
if(res.success){ if(res.success){

216
src/views/activiti/form/ProcessUdgetPlanForm.vue
Unescape View File

@ -34,7 +34,7 @@
<a-col :span="8"> <a-col :span="8">
<a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag type="list" v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true" dictCode="material_type" <j-dict-select-tag type="list" v-decorator="['materialType',validatorRules.materialType]" :trigger-change="true" dictCode="material_type"
placeholder="请选择物资类型"/> placeholder="请选择物资类型" @change="elect" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="8"> <a-col :span="8">
@ -73,12 +73,23 @@
:maxHeight="300" :maxHeight="300"
:action-button="true" :action-button="true"
:rowNumber="true" :rowNumber="true"
:disabled="hieg"
:rowSelection="true" :rowSelection="true"
:actionButton="true"> :actionButton="true">
<template v-slot:group="props">
<a-auto-complete
v-model=materialGroups
:data-source="bigIdRake"
placeholder="请选择"
@search="onSearchRake"
@select="onSelectRake(props,materialGroups)"
/>
</template>
<template v-slot:action="props"> <template v-slot:action="props">
<a-tooltip placement="top"> <a-tooltip placement="top">
<template v-slot:title="props" > <template v-slot:title="props" >
<p v-for="(item,index) in historyBigId" :key="index">历史价格：{{ item }}</p> <p v-for="(item,index) in historyBigId" :key="index" >历史价格：{{ item }}</p>
</template> </template>
<a-button @mouseenter="chaKan(props)">查看</a-button> <a-button @mouseenter="chaKan(props)">查看</a-button>
</a-tooltip> </a-tooltip>
@ -134,7 +145,13 @@
data() { data() {
return { return {
bigId:[], bigId:[],
bigIdRake:[],
materialGroups:'',
materialId :'',
bigIdRakeList:[],
hieg:true,
historyBigId:[], historyBigId:[],
isHistoryBigId:false,
bigIdMerchandiseNews:[], bigIdMerchandiseNews:[],
bigIdMerchandiseNewsList:[], bigIdMerchandiseNewsList:[],
labelCol: { labelCol: {
@ -168,12 +185,13 @@
key: 'materialGroup', key: 'materialGroup',
// type: FormTypes.slot, // <-------------改为 slot 格式 // type: FormTypes.slot, // <-------------改为 slot 格式
// slotName: 'actions', // <-------------slot 的名称，对应 v-slot 冒号后面和等号前面的内容 // slotName: 'actions', // <-------------slot 的名称，对应 v-slot 冒号后面和等号前面的内容
type: FormTypes.sel_search, type: FormTypes.slot,
dictCode: '', // type: FormTypes.sel_search,
slotName: 'group',
width: '200px', width: '200px',
placeholder: '请输入${title}',
options: [], options: [],
props:{title: 'show title'}
// scopedSlots: { customRender: 'edit' },//引入的插槽 // scopedSlots: { customRender: 'edit' },//引入的插槽
// customRender:function (t,r,index) { // customRender:function (t,r,index) {
// console.log(t,r); // console.log(t,r);
@ -191,14 +209,6 @@
options: [], options: [],
}, },
// { // {
// title: '物料描述',
// key: 'materialDescription',
// type: FormTypes.input,
// width: '200px',
// placeholder: '请输入${title}',
// defaultValue: ''
// },
// {
// title: '仓储地点_id', // title: '仓储地点_id',
// key: 'unitWasteWarehouseCodeId', // key: 'unitWasteWarehouseCodeId',
// type: FormTypes.input, // type: FormTypes.input,
@ -295,7 +305,7 @@
title: '对比单价', title: '对比单价',
key: 'action', key: 'action',
type: FormTypes.slot, type: FormTypes.slot,
width: '70px', width: '80px',
// placeholder: '请输入${title}', // placeholder: '请输入${title}',
// defaultValue: '', // defaultValue: '',
slotName: 'action' slotName: 'action'
@ -317,6 +327,14 @@
placeholder: '请输入${title}', placeholder: '请输入${title}',
defaultValue: '' defaultValue: ''
}, },
{
title: '供应商',
key: 'supplierId',
type: FormTypes.input,
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
},
{ {
title: '执行标准', title: '执行标准',
key: 'materialStandard', key: 'materialStandard',
@ -348,6 +366,7 @@
edit: '/hy/processUdgetPlan/edit', edit: '/hy/processUdgetPlan/edit',
queryById: '/hy/processUdgetPlan/queryById', queryById: '/hy/processUdgetPlan/queryById',
selectdeparment:'/sys/selectByUser', selectdeparment:'/sys/selectByUser',
descriptionRakeUrl: "/description/processDescription/list",
descriptionRake: "/description/processDescription/descriptionName", descriptionRake: "/description/processDescription/descriptionName",
merchandiseNewsList: "/merchandisenews/processMerchandiseNews/merchandiseNewsList", merchandiseNewsList: "/merchandisenews/processMerchandiseNews/merchandiseNewsList",
historyUrl: '/suppliesstronger/processSuppliesStronger/list', historyUrl: '/suppliesstronger/processSuppliesStronger/list',
@ -426,81 +445,149 @@
let userInfo=sessionStorage.getItem("USER_INFORMATION"); let userInfo=sessionStorage.getItem("USER_INFORMATION");
// userInfo.company=company; // userInfo.company=company;
this.popupCallback(company,userInfo); this.popupCallback(company,userInfo);
this.fetchData();
}, },
methods: { methods: {
elect(val){
if(val != undefined){
this.hieg = false;
// this.fetchData();
this.fetchDataRake();
}
},
//物料组选择触发
onSelectRake(props,value) {
// console.log('onSelect', value,props);
this.searchRake(value,props);
},
//物料组输入触发
onSearchRake(searchText) {
// console.log(searchText)
this.fetchDataRake(searchText);
},
fetchDataRake(value){
//查询大品类数据
let par = {
delFlag: 0,
descriptionName: value,
pageSize: 100
}
this.bigIdRake = [];
this.bigIdRakeList = [];
getAction(this.url.descriptionRakeUrl,par).then((res)=>{
if(res.success){
// console.log(res.result);
res.result.records.forEach( item => {
this.bigIdRake.push(item.descriptionName);
})
this.bigIdRakeList = res.result.records;
}
});
},
//物料组触发集合
searchRake(val,pro){
this.bigIdRakeList.forEach(item =>{
// console.log(item);
if(item.descriptionName === val){
this.fetchMerchandiseNews(item.id);
this.materialId=item.id
}
})
// console.log(this.materialId);
},
//查看历史价格 //查看历史价格
async chaKan(log){ async chaKan(log){
this.historyBigId = [];
let pas = await log.target.getValuesPromise(log.rowIds); let pas = await log.target.getValuesPromise(log.rowIds);
// console.log(pas);
if(pas[0].materialNumber !== '' && pas[0].materialNumber !== null ){ if(pas[0].materialNumber !== '' && pas[0].materialNumber !== null ){
this.historyBigId = [];
//查询大品类数据 //查询大品类数据
let par = { let par = {
delFlag: 0, delFlag: 0,
merchandisenewsId: pas[0].materialNumber, merchandiseNewsId: pas[0].materialNumber,
pageSize:5 pageSize:5
} }
this.isHistoryBigId = false;
getAction(this.url.historyUrl,par).then((res)=>{ getAction(this.url.historyUrl,par).then((res)=>{
// console.log(res);
if(res.success) { if(res.success) {
res.result.records.forEach( item => { res.result.records.forEach( item => {
this.historyBigId.push(item.price); if(parseInt(res.result.total) > 0){
this.isHistoryBigId = true;
this.historyBigId.push(item.materialPrice);
}
}) })
} }
}); });
} }
}, },
//table 值改变触发 //table 值改变触发
onSelect(record) { onSelect(record) {
if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber === ''){ // if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber === ''){
this.fetchMerchandiseNews(record.row.materialGroup); // console.log("1出发了",record.row);
} // this.fetchMerchandiseNews(record.row.materialGroup);
if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber !== ''){ // }
// console.log("5555出发了",record.row);
if(record.row.materialGroup === '' || record.row.materialGroup === undefined && record.row.materialNumber !== ''){
// console.log("2出发了",record.row);
let materialName = { } let materialName = { }
this.bigIdMerchandiseNewsList.forEach( item => { this.bigIdMerchandiseNewsList.forEach( item => {
if( item.id === record.row.materialNumber ){ if( item.id === record.row.materialNumber ){
materialName ={ materialName ={
name: item.merchandiseName, name: item.merchandiseName,
unit: item.materialsUnit, unit: item.materialsUnit,
supplierId: item.supplierId,
} }
} }
}) })
let values = [ if(record.row.id !== undefined){
{ let values = [
rowKey: record.row.id, {
values: { rowKey: record.row.id,
'materialNumber': record.row.materialNumber, values: {
'materialGroup': record.row.materialGroup, 'materialNumber': record.row.materialNumber,
'materialSeries': "SM-JD36-BA", 'materialGroup': this.materialId,
'materialName': materialName.name, 'materialSeries': "SM-JD36-BA",
'materialUnit': materialName.unit, 'materialName': materialName.name,
'materialUnit': materialName.unit,
'supplierId': materialName.supplierId
},
}, },
}, ]
] // console.log(values);
this.$refs.processUdgetPlanMaterial.setValues(values); this.$refs.processUdgetPlanMaterial.setValues(values);
}
} }
if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){ if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice; // record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
let values = [ // console.log("3出发了",record.row);
{ if(record.row.id !== undefined){
rowKey: record.row.id, let values = [
values: { {
'materialNumber': record.row.materialNumber, rowKey: record.row.id,
'materialGroup': record.row.materialGroup, values: {
'materialSeries': record.row.materialSeries, 'materialNumber': record.row.materialNumber,
'materialName': record.row.materialName, 'materialGroup': record.row.materialGroup,
'materialUnit': record.row.materialUnit, 'materialSeries': record.row.materialSeries,
'materialAmount': record.row.materialQuantity * record.row.materialPrice, 'materialName': record.row.materialName,
'materialType': this.data.materialType 'materialUnit': record.row.materialUnit,
'materialAmount': record.row.materialQuantity * record.row.materialPrice,
'materialType': this.data.materialType
},
}, },
}, ]
] this.$refs.processUdgetPlanMaterial.setValues(values);
this.$refs.processUdgetPlanMaterial.setValues(values); }
} }
}, },
@ -525,6 +612,7 @@
}); });
}); });
getAction(this.url.merchandiseNewsList,par).then((res)=>{ getAction(this.url.merchandiseNewsList,par).then((res)=>{
console.log(res.result);
if(res.success){ if(res.success){
let newList = res.result; let newList = res.result;
if(numberList.length > 0){ if(numberList.length > 0){
@ -563,19 +651,19 @@
delFlag: 0, delFlag: 0,
} }
this.bigId = []; this.bigId = [];
getAction(this.url.descriptionRake,par).then((res)=>{ // getAction(this.url.descriptionRake,par).then((res)=>{
if(res.success){ // if(res.success){
if(this.processUdgetPlanMaterialTable.columns[0].options.length > 0){ // if(this.processUdgetPlanMaterialTable.columns[0].options.length > 0){
this.processUdgetPlanMaterialTable.columns[0].options = []; // this.processUdgetPlanMaterialTable.columns[0].options = [];
} // }
res.result.forEach( item => { // res.result.forEach( item => {
this.processUdgetPlanMaterialTable.columns[0].options.push({ // this.processUdgetPlanMaterialTable.columns[0].options.push({
title : item.descriptionName, // title : item.descriptionName,
value : item.id, // value : item.id,
}) // })
}) // })
} // }
}); // });
}, },
/*回显数据*/ /*回显数据*/
init(){ init(){

2
src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
Unescape View File

@ -203,7 +203,7 @@
methods: { methods: {
handleDetaills(record){ handleDetaills(record){
console.log(record); console.log(record);
this.$router.push({name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',params:{item: record.materialsNumber}}) this.$router.push({name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',params:{item: record.merchandiseNewsId}})
}, },
initDictConfig(){ initDictConfig(){
}, },

4
src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
Unescape View File

@ -163,7 +163,7 @@
queryParam: { queryParam: {
supplier: null, supplier: null,
itemGroup: null, itemGroup: null,
materialsNumber: this.$route.params.item, merchandiseNewsId: this.$route.params.item,
itemDescription: null, itemDescription: null,
unitWasteWarehouseCodeId: null, unitWasteWarehouseCodeId: null,
freightSpace: null, freightSpace: null,
@ -314,7 +314,7 @@
}, },
watch: { watch: {
$route() { $route() {
this.queryParam.materialsNumber = this.$route.params.item this.queryParam.merchandiseNewsId = this.$route.params.item
this.loadData() this.loadData()
} }
}, },

Write Preview
Loading…
Cancel
Save