|
@@ -351,7 +351,21 @@ export default {
|
|
|
this.getUserInfo(row.applyUser)
|
|
|
const { data } = await this.baseRequest1('ApplyPaymentSettleController', 'getInfoByFlowMainId', { flowMainId: row.id })
|
|
|
this.formData = data
|
|
|
- this.formData.flowMainId = data.flowMainId
|
|
|
+ if (data.fileDataIds) {
|
|
|
+ const { data: fileTaoTaoList } = await this.baseRequest1('FileZtController', 'findFileInfoByIds/' + data.fileDataIds, '')
|
|
|
+ console.log(fileTaoTaoList.data)
|
|
|
+ this.formData.fileUrlList = fileTaoTaoList.data.map((e) => {
|
|
|
+ return {
|
|
|
+ url: this.$constant.BASE_URI + '/FileController/download/' + e.id,
|
|
|
+ name: e.fileName,
|
|
|
+ data: e.id,
|
|
|
+ uid: new Date().getTime()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ console.log(this.formData.fileUrlList)
|
|
|
+ } else {
|
|
|
+ this.formData.fileUrlList = []
|
|
|
+ }
|
|
|
this.dialogVisible = status
|
|
|
},
|
|
|
onOpen() {
|
|
@@ -365,18 +379,25 @@ export default {
|
|
|
async handelConfirm() {
|
|
|
this.$refs['elForm'].validate(async valid => {
|
|
|
if (!valid) return
|
|
|
+
|
|
|
+
|
|
|
+ if (this.formData.fileUrlList.length > 0) {
|
|
|
+ this.formData.fileDataIds = this.formData.fileUrlList.map((e) => {
|
|
|
+ return e.data
|
|
|
+ }).toString()
|
|
|
+ }
|
|
|
+
|
|
|
const formData = {
|
|
|
- ...this.formData,
|
|
|
- applyAddWorkTimeString: JSON.stringify(this.applyAddWorkTime)
|
|
|
+ ...this.formData
|
|
|
}
|
|
|
- delete formData.applyAddWorkTime
|
|
|
- delete formData.applyAddWorkTimeList
|
|
|
console.error('formDataformDataformDataformDataformData', formData)
|
|
|
this.loading = true
|
|
|
+ formData.flowMainCcList = []
|
|
|
+
|
|
|
const { data } = await this.baseRequest1('ApplyPaymentSettleController', 'addApplyPaymentSettleAgain', { ...formData })
|
|
|
this.loading = false
|
|
|
if (data.code == 200) {
|
|
|
- this.$message.success('加班申请发起成功')
|
|
|
+ this.$message.success('付款申请发起成功')
|
|
|
this.dialogVisible = false
|
|
|
this.$emit('getData')
|
|
|
}
|