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

src/components/Hotel/roomReservations.vue

@@ -240,14 +240,13 @@
                   {{item.Remarks}}
                 </div>
               </td>
-       
             </tr>
             <tr>
               <td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;">
                 <div class="link">
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
-                  <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
-                    地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
+                  <div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"> 地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
+                  <div  v-show="item.CommonReport.Complain_Extend.Id>0" class="colorE95252">供应商投诉:{{item.CommonReport.Complain_Extend.ComplainContent}}</div>
                 </div>
               </td>
             </tr>

src/components/Supplier/AddSupplierComplaints.vue

@@ -121,17 +121,17 @@
         </ul>
       </div>
       <p>投诉情况</p>
-      <div class="Supplier_AC_complaintList">
+      <!-- <div class="Supplier_AC_complaintList">
         <div class="t">主题内容：</div>
         <ul style="width:90%;">
           <li v-for="subItem in themeList" @click="getTheme(subItem)" :class="{'checked':subItem.isCheck}">
             {{subItem.Name}}
           </li>
         </ul>
-      </div>
+      </div> -->
 
       <el-input type="textarea" style="margin-top:10px;" :rows="5" v-model="EditMsg.ComplainContent"
-        placeholder="具体问题描述，以及投诉人的姓名、联系方式"></el-input>
+        placeholder="具体问题描述"></el-input>
     </div>
     <p style="text-align: center; margin: 10px 0 15px 0;">
       <input type="button" class="normalBtn" value="保存" @click="SaveData()" />
@@ -196,10 +196,10 @@
       },
       //保存数据
       SaveData(status) {
-        if (this.themeCked.length === 0) {
-          this.Error("请选择主题内容");
-          return false;
-        }
+        // if (this.themeCked.length === 0) {
+        //   this.Error("请选择主题内容");
+        //   return false;
+        // }
         //数据组装
         this.EditMsg.ComplainContentrs = "";
         let contentrArr = [];

src/components/Supplier/HotelInfo.vue

@@ -259,7 +259,7 @@
       <div class="btn-list" style="width: 350px;position: fixed;right: 20px;top:50px">
         <span class="common-lefttit"></span>
         <button class="save-Btn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
-        <button class="cancel-Btn" @click="goUrl('HotelManagement')">{{$t('pub.cancelBtn')}}</button>
+        <button class="cancel-Btn" @click="goUrl('HotelManagement2')">{{$t('pub.cancelBtn')}}</button>
       </div>
     </div>
 

src/components/Supplier/HotelProductManage.vue

@@ -253,7 +253,7 @@
             <el-form-item label="供应商" prop="Supplier">
               <el-select v-model="msg2.Supplier" placeholder="请选择">
                 <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
+                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID" v-if="userInfo.SupplierId==item.ID">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -477,7 +477,7 @@
             <el-form-item label="供应商" prop="Supplier">
               <el-select v-model="msg.Supplier" placeholder="请选择">
                 <el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
-                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
+                <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID" v-if="userInfo.SupplierId==item.ID">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -578,6 +578,7 @@
           data: {}
         },
         editShow: false,
+        userInfo:{},
         msg: {
           Hotel: '0',
           Supplier: 30,
@@ -1006,7 +1007,7 @@
       // 获取供应商
       initSupplier() {
         this.ApiPost2("supplier_post_GetAllList", {
-          Type: 1
+          Type: 1,
         }, res => {
           if (res.data.resultCode === 1) {
             this.SupplierList = res.data.data;
@@ -1132,6 +1133,7 @@
       }
     },
     created: function () {
+      this.userInfo = this.getLocalStorageSupplier();
       this.hotelId = this.$route.query.id === undefined ? '0' : this.$route.query.id;
       this.msg.Hotel = this.$route.query.id === undefined ? '0' : this.$route.query.id;
       this.msg2.Hotel = this.$route.query.id === undefined ? '0' : this.$route.query.id;

src/components/Supplier/roomQuery.vue

@@ -157,8 +157,8 @@
               <td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
                 <a style="text-decoration:underline;color:blue;cursor:pointer"
                   @click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
-                  <template v-if="subItem.Complain_Extend.Id>0">编辑</template>
-                  <template v-else>添加</template>
+                  <template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
+                  <template v-else>添加投诉</template>
                 </a>
                 <a style="text-decoration:underline;color:red;cursor:pointer" v-if="subItem.Complain_Extend.Id>0"
                   @click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
@@ -512,7 +512,7 @@
   .roomQuery_SupplierTable tr td {
     border: 1px solid #d1d1d1;
     text-align: center;
-    padding: 10px 0;
+    padding: 5px 0;
 }
 
   .roomQuery_SupplierTable .tdLeft {