Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
2d24031e by 田浩浩
Options

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

2 parents ea24656d 17ab45eb
Expand all
Inline Side-by-side
Showing 10 changed files with 89 additions and 58 deletions
...@@ -64,14 +64,15 @@ ...@@ -64,14 +64,15 @@
64 64
65 // 有子级 65 // 有子级
66 .el-submenu__title { 66 .el-submenu__title {
67 margin-left: 13px; 67 // margin-left: 13px;
68 padding-left: 10px !important; 68 // padding-left: 10px !important;
69 color: $menuText; 69 color: $menuText;
70 background-color: transparent !important; 70 background-color: transparent !important;
71 border-bottom: 1px solid $sliderBorderColor;
71 72
72 &:hover { 73 &:hover {
73 color: $subMenuActiveText !important; 74 color: $subMenuActiveText !important;
74 background-color: $subMenuHover !important; 75 background-color: $menuHover !important;
75 76
76 .svg-icon, 77 .svg-icon,
77 i, 78 i,
...@@ -84,10 +85,11 @@ ...@@ -84,10 +85,11 @@
84 // 没有子级 85 // 没有子级
85 .submenu-title-noDropdown { 86 .submenu-title-noDropdown {
86 color: $menuText; 87 color: $menuText;
87 border-radius: 6px; 88 border-bottom: 1px solid $sliderBorderColor;
88 padding-left: 10px !important;
89 89
90 &:hover { 90 // border-radius: 6px;
91 // padding-left: 10px !important;
92 b &:hover {
91 color: $menuActiveText !important; 93 color: $menuActiveText !important;
92 background-color: $subMenuHover !important; 94 background-color: $subMenuHover !important;
93 95
...@@ -119,8 +121,8 @@ ...@@ -119,8 +121,8 @@
119 .el-submenu__title { 121 .el-submenu__title {
120 font-weight: 600; 122 font-weight: 600;
121 font-size: $sideBarFontSize; 123 font-size: $sideBarFontSize;
122 margin: 0 10px; 124 // margin: 0 10px;
123 border-radius: 6px; 125 // border-radius: 6px;
124 126
125 >i { 127 >i {
126 color: $subMenuActiveText !important; 128 color: $subMenuActiveText !important;
...@@ -151,22 +153,30 @@ ...@@ -151,22 +153,30 @@
151 153
152 & .nest-menu .el-submenu>.el-submenu__title, 154 & .nest-menu .el-submenu>.el-submenu__title,
153 & .el-submenu .el-menu-item { 155 & .el-submenu .el-menu-item {
156
157
154 &.is-active { 158 &.is-active {
155 background-color: $subMenuHover !important; 159 background-color: $subMenuHover !important;
156 color: $menuActiveText !important; 160 color: $menuActiveText !important;
161 border-bottom: 1px solid $sliderBorderColor;
157 } 162 }
158 163
159 &:hover { 164 &:hover {
160 background-color: $subMenuHover !important; 165 background-color: $subMenuHover !important;
161 color: $menuActiveText !important; 166 color: $menuActiveText !important;
167 border-bottom: 1px solid $sliderBorderColor;
162 } 168 }
163 169
164 min-width: 130px !important; 170 min-width: 130px !important;
165 background-color: transparent !important; 171 background-color: transparent !important;
166 font-weight: 600; 172 font-weight: 600;
167 font-size: $sideBarFontSize; 173 font-size: $sideBarFontSize;
168 margin: 0 10px; 174
169 border-radius: 6px; 175 // margin: 0 10px;
176 // border-radius: 6px;
177 span {
178 margin-left: 10px;
179 }
170 } 180 }
171 } 181 }
172 182
...@@ -279,9 +289,9 @@ ...@@ -279,9 +289,9 @@
279 289
280 .nest-menu .el-submenu>.el-submenu__title, 290 .nest-menu .el-submenu>.el-submenu__title,
281 .el-menu-item { 291 .el-menu-item {
282 width: calc(100% - 12px); 292 // width: calc(100% - 12px);
283 border-top-right-radius: 8px; 293 // border-top-right-radius: 8px;
284 border-bottom-right-radius: 8px; 294 // border-bottom-right-radius: 8px;
285 font-weight: 600 !important; 295 font-weight: 600 !important;
286 font-size: 15px !important; 296 font-size: 15px !important;
287 background-color: $menuHover !important; 297 background-color: $menuHover !important;
......
...@@ -17,7 +17,7 @@ $menuActiveText:#ffffff; ...@@ -17,7 +17,7 @@ $menuActiveText:#ffffff;
17 $subMenuActiveText:#ffffff; 17 $subMenuActiveText:#ffffff;
18 18
19 $menuBg:#202B3D; 19 $menuBg:#202B3D;
20 $menuHover:#0794FF; 20 $menuHover:#226ca5;
21 21
22 $subMenuBg:#202B3D; 22 $subMenuBg:#202B3D;
23 $subMenuHover:#0794FF; 23 $subMenuHover:#0794FF;
...@@ -27,6 +27,8 @@ $sideBarFontSize:15px; ...@@ -27,6 +27,8 @@ $sideBarFontSize:15px;
27 27
28 // border颜色 28 // border颜色
29 $borderColor: #EBEEF5; 29 $borderColor: #EBEEF5;
30 $sliderBorderColor: #606266;
31
30 32
31 // the :export directive is the magic sauce for webpack 33 // the :export directive is the magic sauce for webpack
32 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass 34 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
......
...@@ -21,14 +21,12 @@ ...@@ -21,14 +21,12 @@
21 </el-col> 21 </el-col>
22 </el-row> 22 </el-row>
23 </el-form> 23 </el-form>
24 <!-- <personInfoTable @getInfoList="handleGetSqList" :dataList="form.sqrList" /> --> 24 <lb-table :column="sqrColumns" key="sqr1" :data="form.sqrList" :maxHeight="200" heightNumSetting
25 <lb-table border :column="sqrColumns" key="sqr1" :data="form.sqrList" :maxHeight="200" heightNumSetting
26 :pagination="false"> 25 :pagination="false">
27 </lb-table> 26 </lb-table>
28 27
29 <b class="title">权利人</b> 28 <b class="title">权利人</b>
30 <!-- <personInfoTable @getInfoList="handleGetQlList" :dataList="form.qlrList" :isGanged="isGanged" /> --> 29 <lb-table :column="qlrColumns" key="ql2r" :data="form.qlrList" :maxHeight="200" heightNumSetting
31 <lb-table border :column="qlrColumns" key="ql2r" :data="form.qlrList" :maxHeight="200" heightNumSetting
32 :pagination="false"> 30 :pagination="false">
33 </lb-table> 31 </lb-table>
34 <div v-show="isSearch"> 32 <div v-show="isSearch">
...@@ -41,10 +39,10 @@ ...@@ -41,10 +39,10 @@
41 <el-divider></el-divider> 39 <el-divider></el-divider>
42 <div class="submit-button" style="padding-bottom:50px"> 40 <div class="submit-button" style="padding-bottom:50px">
43 <el-button @click="resetClick">重置</el-button> 41 <el-button @click="resetClick">重置</el-button>
44 <el-button type="primary" v-show="isSearch==false" @click="queryChick">查询</el-button> 42 <el-button type="primary" v-show="isSearch == false" @click="queryChick">查询</el-button>
45 <el-button type="primary" v-show="isSearch&&form.dyjlList.length > 0">房产结果打印（{{form.dyjlList.length}}） 43 <el-button type="primary" v-show="isSearch && form.dyjlList.length > 0">房产结果打印（{{ form.dyjlList.length }}）
46 </el-button> 44 </el-button>
47 <el-button type="primary" v-show="isSearch&&form.dyjlList.length == 0">无房证明打印（{{form.dyjlList.length}}） 45 <el-button type="primary" v-show="isSearch && form.dyjlList.length == 0">无房证明打印（{{ form.dyjlList.length }}）
48 </el-button> 46 </el-button>
49 <el-button @click="closeDialog">关闭</el-button> 47 <el-button @click="closeDialog">关闭</el-button>
50 </div> 48 </div>
...@@ -68,10 +66,10 @@ export default { ...@@ -68,10 +66,10 @@ export default {
68 value: { type: Boolean, default: false }, 66 value: { type: Boolean, default: false },
69 bsmSqcx: { type: String, default: "" }, 67 bsmSqcx: { type: String, default: "" },
70 }, 68 },
71 mounted() { 69 mounted () {
72 sendThis(this); 70 sendThis(this);
73 }, 71 },
74 data() { 72 data () {
75 return { 73 return {
76 myValue: this.value, 74 myValue: this.value,
77 //是否查询 75 //是否查询
...@@ -99,7 +97,7 @@ export default { ...@@ -99,7 +97,7 @@ export default {
99 }; 97 };
100 }, 98 },
101 watch: { 99 watch: {
102 value(val) { 100 value (val) {
103 this.myValue = val; 101 this.myValue = val;
104 if (val) { 102 if (val) {
105 //this.$alert(this.bsmSqcx); 103 //this.$alert(this.bsmSqcx);
...@@ -109,9 +107,9 @@ export default { ...@@ -109,9 +107,9 @@ export default {
109 } else { 107 } else {
110 this.loadData(); 108 this.loadData();
111 } 109 }
112 } 110 }
113 }, 111 },
114 "form.djSqcxDO.ycyrgx"(val) { 112 "form.djSqcxDO.ycyrgx" (val) {
115 if (val == "1") { 113 if (val == "1") {
116 this.form.qlrList = this.form.sqrList; 114 this.form.qlrList = this.form.sqrList;
117 } else { 115 } else {
...@@ -119,15 +117,17 @@ export default { ...@@ -119,15 +117,17 @@ export default {
119 this.add("qlr"); 117 this.add("qlr");
120 } 118 }
121 }, 119 },
122 "form.sqrList"(val) { 120 "form.sqrList" (val) {
123 //this.$alert(val); 121 if (this.form.djSqcxDO.ycyrgx == '1') {
124 }, 122 this.form.qlrList = this.form.sqrList
123 }
124 }
125 }, 125 },
126 methods: { 126 methods: {
127 closeDialog() { 127 closeDialog () {
128 this.$emit("input", false); 128 this.$emit("input", false);
129 }, 129 },
130 loadData() { 130 loadData () {
131 this.$startLoading(); 131 this.$startLoading();
132 getJtfcInfo({ sqcxBsm: sqcxBsm }).then((res) => { 132 getJtfcInfo({ sqcxBsm: sqcxBsm }).then((res) => {
133 this.$endLoading(); 133 this.$endLoading();
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,7 @@ export default {
137 } 137 }
138 }); 138 });
139 }, 139 },
140 queryChick() { 140 queryChick () {
141 this.$startLoading(); 141 this.$startLoading();
142 addJtfcCxjgXx(this.form).then((res) => { 142 addJtfcCxjgXx(this.form).then((res) => {
143 this.$endLoading(); 143 this.$endLoading();
...@@ -148,30 +148,30 @@ export default { ...@@ -148,30 +148,30 @@ export default {
148 } 148 }
149 }); 149 });
150 }, 150 },
151 resetClick() { 151 resetClick () {
152 this.form.djSqcxDO = { ycyrgx: "1", cxyt: "" }; 152 this.form.djSqcxDO = { ycyrgx: "1", cxyt: "" };
153 this.form.sqrList = _.cloneDeep([this.newData]); 153 this.form.sqrList = _.cloneDeep([this.newData]);
154 this.form.qlrList =_.cloneDeep([this.newData]); 154 this.form.qlrList = _.cloneDeep([this.newData]);
155 this.form.cxjgList = []; 155 this.form.cxjgList = [];
156 this.form.dyjlList = []; 156 this.form.dyjlList = [];
157 this.isSearch = false; 157 this.isSearch = false;
158 }, 158 },
159 handleRead(scope) {}, 159 handleRead (scope) { },
160 add(type) { 160 add (type) {
161 if (type == "sqr") { 161 if (type == "sqr") {
162 this.form.sqrList.push(this.newData); 162 this.form.sqrList.push(_.cloneDeep(this.newData));
163 } else { 163 } else {
164 this.form.qlrList.push(this.newData); 164 this.form.qlrList.push(_.cloneDeep(this.newData));
165 } 165 }
166 }, 166 },
167 remove(index, row, type) { 167 remove (index, row, type) {
168 if (type == "sqr") { 168 if (type == "sqr") {
169 this.form.sqrList.splice(index, 1); 169 this.form.sqrList.splice(index, 1);
170 } else { 170 } else {
171 this.form.qlrList.splice(index, 1); 171 this.form.qlrList.splice(index, 1);
172 } 172 }
173 }, 173 },
174 teltest(row) { 174 teltest (row) {
175 const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/; 175 const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/;
176 if (row.lxdh == "" || row.lxdh.length <= 10 || !reg.test(row.lxdh)) { 176 if (row.lxdh == "" || row.lxdh.length <= 10 || !reg.test(row.lxdh)) {
177 row.inputErr = true; 177 row.inputErr = true;
......
...@@ -8,7 +8,7 @@ class data extends filter { ...@@ -8,7 +8,7 @@ class data extends filter {
8 constructor() { 8 constructor() {
9 super() 9 super()
10 } 10 }
11 columns() { 11 columns () {
12 return [ 12 return [
13 { 13 {
14 prop: 'qszt', 14 prop: 'qszt',
...@@ -74,7 +74,7 @@ class data extends filter { ...@@ -74,7 +74,7 @@ class data extends filter {
74 } 74 }
75 ] 75 ]
76 } 76 }
77 sqrCol() { 77 sqrCol () {
78 return [ 78 return [
79 { 79 {
80 width: "60", 80 width: "60",
...@@ -94,7 +94,7 @@ class data extends filter { ...@@ -94,7 +94,7 @@ class data extends filter {
94 <i 94 <i
95 class="el-icon-minus pointer" 95 class="el-icon-minus pointer"
96 onClick={() => { 96 onClick={() => {
97 vm.remove(scope.$index, scope.row,"sqr"); 97 vm.remove(scope.$index, scope.row, "sqr");
98 }} 98 }}
99 ></i> 99 ></i>
100 ); 100 );
...@@ -142,6 +142,7 @@ class data extends filter { ...@@ -142,6 +142,7 @@ class data extends filter {
142 return ( 142 return (
143 <el-select 143 <el-select
144 class="width100" 144 class="width100"
145 clearable
145 value={scope.row[scope.column.property]} 146 value={scope.row[scope.column.property]}
146 onChange={(val) => { 147 onChange={(val) => {
147 scope.row[scope.column.property] = val; 148 scope.row[scope.column.property] = val;
...@@ -211,7 +212,7 @@ class data extends filter { ...@@ -211,7 +212,7 @@ class data extends filter {
211 }, 212 },
212 ] 213 ]
213 } 214 }
214 qlrCol() { 215 qlrCol () {
215 return [ 216 return [
216 { 217 {
217 width: "60", 218 width: "60",
...@@ -231,7 +232,7 @@ class data extends filter { ...@@ -231,7 +232,7 @@ class data extends filter {
231 <i 232 <i
232 class="el-icon-minus pointer" 233 class="el-icon-minus pointer"
233 onClick={() => { 234 onClick={() => {
234 vm.remove(scope.$index, scope.row,"qlr"); 235 vm.remove(scope.$index, scope.row, "qlr");
235 }} 236 }}
236 ></i> 237 ></i>
237 ); 238 );
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
3 作者：calliope 3 作者：calliope
4 --> 4 -->
5 <template> 5 <template>
6 <lb-table border :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting 6 <lb-table :column="tableData.columns" :data="tableData.data" :maxHeight="200" heightNumSetting :pagination="false">
7 :pagination="false">
8 </lb-table> 7 </lb-table>
9 </template> 8 </template>
10 <script> 9 <script>
...@@ -13,7 +12,7 @@ export default { ...@@ -13,7 +12,7 @@ export default {
13 props: { 12 props: {
14 dataList: { type: Array, default: () => [{}] }, 13 dataList: { type: Array, default: () => [{}] },
15 }, 14 },
16 created() { 15 created () {
17 if (this.dataList.length == 0) { 16 if (this.dataList.length == 0) {
18 this.add(); 17 this.add();
19 } 18 }
...@@ -21,7 +20,7 @@ export default { ...@@ -21,7 +20,7 @@ export default {
21 computed: { 20 computed: {
22 ...mapGetters(["dictData"]), 21 ...mapGetters(["dictData"]),
23 }, 22 },
24 data() { 23 data () {
25 return { 24 return {
26 tableData: { 25 tableData: {
27 columns: [ 26 columns: [
...@@ -184,7 +183,7 @@ export default { ...@@ -184,7 +183,7 @@ export default {
184 // }, 183 // },
185 }, 184 },
186 methods: { 185 methods: {
187 add() { 186 add () {
188 this.tableData.data.push({ 187 this.tableData.data.push({
189 sqrxm: "", 188 sqrxm: "",
190 sqrzjlxbm: "", 189 sqrzjlxbm: "",
...@@ -193,10 +192,10 @@ export default { ...@@ -193,10 +192,10 @@ export default {
193 inputErr: false, 192 inputErr: false,
194 }); 193 });
195 }, 194 },
196 remove(index, row) { 195 remove (index, row) {
197 this.tableData.data.splice(index, 1); 196 this.tableData.data.splice(index, 1);
198 }, 197 },
199 teltest(row) { 198 teltest (row) {
200 const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/; 199 const reg = /^1([38]\d|5[0-35-9]|7[3678])\d{8}$/;
201 if (row.lxdh == "" || row.lxdh.length <= 10 || !reg.test(row.lxdh)) { 200 if (row.lxdh == "" || row.lxdh.length <= 10 || !reg.test(row.lxdh)) {
202 row.inputErr = true; 201 row.inputErr = true;
......
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
86 label: "联系电话" 86 label: "联系电话"
87 }, 87 },
88 { 88 {
89 label: '修改', 89 label: '操作',
90 render: (h, scope) => { 90 render: (h, scope) => {
91 return ( 91 return (
92 <div> 92 <div>
...@@ -98,6 +98,7 @@ export default { ...@@ -98,6 +98,7 @@ export default {
98 icon="el-icon-edit-outline" 98 icon="el-icon-edit-outline"
99 type="text" 99 type="text"
100 onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button> 100 onClick={() => { this.editClick(scope.$index, scope.row) }}>编辑</el-button>
101
101 } 102 }
102 </div> 103 </div>
103 ) 104 )
...@@ -131,7 +132,9 @@ export default { ...@@ -131,7 +132,9 @@ export default {
131 handler (newVal, oldValue) { 132 handler (newVal, oldValue) {
132 let dataList = _.cloneDeep(this.InformationTable) 133 let dataList = _.cloneDeep(this.InformationTable)
133 if (newVal == 0) { 134 if (newVal == 0) {
134 this.column = _.cloneDeep(dataList).slice(1, dataList.length) 135 // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
136 this.column = _.cloneDeep(dataList)
137
135 } else if ((newVal == '1' || newVal == '3')) { 138 } else if ((newVal == '1' || newVal == '3')) {
136 this.column = dataList 139 this.column = dataList
137 } else { 140 } else {
...@@ -148,7 +151,6 @@ export default { ...@@ -148,7 +151,6 @@ export default {
148 }, 151 },
149 methods: { 152 methods: {
150 handleupdateDetail (value) { 153 handleupdateDetail (value) {
151 debugger
152 if(this.isaddupdate){ 154 if(this.isaddupdate){
153 if (!_.isEqual(value, this.tableData)) { 155 if (!_.isEqual(value, this.tableData)) {
154 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value); 156 this.tableDataList[this.tableDataList.length] = _.cloneDeep(value);
...@@ -170,7 +172,14 @@ export default { ...@@ -170,7 +172,14 @@ export default {
170 172
171 // 删除 173 // 删除
172 deleClick (index, row) { 174 deleClick (index, row) {
173 this.tableData.splice(index, 1) 175 this.$confirm('确定要删除吗, 是否继续?', '提示', {
176 confirmButtonText: '确定',
177 cancelButtonText: '取消',
178 type: 'warning'
179 }).then(() => {
180 this.tableData.splice(index, 1)
181 }).catch(() => {
182 });
174 }, 183 },
175 184
176 // 身份证读取 185 // 身份证读取
......
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 <qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList" 171 <qlrCommonTable v-if="ruleForm.qlxx" @upDateQlrxxList="upDateQlrxxList" :tableData="ruleForm.qlrList"
172 :gyfs="ruleForm.qlxx.gyfs" /> 172 :gyfs="ruleForm.qlxx.gyfs" />
173 173
174 <div v-if="ruleForm.ywrList.length > 0"> 174 <div v-if="ruleForm.ywrList">
175 <div class="slxx_title title-block"> 175 <div class="slxx_title title-block">
176 义务人信息 176 义务人信息
177 <div class="triangle"></div> 177 <div class="triangle"></div>
......
...@@ -338,4 +338,4 @@ export default { ...@@ -338,4 +338,4 @@ export default {
338 /deep/.el-form-item__label { 338 /deep/.el-form-item__label {
339 padding-bottom: 0px; 339 padding-bottom: 0px;
340 } 340 }
341 </style>
...\ No newline at end of file ...\ No newline at end of file
341 </style>
......
...@@ -225,6 +225,16 @@ export default { ...@@ -225,6 +225,16 @@ export default {
225 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val)) 225 this.ruleForm.ywrList && (this.ruleForm.ywrList = _.cloneDeep(val))
226 }, 226 },
227 onSubmit () { 227 onSubmit () {
228 if(this.ruleForm.slywxx.gyfs=="0"){
229 if(this.ruleForm.qlrList.length>1){
230 this.$message({
231 showClose: true,
232 message: "共有方式：单独所有，权利人只能是一个人",
233 type: "error",
234 });
235 return false;
236 }
237 }
228 saveData(this.ruleForm).then((res) => { 238 saveData(this.ruleForm).then((res) => {
229 if (res.code === 200) { 239 if (res.code === 200) {
230 this.$message({ 240 this.$message({
......