sangwenwei hace 1 año
padre
commit
f9905149a4

+ 0 - 1
src/views/jy/borrowMoney/BorrowMoneyList.vue

@@ -532,7 +532,6 @@
 							...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
 							procDefId: this.processDefinitionIdAccount,
 							procDefKey: this.procDefKeyAccount,
-							status: 'startAndHold',
 							title: tabTitle,
 							formType: data.formType,
 							formUrl: data.formUrl,

+ 16 - 17
src/views/jy/borrowMoney/RefundForm.vue

@@ -94,7 +94,6 @@
 		BorrowService:null,
 		CommonApi:null,
 		created () {
-			console.log('jld ')
 			this.borrowService=new BorrowService()
 			this.commonApi = new CommonApi()
 		},
@@ -180,14 +179,15 @@
 								this.inputForm.finalMoney = data.boMoney
 								this.inputForm.endMoney=data.boMoney
 							}
-							if (data.refundStatus === '5'){
+							console.log('status',this.status)
+							if (data.refundStatus === '5' && this.status !== 'audit' && this.status !== 'taskFormDetail'){
 								this.inputForm.refundLower = ''
 							}
 							if (data.refundStatus === '1'){
 								this.borrowService.findByBorId(data.refundId).then((da)=>{
 									console.log('da',da)
 									if (da.length === 0){
-										this.inputForm.finalMoney = data.moneyLower
+										this.inputForm.finalMoney = data.boMoney
 										this.inputForm.endMoney=data.moneyLower
 									}else {
 										let money = 0
@@ -310,20 +310,19 @@
 			},
 			close() {
 				this.inputForm = {
-					id:'',
-					projectList:[],
-					name:'',
-					no:'',
-					projectLeader:'',
-					projectCreateDate:'',
-					createById:'',
-					createByName:'',
-					createDate:'',
-					remarks:'',
-					files: [], // 附件信息
-					types:[], //用印类型
-					number:'', //用印份数
-					projectId:'',
+					id: '',
+					no: '',
+					createById: '',
+					createName: '',
+					createTime: '',
+					reason: '',
+					refundLower:'', // 还款金额小写
+					refund:'', //还款金额大写
+					procInsId:'',
+					finalMoney:'',
+					moneyLower:'', // 借款金额小写
+					endMoney:'',
+					refundId:''
 				}
 				this.visible = false
 			},

+ 4 - 2
src/views/jy/workContractInfo/WorkContractForm.vue

@@ -559,7 +559,7 @@
 							console.log('1',data.contractTypeList)
 							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)
@@ -959,7 +959,9 @@
 			// 暂存
 			saveForm (callback) {
 				this.loading = true
+				console.log('tj',this.inputForm)
 				this.inputForm.filedType = '1'
+				this.inputForm.workAttachmentList = this.$refs.uploadComponent.getDataList()
 				this.contractService.save(this.inputForm).then((data) => {
 					this.loading = false
 					callback(data.businessTable, data.businessId, this.inputForm)
@@ -1076,7 +1078,7 @@
 								}else {
 									this.inputForm.filedType = '2'
 								}
-								this.inputForm.contractTypes=[]
+								// this.inputForm.contractTypes=[]
 								this.contractService.saveContract(this.inputForm).then((data) => {
 									callback(data.businessTable, data.businessId, this.inputForm)
 									this.$refs.inputForm.resetFields()