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

@@ -590,8 +590,13 @@
                     if(res.code===200){
                         this.form = res.result;
                         if(res.result.qszt !== '0'){
+                            console.log(JSON.stringify(res)+":res")
+                            console.log(JSON.stringify(res.result)+":res.result")
+                            console.log(res.result.qszt+":res.result.qszt")
+                            console.log(res.result.qszt !== '0'+":res.result.qszt!==0")
                             this.disableFlag = true;
                         }
+                        console.log(this.disableFlag)
                         if(this.form.scyclx==='0'){
                             this.$set(this.form,"ycjzmj", this.form.jzmj)
                             this.$set(this.form,"yctnjzmj", this.form.tnjzmj)

@@ -57,6 +57,7 @@
 								<td
 									v-for="(hs, hsIndex) in cs.hs"
 									:rowspan="hs.sjcs"
+									:colspan="hs.sjhs"
 									:data-bsm="hs.bsm"
 									ref="hBsm"
 									:key="hsIndex"
@@ -111,6 +112,7 @@
 								<td
 									v-for="(hs, hsIndex) in cs.hs"
 									:rowspan="hs.sjcs"
+									:colspan="hs.sjhs"
 									:data-bsm="hs.bsm"
 									ref="hBsm"
 									:key="hsIndex"
@@ -170,6 +172,7 @@
 							<td
 								v-for="(hs, hsIndex) in cs.hs"
 								:rowspan="hs.sjcs"
+								:colspan="hs.sjhs"
 								:data-bsm="hs.bsm"
 								ref="hBsm"
 								:key="hsIndex"
@@ -214,6 +217,7 @@
 							<td
 								v-for="(hs, hsIndex) in cs.hs"
 								:rowspan="hs.sjcs"
+								:colspan="hs.sjhs"
 								:data-bsm="hs.bsm"
 								ref="hBsm"
 								:key="hsIndex"