Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
89a48c0c by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 53fe3b71 8a14a55c
Inline Side-by-side
Showing 5 changed files with 60 additions and 13 deletions
...@@ -84,13 +84,14 @@ export function getLpbTj (data) { ...@@ -84,13 +84,14 @@ export function getLpbTj (data) {
84 * zrzbsm 自然幢标识码 , 84 * zrzbsm 自然幢标识码 ,
85 * dpdm 自然幢号 , 85 * dpdm 自然幢号 ,
86 */ 86 */
87 export function batchGeneratorBdcdyh (dpdm,zrzbsm) { 87 export function batchGeneratorBdcdyh (dpdm,zrzbsm,override) {
88 return request({ 88 return request({
89 url: 'system/generator/batchGeneratorBdcdyh', 89 url: 'system/generator/batchGeneratorBdcdyh',
90 method: 'get', 90 method: 'get',
91 params: { 91 params: {
92 zrzbsm:zrzbsm, 92 zrzbsm:zrzbsm,
93 dpdm:dpdm, 93 dpdm:dpdm,
94 override:override
94 }, 95 },
95 }) 96 })
96 } 97 }
......
...@@ -235,6 +235,7 @@ ...@@ -235,6 +235,7 @@
235 </template> 235 </template>
236 <template v-if="!hasSyqx"> 236 <template v-if="!hasSyqx">
237 <el-col 237 <el-col
238 class="pr10"
238 :span="5" 239 :span="5"
239 :key="childIndex + '7'" 240 :key="childIndex + '7'"
240 :class="childIndex > 0 ? 'childYT' : ''" 241 :class="childIndex > 0 ? 'childYT' : ''"
...@@ -295,6 +296,7 @@ ...@@ -295,6 +296,7 @@
295 </ul> 296 </ul>
296 </el-col> 297 </el-col>
297 <el-col 298 <el-col
299 class="pr10"
298 :span="5" 300 :span="5"
299 :key="childIndex + '5'" 301 :key="childIndex + '5'"
300 :class="childIndex > 0 ? 'childYT' : ''" 302 :class="childIndex > 0 ? 'childYT' : ''"
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 </el-table-column> --> 35 </el-table-column> -->
36 <el-table-column label="操作" align="center" width="100"> 36 <el-table-column label="操作" align="center" width="100">
37 <template slot-scope="scope"> 37 <template slot-scope="scope">
38 <el-tooltip class="item" effect="light" content="办理" placement="top"> 38 <el-tooltip class="item" effect="light" content="查看" placement="top">
39 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i> 39 <i class="iconfont iconbanli iconfontEdit" @click="handleClick(scope.row)" style="padding:0 10px"></i>
40 </el-tooltip> 40 </el-tooltip>
41 <el-tooltip class="item" effect="light" content="定位" placement="top"> 41 <el-tooltip class="item" effect="light" content="定位" placement="top">
......
...@@ -630,16 +630,60 @@ export default { ...@@ -630,16 +630,60 @@ export default {
630 //批量添加不动产单元号 630 //批量添加不动产单元号
631 addBdcdyh() { 631 addBdcdyh() {
632 // this.pd[0].bsm //自然幢标识码 632 // this.pd[0].bsm //自然幢标识码
633 batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm).then( 633 batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then(
634 (res) => { 634 (res) => {
635 if (res.code === 200) { 635 if (res.code === 200) {
636 this.$message.success("生成完成！"); 636 this.$message.success("生成完成！");
637 } else { 637 } else if(res.code === 206){
638 this.$message.warning(res.message); 638 let hasGenerateCount = res.result.hasGenerateCount;
639 let unGenerateCount = res.result.unGenerateCount;
640 this.open(hasGenerateCount,unGenerateCount);
639 } 641 }
640 } 642 }
641 ); 643 );
642 }, 644 },
645
646 open(hasGenerateCount,unGenerateCount) {
647 const h = this.$createElement;
648 this.$msgbox({
649 title: '消息',
650 message: h('p', null, [
651 h('span', null, '未生成单元号有 '+unGenerateCount+'户,'),
652 h('span', null, '已经生成单元号有 '+hasGenerateCount+'户,'),
653 h('span', null, '是否覆盖全部重新生成？'),
654 ]),
655 showCancelButton: true,
656 confirmButtonText: '覆盖全部生成',
657 cancelButtonText: '跳过已生成单元号户',
658 beforeClose: (action, instance, done) => {
659 if (action === 'confirm') {
660 instance.confirmButtonLoading = true;
661 instance.confirmButtonText = '执行中...';
662 setTimeout(() => {
663 done();
664 setTimeout(() => {
665 batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,2).then(
666 (res) => {
667 if (res.code === 200) {
668 this.$message.success("生成完成！");
669 }
670 });
671 instance.confirmButtonLoading = false;
672 }, 300);
673 }, 3000);
674 } else {
675 batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,1).then(
676 (res) => {
677 if (res.code === 200) {
678 this.$message.success("生成完成！");
679 }
680 });
681 done();
682 }
683 }
684 })
685 },
686
643 //获取各项单元状态统计数据 687 //获取各项单元状态统计数据
644 getDyztBsmList() { 688 getDyztBsmList() {
645 let data = { 689 let data = {
......
...@@ -146,12 +146,12 @@ ...@@ -146,12 +146,12 @@
146 </tr> 146 </tr>
147 147
148 <tr v-for="(item1,index) in form.fwytList" :key="index"> 148 <tr v-for="(item1,index) in form.fwytList" :key="index">
149 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle"> 149 <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" class="tdright" id="ytTitle">
150 <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button> 150 <el-button type="primary" class="inAdd addMinus" size="mini" style="margin-right: 8px" @click="addYtInfo">+</el-button>
151 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;用途<i class="requisite">*</i></span> 151 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;用途<i class="requisite">*</i></span>
152 </td> 152 </td>
153 153
154 <td colspan="1" style="min-width:120px"> 154 <td colspan="1" style="min-width:120px" class="tdright">
155 <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button> 155 <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
156 规划用途 156 规划用途
157 </td> 157 </td>
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
171 v-model="item1.fwytzdbsm" 171 v-model="item1.fwytzdbsm"
172 ></el-select-tree> 172 ></el-select-tree>
173 </td> 173 </td>
174 <td colspan="2" >用途</td> 174 <td colspan="2" class="tdright">用途</td>
175 <td colspan="4" > 175 <td colspan="4" >
176 <el-select-tree style="width:100%" 176 <el-select-tree style="width:100%"
177 ref="yt" 177 ref="yt"
...@@ -190,12 +190,12 @@ ...@@ -190,12 +190,12 @@
190 </tr> 190 </tr>
191 191
192 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> 192 <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
193 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" > 193 <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" class="tdright">
194 <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button> 194 <el-button type="primary" class="inAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
195 <span>房屋结构<i class="requisite">*</i></span> 195 <span>房屋结构<i class="requisite">*</i></span>
196 </td> 196 </td>
197 <td colspan="1" > 197 <td colspan="1" class="tdright">
198 <el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button> 198 <el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 8px" @click="deleteFwjgInfo(index)">-</el-button>
199 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span> 199 <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;删除</span>
200 </td> 200 </td>
201 <td colspan="9" > 201 <td colspan="9" >
......