Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
84361e33 by 任超
Options

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

2 parents bb8594f7 43536a85
Inline Side-by-side
Showing 5 changed files with 170 additions and 80 deletions
...@@ -224,9 +224,9 @@ export default { ...@@ -224,9 +224,9 @@ export default {
224 } 224 }
225 225
226 &.active { 226 &.active {
227 background-color: #42b983; 227 background-color: #0794FF;
228 color: #fff; 228 color: #fff;
229 border-color: #42b983; 229 border-color: #0794FF;
230 230
231 &::before { 231 &::before {
232 content: ''; 232 content: '';
......
...@@ -2,24 +2,46 @@ ...@@ -2,24 +2,46 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <!-- 表单部分 --> 3 <!-- 表单部分 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px"> 5 <el-form
6 :model="queryForm"
7 ref="queryForm"
8 @submit.native.prevent
9 label-width="70px"
10 >
6 <el-row> 11 <el-row>
7 <el-col :span="5"> 12 <el-col :span="5">
8 <el-form-item label="查询编号"> 13 <el-form-item label="查询编号">
9 <el-input placeholder="请输入编号" v-model="queryForm.cxbh" class="width100" clearable @clear="queryClick()"> 14 <el-input
15 placeholder="请输入编号"
16 v-model="queryForm.cxbh"
17 class="width100"
18 clearable
19 @clear="queryClick()"
20 >
10 </el-input> 21 </el-input>
11 </el-form-item> 22 </el-form-item>
12 </el-col> 23 </el-col>
13 <el-col :span="5"> 24 <el-col :span="5">
14 <el-form-item label="申请人"> 25 <el-form-item label="申请人">
15 <el-input placeholder="请输入申请人" v-model="queryForm.sqr" class="width100" @clear="queryClick()" clearable> 26 <el-input
27 placeholder="请输入申请人"
28 v-model="queryForm.sqr"
29 class="width100"
30 @clear="queryClick()"
31 clearable
32 >
16 </el-input> 33 </el-input>
17 </el-form-item> 34 </el-form-item>
18 </el-col> 35 </el-col>
19 36
20 <el-col :span="14" class="btnColRight"> 37 <el-col :span="14" class="btnColRight">
21 <el-form-item> 38 <el-form-item>
22 <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button> 39 <el-button
40 type="primary"
41 native-type="submit"
42 @click="queryClick()"
43 >查询</el-button
44 >
23 <el-button @click="moreQueryClick()">高级查询</el-button> 45 <el-button @click="moreQueryClick()">高级查询</el-button>
24 </el-form-item> 46 </el-form-item>
25 </el-col> 47 </el-col>
...@@ -27,10 +49,19 @@ ...@@ -27,10 +49,19 @@
27 </el-form> 49 </el-form>
28 </div> 50 </div>
29 <!-- 表格 --> 51 <!-- 表格 -->
30 <div class="from-clues-content"> 52 <div class="from-clues-content" id="divcontentid">
31 <lb-table :page-size="pageData.size" id="dydjb" border @sort-change="handleSort" 53 <lb-table
32 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange" 54 :page-size="pageData.size"
33 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 55 id="dydjb"
56 border
57 @sort-change="handleSort"
58 :current-page.sync="pageData.current"
59 :total="tableData.total"
60 @size-change="handleSizeChange"
61 @p-current-change="handleCurrentChange"
62 :column="tableData.columns"
63 :data="tableData.data"
64 >
34 </lb-table> 65 </lb-table>
35 </div> 66 </div>
36 </div> 67 </div>
...@@ -44,13 +75,13 @@ import { getJtfcPage } from "@/api/jtfc"; ...@@ -44,13 +75,13 @@ import { getJtfcPage } from "@/api/jtfc";
44 export default { 75 export default {
45 name: "dydjb", 76 name: "dydjb",
46 mixins: [table], 77 mixins: [table],
47 mounted () { 78 mounted() {
48 sendThis(this); 79 sendThis(this);
49 }, 80 },
50 computed: { 81 computed: {
51 ...mapGetters(["dictData"]), 82 ...mapGetters(["dictData"]),
52 }, 83 },
53 data () { 84 data() {
54 return { 85 return {
55 queryForm: { 86 queryForm: {
56 cxbh: "", 87 cxbh: "",
...@@ -64,36 +95,37 @@ export default { ...@@ -64,36 +95,37 @@ export default {
64 }; 95 };
65 }, 96 },
66 methods: { 97 methods: {
98 //查询
99 queryClick() {
100 this.fetchData();
101 },
67 // 初始化数据 102 // 初始化数据
68 fetchData () { 103 fetchData() {
69 getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#dydjb' }).then((res) => { 104 this.$startLoading("divcontentid");
105 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
106 this.$endLoading();
107 if (res.code === 200) {
70 let { records, total } = res.result; 108 let { records, total } = res.result;
71 this.tableData.data = records; 109 this.tableData.data = records;
72 this.tableData.total = total; 110 this.tableData.total = total;
111 }
73 }); 112 });
74 }, 113 },
75 handleSort (name, sort) { 114 dydjbClick(scope) {
76 console.log(name, sort);
77 },
78
79 dydjbClick (scope) {
80 // var sqcxBsm = scope.row.bsmSqcx;
81 this.$popup("打印登记薄", "sqcx/dydjb/components/dydjbInfo", { 115 this.$popup("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
82 btnShow: true,
83 height: "800px", 116 height: "800px",
84 formData: { 117 formData: {
85 sqcxdata: scope.row, 118 sqcxdata: scope.row,
86 }, 119 },
87 cancel: function () { }, //取消事件的回调 120 cancel: function () {}, //取消事件的回调
88 confirm: function () { 121 confirm: function () {},
89 } 122 });
90 })
91 }, 123 },
92 queryClick () { 124 handleSort(name, sort) {
93 this.fetchData(); 125 console.log(name, sort);
94 } 126 },
95 } 127 },
96 } 128 };
97 </script> 129 </script>
98 <style scoped lang="scss"> 130 <style scoped lang="scss">
99 @import "~@/styles/public.scss"; 131 @import "~@/styles/public.scss";
......
...@@ -130,7 +130,6 @@ export default { ...@@ -130,7 +130,6 @@ export default {
130 } 130 }
131 }, 131 },
132 queryChick () { 132 queryChick () {
133 debugger;
134 this.addJtfc.djSqcxDO = { ...this.ruleForm } 133 this.addJtfc.djSqcxDO = { ...this.ruleForm }
135 // this.$message({ 134 // this.$message({
136 // type: 'success', 135 // type: 'success',
......
...@@ -2,32 +2,59 @@ ...@@ -2,32 +2,59 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <!-- 家庭房产 --> 3 <!-- 家庭房产 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="queryForm" @submit.native.prevent ref="queryForm" label-width="70px"> 5 <el-form
6 :model="queryForm"
7 @submit.native.prevent
8 ref="queryForm"
9 label-width="70px"
10 >
6 <el-row> 11 <el-row>
7 <el-col :span="5"> 12 <el-col :span="5">
8 <el-form-item label="查询编号"> 13 <el-form-item label="查询编号">
9 <el-input placeholder="请输入查询编号" @clear="queryClick()" v-model="queryForm.cxbh" clearable class="width100"> 14 <el-input
15 placeholder="请输入查询编号"
16 @clear="queryClick()"
17 v-model="queryForm.cxbh"
18 clearable
19 class="width100"
20 >
10 </el-input> 21 </el-input>
11 </el-form-item> 22 </el-form-item>
12 </el-col> 23 </el-col>
13 <el-col :span="5"> 24 <el-col :span="5">
14 <el-form-item label="申请人"> 25 <el-form-item label="申请人">
15 <el-input placeholder="请输入申请人" @clear="queryClick()" v-model="queryForm.sqr" clearable class="width100"> 26 <el-input
27 placeholder="请输入申请人"
28 @clear="queryClick()"
29 v-model="queryForm.sqr"
30 clearable
31 class="width100"
32 >
16 </el-input> 33 </el-input>
17 </el-form-item> 34 </el-form-item>
18 </el-col> 35 </el-col>
19 <el-col :span="14" class="btnColRight"> 36 <el-col :span="14" class="btnColRight">
20 <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button> 37 <el-button type="primary" native-type="submit" @click="queryClick()"
38 >查询</el-button
39 >
21 <el-button type="primary" @click="handleAdd">新增</el-button> 40 <el-button type="primary" @click="handleAdd">新增</el-button>
22 </el-col> 41 </el-col>
23 </el-row> 42 </el-row>
24 </el-form> 43 </el-form>
25 </div> 44 </div>
26 <!-- 表格 --> 45 <!-- 表格 -->
27 <div class="from-clues-content"> 46 <div class="from-clues-content" id="divcontentid">
28 <lb-table :page-size="pageData.size" border id="jtfc" :current-page.sync="pageData.current" 47 <lb-table
29 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 48 :page-size="pageData.size"
30 :column="tableData.columns" :data="tableData.data"> 49 border
50 id="jtfc"
51 :current-page.sync="pageData.current"
52 :total="tableData.total"
53 @size-change="handleSizeChange"
54 @p-current-change="handleCurrentChange"
55 :column="tableData.columns"
56 :data="tableData.data"
57 >
31 </lb-table> 58 </lb-table>
32 </div> 59 </div>
33 <addjtfc v-model="isDialog" /> 60 <addjtfc v-model="isDialog" />
...@@ -42,10 +69,10 @@ export default { ...@@ -42,10 +69,10 @@ export default {
42 name: "jtfc", 69 name: "jtfc",
43 components: { addjtfc }, 70 components: { addjtfc },
44 mixins: [table], 71 mixins: [table],
45 mounted () { 72 mounted() {
46 sendThis(this); 73 sendThis(this);
47 }, 74 },
48 data () { 75 data() {
49 return { 76 return {
50 isDialog: false, 77 isDialog: false,
51 sqrOption: [], 78 sqrOption: [],
...@@ -59,29 +86,33 @@ export default { ...@@ -59,29 +86,33 @@ export default {
59 columns: datas.columns(), 86 columns: datas.columns(),
60 data: [], 87 data: [],
61 }, 88 },
62
63 }; 89 };
64 }, 90 },
65 methods: { 91 methods: {
66 queryClick () { 92 //查询
93 queryClick() {
67 this.fetchData(); 94 this.fetchData();
68 }, 95 },
69 // 初始化数据 96 // 初始化数据
70 fetchData () { 97 fetchData() {
71 getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#jtfc' }).then((res) => { 98 this.$startLoading("divcontentid");
99 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
100 this.$endLoading();
101 if (res.code === 200) {
72 let { records, total } = res.result; 102 let { records, total } = res.result;
73 this.tableData.data = records; 103 this.tableData.data = records;
74 this.tableData.total = total; 104 this.tableData.total = total;
105 }
75 }); 106 });
76 }, 107 },
77 handleSort (name, sort) { 108 handleSort(name, sort) {
78 console.log(name, sort); 109 console.log(name, sort);
79 }, 110 },
80 handleAdd () { 111 handleAdd() {
81 this.isDialog = true; 112 this.isDialog = true;
82 } 113 },
83 } 114 },
84 } 115 };
85 </script> 116 </script>
86 <style scoped lang="scss"> 117 <style scoped lang="scss">
87 @import "~@/styles/public.scss"; 118 @import "~@/styles/public.scss";
......
...@@ -2,23 +2,45 @@ ...@@ -2,23 +2,45 @@
2 <div class="from-clues"> 2 <div class="from-clues">
3 <!-- 表单部分 --> 3 <!-- 表单部分 -->
4 <div class="from-clues-header"> 4 <div class="from-clues-header">
5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="70px"> 5 <el-form
6 :model="queryForm"
7 ref="queryForm"
8 @submit.native.prevent
9 label-width="70px"
10 >
6 <el-row> 11 <el-row>
7 <el-col :span="5"> 12 <el-col :span="5">
8 <el-form-item label="查询编号"> 13 <el-form-item label="查询编号">
9 <el-input placeholder="请输入编号" @clear="queryClick()" v-model="queryForm.cxbh" class="width100" clearable> 14 <el-input
15 placeholder="请输入编号"
16 @clear="queryClick()"
17 v-model="queryForm.cxbh"
18 class="width100"
19 clearable
20 >
10 </el-input> 21 </el-input>
11 </el-form-item> 22 </el-form-item>
12 </el-col> 23 </el-col>
13 <el-col :span="5"> 24 <el-col :span="5">
14 <el-form-item label="申请人"> 25 <el-form-item label="申请人">
15 <el-input placeholder="请输入申请人" @clear="queryClick()" v-model="queryForm.sqr" class="width100" clearable> 26 <el-input
27 placeholder="请输入申请人"
28 @clear="queryClick()"
29 v-model="queryForm.sqr"
30 class="width100"
31 clearable
32 >
16 </el-input> 33 </el-input>
17 </el-form-item> 34 </el-form-item>
18 </el-col> 35 </el-col>
19 <el-col :span="14" class="btnColRight"> 36 <el-col :span="14" class="btnColRight">
20 <el-form-item> 37 <el-form-item>
21 <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button> 38 <el-button
39 type="primary"
40 native-type="submit"
41 @click="queryClick()"
42 >查询</el-button
43 >
22 <el-button @click="moreQueryClick()">高级查询</el-button> 44 <el-button @click="moreQueryClick()">高级查询</el-button>
23 </el-form-item> 45 </el-form-item>
24 </el-col> 46 </el-col>
...@@ -26,10 +48,19 @@ ...@@ -26,10 +48,19 @@
26 </el-form> 48 </el-form>
27 </div> 49 </div>
28 <!-- 表格 --> 50 <!-- 表格 -->
29 <div class="from-clues-content"> 51 <div class="from-clues-content" id="divcontentid">
30 <lb-table :page-size="pageData.size" border id="sqcxjl" @sort-change="handleSort" 52 <lb-table
31 :current-page.sync="pageData.current" :total="tableData.total" @size-change="handleSizeChange" 53 :page-size="pageData.size"
32 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 54 border
55 id="sqcxjl"
56 @sort-change="handleSort"
57 :current-page.sync="pageData.current"
58 :total="tableData.total"
59 @size-change="handleSizeChange"
60 @p-current-change="handleCurrentChange"
61 :column="tableData.columns"
62 :data="tableData.data"
63 >
33 </lb-table> 64 </lb-table>
34 </div> 65 </div>
35 </div> 66 </div>
...@@ -41,10 +72,10 @@ import { getJtfcPage } from "@/api/jtfc"; ...@@ -41,10 +72,10 @@ import { getJtfcPage } from "@/api/jtfc";
41 export default { 72 export default {
42 name: "sqcxjl", 73 name: "sqcxjl",
43 mixins: [table], 74 mixins: [table],
44 mounted () { 75 mounted() {
45 sendThis(this); 76 sendThis(this);
46 }, 77 },
47 data () { 78 data() {
48 return { 79 return {
49 queryForm: { 80 queryForm: {
50 cxbh: "", 81 cxbh: "",
...@@ -58,41 +89,38 @@ export default { ...@@ -58,41 +89,38 @@ export default {
58 }; 89 };
59 }, 90 },
60 methods: { 91 methods: {
61 queryClick () { 92 queryClick() {
62 this.fetchData(); 93 this.fetchData();
63 }, 94 },
64 // 初始化数据 95 // 初始化数据
65 fetchData () { 96 fetchData() {
66 97 this.$startLoading("divcontentid");
67 getJtfcPage({ ...this.queryForm, ...this.pageData }, { 'target': '#sqcxjl' }).then((res) => { 98 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
99 this.$endLoading();
100 if (res.code === 200) {
68 let { records, total } = res.result; 101 let { records, total } = res.result;
69 this.tableData.data = records; 102 this.tableData.data = records;
70 this.tableData.total = total; 103 this.tableData.total = total;
104 }
71 }); 105 });
72 }, 106 },
73 handleSort (name, sort) { 107 handleSort(name, sort) {
74 console.log(name, sort); 108 console.log(name, sort);
75 }, 109 },
76 // 查看 110 // 查看
77 handleViewClick (scope) { 111 handleViewClick(scope) {
78 var sqcxBsm = scope.row.bsmSqcx; 112 var sqcxBsm = scope.row.bsmSqcx;
79 this.$popup({ 113 this.$popup("申请查询记录", "sqcx/sqcxjl/components/sqcxjlInfo", {
80 title: "申请查询记录", 114 height: "800px",
81 width: "85%",
82 btnShow: true,
83 editItem: "sqcx/sqcxjl/components/sqcxjlInfo", // 弹窗内容
84 height: "700px",
85 formData: { 115 formData: {
86 sqcxBsm: sqcxBsm, 116 sqcxBsm: sqcxBsm,
87 }, 117 },
88 cancel: function () { }, //取消事件的回调 118 cancel: function () {}, //取消事件的回调
89 confirm: function () { 119 confirm: function () {},
90 // that.loadBdcdylist(); 120 });
91 }, //确认事件的回调 121 },
92 }) 122 },
93 } 123 };
94 }
95 }
96 </script> 124 </script>
97 <style scoped lang="scss"> 125 <style scoped lang="scss">
98 @import "~@/styles/public.scss"; 126 @import "~@/styles/public.scss";
......