Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
d6ec1003 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents 93e929f8 9c0ce83f
Inline Side-by-side
Showing 2 changed files with 9 additions and 0 deletions
...@@ -590,8 +590,13 @@ ...@@ -590,8 +590,13 @@
590 if(res.code===200){ 590 if(res.code===200){
591 this.form = res.result; 591 this.form = res.result;
592 if(res.result.qszt !== '0'){ 592 if(res.result.qszt !== '0'){
593 console.log(JSON.stringify(res)+":res")
594 console.log(JSON.stringify(res.result)+":res.result")
595 console.log(res.result.qszt+":res.result.qszt")
596 console.log(res.result.qszt !== '0'+":res.result.qszt!==0")
593 this.disableFlag = true; 597 this.disableFlag = true;
594 } 598 }
599 console.log(this.disableFlag)
595 if(this.form.scyclx==='0'){ 600 if(this.form.scyclx==='0'){
596 this.$set(this.form,"ycjzmj", this.form.jzmj) 601 this.$set(this.form,"ycjzmj", this.form.jzmj)
597 this.$set(this.form,"yctnjzmj", this.form.tnjzmj) 602 this.$set(this.form,"yctnjzmj", this.form.tnjzmj)
......
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
57 <td 57 <td
58 v-for="(hs, hsIndex) in cs.hs" 58 v-for="(hs, hsIndex) in cs.hs"
59 :rowspan="hs.sjcs" 59 :rowspan="hs.sjcs"
60 :colspan="hs.sjhs"
60 :data-bsm="hs.bsm" 61 :data-bsm="hs.bsm"
61 ref="hBsm" 62 ref="hBsm"
62 :key="hsIndex" 63 :key="hsIndex"
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
111 <td 112 <td
112 v-for="(hs, hsIndex) in cs.hs" 113 v-for="(hs, hsIndex) in cs.hs"
113 :rowspan="hs.sjcs" 114 :rowspan="hs.sjcs"
115 :colspan="hs.sjhs"
114 :data-bsm="hs.bsm" 116 :data-bsm="hs.bsm"
115 ref="hBsm" 117 ref="hBsm"
116 :key="hsIndex" 118 :key="hsIndex"
...@@ -170,6 +172,7 @@ ...@@ -170,6 +172,7 @@
170 <td 172 <td
171 v-for="(hs, hsIndex) in cs.hs" 173 v-for="(hs, hsIndex) in cs.hs"
172 :rowspan="hs.sjcs" 174 :rowspan="hs.sjcs"
175 :colspan="hs.sjhs"
173 :data-bsm="hs.bsm" 176 :data-bsm="hs.bsm"
174 ref="hBsm" 177 ref="hBsm"
175 :key="hsIndex" 178 :key="hsIndex"
...@@ -214,6 +217,7 @@ ...@@ -214,6 +217,7 @@
214 <td 217 <td
215 v-for="(hs, hsIndex) in cs.hs" 218 v-for="(hs, hsIndex) in cs.hs"
216 :rowspan="hs.sjcs" 219 :rowspan="hs.sjcs"
220 :colspan="hs.sjhs"
217 :data-bsm="hs.bsm" 221 :data-bsm="hs.bsm"
218 ref="hBsm" 222 ref="hBsm"
219 :key="hsIndex" 223 :key="hsIndex"
......