Browse Source

概念股第四oh高興VS都剛分手是個很開朗收到客戶發

gqx 2 years ago
parent
commit
b854aadcec

+ 1 - 1
src/views/room/leasegoods.vue

@@ -162,7 +162,7 @@ export default {
         {
           title: "物品",
           align: "center",
-          dataIndex: "goodsId",
+          dataIndex: "goodName",
         },
         {
           title: "数量",

+ 6 - 8
src/views/room/modules/checkIn/BillRoomInfoModal.vue

@@ -22,30 +22,28 @@
             style="color: #fff; font-size: 30px"
           /><a-button type="link"> 调价 </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleLeaseGoods">
           <a-icon type="block" style="color: #fff; font-size: 30px" /><a-button
             type="link"
-            @click="handleLeaseGoods"
           >
             物品借用
           </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleMessage">
           <a-icon
             type="message"
             style="color: #fff; font-size: 30px"
-          /><a-button type="link" @click="handleMessage"> 客户留言 </a-button>
+          /><a-button type="link"> 客户留言 </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleUnion">
           <a-icon
             type="retweet"
             style="color: #fff; font-size: 30px"
-          /><a-button type="link" @click="handleUnion"> 联房 </a-button>
+          /><a-button type="link"> 联房 </a-button>
         </div>
-        <div class="menu">
+        <div class="menu" @click="handleLeaveNotSettle">
           <a-icon type="euro" style="color: #fff; font-size: 30px" /><a-button
             type="link"
-            @click="handleLeaveNotSettle"
           >
             先走不结
           </a-button>

+ 3 - 4
src/views/room/modules/checkIn/FeeForm.vue

@@ -6,11 +6,10 @@
                 <a-col :span="12">
                     <a-form-model-item label="消费项目" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="subjectType">
                         <a-select v-model="model.subjectType" style="50%" placeholder="消费项目" :allowClear="true">
-                            <a-select-option :value="1">押金</a-select-option>
-                            <a-select-option :value="2">预收房费</a-select-option>
-                            <a-select-option :value="3">每日房费</a-select-option>
                             <a-select-option :value="6">商品</a-select-option>
-                            <a-select-option :value="7">点餐</a-select-option>
+                            <a-select-option :value="10">手工房费</a-select-option>
+                            <a-select-option :value="11">水电煤抄表</a-select-option>
+                            <a-select-option :value="12">赔偿费</a-select-option>
                         </a-select>
                     </a-form-model-item>
                     <a-row>

+ 2 - 2
src/views/room/modules/leasegoods/CesOrderLeaseGoodsForm.vue

@@ -46,7 +46,7 @@
               :wrapperCol="wrapperCol"
               prop="goodsId"
             >
-              <a-select v-model="model.goodsId" placeholder="请选择民族">
+              <a-select v-model="model.goodsId" placeholder="请选择物品">
                 <a-select-option
                   :value="item.id"
                   v-for="(item, index) in busDictItemList"
@@ -162,7 +162,7 @@ export default {
     //备份model原始值
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
     getAction("/business/busDictItem/list", {
-      dictId: "1639538235288539138",
+      dictId: "1659108818476990465",
     }).then((res) => {
       if (res.success) {
         this.busDictItemList = res.result.records;