Merge branch 'master' of http://gitlab.oytour.com/zk123/hotelproject

src/components/assetsman/Quotation.vue

@@ -2,9 +2,7 @@
   <div class="Quotation">
     <div class="routerTitle">
       <span class="pageTitle">見積書</span>
-      <span @click="clearAddMsg" style="margin-left:20px" class="addSpan" title="新增">
-        <img style="width:10px;height:10px;margin-right:6px" src="../../assets/img/add.png" alt="" />
-        新たに</span>
+     
       <span @click="DeleteAll" style="margin-left:20px" class="addSpan" title="全部删除">一括削除</span>
     </div>
     <div class="padContent">

src/components/assetsman/RoomList.vue

@@ -19,7 +19,7 @@
           <el-input class="w200" size="small" v-model="msg.RoomName" placeholder="型の名称" title="房间名称"></el-input>
         </li>
         <li>
-          <el-select size="small" v-model="msg.HotelId" placeholder="ホテル" clearable filterable title="酒店">
+          <el-select size="small" v-model="msg.HotelId" placeholder="ホテル" filterable title="酒店">
             <el-option v-for="item in HotelList" :key="item.SID" :label="item.SHotelName" :value="item.SID">
             </el-option>
           </el-select>
@@ -52,8 +52,8 @@
         </tr>
         <tbody v-for="(item,index) in dataList" :key="index">
           <tr>
-            <td rowspan="2" class="tdLeft">{{item.RoomName}}</td>
-            <td rowspan="2" class="tdLeft">{{item.RoomTypeName}}</td>
+            <td style="border-bottom:2px solid #000" rowspan="2" class="tdLeft">{{item.RoomName}}</td>
+            <td style="border-bottom:2px solid #000" rowspan="2" class="tdLeft">{{item.RoomTypeName}}</td>
             <td class="tdCenter">{{item.CostPrice}}</td>
             <td class="tdCenter">{{item.Money}}</td>
             <td class="tdCenter">
@@ -61,8 +61,8 @@
               <span v-else>{{item.ToDayMoney}}</span>
             </td>
             <td class="tdCenter">
-              <span v-if="item.RoomStatus==1">けんかを仕掛ける</span>
-              <span v-if="item.RoomStatus==2">棚をおりる</span>
+              <span v-if="item.RoomStatus==1">やむを得ず</span>
+              <span v-if="item.RoomStatus==2">下機</span>
             </td>
             <td class="tdCenter">
               <span style="cursor: pointer;" v-if="item.ImageList.length>0" @click="SeeImg(item)">部屋の写真を見る</span>
@@ -88,7 +88,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="13" title="描述" class="tdLeft">
+            <td style="border-bottom:2px solid #000" colspan="13" title="描述" class="tdLeft">
               <span>記述:{{item.Description}}</span>
               <span v-if="item.Area && item.Area!=''">、面積:{{item.Area}}</span>
               <span v-if="item.Floor && item.Floor!=''">、階:{{item.Floor}}</span>
@@ -147,11 +147,11 @@
                 placeholder="入力してください"></el-input>
             </el-form-item>
             
-            <el-form-item label="" title="床型">
+            <el-form-item label="" title="床型" prop="BedType">
               <span class="label">ベッド型</span>
               <el-input size="mini" v-model="addMsg.BedType" placeholder="入力してください"></el-input>
             </el-form-item>
-            <el-form-item label="" title="面积">
+            <el-form-item label="" title="面积" prop="Area">
               <span class="label">面積</span>
               <el-input size="mini" v-model="addMsg.Area" placeholder="入力してください"></el-input>
             </el-form-item>
@@ -162,17 +162,17 @@
                 <el-option label="いいえ" :value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="" title="加床价">
+            <el-form-item label="" title="加床价" prop="ExtraBedMoney">
               <span class="label">加床価格</span>
               <el-input size="mini" v-model="addMsg.ExtraBedMoney" placeholder="入力してください"></el-input>
             </el-form-item>
-            <el-form-item label="" title="宽带">
+            <el-form-item label="" title="宽带" prop="BroadBand">
               <span class="label">ブロードバンド</span>
               <el-select size="mini" v-model="addMsg.BroadBand" placeholder="入力してください" clearable filterable>
                 <el-option v-for="(item,index) in wifiList" :key="index" :label="item.Name" :value="item.ID"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="" title="楼层">
+            <el-form-item label="" title="楼层" prop="Floor">
               <span class="label">フロア</span>
               <el-input size="mini" v-model="addMsg.Floor" placeholder="入力してください"></el-input>
             </el-form-item>
@@ -181,7 +181,7 @@
               <el-input @keyup.native="checkInteger(addMsg,'PeopleNum')" size="mini" v-model="addMsg.PeopleNum"
                 placeholder="入力してください"></el-input>
             </el-form-item>
-            <el-form-item label="" title="餐食">
+            <el-form-item label="" title="餐食" prop="Meals">
               <span class="label">食</span>
               <el-select size="mini" v-model="addMsg.Meals" placeholder="入力してください" clearable filterable>
                 <el-option v-for="(item,index) in FoodList" :key="index" :label="item.Name" :value="item.ID"></el-option>
@@ -204,16 +204,6 @@
             </el-form-item>
             <el-form-item label="" prop="RoomFacility" title="客房设施">
               <span class="label">客室施設</span>
-              <!-- <el-input size="mini" v-model="addMsg.RoomFacility" placeholder="入力してください"></el-input> -->
-              <!-- <el-select size="small" multiple collapse-tags v-model="addMsg.RoomFacility" placeholder="選んでください" clearable filterable>
-                <el-option label="电影点播服务" value="电影点播服务"></el-option>
-                <el-option label="24小时热水" value="24小时热水"></el-option>
-                <el-option label="洗衣机" value="洗衣机"></el-option>
-                <el-option label="电热水壶" value="电热水壶"></el-option>
-                <el-option label="浴缸" value="浴缸"></el-option>
-                <el-option label="书桌" value="书桌"></el-option>
-                <el-option label="免费wifi" value="免费wifi"></el-option>
-              </el-select> -->
               <el-select size="mini" multiple collapse-tags v-model="addMsg.RoomFacility" placeholder="入力してください" clearable filterable>
                 <el-option v-for="(item,index) in shebeiList" :key="index" :label="item.HName" :value="item.HConfigId"></el-option>
               </el-select>
@@ -307,6 +297,56 @@
 
         },
         rules: {
+          Meals:[{
+            required: true,
+            message: "選んでください",
+            trigger: "change"
+          }],
+          PeopleNum:[{
+            required: true,
+            message: "フロアを入力してください",
+            trigger: "blur"
+          }],
+          Floor:[{
+            required: true,
+            message: "フロアを入力してください",
+            trigger: "blur"
+          }],
+          BroadBand: [{
+            required: true,
+            message: "選んでください",
+            trigger: "change"
+          }],
+          ExtraBedMoney: [{
+            required: true,
+            message: "加床価格を入力してください",
+            trigger: "blur"
+          }],
+          IsExtraBed: [{
+            required: true,
+            message: "選んでください",
+            trigger: "change"
+          }],
+          Area: [{
+            required: true,
+            message: "面積を入力してください",
+            trigger: "blur"
+          }],
+          BedType: [{
+            required: true,
+            message: "型を入力してください",
+            trigger: "blur"
+          }],
+          CostPrice: [{
+            required: true,
+            message: "仕入れ値を入力してください",
+            trigger: "blur"
+          }],
+          Money: [{
+            required: true,
+            message: "販売価格を入力してください",
+            trigger: "blur"
+          }],
           RoomName: [{
             required: true,
             message: "名前を入力してください",