合并

VUECODE/smart-property-manage/src/router/index.js

@@ -494,14 +494,14 @@ export const constantRouterMap = [
         component: () => import('@/views/grogshop/grogshopRoomAdd'),
         name: 'grogshop-grogshopRoomAdd',
         hidden: true,
-        meta: { title: '新增房间', icon: 'table' }
+        meta: { title: '新增房型', icon: 'table' }
       },
       {
         path: '/grogshop/grogshopRoomEdit',
         component: () => import('@/views/grogshop/grogshopRoomEdit'),
         name: 'grogshop-grogshopRoomEdit',
         hidden: true,
-        meta: { title: '编辑房间', icon: 'table' }
+        meta: { title: '编辑房型', icon: 'table' }
       }
     ]
   },

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

@@ -54,7 +54,7 @@
         type="selection"
         width="55"/>
       <el-table-column prop="id" label="编号" align="center"/>
-      <el-table-column prop="roomName" label="房屋名称" align="center">
+      <el-table-column prop="roomName" label="房型名称" align="center">
          <template slot-scope="scope" >
           <a v-if="scope.row.roomStatus==='1'">
             <span :title="scope.row.roomName" @click="clickTitle(scope.row.id)" style="color: #009FCC">

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

@@ -7,8 +7,8 @@
        <!-- <el-form-item label="房型号" prop="roomNo">
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item> -->
-     <el-form-item class="filter-item" label="房间短描述" prop="remark" >
-        <el-input v-model.trim="ruleForm.remark" placeholder="房间推荐语等"/>
+     <el-form-item class="filter-item" label="房型短描述" prop="remark" >
+        <el-input v-model.trim="ruleForm.remark" placeholder="房型推荐语等"/>
       </el-form-item>
       <el-form-item label="房型价格" prop="price">
         <el-input v-model="ruleForm.price" placeholder="单位元" onkeyup="this.value=this.value.replace(/\D/g,'')"/>

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

@@ -7,11 +7,11 @@
       <!-- <el-form-item label="房型号" >
         <el-input v-model="ruleForm.roomNo" placeholder="房型号"/>
       </el-form-item> -->
-     <el-form-item class="filter-item" label="房间短描述" prop="remark" >
-        <el-input v-model.trim="ruleForm.remark" placeholder="房间推荐语等"/>
+     <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-input v-model="ruleForm.price" placeholder="单位元"/>
+        <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-select v-model="ruleForm.roomStatus" placeholder="上架">
@@ -20,7 +20,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="权重" prop="sort">
-        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数"/>
+        <el-input v-model="ruleForm.sort" placeholder="不小于0的整数" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
       </el-form-item>  
       <el-form-item>
         <el-button type="primary" @click="submitForm()">保存</el-button>
@@ -60,10 +60,10 @@ export default {
   },
   methods: {
     submitForm(){
-      if(this.ruleForm.roomNo ===''){
-        this.$message.error('请输入房型号');
-        return
-      }
+      // if(this.ruleForm.roomNo ===''){
+      //   this.$message.error('请输入房型号');
+      //   return
+      // }
       if(this.ruleForm.roomName ===''){
         this.$message.error('请输入房型名称');
         return

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

@@ -59,7 +59,18 @@
         width="55"/>
       <el-table-column prop="id" label="房间编号" align="center"/>
       <el-table-column prop="houseName" label="房间名称" align="center" >
-        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="clickTitle(scope.row.id)">{{ scope.row.houseName }}</span></a></template>
+        <template slot-scope="scope" >
+          <a v-if="scope.row.houseStatus==='1'">
+            <span :title="scope.row.houseName" @click="clickTitle(scope.row.id)" style="color: #009FCC">
+            {{ scope.row.houseName}}
+            </span>
+          </a>
+          <a v-if="scope.row.houseStatus==='2'">
+            <span :title="scope.row.houseName" @click="clickTitle(scope.row.id)" style="color:#BDBDBD">
+            {{ scope.row.houseName}}
+            </span>
+          </a>
+       </template>
       </el-table-column>
       <el-table-column prop="sort" label="权重" align="center"/>
       <el-table-column prop="rentalPrice" label="租金" align="center"/>