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

@@ -119,7 +119,6 @@
 import fileController from '@/api/fileController'
 import fileController from '@/api/fileController'
 import djqxsd from './djqxsd.vue'
 import djqxsd from './djqxsd.vue'
 import clgzsd from './clgzsd.vue'
 import clgzsd from './clgzsd.vue'
-
 import dyztsd from './dyztsd.vue'
 import dyztsd from './dyztsd.vue'
 export default {
 export default {
   components: {
   components: {

@@ -58,7 +58,7 @@ export default {
         qllx: "",
         qllx: "",
         djywbm: "",
         djywbm: "",
       },
       },
-      ywlys: datas.ywlys(),
+      qllxs: datas.qllxs(),
       tableData: {
       tableData: {
         total: 0,
         total: 0,
         columns: datas.columns(),
         columns: datas.columns(),

@@ -35,23 +35,27 @@ class data extends filter {
         label: "登记业务编码",
         label: "登记业务编码",
       },
       },
       {
       {
-        // prop: "djywmc",//补换证登记 || 补证
-        label: "权利类型",
-        render: (h, scope) => {
-          var djywmcs= scope.row.djywmc.split('||');
-          var qllx=djywmcs[0];
-
-          return (
-            <div>
-              <span>{qllx}</span>
-            </div>
-          );
-        }
-      },
-      {
         prop: "nodename",//
         prop: "nodename",//
-        label: "登记类型",
+        label: "权利类型",
       },
       },
+
+      // {
+      //   // prop: "djywmc",//补换证登记 || 补证
+      //   label: "权利类型",
+      //   render: (h, scope) => {
+      //     var djywmcs= scope.row.djywmc.split('||');
+      //     var qllx=djywmcs[0];
+      //     return (
+      //       <div>
+      //         <span>{qllx}</span>
+      //       </div>
+      //     );
+      //   }
+      // },
+      // {
+      //   prop: "nodename",//
+      //   label: "登记类型",
+      // },
       {
       {
         prop: "fqywdylx",
         prop: "fqywdylx",
         label: "发起业务单元类型",
         label: "发起业务单元类型",
@@ -89,12 +93,11 @@ class data extends filter {
     ]
     ]
   }
   }
 
 
-  ywlys () {
+  qllxs () {
     return [
     return [
-      { value: 1, label: "办事大厅" },
-      { value: 2, label: "微信小程序" },
-      { value: 3, label: "法院端" },
-      { value: 4, label: "银行端" },
+      { value: 1, label: "国有建设用地使用权" },
+      { value: 2, label: "国有建设用地使用权/房屋所有权" },
+      { value: 3, label: "集体建设用地使用权" },
     ]
     ]
   }
   }