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

 <template>
   <div class="navbar-con">
     <div class="navbar">
-      <div class="title">{{ dicData['sysCode'][0].DNAME }}</div>
+      <div class="title">{{ dicData['sysCode'] && dicData['sysCode'][0].DNAME }}</div>
       <div class="user">欢迎进入系统 {{ name }} <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />退出系统</div>
       <div class="sidebarLeft">
         <sidebarLeft />

 <template>
   <div class="dyiq from-clues">
     <div class="from-clues-header">
-      <el-form ref="form" :model="form" label-width="80px">
+      <el-form ref="form" :model="form" label-width="90px">
         <el-row>
-          <el-col :span="5">
-            <el-form-item label="业务号">
-              <el-input v-model="form.YWH" placeholder="业务号"></el-input>
+          <el-col :span="6">
+            <el-form-item label="行政区">
+              <el-input v-model="form.xzq" placeholder="行政区"></el-input>
             </el-form-item>
           </el-col>
+
           <el-col :span="6">
-            <el-form-item label="供役地不动产单元号" label-width="150px">
-              <el-input v-model="form.GYDBDCDYH" placeholder="供役地不动产单元号"></el-input>
+            <el-form-item label="权属状态">
+              <el-select v-model="form.qszt" class="width100" clearable placeholder="请选择权属状态">
+                <el-option v-for="item in qsztOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="6">
-            <el-form-item label="需役地不动产单元号" label-width="150px">
-              <el-input v-model="form.XYDBDCDYH" placeholder="需役地不动产单元号"></el-input>
+            <el-form-item label="坐落">
+              <el-input v-model="form.zl" placeholder="坐落"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="不动产权证号" label-width="120px">
+              <el-input v-model="form.bdcqzh" placeholder="不动产权证号"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="权利人">
+              <el-input v-model="form.xzq" placeholder="权利人"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4" class="from-clues-search-button">
-            <el-button type="primary" @click="handleSubmit">查询结果</el-button>
+            <el-button type="primary" @click="handleSubmit">查询</el-button>
           </el-col>
         </el-row>
+
       </el-form>
     </div>
     <div class="from-clues-content">
@@ -56,11 +75,13 @@ export default {
   data () {
     return {
       form: {
-        YWH: '',
-        GYDBDCDYH: '',
-        XYDBDCDYH: '',
+        xzq: '',
+        qszt: '',
+        zl: '',
+        bdcqzh: '',
         currentPage: 1
       },
+      qsztOptions: [],
       tableData: {
         columns: [{
           label: '序号',

@@ -12,11 +12,9 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              {
-                scope.row.receiveState
-                  ? <span class='adopt'>通过</span>
-                  : <span class='warehousing'>不通过</span>
-              }
+              <span class='adopt' v-show={scope.row.receiveState == 0}>未效验</span>
+              <span class='adopt' v-show={scope.row.receiveState == 1}>效验成功</span>
+              <span class='warehousing' v-show={scope.row.receiveState == 2}>效验失败</span>
             </div>
           )
         }
@@ -28,11 +26,9 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              {
-                scope.row.storageState
-                  ? <span class='success'>成功</span>
-                  : <span class='fail'>失败</span>
-              }
+              <span class='fail' v-show={scope.row.storageState == 0}>未入库</span>
+              <span class='success' v-show={scope.row.storageState == 1}>已入库</span>
+              <span class='fail' v-show={scope.row.storageState == 2}>入库失败</span>
             </div>
           )
         }