Skip to content

bdc / bdcdj-web

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

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

2 parents c4e6187f 2b4d0cd3
Inline Side-by-side
Showing 7 changed files with 43 additions and 36 deletions
...@@ -21,6 +21,5 @@ yarn-error.log* ...@@ -21,6 +21,5 @@ yarn-error.log*
21 *.njsproj 21 *.njsproj
22 *.sln 22 *.sln
23 *.sw? 23 *.sw?
24 /src/api/config.js
25 24
26 package-lock.json 25 package-lock.json
......
1 /*
2 * @Description: api请求配置文件
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-02 13:56:25
5 */
6 export default {
7 SERVERAPI: '/service-jiao', // 泽平
8 // SERVERAPI: '/service-bdcdj' // 38服务器地址
9 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -210,7 +210,7 @@ export function selectZrz (data) { ...@@ -210,7 +210,7 @@ export function selectZrz (data) {
210 } 210 }
211 211
212 /* 212 /*
213 业务办理-选择单元-查询自然幢信息 213 业务办理-选择单元-查询多幢幢信息
214 */ 214 */
215 export function selectDz (data) { 215 export function selectDz (data) {
216 return request({ 216 return request({
......
1 /*
2 * @Description: 引入公共组件
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-02 13:25:48
5 */
1 import dialogBox from '@/components/dialogBox/dialogBox.vue' 6 import dialogBox from '@/components/dialogBox/dialogBox.vue'
2 import LbTable from '@/components/LbTable/lb-table.vue' 7 import LbTable from '@/components/LbTable/lb-table.vue'
3 import Theme from '@/components/Theme/theme.vue' 8 import Theme from '@/components/Theme/theme.vue'
......
...@@ -91,22 +91,10 @@ ...@@ -91,22 +91,10 @@
91 </el-row> 91 </el-row>
92 <el-row> 92 <el-row>
93 <el-col :span="7"> 93 <el-col :span="7">
94 <el-form-item label="自然幢号">
95 <el-input placeholder="请输入自然幢号" v-model="querydzForm.zrzh" clearable>
96 </el-input>
97 </el-form-item>
98 </el-col>
99 <el-col :span="7">
100 <el-form-item label="项目名称"> 94 <el-form-item label="项目名称">
101 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input> 95 <el-input placeholder="请输入项目名称" v-model="querydzForm.xmmc"></el-input>
102 </el-form-item> 96 </el-form-item>
103 </el-col> 97 </el-col>
104 <el-col :span="7">
105 <el-form-item label="建筑物名称">
106 <el-input placeholder="请输入建筑物名称" v-model="querydzForm.jzwmc" clearable>
107 </el-input>
108 </el-form-item>
109 </el-col>
110 98
111 <el-col :span="3" class="btnColRight"> 99 <el-col :span="3" class="btnColRight">
112 <el-form-item> 100 <el-form-item>
...@@ -136,7 +124,7 @@ ...@@ -136,7 +124,7 @@
136 // import { datasduo, sendThisduo } from "../javascript/fwsyqduo.js"; 124 // import { datasduo, sendThisduo } from "../javascript/fwsyqduo.js";
137 import table from "@/utils/mixin/table"; 125 import table from "@/utils/mixin/table";
138 import jump from "@/views/ywbl/ywsq/components/mixin/jump"; 126 import jump from "@/views/ywbl/ywsq/components/mixin/jump";
139 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectH } from "@/api/ywbl.js"; 127 import { selectScBdcdy, startBusinessFlow, choiceBdcdy, selectOtherH, selectZrz, selectDz } from "@/api/ywbl.js";
140 export default { 128 export default {
141 mixins: [table, jump], 129 mixins: [table, jump],
142 props: { 130 props: {
...@@ -195,7 +183,7 @@ ...@@ -195,7 +183,7 @@
195 } else { 183 } else {
196 this.querydzForm.sqywbm = this.sqywInfo.djywbm; 184 this.querydzForm.sqywbm = this.sqywInfo.djywbm;
197 this.querydzForm.fwfl = this.activeName; 185 this.querydzForm.fwfl = this.activeName;
198 selectH({ ...this.querydzForm, ...this.pageData }).then((res) => { 186 selectDz({ ...this.querydzForm, ...this.pageData }).then((res) => {
199 if (res.code === 200) { 187 if (res.code === 200) {
200 this.dztableData.total = res.result.total; 188 this.dztableData.total = res.result.total;
201 this.dztableData.data = res.result.records; 189 this.dztableData.data = res.result.records;
......
...@@ -177,14 +177,14 @@ class data extends filter { ...@@ -177,14 +177,14 @@ class data extends filter {
177 prop: "xmmc", 177 prop: "xmmc",
178 label: "项目名称", 178 label: "项目名称",
179 }, 179 },
180 { 180 // {
181 prop: "zrzh", 181 // prop: "zrzh",
182 label: "自然幢号", 182 // label: "自然幢号",
183 }, 183 // },
184 { 184 // {
185 prop: "jzwmc", 185 // prop: "jzwmc",
186 label: "建筑物名称", 186 // label: "建筑物名称",
187 }, 187 // },
188 { 188 {
189 label: "土地/房屋性质", 189 label: "土地/房屋性质",
190 render: (h, scope) => { 190 render: (h, scope) => {
...@@ -200,7 +200,7 @@ class data extends filter { ...@@ -200,7 +200,7 @@ class data extends filter {
200 render: (h, scope) => { 200 render: (h, scope) => {
201 return ( 201 return (
202 <div> 202 <div>
203 {(scope.row.zdmj) + (' / ') + (scope.row.scjzmj)} 203 {(scope.row.zdmj) + (' / ') + (scope.row.dzmj)}
204 </div> 204 </div>
205 ) 205 )
206 } 206 }
...@@ -227,17 +227,17 @@ class data extends filter { ...@@ -227,17 +227,17 @@ class data extends filter {
227 }, 227 },
228 { 228 {
229 prop: "zl", 229 prop: "zl",
230 label: "自然幢坐落", 230 label: "多幢坐落",
231 },
232 {
233 label: '操作',
234 width: '80',
235 align: 'center',
236 fixed: 'right',
237 render: (h, scope) => {
238 return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
239 }
240 } 231 }
232 // {
233 // label: '操作',
234 // width: '80',
235 // align: 'center',
236 // fixed: 'right',
237 // render: (h, scope) => {
238 // return <el-button type="text" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
239 // }
240 // }
241 ] 241 ]
242 } 242 }
243 243
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-03-02 14:04:16
5 -->
1 <template> 6 <template>
2 <dialogBox :title="title" width="85%" @closeDialog="closeDialog" v-model="value" isMain :isButton="false"> 7 <dialogBox :title="title" width="85%" @closeDialog="closeDialog" v-model="value" isMain :isButton="false">
3 <component :is="router" :sqywInfo="sqywInfo" @closeDialog="closeDialog" @updateDialog="updateDialog" /> 8 <component :is="router" :sqywInfo="sqywInfo" @closeDialog="closeDialog" @updateDialog="updateDialog" />
...@@ -9,6 +14,7 @@ export default { ...@@ -9,6 +14,7 @@ export default {
9 props: { 14 props: {
10 value: { type: Boolean, default: true }, 15 value: { type: Boolean, default: true },
11 sqywInfo: { type: Object, default: () => { } }, 16 sqywInfo: { type: Object, default: () => { } },
17 djywbm: { type: String, default: '' }
12 }, 18 },
13 data () { 19 data () {
14 return { 20 return {
...@@ -20,7 +26,7 @@ export default { ...@@ -20,7 +26,7 @@ export default {
20 value (val) { 26 value (val) {
21 if (val) { 27 if (val) {
22 this.title = "申请业务：" + this.sqywInfo?.djywmc ? this.sqywInfo?.djywmc : ''; 28 this.title = "申请业务：" + this.sqywInfo?.djywmc ? this.sqywInfo?.djywmc : '';
23 let view = queueDjywmc(this.sqywInfo?.djywbm); 29 let view = queueDjywmc(this.sqywInfo?.djywbm || this.djywbm);
24 this.router = this.loadView(view); 30 this.router = this.loadView(view);
25 } 31 }
26 }, 32 },
......