Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
8edac6ad by xiaomiao
Options

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

2 parents c33e0365 cf0280b6
Inline Side-by-side
Showing 9 changed files with 18 additions and 21 deletions
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
59 </div> 59 </div>
60 <!-- 表格 --> 60 <!-- 表格 -->
61 <div class="from-clues-content"> 61 <div class="from-clues-content">
62 <lb-table :page-size="pageData.size" :heightNum="305" class="loadingtext" @sort-change="handleSort" 62 <lb-table :page-size="pageData.size" :heightNum="315" class="loadingtext" @sort-change="handleSort"
63 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange" 63 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange"
64 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 64 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
65 </lb-table> 65 </lb-table>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 09:27:43 4 * @LastEditTime: 2023-08-08 11:01:08
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
8 <!-- 表单部分 --> 8 <!-- 表单部分 -->
9 <div class="from-clues-header"> 9 <div class="from-clues-header">
10 <el-form :model="ruleForm" @submit.native.prevent label-width="80px"> 10 <el-form :model="ruleForm" @submit.native.prevent label-width="50px">
11 <el-row> 11 <el-row>
12 <el-col :span="5"> 12 <el-col :span="5">
13 <el-form-item label="标题"> 13 <el-form-item label="标题">
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 </el-form> 24 </el-form>
25 </div> 25 </div>
26 <!-- 表格 --> 26 <!-- 表格 -->
27 <div class="from-clues-content"> 27 <div class="from-clues-content loadingtext">
28 <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" 28 <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
29 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 29 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
30 :data="tableData.data"> 30 :data="tableData.data">
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
27 </el-form> 27 </el-form>
28 </div> 28 </div>
29 <!-- 表格 --> 29 <!-- 表格 -->
30 <div class="from-clues-content"> 30 <div class="from-clues-content loadingtext">
31 <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total" 31 <lb-table :page-size="pageData.size" border :current-page.sync="pageData.current" :total="tableData.total"
32 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns" 32 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
33 :data="tableData.data"> 33 :data="tableData.data">
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 15:06:24 4 * @LastEditTime: 2023-08-08 14:32:47
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -43,14 +43,6 @@ class data extends filter { ...@@ -43,14 +43,6 @@ class data extends filter {
43 return <div class='suspend'>异议挂起</div> 43 return <div class='suspend'>异议挂起</div>
44 } 44 }
45 return <div class='allow'>进行中</div> 45 return <div class='allow'>进行中</div>
46 // switch (scope.row.lczt) {
47 // case '1':
48 // return <div class='allow'>进行中</div>
49 // case '2':
50 // return <div class='prohibit'>已结束</div>
51 // case '3':
52 // return <div class='allow'>进行中</div>
53 // }
54 } 46 }
55 }, 47 },
56 { 48 {
...@@ -80,11 +72,13 @@ class data extends filter { ...@@ -80,11 +72,13 @@ class data extends filter {
80 prop: "qlrmc", 72 prop: "qlrmc",
81 label: "权利人", 73 label: "权利人",
82 width: '120', 74 width: '120',
75 showOverflowTooltip: true
83 }, 76 },
84 { 77 {
85 prop: "ywrmc", 78 prop: "ywrmc",
86 label: "义务人", 79 label: "义务人",
87 width: '120', 80 width: '120',
81 showOverflowTooltip: true
88 }, 82 },
89 { 83 {
90 prop: "zl", 84 prop: "zl",
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-02 09:58:05 4 * @LastEditTime: 2023-08-07 16:06:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -96,16 +96,16 @@ ...@@ -96,16 +96,16 @@
96 </el-col> 96 </el-col>
97 </el-row> 97 </el-row>
98 <el-row> 98 <el-row>
99 <el-col :span="7"> 99 <el-col :span="6">
100 <el-form-item label="项目名称"> 100 <el-form-item label="项目名称">
101 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input> 101 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
102 </el-form-item> 102 </el-form-item>
103 </el-col> 103 </el-col>
104 104
105 <el-col :span="3" class="btnColRight"> 105 <el-col :span="18" class="btnColRight">
106 <el-form-item> 106 <el-form-item>
107 <el-button type="primary" @click="resetForm(true)">重置</el-button> 107 <el-button type="primary" @click="resetForm(true)">重置</el-button>
108 <el-button type="primary" @click="handleSearch">查询11</el-button> 108 <el-button type="primary" @click="handleSearch">查询</el-button>
109 </el-form-item> 109 </el-form-item>
110 </el-col> 110 </el-col>
111 </el-row> 111 </el-row>
......
...@@ -198,10 +198,11 @@ ...@@ -198,10 +198,11 @@
198 if (data[index].sffqlc == "1") { 198 if (data[index].sffqlc == "1") {
199 this.selectParam = data[index]; 199 this.selectParam = data[index];
200 this.btnDisabled = false; 200 this.btnDisabled = false;
201 // this.djqxList = []
201 } else { 202 } else {
202 this.btnDisabled = true; 203 this.btnDisabled = true;
203 this.getNextNode(data[index].bsmSqyw);
204 } 204 }
205 this.getNextNode(data[index].bsmSqyw);
205 }, 206 },
206 //获取下个节点类型数据 207 //获取下个节点类型数据
207 /** 208 /**
......
...@@ -128,7 +128,8 @@ class data extends filter { ...@@ -128,7 +128,8 @@ class data extends filter {
128 }, 128 },
129 { 129 {
130 label: '操作', 130 label: '操作',
131 width: '110', 131 width: '130',
132 fixed: 'right',
132 render: (h, scope) => { 133 render: (h, scope) => {
133 return ( 134 return (
134 <div> 135 <div>
......
...@@ -39,6 +39,7 @@ class data extends filter { ...@@ -39,6 +39,7 @@ class data extends filter {
39 }, 39 },
40 { 40 {
41 label: "在办环节", 41 label: "在办环节",
42 minWidth: '100',
42 render: (h, scope) => { 43 render: (h, scope) => {
43 if ((scope.row.zbhj != '' && scope.row.zbhj != null) || (scope.row.userName != '' && scope.row.userName != null)) 44 if ((scope.row.zbhj != '' && scope.row.zbhj != null) || (scope.row.userName != '' && scope.row.userName != null))
44 return ( 45 return (
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 <el-col :span="3" class="btnColRight"> 31 <el-col :span="3" class="btnColRight">
32 <el-form-item> 32 <el-form-item>
33 <el-button type="primary" native-type="submit" icon="el-icon-search" @click="handleSearch">查询</el-button> 33 <el-button type="primary" native-type="submit" icon="el-icon-search" @click="handleSearch">查询</el-button>
34 <el-button @click="moreQueryClick()">高级查询</el-button> 34 <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
35 </el-form-item> 35 </el-form-item>
36 </el-col> 36 </el-col>
37 </el-row> 37 </el-row>
......