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

src/components/FinancialModule/BasicDocuments.vue

@@ -1528,7 +1528,6 @@ export default {
                 if(x.ID==i){
                     if (type) {
                         this.payMsgList[index].Account = x.allName;
-                        console.log(x)
                         this.payMsgList[index].CurrenName =x.CurrencyName;
                         this.payMsgList[index].Rate = x.PayRate;
                         this.payMsgList[index].CurrencyId = x.CurrencyId;
@@ -1536,7 +1535,6 @@ export default {
                         this.Calculation(1, index);
                     } else {
                         this.payMsg.Account = x.allName;
-                        console.log(x)
                         this.payMsg.CurrenName =x.CurrencyName;
                         this.payMsg.Rate = x.PayRate;
                         this.payMsg.CurrencyId = x.CurrencyId;
@@ -1762,7 +1760,12 @@ export default {
             //     }
             //   }
             // });
-            this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList;
+            this.AuditOrRefundMsg.TradeDetailList = [];
+            this.GetDetail.TradeDetailList.forEach(x=>{
+                if(x.isChecked){
+                    this.AuditOrRefundMsg.TradeDetailList.push(x);
+                }
+            })
             // if(this.allMoney!=this.currentMoney){
             //     this.Error('原路退款金额与单据总金额不一致');
             //     return;
@@ -1982,7 +1985,21 @@ export default {
                 Trade_Order:subItem.Trade_Order,
                 show: false
             }
-            this.payMsgList.push(payMsg);
+            if(this.payMsgList.length==0){
+                this.payMsgList.push(payMsg);
+            }else{
+                var isPush =false;
+                this.payMsgList.forEach(x=>{
+                    if(x.Trade_Order==subItem.Trade_Order){
+                        isPush=true;
+                        x.OriginalMoney = subItem.RefundMoney;
+                        x.allMoney = subItem.RefundMoney;
+                    }
+                })
+                if(!isPush){
+                    this.payMsgList.push(payMsg);
+                }
+            }
             let total = 0;
             this.payMsgList.forEach(x=>{
                 total +=parseFloat(x.OriginalMoney);

src/components/Supplier/roomQuery.vue

@@ -140,21 +140,72 @@
                 {{childItem.CheckInDateStr}}
               </td>
               <td class="tdLeft">
-               <template v-if="childItem.SupplierId==UserInfo.SupplierId"> {{childItem.NewHotelName}}</template>
+                <template v-if="childItem.SupplierId==UserInfo.SupplierId"> {{childItem.NewHotelName}}</template>
                 <template v-else>
-                      组团社自理
-              </template>
+                  组团社自理
+                </template>
               </td>
               <td>
                 <span style="color:red;">
                   <template v-if="childItem.SupplierId==UserInfo.SupplierId">
                     <template v-if="childItem.OPState==1">[OP选房-OK]</template>
                     <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
-                    <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
+                    <template
+                      v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
                   </template>
                 </span>
               </td>
               <td v-if="childIndex==0" :rowspan="subItem.hotelList.length+1">
+                <el-tooltip class="item" effect="dark" content="操作信息" placement="top-start" style="display:none;">
+                  <el-popover placement="bottom" width="460" trigger="click">
+                    <table>
+                      <tr>
+                        <th width="100">
+                          时间
+                        </th>
+                        <th width="150">
+                          酒店
+                        </th>
+                        <th width="100">
+                          数量
+                        </th>
+                        <th width="100">
+                          状态
+                        </th>
+                      </tr>
+                      <tr v-for="opItem in subItem.hotelList">
+                        <template v-if="opItem.SupplierId==UserInfo.SupplierId">
+                          <td>
+                            {{opItem.CheckInDateStr}}
+                          </td>
+                          <td>
+                            {{opItem.NewHotelName}}
+                          </td>
+                          <td>
+                            <el-input style="width:60px;" v-model='opItem.SupplierBookNum' type='text'
+                              placeholder="预订数量">
+                            </el-input> 间
+                          </td>
+                          <td>
+                            <el-select v-model="opItem.SupplierHotelStatus" filterable class="multiple_input"
+                              :placeholder="$t('pub.pleaseSel')">
+                              <el-option label='未操作' :value='0' :key='0'>
+                              </el-option>
+                              <el-option label='操作中' :value='1' :key='1'>
+                              </el-option>
+                              <el-option label='操作完成' :value='2' :key='2'>
+                              </el-option>
+                            </el-select>
+                          </td>
+                        </template>
+                      </tr>
+                    </table>
+                    <p class="alcenter mt10">
+                      <input type="button" value="保存" @click="SaveSupplierData(subItem.hotelList)" class="normalBtn" />
+                    </p>
+                    <a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference">操作</a>
+                  </el-popover>
+                </el-tooltip>
                 <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>
@@ -164,10 +215,10 @@
                   @click="DeleteSupplierComplain(subItem.Complain_Extend.Id)">删除</a>
               </td>
             </tr>
-            <tr v-if="subIndex==0" > 
-               <td colspan="8" class="redTip">
-                 <p>备注：{{subItem.SupplierRemarks}}</p>
-               </td>
+            <tr v-if="subIndex==0">
+              <td colspan="8" class="redTip">
+                <p>备注：{{subItem.SupplierRemarks}}</p>
+              </td>
             </tr>
           </template>
         </template>
@@ -206,7 +257,7 @@
           PriceStatus: 0,
           CombinationNum: ''
         },
-        UserInfo:{},
+        UserInfo: {},
         //分公司类表
         companyList: [],
         //酒店列表
@@ -347,7 +398,6 @@
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
             this.dataList = res.data.data.pageData;
-            console.log("dataList",this.dataList);
           } else {
             this.$message.error(res.data.message)
           }
@@ -368,13 +418,28 @@
           err => {}
         );
       },
+      //保存酒店新
+      SaveSupplierData(hotelList) {
+        this.ApiPost2(
+          "dmcstatistics_post_SetNewHotelOrder_Supplier", hotelList,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.Success("操作成功!");
+              this.getList();
+            } else {
+              this.Error("操作失败!");
+            }
+          },
+          err => {}
+        );
+      },
       //下载Excel
       DownLoadHotel() {
         this.loading = true;
         let qMsg = {
           queryMsg: this.msg,
           uid: this.UserInfo.SupplierAccountId,
-          OPType:1
+          OPType: 1
         };
         let fileName = "订房查询" + this.$commonUtils.getCurrentDate() + ".xls";
         this.GetLocalFile("hotel_get_downloadHotel", qMsg, fileName,
@@ -464,7 +529,7 @@
       },
     },
     mounted() {
-      this.UserInfo=this.getLocalStorageSupplier();
+      this.UserInfo = this.getLocalStorageSupplier();
       let myDate = new Date();
       let nowDate =
         myDate.getFullYear() +
@@ -498,7 +563,7 @@
     background: #eee !important;
   }
 
-  .roomQuery_SupplierTable{
+  .roomQuery_SupplierTable {
     width: 98%;
     font-size: 12px;
     color: #333;
@@ -519,16 +584,16 @@
     border: 1px solid #d1d1d1;
     text-align: center;
     padding: 5px 0;
-}
+  }
 
   .roomQuery_SupplierTable .tdLeft {
     text-align: left;
     padding-left: 5px;
   }
 
-    .roomQuery_SupplierTable .redTip {
+  .roomQuery_SupplierTable .redTip {
     text-align: left;
-    color:red;
+    color: red;
     padding-left: 5px;
   }