Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -8,49 +8,80 @@
     title="高级搜索">
     <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
       <el-row>
-        <!-- <el-col :span="8">
-          <el-form-item label="申请业务名称" prop="sqywmc">
-            <el-input v-model.trim="ruleForm.sqywmc" clearable placeholder="请输入申请业务名称"></el-input>
+        <el-col :span="8">
+          <el-form-item label="受理开始时间" prop="slkssj">
+            <el-date-picker v-model="ruleForm.slkssj" value-format="yyyy-MM-dd" class="width100" type="date"
+              placeholder="请选择日期" clearable>
+            </el-date-picker>
           </el-form-item>
-        </el-col> -->
+        </el-col>        
         <el-col :span="8">
-          <el-form-item label="权利人" prop="qlrmc">
-            <el-input v-model.trim="ruleForm.qlrmc" clearable placeholder="请输入权利人"></el-input>
+          <el-form-item label="受理结束时间" prop="sljssj">
+            <el-date-picker v-model="ruleForm.sljssj" value-format="yyyy-MM-dd" class="width100" type="date"
+              placeholder="请选择日期" clearable>
+            </el-date-picker>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="义务人" prop="ywrmc">
-            <el-input v-model.trim="ruleForm.ywrmc" clearable placeholder="请输入义务人"></el-input>
+          <el-form-item label="受理人员" prop="slry">
+            <el-input v-model.trim="ruleForm.slry" clearable placeholder="请输入义务人"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8" class="btnColRight">
-          <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button>
-        </el-col>
       </el-row>
-      <!-- <el-row>
+      <el-row>
+        <!-- <el-col :span="8">
+          <el-form-item label="办理环节" prop="stepcfgid">
+            <el-select
+                v-model="queryForm.stepcfgid"
+                class="width100"
+                filterable
+                @change="handleSelect('stepCfg', 'stepCfgName', 'stepcfgid')"
+                @clear="handleEmpty('stepCfgName')"
+                clearable
+                placeholder="请选择办理环节">
+                <el-option
+                  v-for="item in dictData['stepCfg']"
+                  :key="item.dcode"
+                  :label="item.dname"
+                  :value="item.dcode">
+                </el-option>
+              </el-select>
+          </el-form-item>
+        </el-col> -->
         <el-col :span="8">
-          <el-form-item label="受理时间" prop="slsj">
-            <el-date-picker v-model="ruleForm.slsj" value-format="yyyy-MM-dd" class="width100" type="date"
-              placeholder="请选择日期" clearable>
-            </el-date-picker>
+          <el-form-item label="原不动产权证号" prop="ybdcqzh">
+            <el-input v-model.trim="ruleForm.ybdcqzh" clearable placeholder="请输入申请业务名称"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="合同号" prop="zjzl">
+            <el-input v-model.trim="ruleForm.qlrmc" clearable placeholder="请输入合同号"></el-input>
           </el-form-item>
         </el-col>
-      </el-row> -->
+     
+        <!-- <el-col :span="8" class="btnColRight">
+          <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button>
+        </el-col> -->
+      </el-row>
+      
       <el-row class="search-btn">
-        <!-- <el-button type="text" @click.native="closeDialog">收起搜索</el-button> -->
-        <!-- <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button> -->
-        <!-- <el-button icon="el-icon-refresh-left" @click="resetForm('ruleForm')">重置</el-button> -->
+        <el-button type="text" @click.native="closeDialog">收起搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="submitForm('ruleForm')">查询</el-button>
+        <el-button icon="el-icon-refresh-left" @click="resetForm('ruleForm')">重置</el-button>
       </el-row>
     </el-form>
   </dialogBox>
 </template>
 <script>
-
+  import { mapGetters } from "vuex";
   export default {
     props: {
       value: { type: Boolean, default: false },
       advancedForm: { type: Object, default: "" }
     },
+    computed: {
+      ...mapGetters(["dictData", "transfer"]),
+    },
     data () {
       return {
         myValue: this.value,
@@ -58,7 +89,9 @@
           sqywmc: '',
           qlrmc: '',
           ywrmc: '',
-          slsj: ''
+          slsj: '',
+          stepcfgid: '',
+          ybdcqzh: '',
         }
       }
     },
@@ -90,7 +123,8 @@
           sqywmc: '',
           qlrmc: '',
           ywrmc: '',
-          slsj: ''
+          slsj: '',
+          ybdcqzh: '',
         }
       },
       /**

@@ -9,7 +9,7 @@
     <div class="from-clues-header">
       <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="100px">
         <el-row>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="业务来源" prop="ywly">
               <el-select v-model="queryForm.ywly" class="width100" filterable clearable placeholder="请选择业务来源">
                 <el-option v-for="item in dictData['ywly']" :key="item.dcode" :label="item.dname" :value="item.dcode">
@@ -39,17 +39,12 @@
               </el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="4" class="btnColRight">
-            <el-form-item>
-              <el-button @click="handleReset">重置</el-button>
-              <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
-              <!-- <el-button @click="moreQueryClick">高级查询</el-button> -->
-            </el-form-item>
+          <el-col :span="3" class="btnColRight">
+            <el-button @click="handleReset">重置</el-button>      
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="5">
+          <el-col :span="6">
             <el-form-item label="不动产单元号" prop="bdcdyh">
               <el-input placeholder="请输入不动产单元号" v-model.trim="queryForm.bdcdyh" clearable class="width100">
               </el-input>
@@ -73,6 +68,13 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="3" class="btnColRight">
+            <el-form-item>
+              <el-button @click="handleReset">重置</el-button>
+              <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
+              <!-- <el-button @click="moreQueryClick">高级查询</el-button> -->
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </div>