Merge branch 'material-ui' of http://192.168.30.2:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2026-01-07 14:48:38 +08:00
commit 80b8d7e9df
2 changed files with 16 additions and 3 deletions

View File

@ -480,6 +480,11 @@ export default {
// //
async handleChangeType(row) { async handleChangeType(row) {
console.log("xxxxxxxx",row.newTypeId) console.log("xxxxxxxx",row.newTypeId)
//
const selectedOption = row.typeOptions.find(option => option.value === row.newTypeId);
if (selectedOption) {
this.$set(row, 'newTypeName', selectedOption.label);
}
const res = await getPendingOutNumByTypeId(row.newTypeId) const res = await getPendingOutNumByTypeId(row.newTypeId)
console.log('yyyyyyyyy',res.data) console.log('yyyyyyyyy',res.data)
if(res.code==200){ if(res.code==200){
@ -518,7 +523,15 @@ export default {
return true; return true;
} }
// item itemsTemp // item itemsTemp
itemsTemp.push({'typeId': item.typeId,'parentId':item.parentId, 'num': item.num, 'newTypeId': item.newTypeId}); itemsTemp.push({
'typeId': item.typeId,
'parentId': item.parentId,
'num': item.num,
'newTypeId': item.newTypeId,
'maTypeName': item.maTypeName,
'unitName': item.unitName,
'typeName': item.newTypeName || item.typeName
});
} }
}); });
// 0 // 0

View File

@ -579,7 +579,7 @@ export default {
this.sendTemp = [] this.sendTemp = []
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
selection.forEach(item => { selection.forEach(item => {
this.sendTemp.push({ id: item.id, taskId: item.taskId }) this.sendTemp.push({ id: item.id, taskId: item.taskId,code: item.code })
}) })
this.single = selection.length != 1 this.single = selection.length != 1
this.multiple = !selection.length this.multiple = !selection.length
@ -1185,7 +1185,7 @@ export default {
// //
handleSend(row) { handleSend(row) {
const param = { id: row.id, taskId: row.taskId } const param = { id: row.id, taskId: row.taskId,code:row.code }
this.$modal this.$modal
.confirm('是否确认发布所选择的数据项?') .confirm('是否确认发布所选择的数据项?')
.then(async () => { .then(async () => {