Merge branch 'master' of https://github.com/java110/MicroCommunity

WebService/src/main/resources/components/companyPackage/company-cerdentials/company-cerdentials.html

@@ -9,8 +9,9 @@
         </div>
         <div class="col-lg-8">
             <div class="form-group">
-                <label>有效期 *</label>
-                <input v-model="companyCerdentialsInfo.validityPeriod" type="text" class="form-control required email" aria-required="true" />
+                <label>有效期(yyyy-mm-dd) *</label>
+                <input v-model="companyCerdentialsInfo.validityPeriod" size="16" type="text" placeholder="请选择时间"   readonly class="form-control form-control-sm company_time">
+
             </div>
         </div>
         <div class="col-lg-8">

WebService/src/main/resources/components/companyPackage/company-cerdentials/company-cerdentials.js

@@ -12,7 +12,7 @@
             }
         },
          _initMethod:function(){
-
+             vc.component._companyinitDate();
          },
          _initEvent:function(){
                 // 证件信息
@@ -67,7 +67,23 @@
                                                                ]
 
                                                            });
-                    }
+                    },
+            _companyinitDate:function(){
+                $('.company_time').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd',
+                    minView: "month",
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+
+                });
+                $('.company_time').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".company_time").val();
+                        vc.component.companyCerdentialsInfo.validityPeriod = value;
+                    });
+            }
 
         }
 

WebService/src/main/resources/components/companyPackage/company-extend/company-extend.html

@@ -7,12 +7,12 @@
                 <input  v-model="companyExtendInfo.corporation" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
-                <label>注册资本 *</label>
+                <label>注册资本(万元) *</label>
                 <input  v-model="companyExtendInfo.registeredCapital" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
-                <label>成立日期 *</label>
-                <input  v-model="companyExtendInfo.foundingTime" type="text" class="form-control required" aria-required="true" />
+                <label>成立日期(yyyy-mm-dd) *</label>
+                <input v-model="companyExtendInfo.foundingTime" size="16" type="text" placeholder="请选择时间"  readonly class="form-control form-control-sm extend_time">
             </div>
             <div class="form-group">
                 <label>登记机关 *</label>

WebService/src/main/resources/components/companyPackage/company-extend/company-extend.js

@@ -1,105 +1,123 @@
 /**
-    初始化 公司信息
+ 初始化 公司信息
 
-**/
+ **/
 
-(function(vc){
+(function (vc) {
     vc.extends({
-        data:{
-            storeTypes:[],
-            companyExtendInfo:{
-                corporation:"",
-                registeredCapital:"",
-                foundingTime:"",
-                registrationAuthority:"",
-                scope:""
+        data: {
+            storeTypes: [],
+            companyExtendInfo: {
+                corporation: "",
+                registeredCapital: "",
+                foundingTime: "",
+                registrationAuthority: "",
+                scope: ""
             }
         },
-         _initMethod:function(){
-
-         },
-         _initEvent:function(){
+        _initMethod: function () {
+            vc.component._extendInitDate();
+        },
+        _initEvent: function () {
 //              vc.component.$on('errorInfoEvent',function(_errorInfo){
 //                     vc.component.registerInfo.errorInfo = _errorInfo;
 //                     console.log('errorInfoEvent 事件被监听',_errorInfo)
 //                 });
 
-         },
-        watch:{
-            companyExtendInfo:{
+        },
+        watch: {
+            companyExtendInfo: {
                 deep: true,
-                handler:function(){
-                    vc.component.$emit('companyExtendEvent',vc.component.companyExtendInfo);
+                handler: function () {
+                    vc.component.$emit('companyExtendEvent', vc.component.companyExtendInfo);
                 }
-             }
+            }
         },
-        methods:{
-            validateExtend:function(){
+        methods: {
+            validateExtend: function () {
                 return vc.validate.validate({
-                                                       companyExtendInfo:vc.component.companyExtendInfo
-                                                   },{
-                                                       'companyExtendInfo.corporation':[
-                                                           {
-                                                               limit:"required",
-                                                               param:"",
-                                                               errInfo:"法人不能为空"
-                                                           },
-                                                           {
-                                                               limit:"maxLength",
-                                                               param:"50",
-                                                               errInfo:"法人长度必须在50位之内"
-                                                           },
-                                                       ],
-                                                       'companyExtendInfo.registeredCapital':[
-                                                           {
-                                                               limit:"required",
-                                                               param:"",
-                                                               errInfo:"注册资本不能为空"
-                                                           },
-                                                           {
-                                                               limit:"num",
-                                                               param:"50",
-                                                               errInfo:"注册资本必须是数字"
-                                                           },
-                                                       ],
-                                                       'companyExtendInfo.foundingTime':[
-                                                           {
-                                                               limit:"required",
-                                                               param:"",
-                                                               errInfo:"成立时间不能为空"
-                                                           },
-                                                           {
-                                                               limit:"date",
-                                                               param:"",
-                                                               errInfo:"不是有效的日期，例如：2019-03-29"
-                                                           }
-                                                       ],
-                                                       'companyExtendInfo.registrationAuthority':[
-                                                           {
-                                                               limit:"required",
-                                                               param:"",
-                                                               errInfo:"登记机关不能为空"
-                                                           },
-                                                           {
-                                                               limit:"maxLength",
-                                                               param:"50",
-                                                               errInfo:"登记机关长度必须在50位之内"
-                                                           }
-                                                       ],
-                                                       'companyExtendInfo.scope':[
-                                                           {
-                                                               limit:"required",
-                                                               param:"",
-                                                               errInfo:"经营范围不能为空"
-                                                           },
-                                                           {
-                                                               limit:"maxLength",
-                                                               param:"50",
-                                                               errInfo:"经营范围长度必须在50位之内"
-                                                           }
-                                                       ],
+                    companyExtendInfo: vc.component.companyExtendInfo
+                }, {
+                    'companyExtendInfo.corporation': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "法人不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "50",
+                            errInfo: "法人长度必须在50位之内"
+                        },
+                    ],
+                    'companyExtendInfo.registeredCapital': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "注册资本不能为空"
+                        },
+                        {
+                            limit: "num",
+                            param: "50",
+                            errInfo: "注册资本必须是数字"
+                        },
+                    ],
+                    'companyExtendInfo.foundingTime': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "成立时间不能为空"
+                        },
+                        {
+                            limit: "date",
+                            param: "",
+                            errInfo: "不是有效的日期，例如：2019-03-29"
+                        }
+                    ],
+                    'companyExtendInfo.registrationAuthority': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "登记机关不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "50",
+                            errInfo: "登记机关长度必须在50位之内"
+                        }
+                    ],
+                    'companyExtendInfo.scope': [
+                        {
+                            limit: "required",
+                            param: "",
+                            errInfo: "经营范围不能为空"
+                        },
+                        {
+                            limit: "maxLength",
+                            param: "50",
+                            errInfo: "经营范围长度必须在50位之内"
+                        }
+                    ],
+
+                });
+            },
+            _extendInitDate: function () {
+
+                $('.extend_time').datetimepicker({
+                    language: 'zh-CN',
+                    format: 'yyyy-mm-dd',
+                    minView: "month",
+                    initialDate: new Date(),
+                    autoClose: 1,
+                    todayBtn: true
+
+                });
+                $('.extend_time').datetimepicker()
+                    .on('changeDate', function (ev) {
+                        var value = $(".extend_time").val();
+                        vc.component.companyExtendInfo.foundingTime = value;
+                    });
 
-                                                   });
             }
 
         }

WebService/src/main/resources/components/pageFramePackage/common/commonTop.html

@@ -7,6 +7,7 @@
 <link href="/css/animate.css" rel="stylesheet"/>
 <link href="/css/style.css" rel="stylesheet"/>
 <link rel="stylesheet" href="/css/common.css"/>
+<link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
 <script src="/js/vue/vue.min.js" ></script>
 <script src="/js/vue/vue-resource.min.js" ></script>
 <script src="/js/bootstrap/jquery-3.3.1.min.js"></script>
@@ -15,5 +16,10 @@
 <script src="/js/vc-validate.js" ></script>
 <script src="/js/popper.min.js"></script>
 <script src="/js/bootstrap/bootstrap.min.js" ></script>
+<!--<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>-->
+<script src="/js/bootstrap/bootstrap-datetimepicker.js"></script>
+<script src="/js/bootstrap/bootstrap-datetimepicker.zh-CN.js"></script>
+
+
 
 

WebService/src/main/resources/components/pageFramePackage/messageTips/messageTips.html

@@ -2,7 +2,7 @@
     <!--<div class="spinner-border text-success" role="status">
         <span class="sr-only">Loading...</span>
     </div>-->
-    <div  style="width: 300px; margin: 250px auto; text-align: center;">
+    <div  style="width: 300px; margin: 30px auto; text-align: center;">
         <div class="alert alert-info" role="alert" style="display: inline-block;width: auto; height: auto;color:#1c7430;padding: 0.5em 10px;">
             <i class="glyphicon glyphicon-warning-sign"></i>
             <span style="margin-left:10px">{{messageTips.errorInfo}}</span>

WebService/src/main/resources/static/js/bootstrap/bootstrap-datetimepicker.zh-CN.js

@@ -0,0 +1,16 @@
+/**
+ * Simplified Chinese translation for bootstrap-datetimepicker
+ * Yuan Cheung <advanimal@gmail.com>
+ */
+;(function($){
+    $.fn.datetimepicker.dates['zh-CN'] = {
+        days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
+        daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+        daysMin:  ["日", "一", "二", "三", "四", "五", "六", "日"],
+        months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+        monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+        today: "今天",
+        suffix: [],
+        meridiem: ["上午", "下午"]
+    };
+}(jQuery));

WebService/src/main/resources/views/init_company.html

@@ -1,4 +1,4 @@
-
+<!DOCTYPE html>
 <html lang="en"
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org"
@@ -10,22 +10,20 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 
     <title>完善公司信息 | java110</title>
-
     <vc:create name="commonTop"></vc:create>
     <link href="/css/plugins/steps/jquery.steps.css" rel="stylesheet"/>
 
-
 </head>
 
 <body class="gray-bg">
+
 <vc:create name="loading"></vc:create>
 <div >
     <vc:create name="company"></vc:create>
 
 </div>
-
-
 <vc:create name="commonBottom"></vc:create>
+
 </body>
 
 </html>

WebService/src/main/resources/views/propertyFeeFlow.html

@@ -7,7 +7,6 @@
     <meta charset="UTF-8"/>
     <title>缴物业费|java110</title>
     <vc:create name="commonTop"></vc:create>
-    <link rel="stylesheet" href="/css/bootstrap/bootstrap-datetimepicker.min.css"/>
 </head>
 <body>
 <vc:create name="bodyTop"></vc:create>
@@ -31,7 +30,6 @@
 
     </div>
 </div>
-<script src="/js/bootstrap/bootstrap-datetimepicker.min.js"></script>
 <vc:create name="commonBottom"></vc:create>
 </body>
 </html>