平台端页面调整

src/components/page/GlobalHeader.vue

@@ -17,8 +17,8 @@
         :type="collapsed ? 'menu-unfold' : 'menu-fold'"
         @click="toggle"/>
 
-      <span v-if="device === 'desktop'">滚动公告区域</span>
-      <span v-else>Jeecg-Boot</span>
+<!--      <span v-if="device === 'desktop'">滚动公告区域</span>-->
+<!--      <span v-else>Jeecg-Boot</span>-->
 
       <user-menu :theme="theme"/>
     </div>
@@ -225,4 +225,4 @@
 
   /* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
 
-</style>
+</style>

src/components/tools/UserMenu.vue

@@ -2,35 +2,35 @@
   <div class="user-wrapper" :class="theme">
     <!-- update_begin author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
     <!-- update-begin author:sunjianlei date:20191@20 for: 解决全局样式冲突的问题 -->
-    <span class="action" @click="showClick">
-      <a-icon type="search"></a-icon>
-    </span>
+<!--    <span class="action" @click="showClick">-->
+<!--      <a-icon type="search"></a-icon>-->
+<!--    </span>-->
     <!-- update-begin author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
-    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">
-      <a-select
-        class="search-input"
-        showSearch
-        :showArrow="false"
-        placeholder="搜索菜单"
-        optionFilterProp="children"
-        :filterOption="filterOption"
-        :open="isMobile()?true:null"
-        :getPopupContainer="(node) => node.parentNode"
-        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"
-        @change="searchMethods"
-        @blur="hiddenClick"
-      >
-        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>
-      </a-select>
-    </component>
+<!--    <component :is="searchMenuComp" v-show="searchMenuVisible || isMobile()" class="borders" :visible="searchMenuVisible" title="搜索菜单" :footer="null" @cancel="searchMenuVisible=false">-->
+<!--      <a-select-->
+<!--        class="search-input"-->
+<!--        showSearch-->
+<!--        :showArrow="false"-->
+<!--        placeholder="搜索菜单"-->
+<!--        optionFilterProp="children"-->
+<!--        :filterOption="filterOption"-->
+<!--        :open="isMobile()?true:null"-->
+<!--        :getPopupContainer="(node) => node.parentNode"-->
+<!--        :style="isMobile()?{width: '100%',marginBottom:'50px'}:{}"-->
+<!--        @change="searchMethods"-->
+<!--        @blur="hiddenClick"-->
+<!--      >-->
+<!--        <a-select-option v-for="(site,index) in searchMenuOptions" :key="index" :value="site.id">{{site.meta.title}}</a-select-option>-->
+<!--      </a-select>-->
+<!--    </component>-->
     <!-- update-end author:sunjianlei date:20200219 for: 菜单搜索改为动态组件，在手机端呈现出弹出框 -->
     <!-- update-end author:sunjianlei date:20191220 for: 解决全局样式冲突的问题 -->
     <!-- update_end  author:zhaoxin date:20191129 for: 做头部菜单栏导航 -->
-    <span class="action">
-      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">
-        <a-icon type="question-circle-o"></a-icon>
-      </a>
-    </span>
+<!--    <span class="action">-->
+<!--      <a class="logout_title" target="_blank" href="http://doc.jeecg.com">-->
+<!--        <a-icon type="question-circle-o"></a-icon>-->
+<!--      </a>-->
+<!--    </span>-->
     <header-notice class="action"/>
     <a-dropdown>
       <span class="action action-full ant-dropdown-link user-dropdown-menu">
@@ -38,18 +38,18 @@
         <span v-if="isDesktop()">欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
-          <router-link :to="{ name: 'account-center' }">
-            <a-icon type="user"/>
-            <span>个人中心</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="1">
-          <router-link :to="{ name: 'account-settings-base' }">
-            <a-icon type="setting"/>
-            <span>账户设置</span>
-          </router-link>
-        </a-menu-item>
+<!--        <a-menu-item key="0">-->
+<!--          <router-link :to="{ name: 'account-center' }">-->
+<!--            <a-icon type="user"/>-->
+<!--            <span>个人中心</span>-->
+<!--          </router-link>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="1">-->
+<!--          <router-link :to="{ name: 'account-settings-base' }">-->
+<!--            <a-icon type="setting"/>-->
+<!--            <span>账户设置</span>-->
+<!--          </router-link>-->
+<!--        </a-menu-item>-->
         <a-menu-item key="3"  @click="systemSetting">
            <a-icon type="tool"/>
            <span>系统设置</span>
@@ -58,14 +58,14 @@
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-        <a-menu-item key="5" @click="updateCurrentDepart">
-          <a-icon type="cluster"/>
-          <span>切换部门</span>
-        </a-menu-item>
-        <a-menu-item key="6" @click="clearCache">
-          <a-icon type="sync"/>
-          <span>清理缓存</span>
-        </a-menu-item>
+<!--        <a-menu-item key="5" @click="updateCurrentDepart">-->
+<!--          <a-icon type="cluster"/>-->
+<!--          <span>切换部门</span>-->
+<!--        </a-menu-item>-->
+<!--        <a-menu-item key="6" @click="clearCache">-->
+<!--          <a-icon type="sync"/>-->
+<!--          <span>清理缓存</span>-->
+<!--        </a-menu-item>-->
        <!-- <a-menu-item key="2" disabled>
           <a-icon type="setting"/>
           <span>测试</span>
@@ -284,4 +284,4 @@
     color: inherit;
     text-decoration: none;
   }
-</style>
+</style>

src/views/business/BusHotelList.vue

@@ -66,18 +66,19 @@
     <!-- 操作按钮区域 -->
     <div class='table-operator'>
       <a-button @click='handleAdd' type='primary' icon='plus'>新增</a-button>
-      <a-button type='primary' icon='download' @click="handleHotelExportXls('酒店信息')">导出</a-button><!-- handleExportXls-->
-      <a-upload
-        name='file'
-        :showUploadList='false'
-        :multiple='false'
-        :headers='tokenHeader'
-        :action='importExcelUrl'
-        @change='handleHotelImportExcel'>
-        <a-button type='primary' icon='import'>导入</a-button>
-      </a-upload>
+      <!-- handleExportXls-->
+<!--      <a-button type='primary' icon='download' @click="handleHotelExportXls('酒店信息')">导出</a-button>-->
+<!--      <a-upload-->
+<!--        name='file'-->
+<!--        :showUploadList='false'-->
+<!--        :multiple='false'-->
+<!--        :headers='tokenHeader'-->
+<!--        :action='importExcelUrl'-->
+<!--        @change='handleHotelImportExcel'>-->
+<!--        <a-button type='primary' icon='import'>导入</a-button>-->
+<!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList='superFieldList' ref='superQueryModal' @handleSuperQuery='handleSuperQuery'></j-super-query>
+<!--      <j-super-query :fieldList='superFieldList' ref='superQueryModal' @handleSuperQuery='handleSuperQuery'></j-super-query>-->
       <a-dropdown v-if='selectedRowKeys.length > 0'>
         <a-menu slot='overlay'>
           <a-menu-item key='1' @click='batchDel'><a-icon type='delete'/>删除</a-menu-item>

src/views/business/modules/BusHotelForm.vue

@@ -371,7 +371,7 @@
                   }],
                   linkTel: [{
                       required: true, message: '请输入联系电话!'
-                  }],
+                  }, {validator: this.validatePhone}],//, {validator: this.validatePhone}
                   tel: [{
                       required: true, message: '请输入酒店电话!'
                   }],
@@ -390,12 +390,12 @@
                   roomCount: [{
                       required: true, message: '请输入客房总数!'
                   }],
-                  openTime: [{
-                      required: true, message: '请输入开业时间!'
-                  }],
-                  renovationTime: [{
-                      required: true, message: '请输入装修时间!'
-                  }],
+                  // openTime: [{
+                  //     required: true, message: '请输入开业时间!'
+                  // }],
+                  // renovationTime: [{
+                  //     required: true, message: '请输入装修时间!'
+                  // }],
                   checkStatus: [{
                       required: true, message: '请选择审核状态', trigger: 'change'
                   }]
@@ -544,6 +544,7 @@
               const that = this
               // 触发表单验证
               this.$refs.form.validate(valid => {
+                  console.log(valid)
                   if (valid) {
                       that.confirmLoading = true
                       let httpurl = ''
@@ -708,6 +709,30 @@
               }
               this.fileList = fileList
           },
+          validatePhone(rule, value, callback){
+              if(!value){
+                  callback()
+              }else{
+                  if(new RegExp(/^1[3|4|5|6|7|8|9][0-9]\d{8}$/).test(value)){
+                      // var params = {
+                      //     tableName: 'sys_user',
+                      //     fieldName: 'phone',
+                      //     fieldVal: value,
+                      //     dataId: this.userId
+                      // };
+                      // duplicateCheck(params).then((res) => {
+                      //     if (res.success) {
+                      //         callback()
+                      //     } else {
+                      //         callback("手机号已存在!")
+                      //     }
+                      // })
+                      callback()
+                  }else{
+                      callback("请输入正确格式的手机号码!");
+                  }
+              }
+          },
       }
   }
 </script>

src/views/system/UserList.vue

@@ -66,12 +66,12 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleAdd" type="primary" icon="plus" >添加用户</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <j-third-app-button biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally"/>
-      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>-->
+<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+<!--        <a-button type="primary" icon="import">导入</a-button>-->
+<!--      </a-upload>-->
+<!--      <j-third-app-button biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally"/>-->
+<!--      <a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay" @click="handleMenuClick">
           <a-menu-item key="1">
@@ -92,7 +92,7 @@
           <a-icon type="down"/>
         </a-button>
       </a-dropdown>
-      <j-super-query :fieldList="superQueryFieldList" @handleSuperQuery="handleSuperQuery"/>
+<!--      <j-super-query :fieldList="superQueryFieldList" @handleSuperQuery="handleSuperQuery"/>-->
     </div>
 
     <!-- table区域-begin -->
@@ -388,4 +388,4 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less'
-</style>
+</style>

src/views/system/modules/UserModal.vue

@@ -48,9 +48,9 @@
           <a-input placeholder="请输入手机号码" v-model="model.phone" />
         </a-form-model-item>
 
-        <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
-        </a-form-model-item>
+<!--        <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>-->
+<!--        </a-form-model-item>-->
 
         <a-form-model-item label="角色分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!roleDisabled" >
           <j-multi-select-tag
@@ -62,47 +62,47 @@
         </a-form-model-item>
 
         <!--部门分配-->
-        <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
-        </a-form-model-item>
+<!--        <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">-->
+<!--          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>-->
+<!--        </a-form-model-item>-->
 
         <!--租户分配-->
-        <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-multi-select-tag
-                  :disabled="disableSubmit"
-                  v-model="model.relTenantIds"
-                  :options="tenantsOptions"
-                  placeholder="请选择租户">
-          </j-multi-select-tag>
-        </a-form-model-item>
-
-        <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-radio-group  v-model="model.userIdentity"  @change="identityChange">
-            <a-radio :value="1">普通用户</a-radio>
-            <a-radio :value="2">上级</a-radio>
-          </a-radio-group>
-        </a-form-model-item>
-        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-show="departIdShow==true">
-          <j-multi-select-tag
-                  :disabled="disableSubmit"
-                  v-model="model.departIds"
-                  :options="nextDepartOptions"
-                  placeholder="请选择负责部门">
-          </j-multi-select-tag>
-        </a-form-model-item>
+<!--        <a-form-model-item label="租户分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">-->
+<!--          <j-multi-select-tag-->
+<!--                  :disabled="disableSubmit"-->
+<!--                  v-model="model.relTenantIds"-->
+<!--                  :options="tenantsOptions"-->
+<!--                  placeholder="请选择租户">-->
+<!--          </j-multi-select-tag>-->
+<!--        </a-form-model-item>-->
+
+<!--        <a-form-model-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <a-radio-group  v-model="model.userIdentity"  @change="identityChange">-->
+<!--            <a-radio :value="1">普通用户</a-radio>-->
+<!--            <a-radio :value="2">上级</a-radio>-->
+<!--          </a-radio-group>-->
+<!--        </a-form-model-item>-->
+<!--        <a-form-model-item label="负责部门" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-show="departIdShow==true">-->
+<!--          <j-multi-select-tag-->
+<!--                  :disabled="disableSubmit"-->
+<!--                  v-model="model.departIds"-->
+<!--                  :options="nextDepartOptions"-->
+<!--                  placeholder="请选择负责部门">-->
+<!--          </j-multi-select-tag>-->
+<!--        </a-form-model-item>-->
 
         <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
         </a-form-model-item>
 
-        <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-                  style="width: 100%"
-                  placeholder="请选择生日"
-                  v-model="model.birthday"
-                  :format="dateFormat"
-                  :getCalendarContainer="node => node.parentNode"/>
-        </a-form-model-item>
+<!--        <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <a-date-picker-->
+<!--                  style="width: 100%"-->
+<!--                  placeholder="请选择生日"-->
+<!--                  v-model="model.birthday"-->
+<!--                  :format="dateFormat"-->
+<!--                  :getCalendarContainer="node => node.parentNode"/>-->
+<!--        </a-form-model-item>-->
 
         <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">