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

src/components/Hotel/HotelProductManage2.vue

@@ -156,6 +156,12 @@
                 @keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="税金">
+              <el-input-number v-model="msg2.TaxesPrice" :precision="2" :min="0"
+                @keyup.native="checkPrice(msg2,'TaxesPrice')" maxlength="10"></el-input-number>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="大床间成本价" prop="BidroomPrice">
               <el-input-number v-model="msg2.BidroomPrice" :precision="2" :min="0"></el-input-number>
@@ -362,7 +368,12 @@
                 @keyup.native="checkPrice(msg2,'SanKePrice')" maxlength="10"></el-input-number>
             </el-form-item>
           </el-col>
-
+          <el-col :span="6">
+            <el-form-item label="税金">
+              <el-input-number v-model="msg.TaxesPrice" :precision="2" :min="0"
+                @keyup.native="checkPrice(msg,'TaxesPrice')" maxlength="10"></el-input-number>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="大床间成本价" prop="BidroomPrice">
               <el-input-number v-model="msg.BidroomPrice" :precision="2" :min="0"></el-input-number>
@@ -566,6 +577,7 @@
           DateList: [],
           SanKePrice: 0, //散客价
           BatchNumber: 1, //批次号
+          TaxesPrice: 0 //税金
         },
         msg2: {
           Hotel: '0',
@@ -594,7 +606,8 @@
           Week: '',
           DateList: [],
           SanKePrice: 0, //散客价
-          BatchNumber: 1 //批次号
+          BatchNumber: 1, //批次号
+          TaxesPrice: 0 //税金
         },
         rules: {
           InventoryType: {
@@ -917,6 +930,7 @@
             this.msg.GuideRoomPrice = data.GuideRoomPrice;
             this.msg.SanKePrice = data.SanKePrice;
             this.msg.BatchNumber = data.BatchNumber;
+            this.msg.TaxesPrice = data.TaxesPrice;
           }
         })
       },
@@ -994,6 +1008,7 @@
                 this.msg.CostPrice = 0;
                 this.msg.SanKePrice = 0;
                 this.msg.BatchNumber = 1;
+                this.msg.TaxesPrice=0;
               } else {
                 this.Error(res.data.message)
               }
@@ -1008,6 +1023,8 @@
         this.$refs['hotelProductForm2'].resetFields();
         this.msg2.CostPrice = 0;
         this.msg2.SanKePrice = 0;
+        this.msg2.BatchNumber = 1;
+        this.msg2.TaxesPrice = 0;
       },
       //批量删除
       delete2Reset: function () {
@@ -1021,6 +1038,7 @@
               that.msg2.CostPrice = 0;
               that.msg2.SanKePrice = 0;
               that.msg2.BatchNumber = 1;
+              that.msg2.TaxesPrice = 0;
             } else {
               that.Error(res.data.message)
             }
@@ -1029,6 +1047,7 @@
       },
       // 页面编辑保存
       edit2Save: function () {
+        console.log("msg2",this.msg2);
         this.$refs['hotelProductForm2'].validate((valid) => {
           if (valid) {
             this.apipost('dict_post_HotelOffer_SetNewHotelPrice', this.msg2, res => {
@@ -1039,6 +1058,7 @@
                 this.msg2.CostPrice = 0;
                 this.msg2.SanKePrice = 0;
                 this.msg2.BatchNumber = 1;
+                this.msg2.TaxesPrice = 0;
               } else {
                 this.Error(res.data.message)
               }
@@ -1531,14 +1551,17 @@
     color: #606266;
     font-size: 14px;
   }
-  .popList{
+
+  .popList {
     font-size: 12px;
     line-height: 15px;
     text-align: left;
   }
-  .hotelProductManage2_calendarItem>.calendarItem_day>.nowMonth:hover .detailInfo{
-    display:block;
+
+  .hotelProductManage2_calendarItem>.calendarItem_day>.nowMonth:hover .detailInfo {
+    display: block;
   }
+
   .hotelProductManage2 .detailInfo {
     display: none;
     position: absolute;
@@ -1553,29 +1576,34 @@
     border-width: 0 86px 30px;
     border-style: solid;
     opacity: 0.75;
-    border-color: transparent transparent rgba(233, 82, 82, 1); /*透明 透明  灰*/
+    border-color: transparent transparent rgba(233, 82, 82, 1);
+    /*透明 透明  灰*/
   }
-  .hotelProductManage2 .detailInfo .popContent{
+
+  .hotelProductManage2 .detailInfo .popContent {
     width: 170px;
     height: 80px;
     background-color: #e95252;
     text-align: left;
     color: #fff;
     font-size: 12px;
-    margin-top:-2px;
+    margin-top: -2px;
     overflow: auto;
-    padding-bottom:10px;
+    padding-bottom: 10px;
   }
-  .hotelProductManage2 .popList label:first-child{
+
+  .hotelProductManage2 .popList label:first-child {
     display: inline-block;
     width: 40%;
     margin: 10px 0 0 10px;
     text-align: left;
   }
+
   .hotelProductManage2 .popList label:last-child {
     display: inline-block;
     width: 40%;
     margin: 10px 10px 0 0;
     text-align: right;
-}
+  }
+
 </style>

src/components/Hotel/HotelQueryList.vue

@@ -52,8 +52,10 @@
           </span>
         </li>
         <li><span><em>日期</em>
-            <el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck"></el-date-picker>
-            <el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck"></el-date-picker>
+            <el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck">
+            </el-date-picker>
+            <el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck">
+            </el-date-picker>
           </span>
         </li>
         <li>
@@ -69,6 +71,7 @@
           <input type="button" class="normalBtn" value="温馨提示"
             @click="showNotice=true,resetPageIndex(),GetHotelTipList()" />
           <input type="button" class="normalBtn" value="查询" @click="getList()" />
+          <input type="button" class="normalBtn" value="下载" @click="DownLoadHotelQuery()" />
         </li>
       </ul>
     </div>
@@ -248,7 +251,7 @@
           //星级
           Star: 0,
           //价格等级
-          PriceLevel: 0
+          PriceLevel: 0,
         },
         beforeCheck: {
           disabledDate: time => {
@@ -541,6 +544,19 @@
           }
         }, err => {})
       },
+      //Excel下载
+      DownLoadHotelQuery() {
+        this.loading = true;
+        let qMsg = {
+          queryMsg: this.msg,
+          uid: this.getLocalStorage().EmployeeId
+        };
+        let fileName = "酒店查询统计" + this.$commonUtils.getCurrentDate() + ".xls";
+        this.GetLocalFile("hotel_get_downloadHotelQuery", qMsg, fileName,
+          res => {
+            this.loading = false;
+          });
+      },
     },
     mounted() {
       this.getBranchList();

src/components/ShoppingStore/ShoppingStore.vue

@@ -601,20 +601,20 @@
                 <el-input v-model="item.TCNUM" class="w150"></el-input>
               </td>
               <td :class="{'redType':item.ShoppingNameExist==-1}">
-                <el-select clearable class="w150" v-model='item.ShoppingID' filterable :placeholder="$t('hotel.hotel_area')">
+                <el-select clearable class="w150" v-model='item.ShoppingID' filterable placeholder="请选择购物店">
                   <el-option v-for='item in getShop' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
                 </el-select>
               </td>
               <td>{{item.EnterTime}}</td>
               <td :class="{'redType':item.GuideExist==-1}">
-                <el-select clearable class="w150" v-model='item.GuideID' filterable :placeholder="$t('hotel.hotel_area')">
+                <el-select clearable class="w150" v-model='item.GuideID' filterable placeholder="请选择领队">
                   <el-option v-for='item in guidList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
                 </el-select>
               </td>
               <td :class="{'redType':item.LeaderName==-1}">
-                <el-select clearable class="w150" v-model='item.LeaderID' filterable :placeholder="$t('hotel.hotel_area')">
+                <el-select clearable class="w150" v-model='item.LeaderID' filterable placeholder="请选择导游">
                   <el-option v-for='item in leaderList' :key="item.ID" :label="item.Name" :value="item.ID">
                   </el-option>
                 </el-select>

src/components/TravelManager/TravelList/OpTripList.vue

@@ -103,6 +103,8 @@
                 <div class="d7">
                   <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
                   <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
+                  <el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">{{$t('Operation.Op_tripDownLoad')}}</el-button>
+                  <el-button style="display:none;" @click="goB2B(item.ID, 0)" type="primary">{{$t('Operation.Op_b2bView')}}</el-button>
                   <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
                 </div>
               </div>
@@ -157,6 +159,8 @@
           StartGroupDate: "",
           EndGroupDate: "",
         },
+        //当前登录人员信息
+        CurrentUserInfo:{},
         remarkMsg: {
           TCID: 0,
           OPRemark: "",
@@ -326,12 +330,44 @@
           err => {}
         );
       },
+      goB2B(ConfigId, tcid) {
+        var B2BDomain = this.CurrentUserInfo.B2BDomain;
+        var url="http://192.168.2.214:8084";
+            url="http://www.oytour.com";
+        window.open(
+          url+'/#/detailTwo/' +
+          encodeURIComponent(ConfigId) + '/' + tcid +
+          '/preview',
+          '_blank'
+        )
+      },
+        goUrlR(path, item) {
+        var cityId = item.StartCityID
+        if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
+          cityId = item.UnionCityId
+        }
+        let routeData = this.$router.resolve({
+          name: path,
+          query: {
+            configId: item.ID,
+            cityId: cityId,
+            tcid: 0,
+            orderId: 0,
+            vshowL: false,
+            vshowM: false,
+            vshowTCNUM: true,
+          }
+        })
+        window.open(routeData.href, '_blank')
+      }
     },
     mounted() {
       this.getEmployeeList();
       this.getLineList();
     },
     created() {
+        let userInfo = this.getLocalStorage()
+      this.CurrentUserInfo = userInfo;
       this.getControlList();
     },
   };

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -34,12 +34,25 @@
         <li>
           <span>
             <em>{{$t('Operation.Op_baomingCompany')}}</em>
-            <el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
+            <el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getDepartmentMsg.RB_Branch_Id=msg.BranchId,msg.RB_Department_Id='',msg.CreateBy='',getDepartment()">
                <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
                <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>部门选择</em>
+            <el-select  filterable  v-model='msg.RB_Department_Id' @change="employeeMsg.DepartmentId=msg.RB_Department_Id,getEmployee(),msg.CreateBy=''">
+                <el-option :value="0" label="不限"></el-option>
+                <el-option v-for='item in DepartmentList'
+                    :label='item.DepartmentName'
+                    :value='item.DepartmentID'
+                    :key='item.DepartmentID'>
+                </el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <span>
             <em>{{$t('Operation.Op_peopleChoice')}}</em>
@@ -52,10 +65,10 @@
           >
             <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
             <el-option
-              v-for="item in employeeList"
-              :label="item.name"
-              :value="item.empId"
-              :key="item.empId"
+              v-for="item in EmployeeList"
+              :label="item.EmName"
+              :value="item.EmployeeId"
+              :key="item.EmployeeId"
             ></el-option>
           </el-select>
         </li>
@@ -203,7 +216,7 @@
         <th v-if="userId==1" width="130">{{$t('system.table_operation')}}</th>
       </tr>
       <tr>
-        <td v-show="OrderList.length==0" colspan="15" align="center">{{$t('system.content_noData')}}</td>
+        <td v-show="OrderList.length==0" colspan="16" align="center">{{$t('system.content_noData')}}</td>
       </tr>
       <tbody v-for="(item,index) in OrderList" :key="index">
         <tr>
@@ -457,7 +470,7 @@ export default {
         BranchId:-1,
         LineId: -1,
         LineIdStr:"",//线路字符串
-        RB_Department_Id: null,
+        RB_Department_Id: '',
         CreateBy: "-1",
         OrderState: "-1",
         CStartDate: "",
@@ -467,6 +480,13 @@ export default {
         tempOrderId: "",
         SellFormEmp: 0
       },
+      getDepartmentMsg:{// 部门
+          RB_Group_Id:'',
+          RB_Branch_Id:'',
+          Status:0,
+          ParentId:-1,
+          Tier:0,
+      },
       employeeMsg: {
         RB_Group_id: "0",
         RB_Branch_id: "-1",
@@ -477,8 +497,8 @@ export default {
       OrderList: [],
       LineList: [],
       LineTeamList: [],
-      departmentList: [],
-      employeeList: [],
+      DepartmentList: [],
+      EmployeeList: [],
       ddztList: [],
       countData: {
         // 总报名人数
@@ -605,32 +625,6 @@ export default {
         err => {}
       );
     },
-    getEmployee() {
-      this.apipost(
-        "app_get_company_employee",
-        this.employeeMsg,
-        res => {
-          if (res.data.resultCode == 1) {
-            this.employeeList = res.data.data;
-          }
-        },
-        err => {}
-      );
-    },
-    getDepartment() {
-      this.apipost(
-        "Advertising_get_GetNowDepartmentAndSubordinate",
-        {},
-        res => {
-          if (res.data.resultCode == 1) {
-            this.departmentList = res.data.data;
-          } else {
-            this.$message.error(res.data.message);
-          }
-        },
-        err => {}
-      );
-    },
     getLineList() {
       this.apipost("line_post_GetList", {}, res => {
         if (res.data.resultCode == 1) {
@@ -681,7 +675,23 @@ export default {
     //关闭修改业务员
     closeSalseDiv(){
       this.showChangeSales=false;
+    },
+    getDepartment(){  //部门
+        this.apipost('admin_get_DepartmentGetList', this.getDepartmentMsg, res => {
+            if(res.data.resultCode == 1) {
+                this.DepartmentList = res.data.data;
+            }
+        }, err => {})
+    },
+    getEmployee() { //员工
+        this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
+            if(res.data.resultCode == 1) {
+                this.EmployeeList = res.data.data;
+                console.log(this.EmployeeList);
             }
+        }, err => {})
+    },
+
   },
   mounted() {
     let userInfo = this.getLocalStorage();