Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -100,6 +100,7 @@
                     <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==4">{{$t('fnc.zjinchi')}}</span>
                     <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==5">{{$t('fnc.ptxnzhanghu')}}</span>
                     <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==6">{{$t('fnc.djxnzhanghu')}}</span>
+                    <span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==7">收支相抵</span>
                 </p>
                 <p style="font-weight: bold"><span class="">{{$t('hotel.hotel_SerialNumber')}}：</span>{{GetDetail.FrID}}</p>
             </div>

src/components/SalesModule/addPassenger.vue

@@ -302,7 +302,7 @@
                 <el-option v-for="item in roomlist" :key="item.ID" :label="item.HouseInfo" :value="item.ID">
                 </el-option>
               </el-select>
-              <input type="button" value="新增" class="normalBtn" @click="addhouse()" />
+              <input type="button" value="新增房间" class="normalBtn" @click="addhouse()" title="需要拼房，但没有双人间（半间）的点击新增房间"/>
             </el-form-item>
           </li>
           <li>

src/components/SalesModule/passengerSaleList.vue

@@ -67,7 +67,7 @@
         </tbody>
         <tbody v-show="tableList.length===0" class="passengerSaleList_table_noInfo">
           <tr>
-            <td colspan="17" class="">暂无数据</td>
+            <td colspan="18" class="">暂无数据</td>
           </tr>
         </tbody>
       </table>

src/components/activity/addIntegralMall.vue

@@ -194,6 +194,9 @@
 .addIntegralMall .bottom_sub {
   padding-top: 25px;
 }
+.addIntegralMall .ql-editor{
+  min-height: 200px;
+}
 </style>
 <template>
   <el-row class="addIntegralMall">
@@ -240,6 +243,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="商品数量" prop="storeNum">
+          <el-input v-model="addMsg.storeNum" class="w217"/>
+        </el-form-item>
         <el-form-item label="商品状态">
           <el-select filterable v-model="addMsg.state">
             <el-option label="上架" :value="1" :key="1"></el-option>
@@ -313,7 +319,10 @@
         </div>
         <p class="tips tips2">最多上传5张图片</p>
         <span class="resource-lititle resource-lititle2">商品描述</span>
-        <quill-editor :options="editorOption" v-model="addMsg.description"></quill-editor>
+
+        <my-edit v-on:edit-value="addMsg.description = arguments[0]" v-bind:editValue="addMsg.description"
+          v-bind:toolbarShow="toolbar" v-bind:placeholder="placeholder"></my-edit>
+          
         <span class="resource-lititle resource-lititle2">图片介绍</span>
         <div class="resource-imglist clearfix">
           <div class="re-img re-img2" v-for="(item,index) in DiningImageArray2" :key="index">
@@ -378,9 +387,23 @@
 </template>
 <script>
 import { setInterval, setTimeout } from "timers";
+import MyEdit from "../EditTemplate.vue";
 export default {
   data() {
     return {
+      toolbar: {
+        clean: true, //加粗
+        font: true, //字体
+        narrative: false, //叙述,
+        image:true,
+        // bold: true, //加粗
+        // underline: true, //下划线
+        // header1: true, //H1
+        // header2: true, //H2
+        //fontColor: true, //字体颜色
+        // fontBackgroundColor: true, //背景颜色
+      },
+      placeholder: "请输入内容",
       editorOption: {
         modules: {
           toolbar: [
@@ -410,6 +433,7 @@ export default {
         quota: 0,
         ishot: 0,
         descripImg: '',
+        storeNum:''
       },
       MenberList: [],
       GoodsTypeList: [],
@@ -431,7 +455,8 @@ export default {
         tradePeopleReq: [
           { required: true, message: "交易人头数要求", trigger: "blur" }
         ],
-        remark: [{ required: true, message: "请输入备注", trigger: "blur" }]
+        remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
+        storeNum:[{ required: true, message: "请输入商品数量", trigger: "blur" }]
       },
       //上传的文件数组
       DiningImageArray: [],
@@ -446,6 +471,9 @@ export default {
       GoodsSeriesList: [],
     };
   },
+  components: {
+    "my-edit": MyEdit
+  },
   methods: {
     getGoodsSeries() {
       this.loading = true;