소스 검색

二轮延包-承包方、承包方家庭成员字段

rongxin_test
Xyq123* 1 년 전
부모
커밋
adb3396a34
3개의 변경된 파일190개의 추가작업 그리고 4개의 파일을 삭제
  1. +64
    -2
      src/views/contracted/village/contractor/contractorDetail.vue
  2. +73
    -1
      src/views/contracted/village/contractor/contractorDetailAdd.vue
  3. +53
    -1
      src/views/contracted/village/contractor/contractorFamilyDetail.vue

+ 64
- 2
src/views/contracted/village/contractor/contractorDetail.vue 파일 보기

@@ -70,6 +70,52 @@
<van-field v-model="form.cbfdz" label="地址:" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" /> <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.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.lxdh" label="电话:" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
<FieldRadio
v-model="form.sfyzf"
label="是否有住房"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_yes_no"
:on-remote-response="'data'"
/>
<FieldRadio
v-model="form.sfzcjz"
label="是否在村居住"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_yes_no"
:on-remote-response="'data'"
/>
<van-field
v-model="form.householdStatus"
label="整户状态:"
placeholder="请选择整户状态"
required
:rules="[{ required: true }]"
:border="false"
input-align="left"
right-icon="arrow-down"
readonly
clickable
@click="showZhzt = true"
/>
<van-popup v-model="showZhzt" position="bottom">
<van-picker
show-toolbar
:columns="householdStatusOptions"
value-key="dictLabel"
@confirm="householdStatusOptions"
@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.cbfdcjs" label="调查记事:" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" /> <van-field v-model="form.cbfdcjs" label="调查记事:" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
</van-form> </van-form>
<p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p> <p class="btn" @click="submitForm" v-if="taskStatus === '2' && $route.params.surveyStatus !== '3'">保存</p>
@@ -81,17 +127,19 @@
<script> <script>
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import contractorHeader from "./contractorHeader"; import contractorHeader from "./contractorHeader";
import FieldRadio from "@/components/form/FieldRadio";
import { getCbf, updateCbf } from "@/api/contracted/cbf"; import { getCbf, updateCbf } from "@/api/contracted/cbf";


export default { export default {
name: "contractedVillageContractor", name: "contractedVillageContractor",
components: { components: {
contractorHeader
contractorHeader,FieldRadio
}, },
data() { data() {
return { return {
showType:false, showType:false,
showZjType:false, showZjType:false,
showZhzt:false,
// 承包方信息表单 // 承包方信息表单
form: {}, form: {},
// 承包方类型字典 // 承包方类型字典
@@ -100,6 +148,8 @@
credentialTypeOptions: [], credentialTypeOptions: [],
// 调查任务的完成状态:1表示已完成,2表示未完成 // 调查任务的完成状态:1表示已完成,2表示未完成
taskStatus: null, taskStatus: null,
// 整户状态类型字典
householdStatusOptions: [],
}; };
}, },
created() { created() {
@@ -110,6 +160,9 @@
this.getDicts("cert_type").then(response => { this.getDicts("cert_type").then(response => {
this.credentialTypeOptions = response.data; this.credentialTypeOptions = response.data;
}); });
this.getDicts("household_status").then(response => {
this.householdStatusOptions = response.data;
});
}, },
mounted() { mounted() {
setTimeout(() => { setTimeout(() => {
@@ -178,7 +231,16 @@
padding: 0 4vw; padding: 0 4vw;
overflow: hidden; overflow: hidden;
} }

/deep/ .van-field__label {
-webkit-box-flex: 0;
flex: none;
box-sizing: border-box;
width: 9em;
margin-right: 0.32rem;
color: #646566;
text-align: left;
word-wrap: break-word;
}
/deep/ .van-nav-bar{ /deep/ .van-nav-bar{
background: transparent; background: transparent;
} }


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

@@ -66,6 +66,52 @@
<van-field v-model="form.cbfdz" label="地址:" placeholder="请输入地址" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="100" /> <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.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.lxdh" label="电话:" placeholder="请输入电话" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="15" />
<FieldRadio
v-model="form.sfyzf"
label="是否有住房"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_yes_no"
:on-remote-response="'data'"
/>
<FieldRadio
v-model="form.sfzcjz"
label="是否在村居住"
value-key="dictLabel"
data-key="dictValue"
remote-url="/open/zdzh/list/house_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"
readonly
clickable
@click="showZhzt = true"
/>
<van-popup v-model="showZhzt" position="bottom">
<van-picker
show-toolbar
:columns="householdStatusOptions"
value-key="dictLabel"
@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.cbfdcjs" label="调查记事:" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" /> <van-field v-model="form.cbfdcjs" label="调查记事:" type="textarea" rows="3" placeholder="请输入调查记事" required :rules="[{ required: true }]" :border="false" input-align="left" maxlength="250" />
</van-form> </van-form>
<p class="btn" @click="submitForm">保存</p> <p class="btn" @click="submitForm">保存</p>
@@ -77,13 +123,19 @@
<script> <script>
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import { addCbf, generateContractorCode } from "@/api/contracted/cbf"; import { addCbf, generateContractorCode } from "@/api/contracted/cbf";
import FieldRadio from "@/components/form/FieldRadio";
import FieldSelect from "@/components/form/FieldSelect";


export default { export default {
name: "contractedVillageContractorAdd", name: "contractedVillageContractorAdd",
components: {
FieldRadio,FieldSelect
},
data() { data() {
return { return {
showType:false, showType:false,
showZjType:false, showZjType:false,
showZhzt:false,
// 承包方信息表单 // 承包方信息表单
form: { form: {
deptId: null, deptId: null,
@@ -102,10 +154,13 @@
cbflxText: '农户', cbflxText: '农户',
// 承包方证件类型(标签名) // 承包方证件类型(标签名)
cbfzjlxText: '居民身份证', cbfzjlxText: '居民身份证',
householdStatusText:"",
// 承包方类型字典 // 承包方类型字典
contractorTypeOptions: [], contractorTypeOptions: [],
// 承包方证件类型字典 // 承包方证件类型字典
credentialTypeOptions: [], credentialTypeOptions: [],
// 整户状态类型字典
householdStatusOptions: [],
}; };
}, },
created() { created() {
@@ -115,6 +170,9 @@
this.getDicts("cert_type").then(response => { this.getDicts("cert_type").then(response => {
this.credentialTypeOptions = response.data; this.credentialTypeOptions = response.data;
}); });
this.getDicts("household_status").then(response => {
this.householdStatusOptions = response.data;
});
}, },
methods: { methods: {
onConfirmTypeOptions(value){ onConfirmTypeOptions(value){
@@ -127,6 +185,11 @@
this.cbfzjlxText = value.dictLabel; this.cbfzjlxText = value.dictLabel;
this.showZjType = false; this.showZjType = false;
}, },
onConfirmHouseholdStatusOptions(value){
this.form.householdStatus = value.dictValue;
this.householdStatusText = value.dictLabel;
this.showZhzt = false;
},
submitForm() { submitForm() {
this.$refs.formData.validate().then(() => { this.$refs.formData.validate().then(() => {
this.form.deptId = this.$route.params.deptId; this.form.deptId = this.$route.params.deptId;
@@ -164,7 +227,16 @@
padding: 0 4vw; padding: 0 4vw;
overflow: hidden; overflow: hidden;
} }

/deep/ .van-field__label {
-webkit-box-flex: 0;
flex: none;
box-sizing: border-box;
width: 9em;
margin-right: 0.32rem;
color: #646566;
text-align: left;
word-wrap: break-word;
}
/deep/ .van-nav-bar{ /deep/ .van-nav-bar{
background: transparent; background: transparent;
} }


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

@@ -79,6 +79,43 @@
/> />
</van-popup> </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="form.cyzjhm" label="证件号码:" placeholder="请输入证件号码" required :rules="[{ required: true }]" :border="false" input-align="right" maxlength="20" />
<FieldRadio
v-model="form.sfitijzzcy"
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="是否新数据:"
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="无地原因:"
value-key="dictLabel"
data-key="dictValue"
placeholder="选择无地原因"
remote-url="/open/zdzh/list/wdyy_type"
:on-remote-response="'data'"
/>
<FieldRadio
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'"
/>
<van-field <van-field
v-model="cybzText" v-model="cybzText"
label="成员备注:" label="成员备注:"
@@ -111,10 +148,15 @@
</template> </template>
<script> <script>
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import FieldRadio from "@/components/form/FieldRadio";
import FieldSelect from "@/components/form/FieldSelect";
import { getJtcy, addJtcy, updateJtcy } from "@/api/contracted/cbfjtcy"; import { getJtcy, addJtcy, updateJtcy } from "@/api/contracted/cbfjtcy";


export default { export default {
name: "contractedVillageContractor", name: "contractedVillageContractor",
components: {
FieldRadio,FieldSelect
},
data() { data() {
return { return {
titleName: '', // 顶部标题名 titleName: '', // 顶部标题名
@@ -267,7 +309,17 @@
padding: 0 4vw; padding: 0 4vw;
overflow: hidden; overflow: hidden;
} }

/deep/ .elcbshjd_css .van-field__label {
-webkit-box-flex: 0;
-webkit-flex: none;
flex: none;
box-sizing: border-box;
width: 10.2em;
margin-right: 0.32rem;
color: #646566;
text-align: left;
word-wrap: break-word;
}
/deep/ .van-nav-bar{ /deep/ .van-nav-bar{
background: transparent; background: transparent;
} }


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