Merge remote-tracking branch 'origin/master'

smart-office-manager-ui/admin/package.json

@@ -38,8 +38,7 @@
     "vue-cropper": "0.5.5",
     "vue-router": "3.4.9",
     "vue-template-compiler": "^2.6.14",
-    "vuex": "3.6.0",
-    "nprogress": "^0.2.0"
+    "vuex": "3.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
@@ -64,5 +63,7 @@
     "> 1%",
     "last 2 versions",
     "not ie <= 8"
-  ]
+  ],
+  "main": "index.js",
+  "license": "MIT"
 }

smart-office-manager-ui/admin/src/views/metting/record/drawershow.vue

@@ -7,16 +7,16 @@
             size="40%">
         <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
-                            <Field :span="20" label="会议名称" prop="meetName" v-model="form.meetName" placeholder="请输入会议名称"/>
+              <Field :span="20" label="会议名称" prop="meetName" v-model="form.meetName" placeholder="请输入会议名称"/>
               <Field :span="20" label="选择房间" prop="roomId" v-model="form.roomId" type="select" :enumData="dict.roomId" placeholder="请选择开会房间"/>
               <Field :span="20" label="会议日期" prop="meetDate" v-model="form.meetDate" type="date" />
-<!--              <Field :span="20" label="开会开始时间" prop="meetTimeStart" v-model="form.meetTimeStart" type="datetime" />
-             --> <Field :span="20" label="开会开始时间">
+              <Field :span="20" label="开会开始时间" prop="meetTimeStart" v-model="form.meetTimeStart">
               <el-time-select
                   placeholder="起始时间"
                   v-model="form.meetTimeStart"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="HH:mm"
                   format="HH:mm"
+                  :key="form.meetTimeStart"
                   :picker-options="{
                                         start: '07:00',
                                         step: '00:30',
@@ -25,17 +25,18 @@
               </el-time-select>
 
               </Field>
-
-              <Field :span="20" label="开会结束时间">
+              <Field :span="20" label="开会结束时间" prop="meetTimeEnd" v-model="form.meetTimeEnd">
                 <el-time-select
                     placeholder="结束时间"
                     v-model="form.meetTimeEnd"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="HH:mm"
                     format="HH:mm"
+                    :key="form.meetTimeEnd"
                     :picker-options="{
                                         start: '07:00',
                                         step: '00:30',
-                                        end: '20:00'
+                                        end: '20:00',
+                                        minTime:form.meetTimeStart
                                       }">
                 </el-time-select>
 
@@ -82,8 +83,6 @@
                 ],
                 toDate:[
                     "meetDate",
-                    "meetTimeStart",
-                    "meetTimeEnd",
                 ],
                 // 表单校验
                 rules: {
@@ -154,6 +153,8 @@
             },
             /**获取数据后弹框 */
             afterRender(data) {
+                this.form.meetTimeStart = moment(data.entity.meetTimeStart).format('HH:mm');
+                this.form.meetTimeEnd = moment(data.entity.meetTimeEnd).format('HH:mm');
                 this.open = true;
             },
 

smart-office-manager-ui/admin/src/views/room/drawershow.vue

@@ -42,6 +42,13 @@
             this.changePath("room")
         },
         data() {
+            let validatorSheet = (rule, value, callback)=>{
+                if(this.deviceIds.length<1){
+                    callback(new Error('请选择关联设备'))
+                }else{
+                    callback()
+                }
+            }
             return {
               fileType:['png', 'jpg', 'jpeg'],
               roomDeviceList: [],
@@ -69,9 +76,9 @@
                     roomType: [
                         {required: true,message: "请输入房间类型", trigger: "blur" },
                     ],
-                  deviceId: [
-                    {required: true,message: "请选择关联设备", trigger: "blur" },
-                  ],
+                    deviceId: [
+                        {required: true,message: "请选择关联设备", trigger: "blur" ,validator: validatorSheet},
+                    ],
                     createTime: [
                         {required: true,message: "请选择创建时间" },
                     ],
@@ -131,7 +138,6 @@
 
           beforeSubmit(data) {
            // data.deviceName=this.dict.deviceId[data.deviceId]
-            console.log(this.deviceIds)
             let roomDeviceList=this.deviceIds.map(i=>{
               let obj={}
               obj.deviceId=i

smart-office-manager-ui/admin/src/views/workman/drawershow.vue

@@ -27,8 +27,11 @@
                   :fileName="form.photoPath"
               /></Field>
               <Field  :span="20" label="党员示范logo" ><fileUpload v-model="form.filePath"  :fileType="fileType" :fileName="form.fileName"   @getFileName="getFileName" prePath="/file/fileupload"/></Field>
-
-              <Field label="排序值" type="num" prop="order" v-model="form.order" placeholder="请输入排序，值越大越靠前"/>
+                
+                <Field label="排序值" :span="20">
+                <Field type="num" prop="order" v-model="form.order" placeholder="请输入排序，值越大越靠前"/>
+                  <div>请输入排序，值越大越靠前</div>
+                </Field>
             </el-row>
 
             <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
@@ -49,6 +52,28 @@
             this.changePath("workman")
         },
         data() {
+          let mobileReg = (rule, value, callback) =>{
+            if(!value){
+              callback(new Error('请输入电话号码'))
+            }
+            let regExp=/^(0\d{2,3}\-)?([2-9]\d{6,7})+(\-\d{1,6})?$/;
+              if(regExp.test(value)){
+                callback()
+              }else{
+                callback(new Error('请输入正确格式的电话号码'))
+              }
+          }
+          let phoneReg = (rule, value, callback) =>{
+            if(!value){
+              callback(new Error('请输入手机号码'))
+            }
+            let regExp=/^(((\+86)|(\+86-))|((86)|(86\-))|((0086)|(0086\-)))?1[3|5|7|8]\d{9}$/;
+            if(regExp.test(value)){
+              callback()
+            }else{
+              callback(new Error('请输入正确格式的手机号码'))
+            }
+          }
             return {
               fileType:['png', 'jpg', 'jpeg'],
                 // 遮罩层
@@ -79,11 +104,11 @@
                     {required: true,message: "请选择人员所属房间", trigger: "blur" }
                   ],
                   phone: [
-                    {required: true,message: "请输入电话号码", trigger: "blur" },
+                    {required: true,trigger: "blur" ,validator:phoneReg },
                     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                   ],
                   mobile: [
-                    {required: true,message: "请输入手机号码", trigger: "blur" },
+                    {required: true,trigger: "blur" ,validator:mobileReg},
                     {max: 64,message: "最多只能录入64个字符",trigger: "blur",},
                   ],
                     workStatus: [

smart-office-manager-ui/admin/vue.config.js

@@ -17,7 +17,7 @@ module.exports = {
     hot: true, //自动保存
     proxy: {
       "/office": {
-        target: "http://test.office.com:11078",
+        target: "http://192.168.0.98:11085",
         // target: 'http://8.136.255.30:11078',
         changeOrigin: true,
         secure: false,