Commit 3cfe107b authored by jingnan's avatar jingnan 👀

采购入库数据为驳回时编辑明细bug修改

parent 0e2c75e2
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @date 2023-10-19 * @date 2023-10-19
*/ */
<template> <template>
<div class="purchasingWarehousing-newOrEdit"> <div v-dee-loading="loading" class="purchasingWarehousing-newOrEdit">
<!-- <dee-tools :tools="topTools" mode="normal" style="justify-content: end;" /> --> <!-- <dee-tools :tools="topTools" mode="normal" style="justify-content: end;" /> -->
<dee-form <dee-form
ref="form" ref="form"
...@@ -62,6 +62,7 @@ export default { ...@@ -62,6 +62,7 @@ export default {
data() { data() {
const that = this const that = this
return { return {
loading: false,
currBasicData: null, currBasicData: null,
form: {}, form: {},
formData: [{ formData: [{
...@@ -671,8 +672,8 @@ export default { ...@@ -671,8 +672,8 @@ export default {
}, },
{ {
'fieldName': 'state', 'fieldName': 'state',
'operator': 'EQ', 'operator': 'IN',
'value': 'Apply' 'value': ['Apply', 'Back']
} }
], ],
'operator': 'AND' 'operator': 'AND'
...@@ -737,7 +738,9 @@ export default { ...@@ -737,7 +738,9 @@ export default {
'value': this.InStorageApplyProcessInfo && this.InStorageApplyProcessInfo.id || '' 'value': this.InStorageApplyProcessInfo && this.InStorageApplyProcessInfo.id || ''
}) })
} }
this.loading = true
post('InStorageRequestItem/treeSearch', param).then(res => { post('InStorageRequestItem/treeSearch', param).then(res => {
this.loading = false
const data = res.items.map(item => { const data = res.items.map(item => {
return { return {
...item, ...item,
...@@ -766,6 +769,7 @@ export default { ...@@ -766,6 +769,7 @@ export default {
this.childNum = 1 this.childNum = 1
}).catch((err) => { }).catch((err) => {
console.log(err) console.log(err)
this.loading = false
}) })
}, },
// 组装表格数据 // 组装表格数据
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @FilePath: applications/dee-mes/src/privateComponents/components/purchasingWarehousingNewOrEdit/index.vue * @FilePath: applications/dee-mes/src/privateComponents/components/purchasingWarehousingNewOrEdit/index.vue
*/ */
<template> <template>
<div class="purchasingWarehousing-newOrEdit"> <div v-dee-loading="loading" class="purchasingWarehousing-newOrEdit">
<!-- <dee-tools :tools="topTools" mode="normal" style="justify-content: end;" /> --> <!-- <dee-tools :tools="topTools" mode="normal" style="justify-content: end;" /> -->
<dee-form <dee-form
ref="form" ref="form"
...@@ -64,6 +64,7 @@ export default { ...@@ -64,6 +64,7 @@ export default {
data() { data() {
const that = this const that = this
return { return {
loading: false,
currBasicData: null, currBasicData: null,
form: {}, form: {},
formData: [{ formData: [{
...@@ -672,8 +673,8 @@ export default { ...@@ -672,8 +673,8 @@ export default {
}, },
{ {
'fieldName': 'state', 'fieldName': 'state',
'operator': 'EQ', 'operator': 'IN',
'value': 'Apply' 'value': ['Apply', 'Back']
} }
], ],
'operator': 'AND' 'operator': 'AND'
...@@ -738,7 +739,9 @@ export default { ...@@ -738,7 +739,9 @@ export default {
'value': this.InStorageApplyProcessInfo && this.InStorageApplyProcessInfo.id || '' 'value': this.InStorageApplyProcessInfo && this.InStorageApplyProcessInfo.id || ''
}) })
} }
this.loading = true
post('InStorageRequestItem/treeSearch', param).then(res => { post('InStorageRequestItem/treeSearch', param).then(res => {
this.loading = false
const data = res.items.map(item => { const data = res.items.map(item => {
return { return {
...item, ...item,
...@@ -767,6 +770,7 @@ export default { ...@@ -767,6 +770,7 @@ export default {
this.childNum = 1 this.childNum = 1
}).catch((err) => { }).catch((err) => {
console.log(err) console.log(err)
this.loading = false
}) })
}, },
// 组装表格数据 // 组装表格数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment