Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/TpShopTypeController.java

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -69,6 +70,15 @@ public class TpShopTypeController extends BaseController {
 		shopType.setSource("self");
 		shopType.setCreateUser(userElement.getId());
 		shopType.setCreateDate(LocalDateTime.now());
+		//查看索引是否存在
+		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
+		shopTypeQueryWrapper.eq("community_id",shopType.getCommunityId());
+		shopTypeQueryWrapper.eq("sort",shopType.getSort());
+		List<TpShopType> list = shopTypeService.list(shopTypeQueryWrapper);
+		if (list.size() > 0){
+			responseBean.addError("此索引已存在");
+			return responseBean;
+		}
 		boolean state  = shopTypeService.save(shopType);
 		if (state){
 			responseBean.addSuccess("添加成功");
@@ -101,6 +111,17 @@ public class TpShopTypeController extends BaseController {
 	public ResponseBean updateShopType(@RequestBody TpShopType shopType, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = getUserElement(session);
+		//查看索引是否存在
+		QueryWrapper<TpShopType> shopTypeQueryWrapper = new QueryWrapper<>();
+		shopTypeQueryWrapper.eq("community_id",userElement.getCommunityId());
+		shopTypeQueryWrapper.eq("sort",shopType.getSort());
+		shopTypeQueryWrapper.ne("id",shopType.getId());
+		List<TpShopType> list = shopTypeService.list(shopTypeQueryWrapper);
+		if (list.size() > 0){
+			responseBean.addError("此索引已存在");
+			return responseBean;
+		}
+		
 		boolean state  = shopTypeService.updateById(shopType);
 		if (state){
 			responseBean.addSuccess("更新成功");

VUECODE/smart-property-manage/src/api/grogshop.js

@@ -60,7 +60,7 @@ export function hotelRoomRoomStatus(data) {
     url: '/hotelRoomRoomStatus',
     method: 'post',
     data: {
-      roomStatusIds: data.roomStatusIds,
+      id: data.roomStatusIds,
       roomStatus: data.roomStatus
     }
   })

VUECODE/smart-property-manage/src/views/grogshop/configindex.vue

@@ -1,15 +1,17 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
+     
       <el-form-item class="filter-item" label="酒店开关">
-        <el-switch
+        <span  style="font-size:9%;color:#C0C0C0">关闭后业主在APP端将看不到酒店相关的页面</span>
+        <el-switch style="padding-left:25%"
           v-model="listData.hotelSettingValue"
           active-color="#13ce66"
           inactive-color="#ff4949">
         </el-switch>
-        <span>关闭后业主在APP端将看不到酒店相关的页面</span>
       </el-form-item>
       <el-form-item label="酒店首页图" prop="appIndexImg">
+        <span  style="font-size:9%;color:#C0C0C0"> APP端首页显示酒店栏的背景图，如果有文案需求可以用PS在图上添加文字等信息</span>
         <el-upload
           class="avatar-uploader"
           name="uploadFiles"
@@ -59,7 +61,7 @@
           </el-amap>
         </div>
       </el-form-item>
-      <el-form-item label="酒店介绍">
+      <el-form-item label="房间介绍" prop="hotelIntroduction">
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
           <div id="father">
             <wangeditor :content="listData.hotelIntroduction" @wangeditorEvent="wangeditorValue"/>
@@ -127,6 +129,9 @@ export default {
         hotelName: [
           { required: true, message: '酒店名称', trigger: 'blur' }
         ],
+        hotelIntroduction: [
+          { required: true, message: '房间介绍不能为空', trigger: 'change' }
+        ],
       }
     }
   },
@@ -202,6 +207,7 @@ export default {
         }
       })
     },
+
     resetForm(formName) { // 重置
       // 重置为未注册
       this.isRegistered = true
@@ -212,10 +218,6 @@ export default {
       this.$refs[formName].resetFields()
     },
     updateRental() {
-      if (this.listData.hotelLongitude === '' || this.listData.hotelLatitude === '') {
-        this.$message.error('地理坐标不能为空！')
-        return
-      }
       // 加载框
       const loading = this.$loading({
         lock: true,
@@ -223,6 +225,12 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
+      console.log('this.listData.hotelIntroduction',this.listData.hotelIntroduction)
+      if(this.listData.hotelIntroduction === '<p><br></p>'){
+         this.$message.error('房间介绍不能为空')
+         loading.close()
+         return
+      }
       this.$store.dispatch('UpdateHotel', this.listData).then((res) => {
         if (res.code === '0') {
           this.$message({

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoom.vue

@@ -2,7 +2,7 @@
   <div>
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item class="filter-item"  label="房型编号">
-        <el-input v-model="listQuery.roomNo"  placeholder="房型编号"/>
+        <el-input v-model="listQuery.id"  placeholder="房型编号"/>
       </el-form-item>
       <el-form-item class="filter-item"  label="房型名称">
         <el-input v-model="listQuery.roomName" placeholder="房型名称"/>
@@ -16,7 +16,7 @@
          <el-option label="已下架" value="2"/>
         </el-select>
       </el-form-item>
-      <el-form-item class="filter-item"  label="预订日期从">
+      <!-- <el-form-item class="filter-item"  label="预订日期从">
             <el-date-picker
               v-model="listQuery.beginTime"
               type="date"
@@ -28,7 +28,7 @@
               type="date"
               placeholder="年-月-日">
               </el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="info" class="filter-item" @click="handleFilter">清空</el-button>
         <el-button type="primary" @click="search">查询</el-button>
@@ -53,17 +53,28 @@
       <el-table-column
         type="selection"
         width="55"/>
-      <el-table-column prop="roomNo" label="编号" align="center"/>
+      <el-table-column prop="id" label="编号" align="center"/>
       <el-table-column prop="roomName" label="房屋名称" align="center">
          <template slot-scope="scope" >
-        <a :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color: #009FCC">
-           {{ scope.row.roomName}}
-        </a>
+          <a v-if="scope.row.roomStatus==='1'">
+            <span :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color: #009FCC">
+            {{ scope.row.roomName}}
+            </span>
+          </a>
+          <a v-if="scope.row.roomStatus==='2'">
+            <span :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color:#BDBDBD">
+            {{ scope.row.roomName}}
+            </span>
+          </a>
       </template>
       </el-table-column>
       <el-table-column prop="sort" label="权重" align="center"/>
       <el-table-column prop="price" label="房型价格" align="center"/>
-      <el-table-column prop="roomStatus" label="上架状态" align="center"><template slot-scope="scope">{{ scope.row.roomStatus=='1'?'已上架':'已下架' }}</template></el-table-column>
+      <el-table-column prop="roomStatus" label="上架状态" align="center">
+        <template slot-scope="scope">   
+          <span v-if="scope.row.roomStatus==='1'">已上架</span>
+          <span v-if="scope.row.roomStatus==='2'" style="color:#BDBDBD">已下架</span>
+        </template></el-table-column>
       <el-table-column prop="editUser" label="编辑人" align="center"/>
       <el-table-column prop="createDate" label="时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
 
@@ -78,7 +89,6 @@
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"/>
   </div>
-
 </div>
 
 </template>
@@ -200,9 +210,15 @@ export default {
     clickTitle(ids){
     this.$router.push({ name: 'grogshop-grogshopRoomEdit', query: { id: ids}})
     },
-    enditRoom(){
-         const ids = this.deleteIds
+    enditRoom(statusId){
+       const ids = this.deleteIds
+      if (ids.length < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
+        
          this.listQuery.roomStatusIds = ids
+         this.listQuery.roomStatus = statusId
          this.$store.dispatch('HotelRoomRoomStatus', this.listQuery).then((res) => {
          this.$message({
           message: '成功',

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomAdd.vue

@@ -1,19 +1,19 @@
 <template>
   <div id="root">
-    <el-form ref="ruleForm" :model="ruleForm"  label-width="100px" class="demo-ruleForm">
-      <el-form-item label="房型名称" >
+    <el-form ref="ruleForm" :model="ruleForm"  :rules="rules" label-width="100px" class="demo-ruleForm">
+      <el-form-item label="房型名称" prop="roomName">
         <el-input v-model="ruleForm.roomName" placeholder="房型名称"/>
       </el-form-item>
-       <el-form-item label="房型号" >
+       <!-- <el-form-item label="房型号" prop="roomNo">
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item class="filter-item" label="房型描述" prop="remark" >
         <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
       </el-form-item>
-      <el-form-item label="房型价格">
+      <el-form-item label="房型价格" prop="price">
         <el-input v-model="ruleForm.price" placeholder="房型价格" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>
-      <el-form-item class="filter-item"  label="上架状态">
+      <el-form-item class="filter-item"  label="上架状态" prop="roomStatus">
         <el-select v-model="ruleForm.roomStatus" placeholder="上架">
          <el-option label="上架" value="1"/>
          <el-option label="下架" value="2"/>
@@ -40,28 +40,27 @@ export default {
        roomStatus: '',
              sort: '1',
            roomNo: ''
+      },
+      rules: {
+        roomName: [
+          { required: true, message: '请输入房型名称', trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: '请输入房型描述', trigger: 'blur' }
+        ],
+        price: [
+          { required: true, message: '请输入房型描述', trigger: 'blur' }
+        ],
+        roomStatus: [
+          { required: true, message: '请选择状态', trigger: 'blur' }
+        ],         
       }
-      // rules: {
-      //   userName: [
-      //     { required: true, message: '请输入姓名', trigger: 'blur' }
-      //   ],
-      //   price: [
-      //     { required: true, message: '请输入价格', trigger: 'blur' }
-      //   ],
-      //   menuArray: [
-      //     { required: true, message: '请选择角色', trigger: 'blur' }
-      //   ],       
-      // }
     }
   },
   mounted() {
   },
   methods: {
     submitForm(){
-      if(this.ruleForm.roomNo ===''){
-        this.$message.error('请输入房型号');
-        return
-      }
       if(this.ruleForm.roomName ===''){
         this.$message.error('请输入房型名称');
         return

VUECODE/smart-property-manage/src/views/grogshop/grogshopRoomEdit.vue

@@ -4,9 +4,9 @@
       <el-form-item label="房型名称" >
         <el-input v-model="ruleForm.roomName" placeholder="房型名称"/>
       </el-form-item>
-       <el-form-item label="房型号" >
+      <!-- <el-form-item label="房型号" >
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
-      </el-form-item>
+      </el-form-item> -->
      <el-form-item class="filter-item" label="房型描述" prop="remark" >
         <el-input v-model.trim="ruleForm.remark" placeholder="房型描述"/>
       </el-form-item>

VUECODE/smart-property-manage/src/views/rental/rentalAdd.vue

@@ -93,7 +93,7 @@
       <el-form-item label="高德坐标" prop="communityLatitude">
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
-        <span>在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <span  style="font-size:9%;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

VUECODE/smart-property-manage/src/views/rental/rentalEdit.vue

@@ -94,7 +94,7 @@
       <el-form-item label="高德坐标" prop="communityLatitude">
         <el-input placeholder="经度" v-model="listData.communityLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.communityLatitude" style="width: 150px;" />
-        <span>在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <span  style="font-size:9%;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

VUECODE/smart-property-manage/src/views/rental/rentalIndex.vue

@@ -44,7 +44,7 @@
       <el-button type="warning" @click="edit">修改</el-button>
       <el-button type="danger" @click="shelfRental">上架房间</el-button>
       <el-button type="danger" @click="obtainedRental">下架房间</el-button>
-      <span>注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
+      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">注：权重越大，APP端展示越靠前（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"

VUECODE/smart-property-manage/src/views/shop/shopAdd.vue

@@ -48,7 +48,7 @@
       </el-form-item>
       <el-form-item label="权重" prop="sort">
         <el-input v-model="listData.sort" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
-        <span>权重值越大，排序越靠前</span>
+        <span style="font-size:9%;color:#C0C0C0;">权重值越大，排序越靠前</span>
       </el-form-item>
       <el-form-item label="商铺类型" prop="shopTypeId">
         <el-select v-model="listData.shopTypeId" placeholder="商铺类型" clearable class="filter-item">
@@ -74,7 +74,7 @@
       <el-form-item label="高德坐标" prop="shopLatitude">
         <el-input placeholder="经度" v-model="listData.shopLongitude" style="width: 150px;" />
         <el-input placeholder="纬度" v-model="listData.shopLatitude" style="width: 150px;" />
-        <span>在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
+        <span  style="font-size:9%;color:#C0C0C0">在地图上搜索选择酒店位置确定坐标值，供APP端用户导航</span>
       </el-form-item>
       <el-form-item label="">
          <!-- 地图 -->

VUECODE/smart-property-manage/src/views/shop/shopEdit.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="listData" :rules="rules" label-width="150px" class="add-ruleForm">
-      <el-form-item label="商铺名称" prop="shopName">
+      <!-- <el-form-item label="商铺名称" prop="shopName">
         <el-input v-model="listData.shopName"/>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="商铺说明" prop="remark">
         <el-input v-model="listData.remark"/>
       </el-form-item>

VUECODE/smart-property-manage/src/views/shop/shopIndex.vue

@@ -29,7 +29,7 @@
       <el-button type="warning" @click="edit">修改</el-button>
       <el-button type="danger" @click="shelfShop">上架商铺</el-button>
       <el-button type="danger" @click="obtainedShop">下架商铺</el-button>
-      <span>注：权重最大的4个上架且有首页展示图的商铺默认会显示在APP首页（权重相同时按编辑时间从晚到早排序）</span>
+      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">注：权重最大的4个上架且有首页展示图的商铺默认会显示在APP首页（权重相同时按编辑时间从晚到早排序）</span>
     </div>
     <el-table
       v-loading="listLoading"

VUECODE/smart-property-manage/src/views/shop/shopSetting.vue

@@ -9,13 +9,14 @@
           inactive-color="#ff4949"
           @change="changeSetting">
         </el-switch>
-        <span>关闭后业主在APP端将看不到商铺相关的页面</span>
+         <span  style="font-size:9%;color:#C0C0C0;">关闭后业主在APP端将看不到商铺相关的页面</span>
       </el-form-item>
     </el-form>
     <div class="button">
       <el-button type="primary" @click="add">添加</el-button>
       <el-button type="warning" @click="edit">修改</el-button>
       <el-button type="danger" @click="deleteShopType">删除</el-button>
+      <span  style="font-size:9%;color:#C0C0C0;padding-left:25%">索引顺序即显示时的先后顺序，不能相同，必须为大于0的整数，数字越小越靠前，如果有1则1号值排会在APP端第一位</span>
     </div>
     <el-table
       v-loading="listLoading"
@@ -30,7 +31,7 @@
         width="55"/>
       <el-table-column prop="id" label="编号" align="center"/>
       <el-table-column prop="typeName" label="商铺类型" align="center"/>
-      <el-table-column prop="sort" label="权重" align="center"/>
+      <el-table-column prop="sort" label="索引" align="center"/>
       <el-table-column prop="createDate" label="发布时间" align="center"><template slot-scope="scope">{{ formatDate(scope.row.createDate) }}</template></el-table-column>
     </el-table>
     <div class="block">

VUECODE/smart-property-manage/src/views/shop/shopSettingAdd.vue

@@ -4,7 +4,7 @@
       <el-form-item label="商铺类型" prop="typeName">
         <el-input v-model="listQuery.typeName" style="width: 200px;"/>
       </el-form-item>
-      <el-form-item label="权重" prop="sort">
+      <el-form-item label="索引" prop="sort">
         <el-input v-model="listQuery.sort" style="width: 200px;"/>
       </el-form-item>
       <el-form-item>

VUECODE/smart-property-manage/src/views/shop/shopSettingEdit.vue

@@ -4,7 +4,7 @@
       <el-form-item label="商铺类型" prop="typeName">
         <el-input v-model="listQuery.typeName" style="width: 200px;"/>
       </el-form-item>
-      <el-form-item label="权重" prop="sort">
+      <el-form-item label="索引" prop="sort">
         <el-input v-model="listQuery.sort" :disabled="listQuery.isSys" style="width: 200px;"/>
       </el-form-item>
       <el-form-item>