项目流程调整

src/views/jy/project/ProjectAuditForm.vue

@@ -339,7 +339,7 @@
 								method = 'view'
 							}
 							console.log('method2',method)
-							this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentDtoList, 'jyProjectAudit', null, null, null, null, false)
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentDtoList, 'jyProjectAudit', null, null, null, null, null)
 							// this.$refs.archiveFile.newUpload('view', [], 'cwWorkContract', null, null, null, null, false)
 							this.loading = false
 						})

src/views/jy/project/ProjectForm.vue

@@ -297,6 +297,7 @@
 	import UpLoadComponent from '@/views/common/UpLoadComponent'
 	import WorkClientChooseRadio from '../workClientInfo/WorkClientChooseRadio'
 	import userService from '@/api/sys/UserService'
+	import CommonApi from '@/api/cw/common/CommonApi'
 
 	export default {
 		props: {
@@ -373,8 +374,10 @@
 			}
 		},
 		ProjectInfoService:null,
+		commonApi: null,
 		created () {
 			this.projectInfoService=new ProjectInfoService()
+			this.commonApi = new CommonApi()
 		},
 		computed: {
 			bus: {
@@ -674,20 +677,31 @@
 							// } else {
 								this.loading = true
 								this.inputForm.files = this.$refs.uploadComponent.getDataList()
-								if (this.$store.state.user.office.name ==='总经办'){
-									this.inputForm.status = '5'
-								}else {
-									this.inputForm.status = '2'
-									//根据合同类型获取下一节点审核人
-									console.log('this.inputForm.contractTypeFirstValue',this.inputForm.contractTypeFirstValue)
-									if (this.inputForm.contractTypeFirstValue == '1'||this.inputForm.contractTypeFirstValue == '3'){
-										const data1 = await userService.queryByName("潘文超")
-										this.inputForm.assignee = data1.id
+
+							await this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data1) => {
+								console.log('data',data1)
+								if (this.commonJS.isNotEmpty(data1)) {
+									if (data1 === '分管领导审批') {
+										this.inputForm.status = '5'
 									}else {
-										const data1 = await userService.queryByName("杨慧")
-										this.inputForm.assignee = data1.id
+										this.inputForm.status = '2'
 									}
 								}
+							})
+								// if (this.$store.state.user.office.name ==='总经办'){
+								// 	this.inputForm.status = '5'
+								// }else {
+
+									//根据合同类型获取下一节点审核人
+									// console.log('this.inputForm.contractTypeFirstValue',this.inputForm.contractTypeFirstValue)
+									// if (this.inputForm.contractTypeFirstValue == '1'||this.inputForm.contractTypeFirstValue == '3'){
+									// 	const data1 = await userService.queryByName("潘文超")
+									// 	this.inputForm.assignee = data1.id
+									// }else {
+									// 	const data1 = await userService.queryByName("杨慧")
+									// 	this.inputForm.assignee = data1.id
+									// }
+								// }
 								let param = {status: this.inputForm.status, id: this.inputForm.id}
 								this.projectInfoService.updateStatusById(param).then((data) => {
 									callback(data.businessTable, data.businessId, this.inputForm)

src/views/jy/workContractInfo/ContractAddForm.vue

@@ -408,7 +408,7 @@
           contractSpecial: '',
           remarks: '',
           clientName: '',
-          contractProperList: [],
+			workAttachmentList: [],
           status: '',
           customerNo: '',
           customerName: '',
@@ -639,7 +639,7 @@
 					console.log('a',data)
 					this.inputForm = this.recover(this.inputForm, data)
 					this.inputForm.contractNo=data.no
-					this.inputForm.contractTypes=data.contractTypeList
+					this.inputForm.contractTypes=data.contractTypes
 					this.inputForm.cwWorkClientContactDTOList=data.cwWorkClientContactDTOList
 					if(data.contractType){
 						this.showType(data.contractType)
@@ -811,8 +811,8 @@
             if (valid) {
               this.loading = true
               this.inputForm.filedType = '0'
-              this.inputForm.contractProperList = this.$refs.uploadComponent.getDataList()
-              if (this.commonJS.isEmpty(this.inputForm.contractProperList)) {
+              this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()
+              if (this.commonJS.isEmpty(this.inputForm.workAttachmentList)) {
                 // 附件至少上传一条
                 this.$message.error('至少上传一个附件信息')
                 this.loading = false