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

src/components/assetsman/Quotation.vue

+<style>
+  .w100{
+    width:100px!important;
+  }
+  .quotationTable .el-input__inner{
+    height:35px!important;  
+  }
+</style>
 <template>
   <div class="Quotation">
     <div class="routerTitle">
@@ -179,7 +187,7 @@
                     税込みかどうか
                   </td>
                   <td>
-                    <el-select size="small" v-model="addMsg.IsContainsTax" placeholder="税込みかどうか">
+                    <el-select size="small" v-model="addMsg.IsContainsTax" class="w100" placeholder="税込みかどうか">
                       <el-option label="税抜き" :value='0'></el-option>
                       <el-option label="税込み" :value='1'></el-option>
                     </el-select>