|
@@ -81,7 +81,7 @@
|
|
|
import { VSelect, Upload } from '@/components'
|
|
|
import dingDepartUser from '@/views/common/dingDepartUser.js'
|
|
|
import employee from '@/views/expenseManagement/expenseReimbursement/employee.js'
|
|
|
-import { sign } from 'core-js/fn/number'
|
|
|
+import { getDefaultCofig } from '@/api/data.js'
|
|
|
import { queryLastFinishDingUser } from '@/api/salesReturn'
|
|
|
export default {
|
|
|
name: 'ChooseDepartUserModal',
|
|
@@ -144,7 +144,6 @@ export default {
|
|
|
updateUser () {
|
|
|
this.uploading = true
|
|
|
this.$refs.departUserApp.updateDeptUser()
|
|
|
- // this.$refs.departUserCc.updateDeptUser()
|
|
|
},
|
|
|
changeApprovers (value) {
|
|
|
this.form.approvers = value
|
|
@@ -157,9 +156,10 @@ export default {
|
|
|
})
|
|
|
return ret.join(',')
|
|
|
},
|
|
|
- getFormatUser (data) {
|
|
|
+ // 格式化人员数据
|
|
|
+ getFormatUser (list) {
|
|
|
const ret = []
|
|
|
- data.map(item => {
|
|
|
+ list.map(item => {
|
|
|
ret.push({ label: item.userName, value: item.userId || item.userid })
|
|
|
})
|
|
|
return ret
|
|
@@ -217,19 +217,24 @@ export default {
|
|
|
cancel () {
|
|
|
this.isShow = false
|
|
|
},
|
|
|
- pageInit () {
|
|
|
+ async pageInit () {
|
|
|
// 获取审批人员默认值
|
|
|
if (this.showDefUser) {
|
|
|
+ // 默认写死的人员
|
|
|
+ this.spinning = true
|
|
|
+ const data = await getDefaultCofig({ code: 'SALE_RETURN_DING_USER' }).then(res => res.data)
|
|
|
+ const ret = JSON.parse(data.value)
|
|
|
+ if (ret) {
|
|
|
+ this.form.approvers = this.getFormatUser(ret.approvers || [])
|
|
|
+ this.form.ccList = this.getFormatUser(ret.ccList || [])
|
|
|
+ }
|
|
|
+ this.spinning = false
|
|
|
+ this.spinning = true
|
|
|
queryLastFinishDingUser({}).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.form.applyPersonSn = res.data.applyPersonSn
|
|
|
- if (res.data.approversTaskList) {
|
|
|
- this.form.approvers = this.getFormatUser(res.data.approversTaskList)
|
|
|
- }
|
|
|
- if (res.data.ccTaskList) {
|
|
|
- this.form.ccList = this.getFormatUser(res.data.ccTaskList)
|
|
|
- }
|
|
|
}
|
|
|
+ this.spinning = false
|
|
|
})
|
|
|
}
|
|
|
}
|