sangwenwei 1 year ago
parent
commit
859677d6be

+ 1 - 1
src/views/jy/holiday/HolidayForm.vue

@@ -269,7 +269,7 @@
 						throw new Error()
 					} else {
 						this.inputForm.status= '2'
-						if (this.inputForm.days>1){
+						if (this.inputForm.days>2){
 							this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
 								if (this.commonJS.isNotEmpty(da)) {
 									if (da === '总经理审核') {

+ 9 - 8
src/views/jy/workContractInfo/WorkContractForm.vue

@@ -563,11 +563,12 @@
 							this.inputForm.cwWorkClientContactDTOList=data.cwWorkClientContactDTOList
 							if(data.contractType){
 								this.showType(data.contractType)
-							}else {
-								if (data.contractTypeFirst){
-									this.inputForm.contractTypes=data.contractTypeFirst
-								}
-							}
+							 }
+							// else {
+							// 	if (data.contractTypeFirst){
+							// 		this.inputForm.contractTypes=data.contractTypeFirst
+							// 	}
+							// }
 							if (this.commonJS.isNotEmpty(data.primaryLinkman)){
 								this.workClientService.findListByName(data.primaryLinkman).then((da)=>{
 									this.inputForm.address=da[0].registerAddress
@@ -1024,9 +1025,9 @@
 						}
 						this.inputForm.filedType = '2'
 						console.log('3',this.inputForm)
-						if (this.commonJS.isNotEmpty(this.inputForm.contractNo)){
-							this.inputForm.contractTypes=[]
-						}
+						// if (this.commonJS.isNotEmpty(this.inputForm.contractNo)){
+						// 	this.inputForm.contractTypes=[]
+						// }
 						this.contractService.save(this.inputForm).then((data) => {
 							this.inputForm.id = data.businessId
 							this.contractService.findContractById(this.inputForm.id).then((da)=>{