panhui 6 лет назад
Родитель
Сommit
36eabb6fc1
4 измененных файлов с 90 добавлено и 14 удалено
  1. 31 4
      WebRoot/WEB-INF/jsp/newAdmin/rentInfo.jsp
  2. 35 6
      WebRoot/form_yh.html
  3. 24 4
      WebRoot/form_zf.html
  4. 0 0
      WebRoot/js/index.js

+ 31 - 4
WebRoot/WEB-INF/jsp/newAdmin/rentInfo.jsp

@@ -184,11 +184,20 @@
             </el-form-item>
 
             <el-form-item class="excess" label="合同开始日期">
-                <el-input v-model="row_info.contractStart"></el-input>
-
+                <%--<el-input v-model="row_info.contractStart"></el-input>--%>
+                <el-date-picker
+                        v-model="row_info.contractStart"
+                        type="date"
+                        placeholder="选择日期">
+                </el-date-picker>
             </el-form-item>
             <el-form-item class="excess" label="合同结束日期">
-                <el-input v-model="row_info.contractEnd"></el-input>
+                <%--<el-input v-model="row_info.contractEnd"></el-input>--%>
+                <el-date-picker
+                        v-model="row_info.contractEnd"
+                        type="date"
+                        placeholder="选择日期">
+                </el-date-picker>
             </el-form-item>
             <el-form-item class="excess" label="空置期" v-show="show_Flag==1">
                 <el-input v-model="row_info.vacancyTime"></el-input>
@@ -352,7 +361,12 @@
                 <el-input v-model="row_info.reviewRemark" disabled></el-input>
             </el-form-item>
             <el-form-item label="首次支付房租时间">
-                <el-input v-model="row_info.firstPayTime"></el-input>
+                <%--<el-input v-model="row_info.firstPayTime"></el-input>--%>
+                <el-date-picker
+                        v-model="row_info.firstPayTime"
+                        type="date"
+                        placeholder="选择日期">
+                </el-date-picker>
             </el-form-item>
             <el-form-item label="视频">
                 <el-input v-model="row_info.houseVideo"></el-input>
@@ -488,8 +502,21 @@
                 this.model = file_type;
 
             },
+            ChangeTime(time){
+                var date=new Date(time);
+                return date.getFullYear()+'-'+(((date.getMonth()+1)<10)?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+(date.getDate()<10?('0'+date.getDate()):date.getDate())
+            },
             onSubmit: function () {
                 var data = JSON.parse(JSON.stringify(this.row_info));
+                if(data.contractStart) {
+                    data.contractStart = this.ChangeTime(data.contractStart);
+                }
+                if(data.contractEnd) {
+                    data.contractEnd = this.ChangeTime(data.contractEnd);
+                }
+                if(data.firstPayTime){
+                    data.firstPayTime=this.ChangeTime(data.firstPayTime);
+                }
                 var that = this;
                 $.post({
                     url: this.edit ? '../rentInfo/update' : '../rentInfo/save',

+ 35 - 6
WebRoot/form_yh.html

@@ -5,8 +5,9 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>房屋信息页面</title>
     <!-- 引入样式 -->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui@2.0.2/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="lib/element/element-ui.css">
     <link rel="stylesheet" href="css/style.css">
+
 </head>
 <body>
 <div id="app">
@@ -118,7 +119,12 @@
             <el-input v-model="form.monthRent"></el-input>
         </el-form-item>
         <el-form-item class="excess" label="首次支付租金日期">
-            <el-input v-model="form.firstPayTime"></el-input>
+            <!--<el-input v-model="form.firstPayTime"></el-input>-->
+            <el-date-picker
+                    v-model="form.firstPayTime"
+                    type="date"
+                    placeholder="选择日期">
+            </el-date-picker>
         </el-form-item>
 
         <el-form-item class="excess" label="支付方式">
@@ -157,10 +163,20 @@
         </el-form-item>
 
         <el-form-item class="excess" label="合同开始日期">
-            <el-input v-model="form.contractStart"></el-input>
+            <!--<el-input v-model="form.contractStart"></el-input>-->
+            <el-date-picker
+                    v-model="form.contractStart"
+                    type="date"
+                    placeholder="选择日期">
+            </el-date-picker>
         </el-form-item>
         <el-form-item class="excess" label="合同结束日期">
-            <el-input v-model="form.contractEnd"></el-input>
+            <!--<el-input v-model="form.contractEnd"></el-input>-->
+            <el-date-picker
+                    v-model="form.contractEnd"
+                    type="date"
+                    placeholder="选择日期">
+            </el-date-picker>
         </el-form-item>
         <el-form-item class="excess" label="空置期">
             <el-input v-model="form.vacancyTime"></el-input>
@@ -404,9 +420,9 @@
 
 </div>
 </body>
-<script src="js/vue.js"></script>
+<script src="lib/vue/vue.js"></script>
+<script src="lib/element/element-ui.js"></script>
 <script src="js/jquery-3.2.1.min.js"></script>
-<script src="js/index.js"></script>
 <script>
     var app = new Vue({
         el: '#app',
@@ -573,9 +589,22 @@
                     }
                 }.bind(this));
             },
+            ChangeTime(time){
+                var date=new Date(time);
+                return date.getFullYear()+'-'+(((date.getMonth()+1)<10)?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+(date.getDate()<10?('0'+date.getDate()):date.getDate())
+            },
             onSubmit: function () {
 
                 var data = JSON.parse(JSON.stringify(this.form));
+                if(data.contractStart) {
+                    data.contractStart = this.ChangeTime(data.contractStart);
+                }
+                if(data.contractEnd) {
+                    data.contractEnd = this.ChangeTime(data.contractEnd);
+                }
+                if(data.firstPayTime){
+                    data.firstPayTime=this.ChangeTime(data.firstPayTime);
+                }
                 this.loading=true
                 $.post({
                     url: 'rentInfo/postOne',

+ 24 - 4
WebRoot/form_zf.html

@@ -114,10 +114,20 @@
         </el-form-item>
 
         <el-form-item class="excess" label="合同开始日期">
-            <el-input v-model="form.contractStart"></el-input>
+            <!--<el-input v-model="form.contractStart"></el-input>-->
+            <el-date-picker
+                    v-model="form.contractStart"
+                    type="date"
+                    placeholder="选择日期">
+            </el-date-picker>
         </el-form-item>
         <el-form-item class="excess" label="合同结束日期">
-            <el-input v-model="form.contractEnd"></el-input>
+            <!--<el-input v-model="form.contractEnd"></el-input>-->
+            <el-date-picker
+                    v-model="form.contractEnd"
+                    type="date"
+                    placeholder="选择日期">
+            </el-date-picker>
         </el-form-item>
         <el-form-item label="押金收条">
             <el-upload class="avatar-uploader" action="assets/uploadFile" @click.native="clickAvatar('depositPaper')"
@@ -298,8 +308,8 @@
 
 </div>
 </body>
-<script src="js/vue.js"></script>
-<script src="js/index.js"></script>
+<script src="lib/vue/vue.js"></script>
+<script src="lib/element/element-ui.js"></script>
 <script src="js/jquery-3.2.1.min.js"></script>
 <script>
     var app = new Vue({
@@ -434,9 +444,19 @@
                     }
                 }.bind(this));
             },
+            ChangeTime(time){
+                var date=new Date(time);
+                return date.getFullYear()+'-'+(((date.getMonth()+1)<10)?('0'+(date.getMonth()+1)):(date.getMonth()+1))+'-'+(date.getDate()<10?('0'+date.getDate()):date.getDate())
+            },
             onSubmit: function (form) {
 
                 var data = JSON.parse(JSON.stringify(this.form));
+                if(data.contractStart) {
+                    data.contractStart = this.ChangeTime(data.contractStart);
+                }
+                if(data.contractEnd) {
+                    data.contractEnd = this.ChangeTime(data.contractEnd);
+                }
                 this.loading = true
                 $.get({
                     url: 'rentInfo/getOne',

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
WebRoot/js/index.js


Некоторые файлы не были показаны из-за большого количества измененных файлов