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

@@ -6,7 +6,19 @@
   </div>
 </template>
 <script>
-  let column = [
+export default {
+  /**注册组件*/
+  components: {},
+  data () {
+    return {
+      key: 0,
+      tableData:[{
+          xm: '12',
+          zjzl: '32',
+          zjh: '123',
+          fr: "213123",
+        }],
+      InformationTable:[
     {
           width: '60',
           renderHeader: (h, scope) => {
@@ -51,19 +63,6 @@
         }
       }
     ]
-export default {
-  /**注册组件*/
-  components: {},
-  data () {
-    return {
-      key: 0,
-      tableData:[{
-          xm: '12',
-          zjzl: '32',
-          zjh: '123',
-          fr: "213123",
-        }],
-      InformationTable:column
     };
   },
   watch: {
@@ -80,10 +79,10 @@ export default {
     handleAdd () {
       this.tableData.push(
         {
-          xm: '',
-          zjzl: '',
-          zjh: '',
-          fr: "",
+          xm: '22',
+          zjzl: '33',
+          zjh: '44',
+          fr: "55",
         }
       )
       this.key++

 <template>
   <div class='slxx'>
-    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
+    <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px">
       <div class="slxx_title">受理信息</div>
       <el-row>
         <el-col :span="8">
@@ -14,8 +14,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="受理时间：" prop="slsj">
-            <el-input v-model="ruleForm.slsj"></el-input>
+          <el-form-item label="使用权结束时间：" prop="slsj">
+            <el-date-picker v-model="ruleForm.slsj" type="datetime" placeholder="选择结束时间"
+            value-format="yyyy-MM-dd" >
+          </el-date-picker>
           </el-form-item>
         </el-col>
       </el-row>
@@ -209,7 +211,13 @@ export default {
 .slxx_title {
     border-bottom: 1px solid $borderColor;
     padding-left: 10px;
-  padding-bottom: 15px;
+    padding-bottom: 20px;
     margin-bottom: 15px;
+    margin-top: 30px;
+    font-size: 18px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #4A4A4A;
+
 }
 </style>
\ No newline at end of file