Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -32,6 +32,16 @@ export function getDjlxInfo (id) {
 }
 
 /* 
+获取登记类型信息-申请业务规则
+*/
+export function getQllxByBsmSqyw (id) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getQllxByBsmSqyw?bsmSqyw=' + id,
+    method: 'post'
+  })
+}
+
+/* 
 读取申请登记业务信息-申请业务规则
 */
 export function getSqdjywDetail (bsmSqyw) {

@@ -379,7 +379,11 @@ export default {
       getDjlxInfo(this.sqqlRule.bsmSqyw).then((res) => {
         let { result } = res;
         this.djlxList = result ? result : [];
+        if(this.djlxList.length>0){
           this.getDetail(this.djlxList[0].bsmSqyw);
+        }else{
+           this.getDetail(this.sqqlRule.bsmSqyw);
+        }       
       });
       //}
     },

@@ -15,9 +15,9 @@
               >
                 <el-option
                   v-for="item in qllxs"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  :key="item.sxzdz"
+                  :label="item.sxzdmc"
+                  :value="item.sxzdz"
                 >
                 </el-option>
               </el-select>
@@ -93,15 +93,13 @@ import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
 import jump from "./mixin/jump";
 import { selectQlxx, startBusinessFlow } from "@/api/ywbl.js";
+import { getQllxByBsmSqyw } from "@/api/system.js";
 export default {
   mixins: [table, jump],
   props: {
     isJump: { type: Boolean, default: false },
     djywbm: { type: String, default: "" },
-    djqxObj: {
-      type: Object,
-      default: {},
-    },
+    djqxObj: { type: Object, default: {} },
     bsmSqyw: { type: String, default: "" },
   },
   data() {
@@ -114,11 +112,24 @@ export default {
         data: [],
       },
       bdcdysz: [],
+      bsmSqyw: "",
     };
   },
   mounted() {
     sendThis(this);
   },
+  created() {
+    if (this.djqxObj.nodetype === "djlx") {
+      this.bsmSqyw = this.djqxObj.bsmSqyw;
+    } else {
+      this.bsmSqyw = this.djqxObj.parentid;
+    }
+    getQllxByBsmSqyw(this.bsmSqyw).then((res) => {
+      if (res.code === 200) {
+         this.qllxs = res.result ? res.result : [];
+      }
+    });
+  },
   methods: {
     //点击行选中或取消复选框
     handleRowClick(row, column, event) {
@@ -129,7 +140,12 @@ export default {
       this.$emit("closeDialog");
     },
     fetchData() {
+       //this.queryForm.bsmSqyw = this.bsmSqyw;
+      if (this.djqxObj.nodetype === "djlx") {
+        this.queryForm.bsmSqyw = this.djqxObj.bsmSqyw;
+      } else {
         this.queryForm.bsmSqyw = this.djqxObj.parentid;
+      }
       selectQlxx({ ...this.queryForm, ...this.pageData }).then((res) => {
         if (res.code === 200) {
           let { total, records } = res.result;
@@ -152,13 +168,13 @@ export default {
         if (res.code == 200) {
           this.$message({
             showClose: true,
-            message: '发起申请成功',
-            type: 'success'
-          })
+            message: "发起申请成功",
+            type: "success",
+          });
           if (!this.isJump) {
-            this.jump(res.result, this.djywbm)
+            this.jump(res.result, this.djywbm);
           } else {
-            this.$emit('updateDialog', true)
+            this.$emit("updateDialog", true);
           }
         } else {
           this.$message.error(res.message);

@@ -57,7 +57,7 @@
 import { datas, sendThis } from "../javascript/jsydsyq200.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
-import jump from "../components/mixin/jump";
+import jump from "./mixin/jump";
 import { startBusinessFlow, selectJsydQlxx } from "@/api/ywbl.js";
 export default {
   mixins: [table, jump],

@@ -43,17 +43,14 @@
 import { datas, sendThis } from "../javascript/jsydsyq100.js";
 import { defaultParameters } from "../javascript/publicDefaultPar.js";
 import table from "@/utils/mixin/table";
-import jump from "../components/mixin/jump";
+import jump from "./mixin/jump";
 import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
 export default {
   mixins: [table, jump],
   props: {
     isJump: { type: Boolean, default: false },
     djywbm: { type: String, default: '' },
-    djqxObj: {
-      type: Object,
-      default: {}
-    },
+    djqxObj: {type: Object, default: {}},
     bsmSqyw: { type: String, default: '' },
   },
   data () {

 <template>
-  <dialogBox title="查询权利信息" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
+  <dialogBox :title="title" width="85%" :isButton="false" :isMain="true" @closeDialog="closeDialog" v-model="myValue">
     <component :is="editItem" @closeDialog="closeDialog" v-bind="$attrs" :isJump="isJump" id="slectBdc"
-      @updateDialog="updateDialog" :djywbm="djywbm" :key="key" />
+      @updateDialog="updateDialog" :djywbm="djywbm" :key="key" :djqxObj="djqxObj"/>
   </dialogBox>
 </template>
 <script>
@@ -10,14 +10,15 @@ export default {
   props: {
     isJump: { type: Boolean, default: false },
     value: { type: Boolean, default: true },
-    djywbm: { type: String, default: '' }
+    djywbm: { type: String, default: '' },
+    djqxObj: { type: Object, default: {} }
   },
   data () {
     return {
+      title:"",
       key: 0,
       editItem: '',
-      myValue: this.value,
-      djqxObj:this.$attrs
+      myValue: this.value
     }
   },
   watch: {
@@ -36,6 +37,7 @@ export default {
   },
   methods: {
     loadView (view) {
+      this.title ="申请业务："+this.djqxObj.djywmc;
       return r => require.ensure([], () => r(require(`./components/${view}.vue`)))
     },
     closeDialog () {

-export function queueDjywmc (djywbm) {
+export function queueDjywmc(djywbm) {
     let vm = null;
     switch (djywbm) {
         case "A03100"://建设用地使用权（首次登记）
         case "A05100"://宅基地使用权（首次登记）
         case "A07100"://集体建设用地使用权（首次登记）
-            vm = "jsydsyq100";
+            vm = "selectQjzdjbxx";
             break;
         case "A03200":
         case "A03300":
         case "A03400":
-            vm = "jsydsyq200";
+        case "A05200":
+        case "A05300":
+        case "A05400":
+        case "A07200":
+        case "A07300":
+        case "A07400":
+            vm = "selectJsydsyq";
             break;
         case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
+        case "A06100":
+        case "A08100":
             vm = "fwsyq";
             break;
         case "A23100"://农用地使用权(首次登记)

@@ -208,11 +208,12 @@ export default {
         item.cselect = false
       })
       this.btnDisabled = true
-      item.cselect = true
+      item.cselect = true;
+       this.djqxObj = item;
       if (item.sffqlc == '1') {
         this.btnDisabled = false
         this.bsmSqyw = item.bsmSqyw
-        this.djywbm = item.djywbm
+        this.djywbm = item.djywbm;
       } else {
         this.getNextNode(item.bsmSqyw, false)
       }