diff --git a/project/xiushan/apps/AppLandTransfer/components/Add.vue b/project/xiushan/apps/AppLandTransfer/components/Add.vue index b4ca8447..ce49ba09 100644 --- a/project/xiushan/apps/AppLandTransfer/components/Add.vue +++ b/project/xiushan/apps/AppLandTransfer/components/Add.vue @@ -12,109 +12,76 @@ @@ -125,7 +92,7 @@ 保存 - + @@ -136,20 +103,17 @@ @@ -172,7 +136,19 @@ export default { radioTo: '', radioFrom: '', form: { - unifiedCode: '', + landOutflowName: '', + landOutflowNumber: '', + landUndertakeName: '', + landUndertakeNumber: '', + contractNo: '', + circulateType: '', + landArea: '', + yearRent: '', + startDate: '', + endDate:'' , + landInfo: '', + landUse: '', + fileList: {}, }, data: {}, isEdit: false, @@ -182,12 +158,25 @@ export default { computed: { rules() { return { - unifiedCode: [{required: true, message: "请输入名称", trigger: "blur"}], + landOutflowName: [{required: true, message: "请输入土地流出方名称", trigger: "blur"}], + landOutflowNumber: [{required: true, message: "请输入土地流出方证件号码", trigger: "blur"}], + landUndertakeName: [{required: true, message: "请输入土地承接方名称", trigger: "blur"}], + landUndertakeNumber: [{required: true, message: "请输入土地承接方证件号码", trigger: "blur"}], + contractNo: [{required: true, message: "请输入合同编号", trigger: "blur"}], + circulateType: [{required: true, message: "请选择流转形式", trigger: "blur"}], + landArea: [{required: true, message: "请输入土地面积", trigger: "blur"}], + // yearRent: [{required: true, message: "请输入每亩年租金", trigger: "blur"}], + startDate: [{required: true, message: "请选择开始日期", trigger: "blur"}], + // endDate: [{required: true, message: "请选择截止日期", trigger: "blur"}], + landInfo: [{required: true, message: "请输入土地信息", trigger: "blur"}], + // landUse: [{required: true, message: "请输入土地用途", trigger: "blur"}], + fileList: [{required: true, message: "请上传图片", trigger: "blur"}], } }, }, created() { + this.$dict.load('circulateType') if(this.params && this.params.id) { this.id = this.params.id this.getDetail(this.params.id) @@ -201,28 +190,28 @@ export default { }) }, getDetail(id) { - // this.instance.post(`/appcreditadminstrativelicense/queryDetailById?id=${id}`).then(res => { - // if (res.code === 0) { - // this.data = res.data - // } - // }) + this.instance.post(`/applandcirculateinfo/queryDetailById?id=${id}`).then(res => { + if (res.code === 0) { + this.data = res.data + } + }) }, confirm() { - // this.$refs.forms.validate((valid) => { - // if (valid) { - // this.instance.post(`/appcreditadminstrativelicense/addOrUpdate`, { - // ...this.forms, - // id: this.params.id || '', - // }).then(res => { - // if (res.code == 0) { - // this.$message.success('提交成功') - // setTimeout(() => { - // this.cancel(true) - // }, 600) - // } - // }) - // } - // }) + this.$refs.form.validate((valid) => { + if (valid) { + this.instance.post(`/applandcirculateinfo/addOrUpdate`, { + ...this.forms, + id: this.params.id || '', + }).then(res => { + if (res.code == 0) { + this.$message.success('提交成功') + setTimeout(() => { + this.cancel(true) + }, 600) + } + }) + } + }) }, }, } @@ -231,11 +220,10 @@ export default { \ No newline at end of file diff --git a/project/xiushan/apps/AppLandTransfer/components/List.vue b/project/xiushan/apps/AppLandTransfer/components/List.vue index 7c1bc9fa..4eee6637 100644 --- a/project/xiushan/apps/AppLandTransfer/components/List.vue +++ b/project/xiushan/apps/AppLandTransfer/components/List.vue @@ -1,17 +1,23 @@