소스 검색

task 土地确权 承包方信息功能调整

rongxin_test
QI_YUJIE 1 년 전
부모
커밋
66e9c9cb5c
5개의 변경된 파일224개의 추가작업 그리고 70개의 파일을 삭제
  1. +1
    -1
      src/api/contracted/cbf.js
  2. +1
    -1
      src/views/contracted/village/contractor/contractor.vue
  3. +61
    -12
      src/views/contracted/village/contractor/contractorDetail.vue
  4. +73
    -15
      src/views/contracted/village/contractor/contractorDetailAdd.vue
  5. +88
    -41
      src/views/contracted/village/contractor/contractorFamilyDetail.vue

+ 1
- 1
src/api/contracted/cbf.js 파일 보기

@@ -46,7 +46,7 @@ export function updateCbf(data) {
// 删除承包方信息
export function deleteCbf(id) {
return request({
url: '/service/cbf/mobile/remove/' + id,
url: '/service/cbf/delete/' + id,
method: 'get'
});
}


+ 1
- 1
src/views/contracted/village/contractor/contractor.vue 파일 보기

@@ -186,7 +186,7 @@
},
deleteContractor(id, index) {
this.$dialog.confirm({
message: '是否确认删除此条承包方信息?',
message: '是否确认删除此条承包方信息以及与其相关联的家庭成员、承包合同、承包地块?',
}).then(() => {
// on confirm
deleteCbf(id).then(res => {


+ 61
- 12
src/views/contracted/village/contractor/contractorDetail.vue 파일 보기

@@ -70,12 +70,13 @@
<van-field v-model="form.cbfdz" label="地址:" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" />
<van-field v-model="form.yzbm" label="邮编:" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
<van-field v-model="form.lxdh" label="电话:" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
<van-field v-model="form.cbfcysl" label="成员数量:" placeholder="请输入成员数量" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
<FieldRadio
v-model="form.sfyzf"
label="是否有住房"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_yes_no"
remote-url="/open/zdzh/list/sys_yes_no"
:on-remote-response="'data'"
/>
<FieldRadio
@@ -83,11 +84,11 @@
label="是否在村居住"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_yes_no"
remote-url="/open/zdzh/list/sys_yes_no"
:on-remote-response="'data'"
/>
<van-field
v-model="form.householdStatus"
v-model="form.householdStatusText"
label="整户状态:"
placeholder="请选择整户状态"
required
@@ -104,19 +105,49 @@
show-toolbar
:columns="householdStatusOptions"
value-key="dictLabel"
@confirm="householdStatusOptions"
@confirm="onConfirmHouseholdStatusOptions"
@cancel="showZhzt = false"
/>
</van-popup>
<van-field v-model="form.totalArea" label="总面积(亩):" placeholder="请输入总面积㎡" input-align="left" type="number"/>
<van-field v-model="form.qqArea" label="确权面积(亩):" placeholder="请输入确权面积㎡" input-align="left" type="number"/>
<van-field v-model="form.qtArea" label="其他面积(亩):" placeholder="请输入总面积㎡" input-align="left" required type="number"/>
<van-field v-model="form.dks" label="地块数:" placeholder="请输入地块数" input-align="left" type="number"/>
<van-field v-model="form.zzjyArea" label="自主经营面积(亩):" placeholder="请输入自主经营面积㎡" input-align="left" type="number"/>
<van-field v-model="form.lzcArea" label="流转出面积(亩):" placeholder="请输入流转出面积㎡" input-align="left" type="number"/>
<van-field v-model="form.shArea" label="损毁面积(亩):" placeholder="请输入损毁面积㎡" input-align="left" type="number"/>
<van-field v-model="form.zzArea" label="征占面积(亩):" placeholder="请输入征占面积㎡" input-align="left" type="number"/>
<van-field v-model="form.totalArea" label="总面积(亩):" placeholder="请输入总面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.qqArea" label="确权面积(亩):" placeholder="请输入确权面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.qtArea" label="其他面积(亩):" placeholder="请输入其他面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.dks" label="地块数(块):" placeholder="请输入地块数(块)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.zzjyArea" label="自主经营面积(亩):" placeholder="请输入自主经营面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.lzcArea" label="流转出面积(亩):" placeholder="请输入流转出面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.shArea" label="损毁面积(亩):" placeholder="请输入损毁面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.zzArea" label="征占面积(亩):" placeholder="请输入征占面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.cbfdcy" label="调查员:" placeholder="请输入调查员" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
<van-field v-model="form.cbfdcrq" label="调查日期:" placeholder="请选择调查日期" required :rules="[{ required: true }]"
:border="false" input-align="left" right-icon="arrow-down" readonly clickable @click="showDcrq = true" />
<van-popup v-model="showDcrq" position="bottom">
<van-datetime-picker
:value="form.cbfdcrq ? new Date(form.cbfdcrq) : new Date()"
type="date"
title="请选择调查日期"
:min-date="minDate"
:max-date="maxDate"
@confirm="onConfirmDcrq"
@cancel="showDcrq = false"
/>
</van-popup>
<van-field v-model="form.cbfdcjs" label="调查记事:" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
<van-field v-model="form.gsjsr" label="公示记事人:" placeholder="请输入公示记事人" :border="false" input-align="left" maxlength="50" />
<van-field v-model="form.gsjs" label="公示记事:" type="textarea" rows="3" placeholder="请输入公示记事" :border="false" input-align="left" maxlength="250" />
<van-field v-model="form.gsshr" label="公示审核人:" placeholder="请输入公示审核人" :border="false" input-align="left" maxlength="20" />
<van-field v-model="form.gsshrq" label="公示审核日期:" placeholder="请选择公示审核日期" :border="false" input-align="left" right-icon="arrow-down"
readonly clickable @click="showGsshrq = true" />
<van-popup v-model="showGsshrq" position="bottom">
<van-datetime-picker
:value="form.gsshrq ? new Date(form.gsshrq) : new Date()"
type="date"
title="请选择公示审核日期"
:min-date="minDate"
:max-date="maxDate"
@confirm="onConfirmGsshrq"
@cancel="showGsshrq = false"
/>
</van-popup>
</van-form>
<p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
</div>
@@ -140,6 +171,8 @@
showType:false,
showZjType:false,
showZhzt:false,
showDcrq: false,
showGsshrq: false,
// 承包方信息表单
form: {},
// 承包方类型字典
@@ -150,6 +183,8 @@
taskStatus: null,
// 整户状态类型字典
householdStatusOptions: [],
minDate: new Date(1978, 0, 1),
maxDate: new Date(2100, 11, 31),
};
},
created() {
@@ -175,6 +210,7 @@
this.form = response.data;
this.$set(this.form, 'cbflxText', this.selectDictLabel(this.contractorTypeOptions, response.data.cbflx));
this.$set(this.form, 'cbfzjlxText', this.selectDictLabel(this.credentialTypeOptions, response.data.cbfzjlx));
this.$set(this.form, 'householdStatusText', this.selectDictLabel(this.householdStatusOptions, response.data.householdStatus));
});
},
onConfirmTypeOptions(value){
@@ -187,6 +223,19 @@
this.form.cbfzjlxText = value.dictLabel;
this.showZjType = false;
},
onConfirmHouseholdStatusOptions(value){
this.form.householdStatus = value.dictValue;
this.form.householdStatusText = value.dictLabel;
this.showZhzt = false;
},
onConfirmDcrq(data) {
this.form.cbfdcrq = this.format(data, 'yyyy-MM-dd');
this.showDcrq = false;
},
onConfirmGsshrq(data) {
this.form.gsshrq = this.format(data, 'yyyy-MM-dd');
this.showGsshrq = false;
},
submitForm() {
this.$refs.formData.validate().then(() => {
updateCbf(this.form).then(response => {


+ 73
- 15
src/views/contracted/village/contractor/contractorDetailAdd.vue 파일 보기

@@ -11,7 +11,7 @@

<div class="list_main">
<van-form ref="formData">
<van-field v-model="form.cbfbm" label="代码:" placeholder="<自动生成>" :border="false" input-align="left" maxlength="18">
<van-field v-model="form.cbfbm" label="代码:" placeholder="<自动生成>" :border="false" input-align="left" :disabled="true" maxlength="18">
<!-- <template #button>
<van-button size="mini" type="primary" native-type="button" @click="generateCode">生成代码</van-button>
</template> -->
@@ -66,12 +66,13 @@
<van-field v-model="form.cbfdz" label="地址:" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" />
<van-field v-model="form.yzbm" label="邮编:" placeholder="请输入邮编" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="6" />
<van-field v-model="form.lxdh" label="电话:" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
<van-field v-model="form.cbfcysl" label="成员数量:" placeholder="请输入成员数量" required :rules="[{ required: true }]" :border="false" input-align="left" type="number" />
<FieldRadio
v-model="form.sfyzf"
label="是否有住房"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_yes_no"
remote-url="/open/zdzh/list/sys_yes_no"
:on-remote-response="'data'"
/>
<FieldRadio
@@ -79,15 +80,13 @@
label="是否在村居住"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_yes_no"
remote-url="/open/zdzh/list/sys_yes_no"
:on-remote-response="'data'"
/>
<van-field
v-model="householdStatusText"
label="整户状态:"
placeholder="请选择整户状态"
required
:rules="[{ required: true }]"
:border="false"
input-align="left"
right-icon="arrow-down"
@@ -104,15 +103,45 @@
@cancel="showZhzt = false"
/>
</van-popup>
<van-field v-model="form.totalArea" label="总面积(亩):" placeholder="请输入总面积㎡" input-align="left" type="number"/>
<van-field v-model="form.qqArea" label="确权面积(亩):" placeholder="请输入确权面积㎡" input-align="left" type="number"/>
<van-field v-model="form.qtArea" label="其他面积(亩):" placeholder="请输入总面积㎡" input-align="left" required type="number"/>
<van-field v-model="form.dks" label="地块数:" placeholder="请输入地块数" input-align="left" type="number"/>
<van-field v-model="form.zzjyArea" label="自主经营面积(亩):" placeholder="请输入自主经营面积㎡" input-align="left" type="number"/>
<van-field v-model="form.lzcArea" label="流转出面积(亩):" placeholder="请输入流转出面积㎡" input-align="left" type="number"/>
<van-field v-model="form.shArea" label="损毁面积(亩):" placeholder="请输入损毁面积㎡" input-align="left" type="number"/>
<van-field v-model="form.zzArea" label="征占面积(亩):" placeholder="请输入征占面积㎡" input-align="left" type="number"/>
<van-field v-model="form.totalArea" label="总面积(亩):" placeholder="请输入总面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.qqArea" label="确权面积(亩):" placeholder="请输入确权面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.qtArea" label="其他面积(亩):" placeholder="请输入其他面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.dks" label="地块数(块):" placeholder="请输入地块数(块)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.zzjyArea" label="自主经营面积(亩):" placeholder="请输入自主经营面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.lzcArea" label="流转出面积(亩):" placeholder="请输入流转出面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.shArea" label="损毁面积(亩):" placeholder="请输入损毁面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.zzArea" label="征占面积(亩):" placeholder="请输入征占面积(亩)" :border="false" input-align="left" type="number"/>
<van-field v-model="form.cbfdcy" label="调查员:" placeholder="请输入调查员" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="50" />
<van-field v-model="form.cbfdcrq" label="调查日期:" placeholder="请选择调查日期" required :rules="[{ required: true }]"
:border="false" input-align="left" right-icon="arrow-down" readonly clickable @click="showDcrq = true" />
<van-popup v-model="showDcrq" position="bottom">
<van-datetime-picker
:value="new Date()"
type="date"
title="请选择调查日期"
:min-date="minDate"
:max-date="maxDate"
@confirm="onConfirmDcrq"
@cancel="showDcrq = false"
/>
</van-popup>
<van-field v-model="form.cbfdcjs" label="调查记事:" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
<van-field v-model="form.gsjsr" label="公示记事人:" placeholder="请输入公示记事人" :border="false" input-align="left" maxlength="50" />
<van-field v-model="form.gsjs" label="公示记事:" type="textarea" rows="3" placeholder="请输入公示记事" :border="false" input-align="left" maxlength="250" />
<van-field v-model="form.gsshr" label="公示审核人:" placeholder="请输入公示审核人" :border="false" input-align="left" maxlength="20" />
<van-field v-model="form.gsshrq" label="公示审核日期:" placeholder="请选择公示审核日期" :border="false" input-align="left" right-icon="arrow-down"
readonly clickable @click="showGsshrq = true" />
<van-popup v-model="showGsshrq" position="bottom">
<van-datetime-picker
:value="new Date()"
type="date"
title="请选择公示审核日期"
:min-date="minDate"
:max-date="maxDate"
@confirm="onConfirmGsshrq"
@cancel="showGsshrq = false"
/>
</van-popup>
</van-form>
<p class="btn" @click="submitForm">保存</p>
</div>
@@ -136,6 +165,8 @@
showType:false,
showZjType:false,
showZhzt:false,
showDcrq: false,
showGsshrq: false,
// 承包方信息表单
form: {
deptId: null,
@@ -148,19 +179,38 @@
yzbm: null,
lxdh: null,
cbfcysl: null,
cbfdcy: null,
cbfdcrq: null,
cbfdcjs: null,
gsjsr: null,
gsjs: null,
gsshr: null,
gsshrq: null,
sfyzf: 'Y',
sfzcjz: 'Y',
householdStatus: '1',
totalArea: null,
qqArea: null,
qtArea: null,
dks: null,
zzjyArea: null,
lzcArea: null,
shArea: null,
zzArea: null,
},
// 承包方类型(标签名)
cbflxText: '农户',
// 承包方证件类型(标签名)
cbfzjlxText: '居民身份证',
householdStatusText:"",
householdStatusText: "正常",
// 承包方类型字典
contractorTypeOptions: [],
// 承包方证件类型字典
credentialTypeOptions: [],
// 整户状态类型字典
householdStatusOptions: [],
minDate: new Date(1978, 0, 1),
maxDate: new Date(2100, 11, 31),
};
},
created() {
@@ -190,10 +240,18 @@
this.householdStatusText = value.dictLabel;
this.showZhzt = false;
},
onConfirmDcrq(data) {
this.form.cbfdcrq = this.format(data, 'yyyy-MM-dd');
this.showDcrq = false;
},
onConfirmGsshrq(data) {
this.form.gsshrq = this.format(data, 'yyyy-MM-dd');
this.showGsshrq = false;
},
submitForm() {
this.$refs.formData.validate().then(() => {
this.form.deptId = this.$route.params.deptId;
this.form.cbfcysl = 1;
// this.form.cbfcysl = 1;
addCbf(this.form).then(response => {
if (response.code == 200) {
this.$toast({


+ 88
- 41
src/views/contracted/village/contractor/contractorFamilyDetail.vue 파일 보기

@@ -27,6 +27,29 @@
</van-radio-group>
</template>
</van-field>
<van-field
v-model="cyzjlxText"
label="证件类型:"
placeholder="请选择证件类型"
required
:rules="[{ required: true }]"
:border="false"
input-align="right"
right-icon="arrow-down"
readonly
clickable
@click="showCredentialType = true"
/>
<van-popup v-model="showCredentialType" position="bottom">
<van-picker
show-toolbar
:columns="cyzjlxOptions"
value-key="dictLabel"
@confirm="onConfirmCredentialTypeOptions"
@cancel="showCredentialType = false"
/>
</van-popup>
<van-field v-model="form.cyzjhm" label="证件号码:" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="20" />
<van-field
v-model="familyStatusText"
label="与户主关系:"
@@ -56,64 +79,72 @@
</van-radio-group>
</template>
</van-field>
<van-field
v-model="cyzjlxText"
label="证件类型:"
placeholder="请选择证件类型"
required
:rules="[{ required: true }]"
:border="false"
input-align="right"
right-icon="arrow-down"
readonly
clickable
@click="showCredentialType = true"
<field-select
v-if="form.sfgyr === '2'"
v-model="form.wdyy"
label="无地原因:"
value-key="dictLabel"
data-key="dictValue"
placeholder="选择无地原因"
remote-url="/open/zdzh/list/wdyy_type"
:on-remote-response="'data'"
/>
<van-popup v-model="showCredentialType" position="bottom">
<van-picker
show-toolbar
:columns="cyzjlxOptions"
value-key="dictLabel"
@confirm="onConfirmCredentialTypeOptions"
@cancel="showCredentialType = false"
/>
</van-popup>
<van-field v-model="form.cyzjhm" label="证件号码:" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="20" />
<FieldRadio
v-model="form.sfitijzzcy"
label="是否集体经济组织成员:"
v-if="form.sfgyr === '2'"
v-model="form.sfhdr"
label="是否侯地人员:"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/sys_yes_no"
:on-remote-response="'data'"
/>
<FieldRadio
v-model="form.isNew"
label="是否新数据:"
v-model="form.sfjtjjzzcy"
label="是否集体经济组织成员:"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/sys_yes_no"
:on-remote-response="'data'"
/>
<van-field v-model="form.elcbshjd" class = "elcbshjd_css" label="二轮承包时户籍地:" placeholder="请输入二轮承包时户籍地" :border="false" input-align="right" />
<van-field v-model="form.xhjd" label="现户籍地:" placeholder="请输入现户籍地" :border="false" input-align="right" />
<field-select
v-if="form.sfgyr == '2'"
v-model="form.wdyy"
label="无地原因:"
<FieldRadio
v-model="form.isNew"
label="是否新数据:"
value-key="dictLabel"
data-key="dictValue"
placeholder="选择无地原因"
remote-url="/open/zdzh/list/wdyy_type"
remote-url="/open/zdzh/list/sys_yes_no"
:on-remote-response="'data'"
/>
<FieldRadio
v-if="form.sfgyr == '2'"
v-model="form.sfhdr"
label="是否侯地人员:"
<!-- <field-date-picker-->
<!-- v-model="form.newAt"-->
<!-- label="新增时间"-->
<!-- placeholder="请选择新增时间"-->
<!-- formatter="yyyy-MM-dd"-->
<!-- input-align="right"-->
<!-- />-->

<van-field v-model="form.newAt" label="新增时间:" placeholder="请选择新增时间" :border="false"
input-align="right" right-icon="arrow-down" readonly clickable @click="showNewAt = true" />
<van-popup v-model="showNewAt" position="bottom">
<van-datetime-picker
:value="form.newAt ? new Date(form.newAt) : new Date()"
type="date"
title="请选择新增时间"
:min-date="minDate"
:max-date="maxDate"
@confirm="onConfirmNewAt"
@cancel="showNewAt = false"
/>
</van-popup>

<van-field v-model="form.elcbshjd" class="elcbshjd_css" label="二轮承包时户籍地:" placeholder="请输入二轮承包时户籍地" :border="false" input-align="right" maxlength="100" />
<van-field v-model="form.xhjd" label="现户籍地:" placeholder="请输入现户籍地" :border="false" input-align="right" maxlength="100" />
<field-select
v-model="form.householdStatus"
label="整户状态:"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/sys_yes_no"
placeholder="请选择整户状态"
remote-url="/open/zdzh/list/household_status"
:on-remote-response="'data'"
/>
<van-field
@@ -150,12 +181,13 @@
import Cookies from "js-cookie";
import FieldRadio from "@/components/form/FieldRadio";
import FieldSelect from "@/components/form/FieldSelect";
import FieldDatePicker from "@/components/form/FieldDatePicker";
import { getJtcy, addJtcy, updateJtcy } from "@/api/contracted/cbfjtcy";

export default {
name: "contractedVillageContractor",
components: {
FieldRadio,FieldSelect
FieldRadio, FieldSelect, FieldDatePicker
},
data() {
return {
@@ -173,6 +205,9 @@
familyStatusText: null, // 家庭身份标签名
showFamilyStatus: false, // 控制家庭身份字典弹出层的显示和隐藏
taskStatus: null, // 调查任务的完成状态:1表示已完成,2表示未完成
showNewAt: false, // 控制新建日期弹出层的显示和隐藏
minDate: new Date(1978, 0, 1),
maxDate: new Date(2100, 11, 31),
};
},
created() {
@@ -228,6 +263,10 @@
this.cybzText = value.dictLabel;
this.showMemberRemark = false;
},
onConfirmNewAt(data) {
this.form.newAt = this.format(data, 'yyyy-MM-dd');
this.showNewAt = false;
},
goBack() {
this.$router.push({
name: 'contractedVillageContractorFamily',
@@ -293,7 +332,15 @@
cybz: null,
cybzsm: null,
cycgfs: null,
gqzbh: null
gqzbh: null,
sfjtjjzzcy: 'Y',
isNew: 'N',
newAt: null,
elcbshjd: null,
xhjd: null,
wdyy: null,
sfhdr: 'N',
householdStatus: '1',
};
this.cyzjlxText = '居民身份证';
}


불러오는 중...
취소
저장