|
@@ -630,7 +630,6 @@
|
|
this.projectRecordsService = new ProjectRecordsService()
|
|
this.projectRecordsService = new ProjectRecordsService()
|
|
this.projectReportService = new ProjectReportService()
|
|
this.projectReportService = new ProjectReportService()
|
|
this.userService = new UserService()
|
|
this.userService = new UserService()
|
|
- console.log('qz2', this.inputForm.qz2)
|
|
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
bus: {
|
|
bus: {
|
|
@@ -687,10 +686,6 @@
|
|
this.inputForm.projectMasterId1 !== value &&
|
|
this.inputForm.projectMasterId1 !== value &&
|
|
this.inputForm.projectMasterId2 !== value &&
|
|
this.inputForm.projectMasterId2 !== value &&
|
|
this.commonJS.isNotEmpty(value)) {
|
|
this.commonJS.isNotEmpty(value)) {
|
|
- console.log('项目经理1', this.inputForm.projectMasterId1)
|
|
|
|
- console.log('项目经理2', this.inputForm.projectMasterId2)
|
|
|
|
- console.log('签字注师2', this.inputForm.signatureAnnotator2)
|
|
|
|
- console.log('签字注师1', value)
|
|
|
|
this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
|
|
this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
this.inputForm.signatureAnnotator1 = ''
|
|
this.inputForm.signatureAnnotator1 = ''
|
|
@@ -710,11 +705,8 @@
|
|
this.$refs.userSelect2.changeNameValue('')
|
|
this.$refs.userSelect2.changeNameValue('')
|
|
this.$refs.userSelect2.clearSelectData()
|
|
this.$refs.userSelect2.clearSelectData()
|
|
this.$forceUpdate()
|
|
this.$forceUpdate()
|
|
- console.log('qz20', this.inputForm.qz2)
|
|
|
|
})
|
|
})
|
|
} else if (!this.inputForm.qz2.includes(value)) {
|
|
} else if (!this.inputForm.qz2.includes(value)) {
|
|
- console.log('q12222', value)
|
|
|
|
- console.log('qz21', this.inputForm.qz2)
|
|
|
|
this.$message.warning('该用户没有签字注师2的权限')
|
|
this.$message.warning('该用户没有签字注师2的权限')
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
this.inputForm.signatureAnnotator2 = ''
|
|
this.inputForm.signatureAnnotator2 = ''
|
|
@@ -727,25 +719,18 @@
|
|
this.inputForm.projectMasterId2 !== this.inputForm.signatureAnnotator1 &&
|
|
this.inputForm.projectMasterId2 !== this.inputForm.signatureAnnotator1 &&
|
|
this.inputForm.projectMasterId1 !== value && this.commonJS.isNotEmpty(value) &&
|
|
this.inputForm.projectMasterId1 !== value && this.commonJS.isNotEmpty(value) &&
|
|
this.inputForm.projectMasterId2 !== value) {
|
|
this.inputForm.projectMasterId2 !== value) {
|
|
- console.log('项目经理1', this.inputForm.projectMasterId1)
|
|
|
|
- console.log('项目经理2', this.inputForm.projectMasterId2)
|
|
|
|
- console.log('签字注师1', this.inputForm.signatureAnnotator1)
|
|
|
|
- console.log('签字注师2', value)
|
|
|
|
this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
|
|
this.$message.warning('签字注师1和签字注师2至少有一个与项目经理相同')
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
this.inputForm.signatureAnnotator2 = ''
|
|
this.inputForm.signatureAnnotator2 = ''
|
|
this.$refs.userSelect2.changeNameValue('')
|
|
this.$refs.userSelect2.changeNameValue('')
|
|
this.$refs.userSelect2.clearSelectData()
|
|
this.$refs.userSelect2.clearSelectData()
|
|
this.$forceUpdate()
|
|
this.$forceUpdate()
|
|
- console.log('qz22', this.inputForm.qz2)
|
|
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
this.inputForm.signatureAnnotator2 = value
|
|
this.inputForm.signatureAnnotator2 = value
|
|
}
|
|
}
|
|
},
|
|
},
|
|
init (method, id) {
|
|
init (method, id) {
|
|
- console.log('qz2', this.inputForm.qz2)
|
|
|
|
- console.log('id', id)
|
|
|
|
this.visible = true
|
|
this.visible = true
|
|
this.activeName = 'enclosure'
|
|
this.activeName = 'enclosure'
|
|
// this.activeName = 'archiveFile'
|
|
// this.activeName = 'archiveFile'
|
|
@@ -825,7 +810,6 @@
|
|
// this.$refs.inputForm.resetFields()
|
|
// this.$refs.inputForm.resetFields()
|
|
// this.loading = true
|
|
// this.loading = true
|
|
this.userService.list1().then(({data}) => {
|
|
this.userService.list1().then(({data}) => {
|
|
- console.log('data111', data)
|
|
|
|
this.inputForm.qz2 = data
|
|
this.inputForm.qz2 = data
|
|
}
|
|
}
|
|
)
|
|
)
|
|
@@ -861,7 +845,6 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
getContract (row) {
|
|
getContract (row) {
|
|
- console.log('row', row)
|
|
|
|
this.inputForm.projectName = row.projectName // 项目名称
|
|
this.inputForm.projectName = row.projectName // 项目名称
|
|
this.inputForm.projectId = row.id // 项目id
|
|
this.inputForm.projectId = row.id // 项目id
|
|
this.inputForm.projectNumber = row.projectNumber // 项目编号
|
|
this.inputForm.projectNumber = row.projectNumber // 项目编号
|
|
@@ -914,7 +897,6 @@
|
|
throw new Error()
|
|
throw new Error()
|
|
} else {
|
|
} else {
|
|
if (status === 'save') {
|
|
if (status === 'save') {
|
|
- console.log('save111111')
|
|
|
|
// 暂存
|
|
// 暂存
|
|
this.inputForm.status = '5'
|
|
this.inputForm.status = '5'
|
|
this.loading = true
|
|
this.loading = true
|