Merge remote-tracking branch 'origin/master'

@@ -5,14 +5,31 @@
 </template>
 
 <script>
+import { getDdicByMC } from "../src/api/common";
 export default {
 	mounted() {
+		this.getDic();
 		window.addEventListener("unload", this.saveState);
 	},
 	methods: {
 		saveState() {
 			sessionStorage.setItem("state", JSON.stringify(this.$store.state));
 		},
+		//请求字典数据
+		getDic() {
+			let s = this.$store.state;
+			s.zjzlList = s.zjzlList.length == 0 ? this.getDicData("证件种类") : s.zjzlList;
+			s.gjList = s.gjList.length == 0 ? this.getDicData("国家和地区") : s.gjList;
+			s.ssList = s.ssList.length == 0 ? this.getDicData("省市") : s.ssList;
+			s.qlrlxList = s.qlrlxList.length == 0 ? this.getDicData("权利人类型") : s.qlrlxList;
+			s.xbList = s.xbList.length == 0 ? this.getDicData("性别") : s.xbList;
+			s.sshyList = s.sshyList.length == 0 ? this.getDicData("国民经济行业分类代码") : s.sshyList;
+		},
+		getDicData(name) {
+			getDdicByMC(name).then((res) => {
+				return res.result;
+			});
+		},
 	},
 };
 </script>

@@ -61,7 +61,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.qlrlxbsm">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in qlrlxList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -75,7 +75,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.zjzlbsm">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in zlzlList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -103,7 +103,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.gjbsm">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in gjList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -115,7 +115,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.hjszssbsm">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in ssList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -129,7 +129,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.xbbsm">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in xbList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -147,7 +147,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.sshy">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in sshyList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -176,7 +176,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.fr.zjzlbsm">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in zjzlList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -222,7 +222,7 @@
 							<td colspan="3">
 								<el-select class="formSelect" v-model="item.zjzlbsm">
 									<el-option
-										v-for="item in qllxList"
+										v-for="item in zjzlList"
 										:key="item.bsm"
 										:label="item.mc"
 										:value="item.bsm"
@@ -251,7 +251,7 @@
 						<td colspan="3">
 							<el-select class="formSelect" v-model="formData.gyfsbsm">
 								<el-option
-									v-for="item in qllxList"
+									v-for="item in qlrlxList"
 									:key="item.bsm"
 									:label="item.mc"
 									:value="item.bsm"
@@ -356,7 +356,12 @@ export default {
 				zjh: "",
 				zjzlbsm: "",
 			},
-			qllxList: [],
+			qlrlxList: this.$store.state.qlrlxList,
+			zjzlList: this.$store.state.zjzlList,
+			xbList: this.$store.state.xbList,
+			gjList: this.$store.state.gjList,
+			ssList: this.$store.state.ssList,
+			sshyList: this.$store.state.sshyList,
 		};
 	},
 	methods: {

@@ -13,6 +13,12 @@ const store = new Vuex.Store({
         xzqList: [],
         djqList: [],
         djzqList: [],
+        zjzlList:[],
+        gjList:[],
+        ssList:[],
+        qlrlxList:[],
+        xbList:[],
+        sshyList:[],
         //创建自然幢时需要用到的临时存储信息
         zrzbsm: '',
         xmmc: '',