|
@@ -451,7 +451,8 @@ import {
|
|
|
changeAccountStatus,
|
|
|
resetPassword,
|
|
|
stockForceUserList,
|
|
|
- stockForceUserAdd
|
|
|
+ stockForceUserAdd,
|
|
|
+ stockForceUserForceStockList
|
|
|
} from '@/api/setting'
|
|
|
import { getDealerList, getCategoryList } from '@/api/common'
|
|
|
import { findElem, downloadFiles, handleImportTwo } from '@/utils/util'
|
|
@@ -638,15 +639,27 @@ export default {
|
|
|
adminUserForceStocks:pams
|
|
|
}).then(res=>{
|
|
|
this.resetForcedHold = false
|
|
|
- console.log(res)
|
|
|
this.$successMsg('设置成功')
|
|
|
})
|
|
|
},
|
|
|
getForcedHoldList(){
|
|
|
this.resetForcedHoldList = []
|
|
|
stockForceUserList().then(res=>{
|
|
|
- this.resetForcedHoldList = res.data
|
|
|
- this.resetForcedHold = true
|
|
|
+ stockForceUserForceStockList({
|
|
|
+ adminUserId:this.adminUserId_jl
|
|
|
+ }).then(res2=>{
|
|
|
+ this.resetForcedHoldList = res.data.map(item=>{
|
|
|
+ if(res2.data.find(val=>val.correspondId===item.id)){
|
|
|
+ item.kingDeeCategories.map(data=>{
|
|
|
+ if(res2.data.find(val=>val.categoryId===data.id && val.correspondId===item.id)){
|
|
|
+ data.isChecked = true
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ this.resetForcedHold = true
|
|
|
+ })
|
|
|
})
|
|
|
},
|
|
|
setForcedHold(row){
|