Commit 874b3a17 authored by 沈良进's avatar 沈良进

页面修改

parent 4f521377
...@@ -84,11 +84,10 @@ ...@@ -84,11 +84,10 @@
.superSearchLayer>div>span { .superSearchLayer>div>span {
margin: 0 15px 0 5px; margin: 0 15px 0 5px;
} }
.productQuerybottomLayer { .productQuerybottomLayer {
overflow: auto; overflow: auto;
position: fixed; position: fixed;
/* max-height: 300px; */
z-index: 50; z-index: 50;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -238,7 +237,8 @@ ...@@ -238,7 +237,8 @@
<ul> <ul>
<li> <li>
<span><em>{{ $t("scen.sc_cp") }}</em> <span><em>{{ $t("scen.sc_cp") }}</em>
<el-select class="w150" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')"> <!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加-->
<el-select class="w150" v-model="msg.BranchId" filterable :disabled="CurrentUserInfo.RB_Branch_id==1220" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id"> <el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -446,11 +446,12 @@ ...@@ -446,11 +446,12 @@
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<!-- 产品列表 --> <!-- 产品列表 -->
<productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle" :PBranchId="msg.BranchId"></productOrderList> <productOrderList :loading="loading" :list="list" @success="reSearchPage" :pagesTitle="pagesTitle"
:PBranchId="msg.BranchId"></productOrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
...@@ -673,7 +674,7 @@ ...@@ -673,7 +674,7 @@
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.CurrentUserInfo = this.userInfo ; this.CurrentUserInfo = this.userInfo;
this.userId = this.userInfo.EmployeeId; this.userId = this.userInfo.EmployeeId;
this.msg.BranchId = this.userInfo.RB_Branch_id.toString(); this.msg.BranchId = this.userInfo.RB_Branch_id.toString();
if (this.$route.query.id) { if (this.$route.query.id) {
...@@ -687,13 +688,13 @@ ...@@ -687,13 +688,13 @@
let nowDay = this.FormartDate(new Date()); let nowDay = this.FormartDate(new Date());
this.msg.StartTime = nowDay; this.msg.StartTime = nowDay;
} }
this.getCompanyList();//公司 this.getCompanyList(); //公司
this.getList();//产品列表 this.getList(); //产品列表
this.getLineList();//线路 this.getLineList(); //线路
this.getSalePlace();//销售平台 this.getSalePlace(); //销售平台
this.getAirlineList();//获取航空公司 this.getAirlineList(); //获取航空公司
this.getStartList();//出发城市 this.getStartList(); //出发城市
this.getStartList1();//目的地 this.getStartList1(); //目的地
}, },
}; };
......
...@@ -237,7 +237,9 @@ ...@@ -237,7 +237,9 @@
<div class="productQuerySearch" v-if="!TCIDList"> <div class="productQuerySearch" v-if="!TCIDList">
<ul> <ul>
<li><span><em>{{$t('scen.sc_cp')}}</em> <li><span><em>{{$t('scen.sc_cp')}}</em>
<el-select class='w150' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')"> <!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加-->
<el-select class='w150' v-model="msg.BranchId" :disabled="CurrentUserInfo.RB_Branch_id==1220" filterable
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -1286,7 +1288,7 @@ ...@@ -1286,7 +1288,7 @@
Number(this.addMsg.BabyNum)) - Number(this.addMsg.BabyNum)) -
(Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum)); (Number(this.addMsg.ESeatNum) + Number(this.addMsg.FSeatNum));
this.TotalNumber = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg this.TotalNumber = (Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg
.ChirdNum) + .ChirdNum) +
Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum)) Number(this.addMsg.BabyNum) + Number(this.addMsg.OldPeopleNum))
this.addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum; this.addMsg.YSeatNum = SeatNum < 0 ? 0 : SeatNum;
this.autoRemarks("VisaNum", "不要签证数量") this.autoRemarks("VisaNum", "不要签证数量")
...@@ -1480,7 +1482,7 @@ ...@@ -1480,7 +1482,7 @@
qzf: '', qzf: '',
} }
}, },
saveOrder() { saveOrder() {
if ((Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this if ((Number(this.addMsg.AirticketNum) + Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this
.addMsg.OldPeopleNum) + Number(this.addMsg.BabyNum)) < Number(this.addMsg.SafeNum)) { .addMsg.OldPeopleNum) + Number(this.addMsg.BabyNum)) < Number(this.addMsg.SafeNum)) {
this.$message.warning('保险数量不能大于人数总和!') this.$message.warning('保险数量不能大于人数总和!')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment