Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

+import request from '@/plugin/axios'
+
+/**
+ * 查询土地承包经营权、农用地其他使用权调查表基本信息
+ */
+export function getQjTdcbjyqNydqtsyqdcDetailByZdbsm(data) {
+    return request({
+        url: '/zd/qjTdcbjyqNydqtsyqdc/getQjTdcbjyqNydqtsyqdcDetailByZdbsm',
+        method: 'get',
+        params: {
+          zdbsm: data,
+        }
+    })
+}
+
+/**
+ * 保存权籍_土地承包经营权、农用地其他使用权调查基本信息
+ */
+export function saveOrUpdateQjTdcbjyqNydqtsyqdc(data) {
+    return request({
+        url: '/zd/qjTdcbjyqNydqtsyqdc/saveOrUpdateQjTdcbjyqNydqtsyqdc',
+        method: 'post',
+        data: data,
+    })
+}

@@ -55,6 +55,9 @@ const store = new Vuex.Store({
         newZdbsm:'',
         isWorkFlow:false, // 判断是否工作流数据
         lcgzShow:false,//是否待办箱的数据，显示流程追踪
+        familyList:[], //家庭关系分类
+        syttlx:[],//水域滩涂类型
+        yzyfs:[] //养殖业方式
     },
     modules: {
         user,

@@ -321,6 +321,10 @@ export default {
 			s.cqlyOptions = s.cqlyOptions.length == 0 ?await this.getDicData("产权来源") : s.cqlyOptions;
 			s.jgOptions = s.jgOptions.length == 0 ?await this.getDicData("房屋结构") : s.jgOptions;
 			s.gmjjhyflbsmList = s.gmjjhyflbsmList.length == 0 ?await this.getDicData("国民经济行业分类代码") : s.gmjjhyflbsmList;
+			s.familyList = s.familyList.length == 0 ?await this.getDicData("家庭成员") : s.familyList;
+			s.syttlx = s.syttlx.length == 0 ?await this.getDicData("水域滩涂类型") : s.syttlx;
+			s.yzyfs = s.yzyfs.length == 0 ?await this.getDicData("养殖业方式") : s.yzyfs;
+			
 		},
 		async getDicData(name) {
 			return await getDdicByMC(name).then((res)=> {

@@ -17,11 +17,11 @@
                     </td>
                 </tr>
                 <tr height="30">
-                    <td  colspan="2" align="center"  >坐落</td>
+                    <td  colspan="2" align="center"  ><i class="requisite">*</i>坐落</td>
                     <td  colspan="4"  >
                         <input class="formInput" v-model="form.zl" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="zl">
                     </td>
-                    <td  colspan="2" align="center"  >不动产单元号</td>
+                    <td  colspan="2" align="center"  ><i class="requisite">*</i>不动产单元号</td>
                     <td  colspan="4"  class="psr">
                         <input class="formInput percent80"  maxlength="28" v-model="form.bdcdyh" :disabled="form.qszt!=='0'" @blur="inputBlur($event)" ref="bdcdyh">
                         <el-button @click.prevent="generatorCode"  size="mini" class="createBtn" type="warning" :disabled="form.qszt!=='0'">生成</el-button>

@@ -817,6 +817,7 @@ export default {
 				item.style.border = '';
 				item.className = '';
 			});
+			this.bsms=bsms;
 			//清除选中户
 			// this.$refs.lpbContent.clearChoosedH();
 			this.$nextTick(()=>{