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

修改采购数据交互

dev
caoyizhong 2 years ago
parent
b2577ade94
commit
0846b09ded
3 changed files with 113 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/components/jeecg/JEditableTable.vue
  2. 2
      src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
  3. 159
      src/views/activiti/form/ProcessUdgetPlanForm.vue

3
src/components/jeecg/JEditableTable.vue
Unescape View File

@ -534,7 +534,7 @@
:placeholder="replaceProps(col, col.placeholder)"
@change="(v)=>handleSearchSelectChange(v,id,row,col)"
allowClear
/>
/><!-- asdfasdf-->
<span
v-else
class="j-td-span no-edit"
@ -1979,6 +1979,7 @@
},
/** select 搜索时的事件，用于动态添加options */
handleSearchSelect(value, id, row, col) {
console.log("select 搜索时的事件，用于动态添加options============>",value,id,row,col)
if (col.allowSearch !== true && col.allowInput === true) {
// 是否找到了对应的项，找不到则添加这一项
let flag = false

2
src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
Unescape View File

@ -341,7 +341,7 @@
}
return true
}
return this.disabled = false
return this.heid = false
},
showFlowSubmitButton() {
if (this.formBpm === true) {

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

@ -78,11 +78,12 @@
:actionButton="true">
<template v-slot:group="props">
<a-auto-complete
v-decorator="['materialGroups']"
v-decorator="[`materialGroup`]"
:data-source="bigIdRake"
placeholder="请选择"
@search="onSearchRake"
@select="onSelectRake(props,$event)"
/>
</template>
@ -188,10 +189,8 @@
type: FormTypes.slot,
// type: FormTypes.sel_search,
slotName: 'group',
width: '200px',
options: [],
// options: [],
// scopedSlots: { customRender: 'edit' },//引入的插槽
// customRender:function (t,r,index) {
// console.log(t,r);
@ -269,7 +268,7 @@
key: 'materialName',
type: FormTypes.input,
// type: FormTypes.sel_search,
dictCode: '',
// dictCode: '',
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -278,7 +277,7 @@
title: '系列',
key: 'materialSeries',
type: FormTypes.input,
dictCode: '',
// dictCode: '',
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -288,7 +287,7 @@
key: 'materialUnit',
type: FormTypes.input,
// type: FormTypes.select,
dictCode: '',
// dictCode: '',
width: '200px',
placeholder: '请输入${title}',
defaultValue: ''
@ -447,6 +446,10 @@
this.popupCallback(company,userInfo);
},
mounted() {
console.log( this.$refs.processUdgetPlanMaterial);
// this.form.setFieldsValue("materialGroup",123123);
},
methods: {
elect(val){
if(val != undefined){
@ -486,15 +489,38 @@
});
},
//物料组触发集合
searchRake(val,pro){
this.bigIdRakeList.forEach(item =>{
async searchRake(val, pro) {
// console.log(pro)
for (const item of this.bigIdRakeList) {
// console.log(item);
if(item.descriptionName === val){
this.fetchMerchandiseNews(item.id);
this.materialId=item.id
if (item.descriptionName === val) {
await this.fetchMerchandiseNews(item.id);
this.materialId = item.id
}
})
}
// console.log(this.materialId);
if (pro.rowId !== undefined) {
let values = [
{
rowKey: pro.rowId,
values: {
'materialNumber': '',
'materialGroup': this.materialId,
'materialSeries': '',
'materialName': '',
'materialUnit': '',
'supplierId': '',
'materialPrice': '',
'materialQuantity': '',
},
},
]
// console.log(values);
this.$refs.processUdgetPlanMaterial.setValues(values);
}
},
@ -530,14 +556,35 @@
},
//table 值改变触发
onSelect(record) {
// console.log("0出发了",record.row);
// if(record.row.materialGroup !== '' && record.row.materialGroup !== undefined && record.row.materialNumber === ''){
// console.log("1出发了",record.row);
// this.fetchMerchandiseNews(record.row.materialGroup);
// // this.fetchMerchandiseNews(record.row.materialGroup);
// if(record.row.id !== undefined){
// let values = [
// {
// rowKey: record.row.id,
// values: {
// 'materialNumber': '',
// 'materialGroup': this.materialId,
// 'materialSeries': '',
// 'materialName': '',
// 'materialUnit': '',
// 'supplierId': '',
// 'materialAmount': '',
// 'materialType': ''
// },
// },
// ]
// // console.log(values);
// this.$refs.processUdgetPlanMaterial.setValues(values);
// }
// }
// console.log("5555出发了",record.row);
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 = { }
// console.log("this.bigIdMerchandiseNewsList",this.bigIdMerchandiseNewsList)
this.bigIdMerchandiseNewsList.forEach( item => {
if( item.id === record.row.materialNumber ){
materialName ={
@ -548,6 +595,7 @@
}
})
// console.log(materialName);
if(record.row.id !== undefined){
let values = [
{
@ -569,7 +617,7 @@
if(record.row.materialQuantity !== '' && record.row.materialPrice !== '' && record.row.materialQuantity !== undefined && record.row.materialPrice !== undefined){
// record.row.materialAmount = record.row.materialQuantity * record.row.materialPrice;
// console.log("3出发了",record.row);
console.log("3出发了",record.row);
if(record.row.id !== undefined){
let values = [
{
@ -591,38 +639,40 @@
}
},
fetchMerchandiseNews(value){ //查询物料清单信息
//查询大品类数据
let par = {
delFlag: 0,
descriptionId:value,
}
this.bigIdMerchandiseNews = [];
this.bigIdMerchandiseNewsList = [];
let qc = [];
let numberList = [];
if(this.processUdgetPlanMaterialTable.columns[1].options.length > 0){
this.processUdgetPlanMaterialTable.columns[1].options = [];
}
this.$refs.processUdgetPlanMaterial.getValues((a,b,c)=>{
b.forEach(item =>{
if(item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null){
numberList.push(item.materialNumber);
}
fetchMerchandiseNews(value){ //查询物料清单信息
return new Promise((resolve, reject)=>{
//查询大品类数据
let par = {
delFlag: 0,
descriptionId:value,
}
this.bigIdMerchandiseNews = [];
this.bigIdMerchandiseNewsList = [];
let qc = [];
let numberList = [];
if(this.processUdgetPlanMaterialTable.columns[1].options.length > 0){
this.processUdgetPlanMaterialTable.columns[1].options = [];
}
this.$refs.processUdgetPlanMaterial.getValues((a,b,c)=>{
b.forEach(item =>{
if(item.materialNumber !== '' && item.materialNumber !== undefined && item.materialNumber !== null){
numberList.push(item.materialNumber);
}
});
});
});
getAction(this.url.merchandiseNewsList,par).then((res)=>{
console.log(res.result);
if(res.success){
let newList = res.result;
getAction(this.url.merchandiseNewsList,par).then((res)=>{
console.log(res.result);
if(res.success){
let newList = res.result;
if(numberList.length > 0){
newList.forEach( item => {
qc.push({
title : item.materialsNumber,
value : item.id,
disabled : false
})
newList.forEach( item => {
qc.push({
title : item.materialsNumber,
value : item.id,
disabled : false
})
})
numberList.forEach( num => {
qc.forEach( i => {
if(num === i.value){
@ -640,9 +690,13 @@
})
})
}
this.bigIdMerchandiseNewsList = res.result;
}
});
this.bigIdMerchandiseNewsList = res.result
resolve( res.result );
}
});
})
},
fetchData(value){ //查询物料组
@ -676,6 +730,11 @@
let formData = res.result;
formData.tableName = r.tableName;
this.data = formData;
if (formData.materialType){
this.hieg=false;
this.fetchDataRake();
}
this.editAfter();
this.btndisabled = false;
}else {
@ -721,6 +780,8 @@
if (this.data.id) {
let params = { id: this.data.id }
this.requestSubTableData(this.url.processUdgetPlanMaterial.list, params, this.processUdgetPlanMaterialTable)
console.log('子表数据',this.processUdgetPlanMaterialTable) ;
}
},
/** 整理成formData */

Write Preview
Loading…
Cancel
Save