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

@@ -799,6 +799,25 @@ class business {
     })
   }
 
+    // 更正登记信息
+    async getQlfQlGzdjById(bsmSjsb) {
+      return request({
+        url: SERVER.SERVERAPI + '/rest/reg/QlfQlGzdj/detail',
+        method: 'get',
+        params: {
+          bsmSjsb: bsmSjsb
+        }
+      })
+    }
+    // 更正登记信息-修改
+    async updateQlfQlGzdj(data) {
+      return request({
+        url: SERVER.SERVERAPI + '/rest/reg/QlfQlGzdj/edit',
+        method: 'post',
+        data
+      })
+    }
+
   // 地役权信息
   async getQlfQlDyiqById(bsmSjsb) {
     return request({

 <template>
-  <button class="button" :class="nativeType" @click="handleClick" :type="nativeType">
+  <button class="button" :class="nativeType" @click.prevent="handleClick" :type="nativeType">
     <slot></slot>
   </button>
 </template>

@@ -76,7 +76,7 @@
               文件件数： <br />
               <p class="label-detail">（WJJS）</p>
             </span>
-            <el-input-number controls-position="right":disabled="$store.state.business.Edit" v-model.number="ruleForm.WJJS" type="number"
+            <el-input-number controls-position="right" :disabled="$store.state.business.Edit" v-model.number="ruleForm.WJJS" type="number"
               v-only-number="{ max: 9999, min: 0, precision: 0 }" placeholder="文件件数"></el-input-number>
           </el-form-item>
         </el-col>

@@ -81,7 +81,7 @@
               <p class="label-detail">（SQFBCZ）</p>
             </span>
             <el-select :disabled="$store.state.business.Edit" v-model="ruleForm.SQFBCZ" placeholder="申请分别持证">
-              <el-option v-for="item in dicData['A6']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
+              <el-option v-for="item in dicData['A6']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE-0">
               </el-option>
             </el-select>
           </el-form-item>

@@ -219,38 +219,6 @@
           </el-form-item>
         </el-col>        
         <el-col :span="8">
-          <el-form-item prop="ZXYGYWH">
-            <span slot="label">
-              注销预告业务号： <br />
-              <p class="label-detail">（ZXYGYWH）</p>
-            </span>
-            <el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ZXYGYWH" placeholder="注销预告业务号">
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item prop="ZXYGYY">
-            <span slot="label">
-              注销预告原因： <br />
-              <p class="label-detail">（ZXYGYY）</p>
-            </span>
-            <el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ZXYGYY" placeholder="注销预告原因">
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item prop="ZXSJ">
-            <span slot="label">
-              注销时间： <br />
-              <p class="label-detail">（ZXSJ）</p>
-            </span>
-            <el-date-picker :disabled="$store.state.business.Edit" type="datetime" placeholder="选择日期" clearable
-              v-model="ruleForm.ZXSJ" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
           <el-form-item prop="QDJG" :rules="{ type: 'number' }">
             <span slot="label">
               取得价格/被担保主债权数额： <br />
@@ -373,6 +341,38 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item prop="ZXYGYWH">
+            <span slot="label">
+              注销预告业务号： <br />
+              <p class="label-detail">（ZXYGYWH）</p>
+            </span>
+            <el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ZXYGYWH" placeholder="注销预告业务号">
+            </el-input>
+          </el-form-item>
+        </el-col>       
+        <el-col :span="8">
+          <el-form-item prop="ZXSJ">
+            <span slot="label">
+              注销时间： <br />
+              <p class="label-detail">（ZXSJ）</p>
+            </span>
+            <el-date-picker :disabled="$store.state.business.Edit" type="datetime" placeholder="选择日期" clearable
+              v-model="ruleForm.ZXSJ" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+          </el-form-item>
+        </el-col>
+         <el-col :span="8">
+          <el-form-item prop="ZXYGYY">
+            <span slot="label">
+              注销预告原因： <br />
+              <p class="label-detail">（ZXYGYY）</p>
+            </span>
+            <el-input :disabled="$store.state.business.Edit" v-model="ruleForm.ZXYGYY" placeholder="注销预告原因">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <message-tips ref="msg" />
   </div>

@@ -7,38 +7,61 @@ class data extends filter {
     return [
       {
         label: "行政区",
-        width: 150,
+        width: 80,        
         render: (h, scope) => {
           return (
             <div>
-              <span>{this.dicStatus(scope.row.xzq, 'A20')}</span>
+              <span>{this.dicStatus(scope.row.QXDM, 'A20')}</span>
             </div>
           )
         },
       },
       {
         label: "权属状态",
-        width: 150,
+        width: 80,  
         render: (h, scope) => {
           return (
             <div>
-              <span>{this.dicStatus(scope.row.qszt, 'A22')}</span>
+              <span>{this.dicStatus(scope.row.QSZT, 'A22')}</span>
+            </div>
+          )
+        },
+      },     
+      {
+        label: "权利类型",
+        width: 200,  
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{this.dicStatus(scope.row.QLLX, 'A8')}</span>
+            </div>
+          )
+        },
+      },
+      {
+        label: "登记类型",
+        width: 100,  
+        render: (h, scope) => {
+          return (
+            <div>
+              <span>{this.dicStatus(scope.row.DJLX, 'A21')}</span>
             </div>
           )
         },
       },
       {
         label: "业务号",
-        prop: "ywh",
+        prop: "YWH",
         width: 150
       },
       {
         label: "不动产单元号",
-        prop: "bdcdyh"
+        prop: "BDCDYH",
+        width: 240,  
       },
       {
         label: "不动产权证号",
-        prop: "bdcqzh"
+        prop: "BDCQZH"
       },
       {
         label: "权利人",
@@ -46,28 +69,25 @@ class data extends filter {
       },
       {
         label: "用途",
-        prop: "tdyt"
+        prop: "YT"
       },
       {
-        label: "土地面积",
-        prop: "tdmj"
+        label: "使用权面积",
+        prop: "SYQMJ"
       },
       {
         label: "坐落",
         prop: "zl"
       },
-      {
-        label: "登记类型",
-        prop: "djlx"
-      },
+      
       {
         label: "登记时间",
         width: 140,
-        prop: "djsj"
+        prop: "DJSJ"
       },
       {
         label: "登记机构",
-        prop: "djjg"
+        prop: "DJJG"
       }
     ]
   }