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

src/assets/css/message.css

@@ -33,7 +33,7 @@
 .IM_myNav li{width: 105px; height: 20px; margin-top: 10px; cursor: pointer; font-size:14px; border-right: 1px solid #868E94; text-align: center; color: #666; float: left;}
 .IM_myNav li.cked{color: #E95252;}
 .IM_myNav li:last-child{border:none}
-.IM_cont{height: 700px; overflow-y: auto; padding:5px 15px; }
+.IM_cont{height: 770px; overflow-y: auto; padding:5px 15px; }
 .IM_cont_item{margin: 10px 0; padding: 10px; background: rgba(255,255,255,.6); border-radius: 4px;}
 .IM_cont_item .userAndTime{font-size: 14px; color: #333;}
 .IM_cont_item .userAndTime>img{width: 24px; height: 24px; border-radius: 12px; vertical-align: middle;}
@@ -42,7 +42,7 @@
 .IM_cont .artcleAddress{font-size: 12px; color: #666; padding: 5px 0; height: 24px; line-height: 24px;}
 .IM_cont .artcleAddress{color: #999;}
 .IM_cont .artcleAddress i{margin:0 2px;}
-.IM_cont .artclePic>img{cursor: pointer;}
+.IM_cont .artclePic>img{cursor: pointer;width:100%;}
 .IM_contacts::-webkit-scrollbar,.IM_cont::-webkit-scrollbar,.IM_messageList::-webkit-scrollbar{width: 4px;height: 1px;}
 .IM_contacts::-webkit-scrollbar-thumb,.IM_cont::-webkit-scrollbar-thumb,.IM_messageList::-webkit-scrollbar-thumb{-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #999;}
 .praiseAndReview{margin: 15px 0; border-radius: 10px; width: 100%; height: auto; overflow: hidden;}

src/components/TravelManager/TravelList/HotelOrderTotal.vue

@@ -141,7 +141,9 @@
     text-decoration: underline;
     cursor: pointer;
   }
-
+  .SalesHotelOrder .el-button-group .el-button{
+    padding:5px;
+  }
 </style>
 
 <template>
@@ -295,23 +297,25 @@
 
     <table class="SalesHotelOrderTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th>订单号</th>
-        <th>第三方订单号</th>
-        <th>团号</th>
+        <th width="50">订单号</th>
+        <th width="95">第三方订单号</th>
+        <th width="190">团号</th>
         <th>房间数</th>
         <th>总额</th>
         <th>实收</th>
         <th>大红包</th>
         <th>优惠金额</th>
         <th>待收金额</th>
+        <th>日元(含税/不含税)</th>
+        <th>日元成本价</th>
         <th>订单状态</th>
         <th>创建时间</th>
         <th>入住/离店时间</th> 
         <th>取消费用</th>
-        <th>客户信息</th>
+        <th width="220">客户信息</th>
         <th>创建人</th>
         <th>结束时间</th>
-        <th>操作</th>
+        <th width="180">操作</th>
       </tr>
       <tbody v-for="(item,index) in dataList">
         <tr>
@@ -324,6 +328,8 @@
             <td>{{item.RedEnvelopeMoney}}</td>
             <td>{{item.DiscountMoney}}</td>
             <td>{{item.DueinMoney}}</td>
+            <td>{{item.UpdateJapanese}}/{{item.totalChargeableRateInfoTaxOut}}</td>
+            <td>{{item.UpdateJapanese-(item.totalChargeableRateInfoTaxOut*0.04)}}</td>
             <td>
               <span :class="item.OrderStatus=='已取消'?'color_red_order':''">{{item.OrderStatus}}</span>
             </td>
@@ -354,6 +360,9 @@
                     <el-tooltip class="item" effect="dark" content="详情" placement="top-start">
                       <el-button type="success" icon="iconfont icon-sousuo" @click="goOrderDetails(item.OrderID)"></el-button>
                     </el-tooltip>
+                    <el-tooltip v-if="EmployeeId==380||EmployeeId==46||EmployeeId==1||EmployeeId==5" class="item" effect="dark" content="修改成本价" placement="top-start">
+                      <el-button type="success" icon="iconfont icon-Edit" @click="getThisMsg(item)"></el-button>
+                    </el-tooltip>
                   </el-button-group>
                 </el-row>
             </td>
@@ -369,7 +378,7 @@
                     </div>
                 </div>
             </td>
-            <td colspan="9" style="text-align:left;width:600px">
+            <td colspan="10" style="text-align:left;width:600px">
                 <div class="SH_OrderDan">
                     <div>收款单据：</div>
                     <div>
@@ -429,6 +438,23 @@
           <button class="normalBtn" type="primary" @click="querenGL">{{$t('pub.sureBtn')}}</button>
       </div>
     </el-dialog>
+
+    <el-dialog title="修改价格" width="400px" :visible.sync="updatePriceDialog" center :before-close="closeChangeMachie">
+      <el-form label-width="110px">
+          <el-form-item label="日元含税价">
+              <el-input type="text" v-model="updateMsg.UpdateJapanesePrice" @keyup.native="checkPrice(updateMsg,'UpdateJapanesePrice')"></el-input>
+          </el-form-item>
+          <el-form-item label="日元不含税价">
+              <el-input type="text" v-model="updateMsg.totalChargeableRateInfoTaxOut" @keyup.native="checkPrice(updateMsg,'totalChargeableRateInfoTaxOut')"></el-input>
+          </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+          <button class="hollowFixedBtn" @click="updatePriceDialog=false">{{$t('pub.cancelBtn')}}</button>
+          <button class="normalBtn" type="primary" @click="querenPrice">{{$t('pub.sureBtn')}}</button>
+      </div>
+    </el-dialog>
+
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
       :page-size=msg.pageSize :total=total>
     </el-pagination>
@@ -456,6 +482,14 @@ export default {
       total:0,
       currentPage: 1,
       loading:false,
+      updateMsg:{
+        OrderID:'',
+        //日元含税价
+        UpdateJapanesePrice:0,
+        //日元不含税价
+        totalChargeableRateInfoTaxOut:0
+      },
+      updatePriceDialog:false,
       StartTimeBefore: {
         disabledDate: time => {
             if (this.msg.EndTime == null) {
@@ -529,6 +563,8 @@ export default {
       searchList: [],
       loading2: false,
       dialogFormVisible: false,
+      //员工ID
+      EmployeeId:''
     };
   },
   methods: {
@@ -551,6 +587,33 @@ export default {
         }
       },err => {});
     },
+    //获取当前信息
+    getThisMsg(item){
+      this.updatePriceDialog=true;
+      this.updateMsg.OrderID = item.OrderID;
+      this.updateMsg.UpdateJapanesePrice=item.UpdateJapanese;
+      this.updateMsg.totalChargeableRateInfoTaxOut=item.totalChargeableRateInfoTaxOut;
+    },
+    //修改成本价
+    querenPrice(){
+      this.$confirm('是否确认修改?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+						this.apipost('sellorder_post_UpdateUpdateJapaneseOrder', this.updateMsg, res => {
+							if(res.data.resultCode == 1) {
+                this.Success("修改成功");
+                this.updatePriceDialog=false;
+								this.getList()
+							} else {
+								this.Error(res.data.message)
+							}
+						}, err => {})
+					}).catch(() => {
+            this.Error('已取消修改');
+      });
+    },
     closeChangeMachie(done) {  //  弹=窗口关闭
       done();
     },
@@ -610,7 +673,6 @@ export default {
           if (res.data.resultCode == 1) {
              this.dataList = res.data.data.pageData;
              this.total = res.data.data.count;
-             console.log(this.dataList,'datalist');
              let userInfo = this.getLocalStorage();
              let EmployeeId = userInfo.EmployeeId; 
              this.dataList.forEach(x=>{
@@ -729,7 +791,7 @@ export default {
     let userInfo=this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id;    //集团
     this.getDepartmentMsg.RB_Branch_Id=userInfo.RB_Branch_id;   //公司
-
+    this.EmployeeId=userInfo.EmployeeId //员工
     this.getCompanyList()
     this.getDepartment()
     this.getEmployee()