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

@@ -59,7 +59,7 @@
     </div>
     <!-- 表格 -->
     <div class="from-clues-content">
-      <lb-table :page-size="pageData.size" :heightNum="305" class="loadingtext" @sort-change="handleSort"
+      <lb-table :page-size="pageData.size" :heightNum="315" class="loadingtext" @sort-change="handleSort"
         :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
       </lb-table>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 09:27:43
+ * @LastEditTime: 2023-08-08 11:01:08
 -->
 <template>
   <div class="from-clues">
     <!-- 表单部分 -->
     <div class="from-clues-header">
-      <el-form :model="ruleForm" @submit.native.prevent label-width="80px">
+      <el-form :model="ruleForm" @submit.native.prevent label-width="50px">
         <el-row>
           <el-col :span="5">
             <el-form-item label="标题">
@@ -24,7 +24,7 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="from-clues-content">
+    <div class="from-clues-content loadingtext">
       <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">

@@ -27,7 +27,7 @@
       </el-form>
     </div>
     <!-- 表格 -->
-    <div class="from-clues-content">
+    <div class="from-clues-content loadingtext">
       <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
         @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
         :data="tableData.data">

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-05-24 15:06:24
+ * @LastEditTime: 2023-08-08 14:32:47
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -43,14 +43,6 @@ class data extends filter {
             return <div class='suspend'>异议挂起</div>
           }
           return <div class='allow'>进行中</div>
-          // switch (scope.row.lczt) {
-          //   case '1':
-          //     return <div class='allow'>进行中</div>
-          //   case '2':
-          //     return <div class='prohibit'>已结束</div>
-          //   case '3':
-          //     return <div class='allow'>进行中</div>
-          // }
         }
       },
       {
@@ -80,11 +72,13 @@ class data extends filter {
         prop: "qlrmc",
         label: "权利人",
         width: '120',
+        showOverflowTooltip: true
       },
       {
         prop: "ywrmc",
         label: "义务人",
         width: '120',
+        showOverflowTooltip: true
       },
       {
         prop: "zl",

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 09:58:05
+ * @LastEditTime: 2023-08-07 16:06:37
 -->
 <template>
   <div class="from-clues">
@@ -96,16 +96,16 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="项目名称">
                 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="3" class="btnColRight">
+            <el-col :span="18" class="btnColRight">
               <el-form-item>
                 <el-button type="primary" @click="resetForm(true)">重置</el-button>
-                <el-button type="primary" @click="handleSearch">查询11</el-button>
+                <el-button type="primary" @click="handleSearch">查询</el-button>
               </el-form-item>
             </el-col>
           </el-row>

@@ -198,10 +198,11 @@
         if (data[index].sffqlc == "1") {
           this.selectParam = data[index];
           this.btnDisabled = false;
+          // this.djqxList = []
         } else {
           this.btnDisabled = true;
-          this.getNextNode(data[index].bsmSqyw);
         }
+        this.getNextNode(data[index].bsmSqyw);
       },
       //获取下个节点类型数据
       /**

@@ -128,7 +128,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '110',
+        width: '130',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>

@@ -39,6 +39,7 @@ class data extends filter {
       },
       {
         label: "在办环节",
+        minWidth: '100',
         render: (h, scope) => {
           if ((scope.row.zbhj != '' && scope.row.zbhj != null) || (scope.row.userName != '' && scope.row.userName != null))
             return (

@@ -31,7 +31,7 @@
           <el-col :span="3" class="btnColRight">
             <el-form-item>
               <el-button type="primary" native-type="submit" icon="el-icon-search" @click="handleSearch">查询</el-button>
-              <el-button @click="moreQueryClick()">高级查询</el-button>
+              <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
             </el-form-item>
           </el-col>
         </el-row>