|
|
@@ -25,7 +25,7 @@
|
|
|
:edit-rules="tableRules"
|
|
|
:edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true, icon: '-'}"
|
|
|
>
|
|
|
- <vxe-table-column field="programName" align="center" title="项目名称" :edit-render="{}">
|
|
|
+ <vxe-table-column field="programName" align="center" title="项目名称1111111" :edit-render="{}">
|
|
|
<template v-slot:edit="scope">
|
|
|
<el-input @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.programName"/>
|
|
|
</template>
|
|
|
@@ -257,6 +257,23 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+
|
|
|
+
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item v-if="bj!== ''" label="报备类型" prop="reportType"
|
|
|
+ :rules="[
|
|
|
+ {required: true, message:'报备类型不能为空', trigger:'blur'}
|
|
|
+ ]">
|
|
|
+ <el-select v-model="inputForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
|
|
|
+ <el-option
|
|
|
+ v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<!-- <el-col :span="12">-->
|
|
|
<!-- <el-form-item label="发票金额(元)" prop="account"-->
|
|
|
<!-- :rules="[-->
|
|
|
@@ -681,6 +698,7 @@
|
|
|
{ required: true, message: '请填写发票金额' }
|
|
|
]
|
|
|
},
|
|
|
+ bj: '',
|
|
|
title: '',
|
|
|
method: '',
|
|
|
visible: false,
|
|
|
@@ -706,6 +724,7 @@
|
|
|
bankAccount: '',
|
|
|
receivablesType: '2',
|
|
|
billingContent: '',
|
|
|
+ reportType: '',
|
|
|
account: '',
|
|
|
billingContentTerms: '',
|
|
|
billingPeople: JSON.parse(localStorage.getItem('user')).name,
|
|
|
@@ -813,6 +832,7 @@
|
|
|
bankAccount: '',
|
|
|
receivablesType: '2',
|
|
|
billingContent: '',
|
|
|
+ reportType: '',
|
|
|
account: '',
|
|
|
billingContentTerms: '',
|
|
|
billingPeople: JSON.parse(localStorage.getItem('user')).name,
|
|
|
@@ -995,6 +1015,7 @@
|
|
|
}).catch(() => {
|
|
|
this.loading = false
|
|
|
})
|
|
|
+ console.log('this.inputForm.financeInvoiceBaseDTOList', this.inputForm.financeInvoiceBaseDTOList)
|
|
|
return
|
|
|
} else if (status === 'start') {
|
|
|
// 送审 待审核
|
|
|
@@ -1117,6 +1138,7 @@
|
|
|
})
|
|
|
},
|
|
|
close () {
|
|
|
+ this.bj = ''
|
|
|
this.$refs.uploadComponent.clearUpload()
|
|
|
this.$refs.inputForm.resetFields()
|
|
|
this.inputForm = {
|
|
|
@@ -1139,6 +1161,7 @@
|
|
|
bankAccount: '',
|
|
|
receivablesType: '2',
|
|
|
billingContent: '',
|
|
|
+ reportType: '',
|
|
|
account: '',
|
|
|
billingContentTerms: '',
|
|
|
billingPeople: '',
|
|
|
@@ -1177,7 +1200,6 @@
|
|
|
}
|
|
|
if (type === 'detail') {
|
|
|
this.$refs.detailTable.insert().then((data) => {
|
|
|
- console.log('123456')
|
|
|
console.log('this.input.actualPrice, ', this.inputForm.actualPrice)
|
|
|
data.account = this.inputForm.actualPrice
|
|
|
this.inputForm.financeInvoiceDetailDTOList.push(data)
|
|
|
@@ -1203,6 +1225,7 @@
|
|
|
this.$refs.receivablesTable.remove(row)
|
|
|
this.inputForm.financeInvoiceReceivablesDTOList.splice(rowIndex, 1)
|
|
|
}
|
|
|
+ this.bj = ''
|
|
|
},
|
|
|
openProgramPageForm (rowIndex) {
|
|
|
if (this.commonJS.isEmpty(this.inputForm.financeInvoiceBaseDTOList[0].programName) || this.inputForm.financeInvoiceBaseDTOList.length === 1) {
|
|
|
@@ -1217,28 +1240,55 @@
|
|
|
this.programRow = rowIndex
|
|
|
},
|
|
|
getProgram (rows) {
|
|
|
+ console.log('rows2', rows)
|
|
|
rows.forEach((item, index) => {
|
|
|
- if (index === 0) {
|
|
|
- let r = this.inputForm.financeInvoiceBaseDTOList[this.programRow]
|
|
|
- r.programName = item.projectName
|
|
|
- r.contractName = item.contractName
|
|
|
- r.programNo = item.projectNumber
|
|
|
- r.contractId = item.contractId
|
|
|
- r.programId = item.id
|
|
|
- r.reportNo = item.reportNo
|
|
|
- this.inputForm.financeInvoiceBaseDTOList[this.programRow] = r
|
|
|
+ if (!this.commonJS.isEmpty(rows.bj1)) {
|
|
|
+ this.bj = rows.bj1
|
|
|
+ if (index === 0) {
|
|
|
+ let r = this.inputForm.financeInvoiceBaseDTOList[this.programRow]
|
|
|
+ r.programName = item.projectName
|
|
|
+ r.contractName = item.contractName
|
|
|
+ r.programNo = item.projectNumber
|
|
|
+ r.contractId = item.contractId
|
|
|
+ r.programId = item.id
|
|
|
+ r.reportNo = item.reportNo
|
|
|
+ this.inputForm.financeInvoiceBaseDTOList[this.programRow] = r
|
|
|
+ } else {
|
|
|
+ let r = {
|
|
|
+ programName: item.projectName,
|
|
|
+ contractName: item.contractName,
|
|
|
+ programNo: item.projectNumber,
|
|
|
+ contractId: item.contractId,
|
|
|
+ programId: item.id,
|
|
|
+ reportNo: item.reportNo
|
|
|
+ }
|
|
|
+ this.$refs.baseTable.insertAt(r)
|
|
|
+ this.inputForm.financeInvoiceBaseDTOList.push(r)
|
|
|
+ this.baseKey = Math.random()
|
|
|
+ }
|
|
|
} else {
|
|
|
- let r = {
|
|
|
- programName: item.projectName,
|
|
|
- contractName: item.contractName,
|
|
|
- programNo: item.projectNumber,
|
|
|
- contractId: item.contractId,
|
|
|
- programId: item.id,
|
|
|
- reportNo: item.reportNo
|
|
|
+ if (index === 0) {
|
|
|
+ let r = this.inputForm.financeInvoiceBaseDTOList[this.programRow]
|
|
|
+ r.programName = item.projectName
|
|
|
+ r.contractName = item.contractName
|
|
|
+ r.programNo = item.projectNumber
|
|
|
+ r.contractId = item.contractId
|
|
|
+ r.programId = item.id
|
|
|
+ r.reportNo = item.reportNo
|
|
|
+ this.inputForm.financeInvoiceBaseDTOList[this.programRow] = r
|
|
|
+ } else {
|
|
|
+ let r = {
|
|
|
+ programName: item.projectName,
|
|
|
+ contractName: item.contractName,
|
|
|
+ programNo: item.projectNumber,
|
|
|
+ contractId: item.contractId,
|
|
|
+ programId: item.id,
|
|
|
+ reportNo: item.reportNo
|
|
|
+ }
|
|
|
+ this.$refs.baseTable.insertAt(r)
|
|
|
+ this.inputForm.financeInvoiceBaseDTOList.push(r)
|
|
|
+ this.baseKey = Math.random()
|
|
|
}
|
|
|
- this.$refs.baseTable.insertAt(r)
|
|
|
- this.inputForm.financeInvoiceBaseDTOList.push(r)
|
|
|
- this.baseKey = Math.random()
|
|
|
}
|
|
|
})
|
|
|
this.$forceUpdate()
|
lijt