82416799 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 7cf9b4cb 20745797
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
48 active_color: item.expand, 48 active_color: item.expand,
49 }" 49 }"
50 > 50 >
51 <span v-if="item.qszt=='0'" style="color:red">(临)</span> 51 <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
52 <span v-if="item.qszt=='1'" style="color:green">(正)</span> 52 <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/>
53 <span v-if="item.qszt=='2'" style="color:blue">(现)</span> 53 <img class="qsztImg" v-if="item.qszt=='2'" :src="xianshi"/>
54 {{ item.mc }} 54 {{ item.mc }}
55 </div> 55 </div>
56 </div> 56 </div>
...@@ -97,6 +97,9 @@ export default { ...@@ -97,6 +97,9 @@ export default {
97 return { 97 return {
98 time:null, 98 time:null,
99 treeXzqHeight:0, 99 treeXzqHeight:0,
100 linshi:require("../../assets/images/lin.png"),
101 zhengshi:require("../../assets/images/zheng.png"),
102 xianshi:require("../../assets/images/xian.png"),
100 } 103 }
101 }, 104 },
102 mounted(){ 105 mounted(){
...@@ -370,4 +373,9 @@ export default { ...@@ -370,4 +373,9 @@ export default {
370 center; 373 center;
371 background-size: contain; 374 background-size: contain;
372 } 375 }
376 .qsztImg{
377 width: 14px;
378 position: relative;
379 top: 1px;
380 }
373 </style> 381 </style>
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
20 </el-form-item> 20 </el-form-item>
21 <el-form-item label="不动产单元号"> 21 <el-form-item label="不动产单元号">
22 <el-input 22 <el-input
23 maxlength="28"
23 v-model="queryData.bdcdyh" 24 v-model="queryData.bdcdyh"
24 placeholder="输入不动产单元号" 25 placeholder="输入不动产单元号"
25 @change="query" 26 @change="query"
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
10 <tr height="30"> 10 <tr height="30">
11 <td colspan="2" align="center" >宗地代码</td> 11 <td colspan="2" align="center" >宗地代码</td>
12 <td colspan="4" > 12 <td colspan="4" >
13 <input class="formInput" v-model="form.zddm"> 13 <input class="formInput" maxlength="19" v-model="form.zddm">
14 </td> 14 </td>
15 <td colspan="2" align="center" >不动产单元号</td> 15 <td colspan="2" align="center" >不动产单元号</td>
16 <td colspan="4" class="psr"> 16 <td colspan="4" class="psr">
17 <input class="formInput percent80" v-model="form.bdcdyh"> 17 <input class="formInput percent80" maxlength="28" v-model="form.bdcdyh">
18 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> 18 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
......
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
154 this.$router.push({ 154 this.$router.push({
155 path: path, 155 path: path,
156 query: { 156 query: {
157 bsm: newGlbsm, 157 bsm: res.result,
158 source: 2 158 source: 2
159 } 159 }
160 }); 160 });
......
...@@ -33,7 +33,7 @@ export default { ...@@ -33,7 +33,7 @@ export default {
33 }, 33 },
34 methods: { 34 methods: {
35 handleClick(tab, event) { 35 handleClick(tab, event) {
36 console.log(tab, event); 36 // console.log(tab, event);
37 }, 37 },
38 }, 38 },
39 created() {}, 39 created() {},
......
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
107 </td> 107 </td>
108 <td colspan="2">宗地代码<i class="requisite">*</i></td> 108 <td colspan="2">宗地代码<i class="requisite">*</i></td>
109 <td colspan="4" class="psr"> 109 <td colspan="4" class="psr">
110 <input :disabled="formData.qszt!='0'" 110 <input :disabled="formData.qszt!='0'" maxlength="19"
111 type="text" placeholder="请输入" 111 type="text" placeholder="请输入"
112 class="formInput percent80" 112 class="formInput percent80"
113 v-model="formData.zddm" 113 v-model="formData.zddm"
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
126 <td colspan="2">不动产单元号<i class="requisite">*</i></td> 126 <td colspan="2">不动产单元号<i class="requisite">*</i></td>
127 <td colspan="4" class="psr"> 127 <td colspan="4" class="psr">
128 <input 128 <input
129 type="text" :disabled="formData.qszt!='0'" 129 type="text" :disabled="formData.qszt!='0'" maxlength="28"
130 class="formInput percent80" 130 class="formInput percent80"
131 v-model="formData.bdcdyh" 131 v-model="formData.bdcdyh"
132 /> 132 />
...@@ -685,6 +685,7 @@ export default { ...@@ -685,6 +685,7 @@ export default {
685 background-color: #fff; 685 background-color: #fff;
686 font-size: 14px; 686 font-size: 14px;
687 width: 100%; 687 width: 100%;
688 table-layout: fixed;
688 th { 689 th {
689 height: 36px; 690 height: 36px;
690 line-height: 36px; 691 line-height: 36px;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
8 <el-radio-button label="0">预测</el-radio-button> 8 <el-radio-button label="0">预测</el-radio-button>
9 </el-radio-group> 9 </el-radio-group>
10 <el-input 10 <el-input
11 maxlength="28"
11 v-model="bdcdyh" 12 v-model="bdcdyh"
12 :style="{ width: inputWidth + 'px' }" 13 :style="{ width: inputWidth + 'px' }"
13 @focus="inputFocus" 14 @focus="inputFocus"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 </td> 21 </td>
22 <td colspan="2" align="center">自然幢号</td> 22 <td colspan="2" align="center">自然幢号</td>
23 <td colspan="4"> 23 <td colspan="4">
24 <el-input v-model="form.zrzh"></el-input> 24 <el-input v-model="form.zrzh" maxlength="24"></el-input>
25 </td> 25 </td>
26 </tr> 26 </tr>
27 <tr height="30"> 27 <tr height="30">
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 </td> 31 </td>
32 <td colspan="2" align="center">不动产单元号</td> 32 <td colspan="2" align="center">不动产单元号</td>
33 <td colspan="4" class="psr"> 33 <td colspan="4" class="psr">
34 <el-input v-model="form.bdcdyh" class="percent80"></el-input> 34 <el-input v-model="form.bdcdyh" maxlength="28" class="percent80"></el-input>
35 <el-button 35 <el-button
36 @click.prevent="" 36 @click.prevent=""
37 size="mini" 37 size="mini"
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
10 <td colspan="2">宗地代码</td> 10 <td colspan="2">宗地代码</td>
11 <td colspan="4" style="min-width:450px"> 11 <td colspan="4" style="min-width:450px">
12 <input v-model="form.zddm" class="formInput" disabled> 12 <input v-model="form.zddm" class="formInput" disabled>
13 <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm"> 13 <input v-show="false" :disabled="form.qszt!='0'" maxlength="19" class="formInput" v-model="form.zdbsm">
14 </td> 14 </td>
15 <td colspan="2" >自然幢号<i class="requisite">*</i></td> 15 <td colspan="2" >自然幢号<i class="requisite">*</i></td>
16 <td colspan="4" class="psr"> 16 <td colspan="4" class="psr">
17 <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh"> 17 <input class="formInput percent80" :disabled="form.qszt!='0'" maxlength="24" v-model="form.zrzh">
18 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button> 18 <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button>
19 </td> 19 </td>
20 </tr> 20 </tr>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 </td> 25 </td>
26 <td colspan="2" >不动产单元号<i class="requisite">*</i></td> 26 <td colspan="2" >不动产单元号<i class="requisite">*</i></td>
27 <td colspan="4"> 27 <td colspan="4">
28 <input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh"> 28 <input class="formInput " :disabled="form.qszt!='0'" maxlength="28" v-model="form.bdcdyh">
29 </td> 29 </td>
30 </tr> 30 </tr>
31 31
......