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

@@ -126,11 +126,29 @@
         <el-row :gutter="10">
           <el-col :span="8">
             <el-form-item :class="flag ? 'marginBot0' : ''" label="抵押方式：">
-              <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input>
+              <!-- <el-input disabled v-model="ruleForm.slywxx.djqxmc"></el-input> -->
+              <el-radio-group disabled v-model="ruleForm.diyaq.dyfs">
+                  <el-radio label="1">一般抵押</el-radio>
+                  <el-radio label="2">最高额抵押</el-radio>
+                </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="16">
+            <el-form-item
+              :class="flag ? 'marginBot0' : ''"
+              label="是否存在禁止或者限制转让抵押不动产的约定："
+              label-width="350px"
+            >
+              <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz">
+                <el-radio label="1">启用</el-radio>
+                <el-radio label="0">禁用</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-          <el-col :span="8">
+        <el-row :gutter="10">
+          <el-col :span="8" v-show="ruleForm.diyaq.dyfs==1">
             <el-form-item
               :class="flag ? 'marginBot0' : ''"
               label="被担保主债权数额："
@@ -139,7 +157,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="8" v-show="ruleForm.diyaq.dyfs==2">
             <el-form-item
               :class="flag ? 'marginBot0' : ''"
               label="最高债权额："
@@ -147,15 +165,14 @@
               <el-input  v-model="ruleForm.diyaq.zgzqse"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
 
-        <el-row>
           <el-col :span="8">
             <el-form-item
               :class="flag ? 'marginBot0' : ''"
               label="债务履行起始时间："
             >
-              <el-input v-model="ruleForm.diyaq.zwlxqssj"></el-input>
+              <el-date-picker v-model="ruleForm.diyaq.zwlxqssj"  type="date">
+            </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -163,25 +180,12 @@
               :class="flag ? 'marginBot0' : ''"
               label="债务履行结束时间："
             >
-              <el-input v-model="ruleForm.diyaq.zwlxjssj"></el-input>
+              <el-date-picker v-model="ruleForm.diyaq.zwlxjssj"  type="date">
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row>
-          <el-col :span="24">
-            <el-form-item
-              :class="flag ? 'marginBot0' : ''"
-              label="是否存在禁止或者限制转让抵押不动产的约定："
-              label-width="350px"
-            >
-              <el-radio-group v-model="ruleForm.diyaq.sfczjzhxz">
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="0">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
 
         <el-row>
           <el-col :span="24">
@@ -192,7 +196,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :class="flag ? 'marginBot0' : ''" label="最高债权确定事实和数额：">
+            <el-form-item :class="flag ? 'marginBot0' : ''" label="最高债权确定事实和数额：" label-width="200px">
               <el-input v-model="ruleForm.diyaq.zgzqqdss"></el-input>
             </el-form-item>
           </el-col>