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

@@ -2,7 +2,21 @@
 export default class filter {
 export default class filter {
   // 业务来源
   // 业务来源
   busSource(val) {
   busSource(val) {
-    let status = { 1: '办事大厅', 2: '微信小程序',default: '暂无' }
+    let status = { 1: '办事大厅', 2: '微信小程序' }
     return status[val]
     return status[val]
   }
   }
+
+  //申请分类（1：正常申请，2：一并申请，3：补录申请）
+  sqfls (val) {
+    let status = { 1: '正常申请', 2: '一并申请', 3: '补录申请' }
+    return status[val]
+  }
+
+  //是否启用（1：启用，2：禁用）
+  sfqys (val) {
+    let status = { 1: '启用', 2: '禁用' }
+    return status[val]
+  }
+  
+  
 }
 }

@@ -20,7 +20,7 @@
           </el-col>
           </el-col>
           <el-col :span="12" class="btnCol">
           <el-col :span="12" class="btnCol">
             <el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="fetchData()">查询</el-button>
+              <el-button type="primary" @click="queryClick()">查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
               <el-button @click="moreQueryClick()">高级查询</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
@@ -62,15 +62,15 @@ export default {
       tableData: {
       tableData: {
         total: 0,
         total: 0,
         columns: datas.columns(),
         columns: datas.columns(),
-        data: [
-          {
-            slsj: "2022-5-12",
-          }
-        ]
       }
       }
     }
     }
   },
   },
   methods: {
   methods: {
+    //查询
+    queryClick(){
+      this.fetchData();
+    },
+
     // 初始化数据
     // 初始化数据
     fetchData () {
     fetchData () {
       getSysSqdjywBysearch({ ...this.queryForm, ...this.pageData }).then(res => {
       getSysSqdjywBysearch({ ...this.queryForm, ...this.pageData }).then(res => {
@@ -81,6 +81,8 @@ export default {
         }
         }
       })
       })
     },
     },
+
+    //编辑
     editClick () {
     editClick () {
       this.isDialog = true
       this.isDialog = true
     }
     }

@@ -23,19 +23,33 @@ class data extends filter {
         }
         }
       },
       },
       {
       {
-        prop: "sqfl",
+        prop: "sqfl",//申请分类（1：正常申请，2：一并申请，3：补录申请）
         label: "申请分类",
         label: "申请分类",
+        render: (h, scope) => {
+          return <div>{this.sqfls(scope.row.sqfl)}</div>;
+        }
+
       },
       },
       {
       {
         prop: "djywbm",
         prop: "djywbm",
         label: "登记业务编码",
         label: "登记业务编码",
       },
       },
       {
       {
-        prop: "qllx",
+        // prop: "djywmc",//补换证登记 || 补证
         label: "权利类型",
         label: "权利类型",
+        render: (h, scope) => {
+          var djywmcs= scope.row.djywmc.split('||');
+          var qllx=djywmcs[0];
+
+          return (
+            <div>
+              <span>{qllx}</span>
+            </div>
+          );
+        }
       },
       },
       {
       {
-        prop: "djlx",
+        prop: "nodename",//
         label: "登记类型",
         label: "登记类型",
       },
       },
       {
       {
@@ -43,8 +57,12 @@ class data extends filter {
         label: "发起业务单元类型",
         label: "发起业务单元类型",
       },
       },
       {
       {
-        prop: "sfqy",
+        prop: "enabled",
         label: "是否启用",
         label: "是否启用",
+        render: (h, scope) => {
+          return <div>{this.sfqys(scope.row.sqfl)}</div>;
+        }
+
       },
       },
       {
       {
         prop: "czsj",
         prop: "czsj",