Skip to content

S
SuperMan
Commit 7d702c52 authored by Mac's avatar Mac
Browse files
Options

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

parents 171eaa42 1aa96b6b
Show whitespace changes
Inline Side-by-side
Showing with 2696 additions and 3136 deletions
package-lock.json
View file @ 7d702c52
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ 7d702c52
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"@riophae/vue-treeselect": "0.0.38", "@riophae/vue-treeselect": "0.0.38",
"@xkeshi/vue-barcode": "^1.0.0", "@xkeshi/vue-barcode": "^1.0.0",
"ali-oss": "^5.3.1", "ali-oss": "^5.3.1",
"axios": "^0.18.0", "axios": "^0.19.0",
"browser-md5-file": "^1.0.0", "browser-md5-file": "^1.0.0",
"child_process": "^1.0.2", "child_process": "^1.0.2",
"co": "^4.6.0", "co": "^4.6.0",
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"lrz": "^4.9.40", "lrz": "^4.9.40",
"moment": "^2.24.0", "moment": "^2.24.0",
"node-sass": "^4.11.0", "node-sass": "^4.11.0",
"particleground-light": "^1.0.6",
"pdfjs-dist": "^2.0.489", "pdfjs-dist": "^2.0.489",
"pinyin": "^2.8.3", "pinyin": "^2.8.3",
"qrcode": "^1.2.2", "qrcode": "^1.2.2",
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-amap": "^0.5.6", "vue-amap": "^0.5.6",
"vue-draggable-resizable": "^1.7.2", "vue-draggable-resizable": "^1.7.2",
"vue-echarts-v3": "^1.0.19", "vue-echarts-v3": "^2.0.1",
"vue-i18n": "^7.6.0", "vue-i18n": "^7.6.0",
"vue-quill-editor": "^3.0.6", "vue-quill-editor": "^3.0.6",
"vue-treeselect": "^1.0.7", "vue-treeselect": "^1.0.7",
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
"babel-preset-stage-2": "^6.22.0", "babel-preset-stage-2": "^6.22.0",
"chalk": "^2.4.2", "chalk": "^2.4.2",
"copy-webpack-plugin": "^4.0.1", "copy-webpack-plugin": "^4.0.1",
"css-loader": "^0.28.11", "css-loader": "^2.1.1",
"eslint": "^4.15.0", "eslint": "^4.15.0",
"eslint-config-standard": "^10.2.1", "eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^3.0.0", "eslint-friendly-formatter": "^3.0.0",
...@@ -79,7 +80,7 @@ ...@@ -79,7 +80,7 @@
"less": "^3.9.0", "less": "^3.9.0",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^5.0.1",
"ora": "^1.2.0", "ora": "^1.2.0",
"portfinder": "^1.0.13", "portfinder": "^1.0.13",
"postcss-import": "^11.0.0", "postcss-import": "^11.0.0",
...@@ -90,14 +91,14 @@ ...@@ -90,14 +91,14 @@
"shelljs": "^0.7.6", "shelljs": "^0.7.6",
"style-loader": "^0.21.0", "style-loader": "^0.21.0",
"uglifyjs-webpack-plugin": "^1.1.1", "uglifyjs-webpack-plugin": "^1.1.1",
"url-loader": "^0.5.9", "url-loader": "^2.0.0",
"vue-easytable": "^1.7.2", "vue-easytable": "^1.7.2",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vue-style-loader": "^3.0.1", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "^2.5.2",
"webpack": "^3.6.0", "webpack": "^3.6.0",
"webpack-bundle-analyzer": "^2.9.0", "webpack-bundle-analyzer": "^3.3.2",
"webpack-dev-server": "^2.9.1", "webpack-dev-server": "^2.9.1",
"webpack-merge": "^4.1.0" "webpack-merge": "^4.1.0"
}, },
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ 7d702c52
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> --> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export()"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -472,8 +472,10 @@ export default { ...@@ -472,8 +472,10 @@ export default {
count:0, count:0,
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{},
} }
},created(){ },created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){ if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
...@@ -502,6 +504,13 @@ export default { ...@@ -502,6 +504,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=1;
var fileName = "现金账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
addChuNaFun(){ // 添加出纳按钮点击事件 addChuNaFun(){ // 添加出纳按钮点击事件
let count = 0; let count = 0;
let allBPrice = 0; let allBPrice = 0;
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 7d702c52
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> --> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -415,8 +415,11 @@ export default { ...@@ -415,8 +415,11 @@ export default {
count:0, count:0,
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{},
} }
},created(){ },
created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){ if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
...@@ -445,6 +448,13 @@ export default { ...@@ -445,6 +448,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=2;
var fileName = "银行账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){ goUrlNew(item){
let status=false; let status=false;
if(item.CostTypeList){ if(item.CostTypeList){
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 7d702c52
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click=""/> --> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -407,8 +407,10 @@ export default { ...@@ -407,8 +407,10 @@ export default {
count:0, count:0,
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{},
} }
},created(){ },created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){ if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
...@@ -437,6 +439,13 @@ export default { ...@@ -437,6 +439,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=3;
var fileName = "平台账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){ goUrlNew(item){
let status=false; let status=false;
if(item.CostTypeList){ if(item.CostTypeList){
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ 7d702c52
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/> <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> --> <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -202,12 +202,21 @@ ...@@ -202,12 +202,21 @@
</tr> </tr>
<tr> <tr>
<td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td> <td :colspan="5">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}} {{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td></td> <!-- <td></td>
<td></td> <td></td>
<td> {{ moneyFormat(endRStartMoney) }} </td> <td> {{ moneyFormat(endRStartMoney) }} </td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td> {{ moneyFormat(endStartMoney) }} </td> -->
<td> {{ moneyFormat(wShou) }} </td>
<td> {{ moneyFormat(wZhi) }} </td>
<td> {{ moneyFormat(endRStartMoney) }} </td>
<td></td>
<td> {{ moneyFormat(bShou) }} </td>
<td> {{ moneyFormat(bZhi) }} </td>
<td> {{ moneyFormat(endStartMoney) }} </td> <td> {{ moneyFormat(endStartMoney) }} </td>
</tr> </tr>
</table> </table>
...@@ -436,8 +445,15 @@ export default { ...@@ -436,8 +445,15 @@ export default {
count:0, count:0,
allBPrice:0, allBPrice:0,
allWPrice:0, allWPrice:0,
userInfo:{},
wShou:0,
wZhi:0,
bShou:0,
bZhi:0,
} }
},created(){ },created(){
this.userInfo = this.getLocalStorage();
if(this.$route.query.TypeId&&!this.$route.query.ID){ if(this.$route.query.TypeId&&!this.$route.query.ID){
this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier); this.msg.Is_Cashier = parseInt(this.$route.query.Is_Cashier);
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
...@@ -467,6 +483,13 @@ export default { ...@@ -467,6 +483,13 @@ export default {
} }
},methods:{ },methods:{
Export(){
let msg=this.msg;
msg.EmployeeId = this.userInfo.EmployeeId;
msg.AccountToExcelType=4;
var fileName = "奖金池账户明细.xls";
this.GetLocalFile("Financial_post_OutToExcelAccountDetailList", msg, fileName);
},
goUrlNew(item){ goUrlNew(item){
let status=false; let status=false;
if(item.CostTypeList){ if(item.CostTypeList){
...@@ -574,23 +597,35 @@ export default { ...@@ -574,23 +597,35 @@ export default {
} }
this.endStartMoney = ''; this.endStartMoney = '';
this.endRStartMoney =''; this.endRStartMoney ='';
this.bShou = 0;
this.wShou = 0;
this.bZhi = 0;
this.wZhi = 0;
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{ this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
if(data.length){ if(data.length){
this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; // 外币 this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; // 外币
this.RStartMoney = data[0].StartMoney?data[0].StartMoney:0; // 本位币 this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0; // 本位币
let endStartMoney = 0, let endStartMoney = this.StartMoney;
endRStartMoney = 0; let endRStartMoney = this.RStartMoney;
data.forEach( ( x , i ) => { data.forEach( ( x , i ) => {
if(x.Type==1){ if(x.Type==1){
endRStartMoney = endStartMoney + x.OriginalMoney; // endRStartMoney = endStartMoney + x.OriginalMoney;
// endStartMoney = endStartMoney + x.Money;
// x.enRSMoney = endRStartMoney;
// x.enSMoney = endStartMoney;
this.bShou = this.bShou + x.Money;
this.wShou = this.wShou + x.OriginalMoney;
endRStartMoney = endRStartMoney + x.OriginalMoney;
endStartMoney = endStartMoney + x.Money; endStartMoney = endStartMoney + x.Money;
x.enRSMoney = endRStartMoney; x.enRSMoney = endRStartMoney;//外币收入
x.enSMoney = endStartMoney; x.enSMoney = endStartMoney;
}else if(x.Type==2){ }else if(x.Type==2){
endRStartMoney = endStartMoney - x.OriginalMoney; this.bZhi = this.bZhi + x.Money;
this.wZhi = this.wZhi + x.OriginalMoney;
endRStartMoney = endRStartMoney - x.OriginalMoney;
endStartMoney = endStartMoney - x.Money; endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney; x.enRSMoney = endRStartMoney;
x.enSMoney = endStartMoney; x.enSMoney = endStartMoney;
......
src/components/FinancialModule/addFinancialProcess.vue
View file @ 7d702c52
...@@ -368,6 +368,8 @@ ...@@ -368,6 +368,8 @@
<div class="approval_page_content"> <div class="approval_page_content">
<div class="approval_person_content"> <div class="approval_person_content">
<span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span> <span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
<span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span>
<div class="approval_person_list fl"> <div class="approval_person_list fl">
<span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span> <span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span>
<div class="padding_l88"> <div class="padding_l88">
...@@ -494,6 +496,25 @@ ...@@ -494,6 +496,25 @@
<button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="saveAuditUser">{{$t('pub.sureBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog
title="修改审批人"
:visible.sync="Auditshow"
width="400px">
<div>
<ul>
<li v-for="(item,index) in myAuditList" :key="index+500" style="margin-bottom:10px">
<span style="display:inline-block;width:90px">{{item.AuditDescription}}</span>
<el-input v-model.number="item.Sort" size="mini" style="width:200px"></el-input>
</li>
</ul>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button size="mini" type="danger" @click="AuditSort">确 定</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -504,6 +525,7 @@ export default { ...@@ -504,6 +525,7 @@ export default {
components: { Treeselect }, components: { Treeselect },
data(){ data(){
return{ return{
Auditshow:false,
accListShow: true, accListShow: true,
TemplateId:0, TemplateId:0,
radio:1, radio:1,
...@@ -666,7 +688,8 @@ export default { ...@@ -666,7 +688,8 @@ export default {
filterText2(val) { filterText2(val) {
this.$refs.treeUser.filter(val); this.$refs.treeUser.filter(val);
} }
},created(){ },
created(){
let userInfo=this.getLocalStorage(); let userInfo=this.getLocalStorage();
this.TemplateId = this.$route.query.id; this.TemplateId = this.$route.query.id;
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
...@@ -679,7 +702,8 @@ export default { ...@@ -679,7 +702,8 @@ export default {
this.addMsg.RB_BranchId = this.$route.query.Branch_Id; this.addMsg.RB_BranchId = this.$route.query.Branch_Id;
}; };
} }
},mounted(){ },
mounted(){
this.getCompanyList(); this.getCompanyList();
this.getMaxDepartmentTierList(); this.getMaxDepartmentTierList();
...@@ -690,7 +714,31 @@ export default { ...@@ -690,7 +714,31 @@ export default {
} }
this.getFinancialFlowTemplate_post_GetNodeList(); this.getFinancialFlowTemplate_post_GetNodeList();
this.getRole() this.getRole()
},methods:{ },
methods:{
AuditSort(){
let sum=0;
let sortnum=0;
for(let i=0;i<this.myAuditList.length;i++){
let id=this.myAuditList[i].Sort;
sum+=i+1;
sortnum+=this.myAuditList[i].Sort;
}
if(sum!=sortnum){
this.Error("请输入连续的排序！")
return;
}
this.myAuditList.sort(
this.$commonUtils.createComprisonFunction("Sort")
);
this.Auditshow=false;
},
EditAudit(){
// console.log("myAuditList",this.myAuditList)
},
handleCheckAllChangeAcc(val) { handleCheckAllChangeAcc(val) {
this.accListMsg = val ? [1,2,3,4] : []; this.accListMsg = val ? [1,2,3,4] : [];
this.isIndeterminate = false; this.isIndeterminate = false;
......
src/components/Hotel/HotelProductManage2.vue
View file @ 7d702c52
...@@ -57,42 +57,45 @@ ...@@ -57,42 +57,45 @@
<div :class="stockColor(item,subItem)" <div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''" :style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)"> @click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br /> <el-popover placement="bottom" title="报价信息" width="400" trigger="hover"
v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="detailInfo" v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template>
<div class="triangle_border_up"></div> <table style="margin-left:3px;padding-top:2px;width:370px;">
<div class="popContent">
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="popList">
<table style="margin-left:3px;padding-top:2px;">
<tr> <tr>
<th width="50">批次</th> <th width="40" style="text-align:center">批次</th>
<th width="50">价格</th> <th width="40" style="text-align:center">价格</th>
<th width="50">库存</th> <th width="40" style="text-align:center">库存</th>
<th width="50">剩余库存</th> <th width="60" style="text-align:center">剩余<br/>库存</th>
<th width="140" style="text-align:center">供应商</th>
<th width="50" style="text-align:center">操作</th>
</tr> </tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList"> <tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td> <td style="text-align:center">
{{childItem.BatchNumber}} {{childItem.BatchNumber}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.CostPrice}} {{childItem.CostPrice}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.Inventory}} {{childItem.Inventory}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.RemainingInventory}} {{childItem.RemainingInventory}}
</td> </td>
<td style="text-align:left">
{{childItem.SupplierName}}
</td>
<td style="text-align:center">
<a style="text-decoration:underline;cursor:pointer;color:blue;"
@click="goEdit('2', subItem.day,childItem.BatchNumber)">修改</a>
</td>
</tr> </tr>
</table> </table>
<input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/>
</div>
</template> </template>
</div> <span slot="reference" >{{subItem.date.getDate()}}</span>
</div> </el-popover>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template v-else>
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span> {{subItem.date.getDate()}}
</template> </template>
</div> </div>
</div> </div>
...@@ -159,8 +162,7 @@ ...@@ -159,8 +162,7 @@
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0" <el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col </el-col <el-col :span="6">
<el-col :span="6">
<el-form-item label="标准间成本价"> <el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0" <el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
...@@ -225,6 +227,19 @@ ...@@ -225,6 +227,19 @@
<el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg2.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='3'></el-option>
<el-option label='预付' :value='4'></el-option>
<el-option label='预付款抵扣' :value='5'></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -449,6 +464,19 @@ ...@@ -449,6 +464,19 @@
<el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='3'></el-option>
<el-option label='预付' :value='4'></el-option>
<el-option label='预付款抵扣' :value='5'></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -607,8 +635,9 @@ ...@@ -607,8 +635,9 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
}, },
msg2: { msg2: {
Hotel: '0', Hotel: '0',
...@@ -639,8 +668,9 @@ ...@@ -639,8 +668,9 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
PayStyle: 0, //付款方式
}, },
rules: { rules: {
InventoryType: { InventoryType: {
...@@ -880,7 +910,6 @@ ...@@ -880,7 +910,6 @@
}, res => { }, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let json = res.data.data; let json = res.data.data;
this.hotelInfo.HotelName = json.HotelName; this.hotelInfo.HotelName = json.HotelName;
this.hotelInfo.TotalInventory = json.TotalInventory; this.hotelInfo.TotalInventory = json.TotalInventory;
this.hotelInfo.Validity = json.Validity; this.hotelInfo.Validity = json.Validity;
...@@ -964,8 +993,9 @@ ...@@ -964,8 +993,9 @@
this.msg.SanKePrice = data.SanKePrice; this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber; this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice; this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay; this.msg.BeforeDay = data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum; this.msg.FreeRoomNum = data.FreeRoomNum;
this.msg.PayStyle = data.PayStyle;
} }
}) })
}, },
...@@ -1007,7 +1037,7 @@ ...@@ -1007,7 +1037,7 @@
initSupplier() { initSupplier() {
this.apipost("supplier_post_GetAllList", { this.apipost("supplier_post_GetAllList", {
Type: 1, Type: 1,
Country:651 Country: 651
}, res => { }, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.SupplierList = res.data.data; this.SupplierList = res.data.data;
...@@ -1044,9 +1074,10 @@ ...@@ -1044,9 +1074,10 @@
this.msg.CostPrice = 0; this.msg.CostPrice = 0;
this.msg.SanKePrice = 0; this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1; this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0; this.msg.TaxesPrice = 0;
this.msg.BeforeDay=0; this.msg.BeforeDay = 0;
this.msg.FreeRoomNum=0; this.msg.FreeRoomNum = 0;
this.msg.PayStyle = 0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1063,8 +1094,9 @@ ...@@ -1063,8 +1094,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -1079,8 +1111,9 @@ ...@@ -1079,8 +1111,9 @@
that.msg2.SanKePrice = 0; that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1; that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0; that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0; that.msg2.BeforeDay = 0;
that.msg2.FreeRoomNum=0; that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle = 0;
} else { } else {
that.Error(res.data.message) that.Error(res.data.message)
} }
...@@ -1100,8 +1133,9 @@ ...@@ -1100,8 +1133,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle = 0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1148,6 +1182,7 @@ ...@@ -1148,6 +1182,7 @@
this.initSupplier(); this.initSupplier();
} }
} }
</script> </script>
<style> <style>
...@@ -1607,7 +1642,7 @@ ...@@ -1607,7 +1642,7 @@
.hotelProductManage2 .detailInfo { .hotelProductManage2 .detailInfo {
display: none; display: none;
position: absolute; position: absolute;
left: -70px; left: -145px;
top: 50px; top: 50px;
z-index: 999; z-index: 999;
} }
...@@ -1615,7 +1650,7 @@ ...@@ -1615,7 +1650,7 @@
.hotelProductManage2 .triangle_border_up { .hotelProductManage2 .triangle_border_up {
width: 0; width: 0;
height: 0; height: 0;
border-width: 0 103px 30px; border-width: 0 175px 30px;
border-style: solid; border-style: solid;
opacity: 0.75; opacity: 0.75;
border-color: transparent transparent rgba(233, 82, 82, 1); border-color: transparent transparent rgba(233, 82, 82, 1);
...@@ -1623,7 +1658,7 @@ ...@@ -1623,7 +1658,7 @@
} }
.hotelProductManage2 .detailInfo .popContent { .hotelProductManage2 .detailInfo .popContent {
width: 205px; width: 350px;
min-height: 80px; min-height: 80px;
background-color: #e95252; background-color: #e95252;
text-align: left; text-align: left;
...@@ -1647,7 +1682,11 @@ ...@@ -1647,7 +1682,11 @@
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
text-align: right; text-align: right;
} }
.hotelProductManage2 .Htupbtn{
padding:0 10px;height:25px;margin:10px 0 0 75px; .hotelProductManage2 .Htupbtn {
padding: 0 10px;
height: 25px;
margin: 10px 0 0 75px;
} }
</style> </style>
src/components/Hotel/roomQuery.vue
View file @ 7d702c52
...@@ -167,8 +167,9 @@ ...@@ -167,8 +167,9 @@
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;"> class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
{{childItem.NewHotelName}} {{childItem.NewHotelName}}
<span class="colorE95252"> <span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template> <template v-if="childItem.OPState==1">[OP-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}} <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}
</template> </template>
</span> </span>
</p> </p>
......
src/components/Restaurant/FoodOrder.vue
View file @ 7d702c52
...@@ -214,6 +214,12 @@ export default { ...@@ -214,6 +214,12 @@ export default {
this.currentPage = 1; this.currentPage = 1;
}, },
getList() { getList() {
if(!this.msg.startDate){
this.msg.startDate="";
}
if(!this.msg.endDate){
this.msg.endDate="";
}
this.loading = true; this.loading = true;
this.apiJavaPost("/api/erp/dining/getDiningOrder", this.msg, res => { this.apiJavaPost("/api/erp/dining/getDiningOrder", this.msg, res => {
this.loading = false; this.loading = false;
......
src/components/Supplier/HotelProductManage.vue
View file @ 7d702c52
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<el-date-picker v-model="condition.month" type="month" value-format="yyyy-MM" :clearable="false" <el-date-picker v-model="condition.month" type="month" value-format="yyyy-MM" :clearable="false"
placeholder="选择月"></el-date-picker> placeholder="选择月"></el-date-picker>
</div> </div>
<input type="button" class="normalBtn" value="查询" @click="getMonths()"/> <input type="button" class="normalBtn" value="查询" @click="getMonths()" />
<input type="button" class="normalBtn" value="批量编辑" style="margin-right:10px;" @click="goEdit('1')"/> <input type="button" class="normalBtn" value="批量编辑" style="margin-right:10px;" @click="goEdit('1')" />
</div> </div>
<div class="hotelProductManage2_tableBox"> <div class="hotelProductManage2_tableBox">
<table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0"> <table class="hotelProductManage2_table" border="0" cellspacing="0" cellpadding="0">
...@@ -55,42 +55,41 @@ ...@@ -55,42 +55,41 @@
<div :class="stockColor(item,subItem)" <div :class="stockColor(item,subItem)"
:style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''" :style="subItem.month===item.date&&msg2.DateList.indexOf(subItem.day)!==-1?'border-color: green':''"
@click="calendarDayOn(item, subItem)"> @click="calendarDayOn(item, subItem)">
{{subItem.date.getDate()}}<br /> <el-popover placement="bottom" title="报价信息" width="280" trigger="hover"
v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="detailInfo" v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template>
<div class="triangle_border_up"></div> <table style="margin-left:3px;padding-top:2px;width:270px;">
<div class="popContent">
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<div class="popList">
<table style="margin-left:3px;padding-top:2px;">
<tr> <tr>
<th width="50">批次</th> <th width="50" style="text-align:center">批次</th>
<th width="50">价格</th> <th width="50" style="text-align:center">价格</th>
<th width="50">库存</th> <th width="50" style="text-align:center">库存</th>
<th width="50">剩余库存</th> <th width="60" style="text-align:center">剩余<br/>库存</th>
<th width="50" style="text-align:center">操作</th>
</tr> </tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList"> <tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td> <td style="text-align:center">
{{childItem.BatchNumber}} {{childItem.BatchNumber}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.CostPrice}} {{childItem.CostPrice}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.Inventory}} {{childItem.Inventory}}
</td> </td>
<td> <td style="text-align:center">
{{childItem.RemainingInventory}} {{childItem.RemainingInventory}}
</td> </td>
<td style="text-align:center">
<a style="text-decoration:underline;cursor:pointer;color:blue;"
@click="goEdit('2', subItem.day,childItem.BatchNumber)">修改</a>
</td>
</tr> </tr>
</table> </table>
<input type="button" class="hollowFixedBtn Htupbtn" value="修改" @click="goEdit('2', subItem.day,subItem.data.SubList[0].BatchNumber)"/>
</div>
</template> </template>
</div> <span slot="reference" >{{subItem.date.getDate()}}</span>
</div> </el-popover>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]"> <template v-else>
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span> {{subItem.date.getDate()}}
</template> </template>
</div> </div>
</div> </div>
...@@ -157,8 +156,7 @@ ...@@ -157,8 +156,7 @@
<el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0" <el-input-number v-model="msg2.FreeRoomNum" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'FreeRoomNum')" maxlength="10"></el-input-number>
</el-form-item> </el-form-item>
</el-col </el-col <el-col :span="6">
<el-col :span="6">
<el-form-item label="标准间成本价"> <el-form-item label="标准间成本价">
<el-input-number v-model="msg2.CostPrice" :precision="2" :min="0" <el-input-number v-model="msg2.CostPrice" :precision="2" :min="0"
@keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number> @keyup.native="checkPrice(msg2,'CostPrice')" maxlength="10"></el-input-number>
...@@ -223,6 +221,19 @@ ...@@ -223,6 +221,19 @@
<el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg2.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg2.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='3' ></el-option>
<el-option label='预付' :value='4' ></el-option>
<el-option label='预付款抵扣' :value='5'></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -251,7 +262,8 @@ ...@@ -251,7 +262,8 @@
<el-form-item label="供应商" prop="Supplier"> <el-form-item label="供应商" prop="Supplier">
<el-select v-model="msg2.Supplier" placeholder="请选择"> <el-select v-model="msg2.Supplier" placeholder="请选择">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option> <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" v-if="userInfo.SupplierId==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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -447,6 +459,19 @@ ...@@ -447,6 +459,19 @@
<el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input> <el-input v-model="msg.CurrentRate" placeholder="汇率" style="width:80px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="付款方式 ">
<el-select class='w135 sel' v-model='msg.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='3' ></el-option>
<el-option label='预付' :value='4' ></el-option>
<el-option label='预付款抵扣' :value='5'></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;"> <el-row style="padding: 20px 0 0 0;border-top: 1px dashed #ccc;">
<el-col :span="6"> <el-col :span="6">
...@@ -475,7 +500,8 @@ ...@@ -475,7 +500,8 @@
<el-form-item label="供应商" prop="Supplier"> <el-form-item label="供应商" prop="Supplier">
<el-select v-model="msg.Supplier" placeholder="请选择"> <el-select v-model="msg.Supplier" placeholder="请选择">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option> <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" v-if="userInfo.SupplierId==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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -576,7 +602,7 @@ ...@@ -576,7 +602,7 @@
data: {} data: {}
}, },
editShow: false, editShow: false,
userInfo:{}, userInfo: {},
msg: { msg: {
Hotel: '0', Hotel: '0',
Supplier: 30, Supplier: 30,
...@@ -606,9 +632,10 @@ ...@@ -606,9 +632,10 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
OpType:1,//供应商操作 OpType: 1, //供应商操作
PayStyle:0,//付款方式
}, },
msg2: { msg2: {
Hotel: '0', Hotel: '0',
...@@ -639,9 +666,10 @@ ...@@ -639,9 +666,10 @@
SanKePrice: 0, //散客价 SanKePrice: 0, //散客价
BatchNumber: 1, //批次号 BatchNumber: 1, //批次号
TaxesPrice: 0, //税金 TaxesPrice: 0, //税金
BeforeDay:0,//提前还房天数 BeforeDay: 0, //提前还房天数
FreeRoomNum:0,//免间数 FreeRoomNum: 0, //免间数
OpType:1,//供应商操作 OpType: 1, //供应商操作
PayStyle:0,//付款方式
}, },
rules: { rules: {
InventoryType: { InventoryType: {
...@@ -874,10 +902,15 @@ ...@@ -874,10 +902,15 @@
this.msg2.DateList.splice(dayIndex, 1) this.msg2.DateList.splice(dayIndex, 1)
}, },
getData: function (date, key) { getData: function (date, key) {
var sId = 0;
if (this.getLocalStorageSupplier()) {
sId = this.getLocalStorageSupplier().SupplierId;
}
this.ApiPost2('hotelreport_get_GetHotelPriceMonthStatistics', { this.ApiPost2('hotelreport_get_GetHotelPriceMonthStatistics', {
HotelId: this.hotelId, HotelId: this.hotelId,
Year: date.split('-')[0], Year: date.split('-')[0],
Month: date.split('-')[1] Month: date.split('-')[1],
Supplier: sId
}, res => { }, res => {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
let json = res.data.data; let json = res.data.data;
...@@ -965,8 +998,9 @@ ...@@ -965,8 +998,9 @@
this.msg.SanKePrice = data.SanKePrice; this.msg.SanKePrice = data.SanKePrice;
this.msg.BatchNumber = data.BatchNumber; this.msg.BatchNumber = data.BatchNumber;
this.msg.TaxesPrice = data.TaxesPrice; this.msg.TaxesPrice = data.TaxesPrice;
this.msg.BeforeDay=data.BeforeDay; this.msg.BeforeDay = data.BeforeDay;
this.msg.FreeRoomNum=data.FreeRoomNum; this.msg.FreeRoomNum = data.FreeRoomNum;
this.msg.PayStyle=data.PayStyle;
} }
}) })
}, },
...@@ -1044,9 +1078,10 @@ ...@@ -1044,9 +1078,10 @@
this.msg.CostPrice = 0; this.msg.CostPrice = 0;
this.msg.SanKePrice = 0; this.msg.SanKePrice = 0;
this.msg.BatchNumber = 1; this.msg.BatchNumber = 1;
this.msg.TaxesPrice=0; this.msg.TaxesPrice = 0;
this.msg.BeforeDay=0; this.msg.BeforeDay = 0;
this.msg.FreeRoomNum=0; this.msg.FreeRoomNum = 0;
this.msg.PayStyle=0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1063,8 +1098,9 @@ ...@@ -1063,8 +1098,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle=0;
}, },
//批量删除 //批量删除
delete2Reset: function () { delete2Reset: function () {
...@@ -1079,8 +1115,9 @@ ...@@ -1079,8 +1115,9 @@
that.msg2.SanKePrice = 0; that.msg2.SanKePrice = 0;
that.msg2.BatchNumber = 1; that.msg2.BatchNumber = 1;
that.msg2.TaxesPrice = 0; that.msg2.TaxesPrice = 0;
that.msg2.BeforeDay=0; that.msg2.BeforeDay = 0;
that.msg2.FreeRoomNum=0; that.msg2.FreeRoomNum = 0;
that.msg2.PayStyle=0;
} else { } else {
that.Error(res.data.message) that.Error(res.data.message)
} }
...@@ -1100,8 +1137,9 @@ ...@@ -1100,8 +1137,9 @@
this.msg2.SanKePrice = 0; this.msg2.SanKePrice = 0;
this.msg2.BatchNumber = 1; this.msg2.BatchNumber = 1;
this.msg2.TaxesPrice = 0; this.msg2.TaxesPrice = 0;
this.msg2.BeforeDay=0; this.msg2.BeforeDay = 0;
this.msg2.FreeRoomNum=0; this.msg2.FreeRoomNum = 0;
this.msg2.PayStyle=0;
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1149,6 +1187,7 @@ ...@@ -1149,6 +1187,7 @@
this.initSupplier(); this.initSupplier();
} }
} }
</script> </script>
<style> <style>
...@@ -1644,7 +1683,11 @@ ...@@ -1644,7 +1683,11 @@
margin: 10px 10px 0 0; margin: 10px 10px 0 0;
text-align: right; text-align: right;
} }
.hotelProductManage2 .Htupbtn{
padding:0 10px;height:25px;margin:10px 0 0 75px; .hotelProductManage2 .Htupbtn {
padding: 0 10px;
height: 25px;
margin: 10px 0 0 75px;
} }
</style> </style>
src/components/Supplier/HotelQueryList.vue
View file @ 7d702c52
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight"> <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180"> <el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer"> <div>
{{scope.row.HotelName}}</div> {{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div> <div>{{scope.row.TotalInventory}}</div>
<input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;" @click="getLogsList(scope.row.HotelId)" value="操作日志"/> <input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;" @click="getLogsList(scope.row.HotelId)" value="操作日志"/>
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div> <div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template> </template>
</div> </div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" <div class="Hotel_kong Com_hoteldiv"
> >
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}} {{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div> </div>
...@@ -653,11 +653,6 @@ ...@@ -653,11 +653,6 @@
</script> </script>
<style> <style>
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
.HqCom_bottom .ql-container { .HqCom_bottom .ql-container {
min-height: 100px; min-height: 100px;
} }
......
src/components/Supplier/roomQuery.vue
View file @ 7d702c52
...@@ -149,8 +149,8 @@ ...@@ -149,8 +149,8 @@
<span style="color:red;"> <span style="color:red;">
<template v-if="childItem.SupplierId==UserInfo.SupplierId"> <template v-if="childItem.SupplierId==UserInfo.SupplierId">
<template v-if="childItem.OPState==1">[OP选房-OK]</template> <template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}} <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template>
</template> <template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}}</template>
</template> </template>
</span> </span>
</td> </td>
......
src/components/SupplierIndex.vue
View file @ 7d702c52
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="nav-left"> <div class="nav-left">
<img class="GroupPic" src="../assets/img/daxiang.png" /> <img class="GroupPic" src="../assets/img/daxiang.png" />
</div> </div>
<div class="nav-middle"> <div class="nav-middle SupplierIndex_Nav">
<ul class="clearfix" :style="{width:`${allWindowWidth}px`}"> <ul class="clearfix" :style="{width:`${allWindowWidth}px`}">
<li v-for="(item,index) in menuList" v-if="item.URL!=''" :class="{active:item.Id==chosenIndex}" <li v-for="(item,index) in menuList" v-if="item.URL!=''" :class="{active:item.Id==chosenIndex}"
@click="goUrl(item.URL,item.Id,index)"> @click="goUrl(item.URL,item.Id,index)">
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
<div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList" <div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList"
v-loading="loading"> v-loading="loading">
<div class="hotelProductManage2_tableBox" style="margin:20px 0;"> <div style="margin:20px 0">
<span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span> <span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span> <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span> <span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
:height="tableHeight"> :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180"> <el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer"> <div>
{{scope.row.HotelName}}</div> {{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div> <div>{{scope.row.TotalInventory}}</div>
</template> </template>
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div> <div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template> </template>
</div> </div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge"> <div class="Hotel_kong Com_hoteldiv">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}} {{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div> </div>
<div class="Hotel_kong Com_hoteldiv"> <div class="Hotel_kong Com_hoteldiv">
...@@ -907,7 +907,9 @@ ...@@ -907,7 +907,9 @@
float: left; float: left;
z-index: 2019128; z-index: 2019128;
} }
.SupplierIndex_Nav ul li{
margin-left:20px;
}
.nav-middle ul li i { .nav-middle ul li i {
font-size: 16px; font-size: 16px;
color: #a6adb4; color: #a6adb4;
...@@ -1058,12 +1060,6 @@ ...@@ -1058,12 +1060,6 @@
top: 50px !important; top: 50px !important;
} }
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
.HqCom_bottom .ql-container { .HqCom_bottom .ql-container {
min-height: 100px; min-height: 100px;
} }
......
src/components/SupplierLogin.vue
View file @ 7d702c52
...@@ -31,7 +31,16 @@ ...@@ -31,7 +31,16 @@
.Supplier_Login .login-Div .loginBtn:hover { .Supplier_Login .login-Div .loginBtn:hover {
background-color: #5182E4; background-color: #5182E4;
} }
.Supplier_Login .login_back{
position: absolute!important;
width:100%;
height:60%;
top:0;
left:0;
}
.Supplier_Login .Supplier_loginDiv{
background-color:rgba(255,255,255,0.2)!important;
}
</style> </style>
<template> <template>
...@@ -43,8 +52,8 @@ ...@@ -43,8 +52,8 @@
</div> </div>
</div> </div>
</div> </div>
<div class="login_back"></div>
<form class="login-Div"> <form class="login-Div Supplier_loginDiv">
<div v-if="isShow==1"> <div v-if="isShow==1">
<div class="mainTitle"> <div class="mainTitle">
<div class="login_Title"> <div class="login_Title">
...@@ -82,6 +91,7 @@ ...@@ -82,6 +91,7 @@
</template> </template>
<script> <script>
import Particle from 'particleground-light'
export default { export default {
name: "login-box", name: "login-box",
data() { data() {
...@@ -108,6 +118,10 @@ ...@@ -108,6 +118,10 @@
}; };
}, },
mounted() { mounted() {
new Particle(document.querySelector('.login_back'),{
dotColor: '#19294C',
lineColor: '#19294C'
})
this.init(); this.init();
let that = this; let that = this;
this.clock = setInterval(() => { this.clock = setInterval(() => {
......
src/components/scenicSpot/ScenTicketOrder.vue
View file @ 7d702c52
...@@ -268,13 +268,18 @@ export default { ...@@ -268,13 +268,18 @@ export default {
this.currentPage = 1; this.currentPage = 1;
}, },
getList() { getList() {
if(!this.msg.startDate){
this.msg.startDate="";
}
if(!this.msg.endDate){
this.msg.endDate="";
}
this.loading = true; this.loading = true;
this.apiJavaPost("/api/erp/ticketCoupons/getTicketCouponsOrder", this.msg, res => { this.apiJavaPost("/api/erp/ticketCoupons/getTicketCouponsOrder", this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log(this.dataList,'datalist');
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
......
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