酒店报价新增税入税别

src/components/Hotel/HotelProductManage2.vue

@@ -57,15 +57,15 @@
             <div :class="stockColor(item,subItem)"
               :style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
               @click="calendarDayOn(item, subItem)">
-              <el-popover placement="bottom" title="报价信息" width="400" trigger="hover"
+              <el-popover placement="bottom" title="报价信息" width="470" trigger="hover"
                 v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
                 <template>
-                  <table style="margin-left:3px;padding-top:2px;width:370px;">
+                  <table style="margin-left:3px;padding-top:2px;width:450px;">
                     <tr>
                       <th width="40" style="text-align:center">批次</th>
-                      <th width="40" style="text-align:center">价格</th>
-                      <th width="40" style="text-align:center">库存</th>
-                      <th width="60" style="text-align:center">剩余<br/>库存</th>
+                      <th width="100" style="text-align:center">价格</th>
+                      <th width="50" style="text-align:center">库存</th>
+                      <th width="80" style="text-align:center">剩余库存</th>
                       <th width="140" style="text-align:center">供应商</th>
                       <th width="50" style="text-align:center">操作</th>
                     </tr>
@@ -74,7 +74,7 @@
                         {{childItem.BatchNumber}}
                       </td>
                       <td style="text-align:center;white-space:nowrap; ">
-                        {{childItem.CostPrice}}
+                        {{childItem.CostPrice}} {{childItem.PriceTaxTypeStr}}
                       </td>
                       <td style="text-align:center;white-space:nowrap; ">
                         {{childItem.Inventory}}
@@ -273,6 +273,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="税入/税别">
+              <el-select v-model="msg2.PriceTaxType" placeholder="请选择">
+                <el-option label="请选择" :value='0'></el-option>
+                <el-option :key="1" label="税入R0" :value="1"></el-option>
+                <el-option :key="2" label="税别R10" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="18">
             <el-form-item label="备注" prop="Remark">
               <el-input type="textarea" v-model="msg2.Remark" :rows="1" placeholder="请输入备注内容" style="width: 600px;">
@@ -510,6 +519,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="税入/税别">
+              <el-select v-model="msg.PriceTaxType" placeholder="请选择">
+                <el-option label="请选择" :value='0'></el-option>
+                <el-option :key="1" label="税入R0" :value="1"></el-option>
+                <el-option :key="2" label="税别R10" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="18">
             <el-form-item label="备注" prop="Remark">
               <el-input type="textarea" v-model="msg.Remark" :rows="1" placeholder="请输入备注内容" style="width: 600px;">
@@ -638,6 +656,7 @@
           BeforeDay: 0, //提前还房天数
           FreeRoomNum: 0, //免间数
           PayStyle: 0, //付款方式
+          PriceTaxType: 0, //税入税别
         },
         msg2: {
           Hotel: '0',
@@ -671,6 +690,7 @@
           BeforeDay: 0, //提前还房天数
           FreeRoomNum: 0, //免间数
           PayStyle: 0, //付款方式
+          PriceTaxType: 0, //税入税别
         },
         rules: {
           InventoryType: {
@@ -996,6 +1016,7 @@
             this.msg.BeforeDay = data.BeforeDay;
             this.msg.FreeRoomNum = data.FreeRoomNum;
             this.msg.PayStyle = data.PayStyle;
+            this.msg.PriceTaxType=data.PriceTaxType;
           }
         })
       },
@@ -1078,6 +1099,7 @@
                 this.msg.BeforeDay = 0;
                 this.msg.FreeRoomNum = 0;
                 this.msg.PayStyle = 0;
+                this.msg.PriceTaxType=0;
               } else {
                 this.Error(res.data.message)
               }
@@ -1097,6 +1119,7 @@
         this.msg2.BeforeDay = 0;
         this.msg2.FreeRoomNum = 0;
         this.msg2.PayStyle = 0;
+        this.msg2.PriceTaxType=0;
       },
       //批量删除
       delete2Reset: function () {
@@ -1114,6 +1137,7 @@
               that.msg2.BeforeDay = 0;
               that.msg2.FreeRoomNum = 0;
               that.msg2.PayStyle = 0;
+              that.msg2.PriceTaxType=0;
             } else {
               that.Error(res.data.message)
             }
@@ -1136,6 +1160,7 @@
                 this.msg2.BeforeDay = 0;
                 this.msg2.FreeRoomNum = 0;
                 this.msg2.PayStyle = 0;
+                this.msg2.PriceTaxType=0;
               } else {
                 this.Error(res.data.message)
               }