Skip to content

S
SuperMan
Commit 36e17a32 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 9f816da9 6d82647c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4483 additions and 173 deletions
src/components/Details.vue
View file @ 36e17a32
......@@ -542,6 +542,9 @@ export default {
case "/CapitalAllocationDetail": //资金调拨
path = "/CapitalAllocation";
break;
case "/addIntegralMall": //新增商品
path = "/IntegralMall";
break;
}
//找到Root
......@@ -756,6 +759,9 @@ export default {
case "/CapitalAllocationDetail": //资金调拨
path = "/CapitalAllocation";
break;
case "/addIntegralMall": //新增商品
path = "/IntegralMall";
break;
}
//找到Root
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 36e17a32
......@@ -204,7 +204,7 @@
<el-option :label="$t('fnc.ptxnzhanghu')" :value='5' :key='5' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.djxnzhanghu')" :value='6' :key='6' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option :label="$t('fnc.szxiangdi')" :value='7' :key='7' v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12'></el-option>
<el-option label="原路退款" :value='8' :key='8' v-if='msg.TemplateId===2 || msg.TemplateId===12 ||msg.TemplateId===61 || msg.TemplateId===62'></el-option>
</el-select>
<el-select v-if="!showDisable" filterable v-model='msg.ClientType' :placeholder="$t('fnc.khleixing')" @change="financeinfo_post_GetClientAccountList(msg.ClientType)" class="w135 _border_b_1">
......
src/components/Hotel/roomQuery.vue
View file @ 36e17a32
......@@ -74,16 +74,6 @@
<el-input v-model='msg.CombinationNum'></el-input>
</span>
</li>
<li>
<span>
<em>出团公司</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>酒店</em>
......@@ -93,14 +83,14 @@
</el-select>
</span>
</li>
<li style="display:none;">
<li>
<span>
<em>酒店状态</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="全部OK" :value='100'></el-option>
<el-option label="暂定一晚" :value='1'></el-option>
<el-option label="暂定二晚" :value='2'></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>
......@@ -109,6 +99,16 @@
</el-select>
</span>
</li>
<li>
<span>
<em>出团公司</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
......@@ -166,10 +166,10 @@
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
{{childItem.NewHotelName}}
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</span>
</p>
</div>
......@@ -212,7 +212,7 @@
TCNUM: '',
PriceStatus: 0,
CombinationNum: '',
HotelStatus:-1,
HotelStatus: 0
},
//分公司类表
companyList: [],
......@@ -339,7 +339,7 @@
})
}
y.colNum = 9 + y.CommonReport.newHotel.length;
})
});
})
} else {
this.$message.error(res.data.message)
......
src/components/Hotel/roomReservations.vue
View file @ 36e17a32
......@@ -80,7 +80,22 @@
</el-select>
</span>
</li>
<li>
<span>
<em>酒店状态</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="全部OK" :value='100'></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-option label="暂定七晚以上" :value='7'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
......@@ -271,7 +286,8 @@
CreateBy:0,
TCNUM: '',
PriceStatus: 0,
CombinationNum:''
CombinationNum:'',
HotelStatus:0
},
thLengthTitle: [],
list: [],
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 36e17a32
......@@ -115,7 +115,8 @@
</td>
<td v-if="childIndex==0" :rowspan="5">
<div class="w150">
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')" :disabled="subItem.OPState==1"
<!--:disabled="subItem.OPState==1"-->
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'>
......@@ -228,7 +229,8 @@
</td>
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5">
<template v-if="subItem.OPState!=1">
<!--v-if="subItem.OPState!=1"-->
<template >
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip>
......@@ -241,9 +243,9 @@
</el-button>
</el-tooltip>
</template>
<template v-else>
<!-- <template v-else>
<span class="Hotel_red">OP选房确认</span>
</template>
</template> -->
</td>
</tr>
</template>
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 36e17a32
......@@ -96,7 +96,7 @@
</div>
</td>
</tr>
<tr>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
......@@ -187,7 +187,7 @@
</tr>
</template>
</template>
<tr>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="6">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
......@@ -258,7 +258,7 @@
</tr>
</template>
</template>
<tr>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
......@@ -331,7 +331,7 @@
</tr>
</template>
</template>
<tr>
<tr v-if="TotalNav.reimburseTotalPrice">
<td>总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
......@@ -343,6 +343,40 @@
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th>单号</th>
<th>挂账金额</th>
<th>挂账类型</th>
<th>挂账对象</th>
<th>单据状态</th>
<th>创建时间</th>
<th>创建人</th>
</tr>
<tr v-for="item in HangingList">
<td>
<span>{{item.FrID}}</span>
</td>
<td>
<span>{{item.Money}}</span>
</td>
<td>
<span>{{item.HangingAccountsTypeStr}}</span>
</td>
<td>
<span>{{item.RemitterName}}：{{item.AccountNumber}}</span>
</td>
<td>
<span>{{item.StatusStr}}</span>
</td>
<td>
<span>{{item.CreateDateStr}}</span>
</td>
<td>
<span>{{item.createByStr}}</span>
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th>预付合计</th>
......@@ -411,9 +445,23 @@
NewCombinationNum: '',
TotalNav: [],
LeaderGetPrice: 0,
HangingList: []
}
},
methods: {
getHangingAccountByTCIDList: function () {
this.apipost(
'Financial_post_GetHangingAccountByTCIDList', {
TCIDs: this.$route.query.id
},
res => {
if (res.data.resultCode == 1) {
this.HangingList = res.data.data
}
},
err => {}
)
},
goFncUrl: function (path, id) {
this.$router.push({
name: path,
......@@ -668,6 +716,7 @@
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList();
this.getTotalNav();
this.getHangingAccountByTCIDList()
}
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ 36e17a32
......@@ -777,11 +777,13 @@
<el-form-item label="客户门店" prop="CustomerId"
v-show="addMsg.CustomerType==1||addMsg.CustomerType==2||addMsg.CustomerType==''">
<el-select v-model='addMsg.CustomerId' filterable :placeholder="$t('pub.pleaseSel')" @change='getSspt'
v-if="addMsg.OrderForm !== 4"
:disabled="true">
<el-option v-for="item in khmdList" :label='item.customerName' :value='item.customerId'
:key='item.customerId'>
</el-option>
</el-select>
<el-input v-else v-model='addMsg.allName' :disabled="true"></el-input>
</el-form-item>
</el-col>
......@@ -1061,7 +1063,7 @@
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客人来源" prop="ClientSource">
<el-select v-model='addMsg.ClientSource' :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model='addMsg.ClientSource' :disabled="addMsg.OrderForm!==4 ? true : false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in ddlyList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
......@@ -1077,7 +1079,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="交易方式" prop="TradeWay" v-show='addMsg.ClientSource==1'>
<el-select v-model='addMsg.TradeWay' :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model='addMsg.TradeWay' :disabled="addMsg.OrderForm !== 4 ? true : false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
......@@ -1946,6 +1948,7 @@
Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0,
addMsg: {
OrderForm: 1,
OrderId: '0',
TCID: '0',
CustomerType: '',
......@@ -2680,7 +2683,7 @@
this.remarksMsg.isOrder = obj.isOrder
}
},
getDetail(obj) {
getDetail(obj) {
this.Ysze = false;
this.starTime = obj.startDate
this.endTime = obj.backDate
......@@ -2721,6 +2724,8 @@
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderForm = x.OrderForm
this.addMsg.allName = x.ContactName
this.IsChildrenTour = x.IsChildrenTour
this.IsBirdDiscount = x.IsBirdDiscount
......@@ -2745,6 +2750,8 @@
this.isShowLayer = true
this.isShowHouse = false
this.isShowLayerRemarks = false
this.getKhmdList(this.addMsg.CustomerType, obj.lineId)
this.getDdlyList(this.addMsg.CustomerType)
this.apipost(
'app_today_visit_GetCustomerBrandByCustomerId', {
customerInfoId: x.CustomerId
......@@ -2793,9 +2800,6 @@
this.Unit_PriceList.push(obj);
}
}, err => {})
this.getKhmdList(this.addMsg.CustomerType, obj.lineId)
this.getDdlyList(this.addMsg.CustomerType)
} else {
this.$message.error(res.data.message)
}
......@@ -3467,7 +3471,7 @@
err => {}
)
},
getDdlyList(id) {
getDdlyList(id) {
this.apipost(
'sellorder_get_GetSellClientSourceEnumList', {
typeId: id
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 36e17a32
......@@ -701,7 +701,7 @@
<el-input v-model='addMsg.ContactMobile'></el-input>
</el-form-item>
<el-form-item label="客户门店" prop="CustomerId" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2||addMsg.CustomerType==''" >
<el-select v-model='addMsg.CustomerId' filterable :placeholder="$t('pub.pleaseSel')" @change='getSspt' :disabled="true">
<el-select v-model='addMsg.CustomerId' filterable :placeholder="$t('pub.pleaseSel')" @change='getSspt' v-if="addMsg.OrderForm !== 4" :disabled="true">
<el-option
v-for="(item,index) in khmdList"
:label='item.customerName'
......@@ -709,6 +709,7 @@
:key='index'>
</el-option>
</el-select>
<el-input v-else v-model='addMsg.allName' :disabled="true"></el-input>
</el-form-item>
</el-col>
......@@ -900,7 +901,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="交易方式" prop="TradeWay" v-show='addMsg.ClientSource==1'>
<el-select v-model='addMsg.TradeWay' :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model='addMsg.TradeWay' :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-option
v-for="item in jyfsList"
:label='item.Name'
......@@ -1280,7 +1281,7 @@
<el-row :gutter="20">
<el-col :span="4">
<el-form-item label="客人来源" prop="ClientSource">
<el-select v-model='addMsg.ClientSource' :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model='addMsg.ClientSource' :disabled="addMsg.OrderForm!==4 ? true : false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option
v-for="item in ddlyList"
:label='item.Name'
......@@ -1304,7 +1305,7 @@
</el-col>
<el-col :span="4">
<el-form-item label="交易方式" prop="TradeWay" v-show='addMsg.ClientSource==1'>
<el-select v-model='addMsg.TradeWay' :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-select v-model='addMsg.TradeWay' :disabled="addMsg.OrderForm !== 4 ? true : false" filterable :placeholder="$t('pub.pleaseSel')">
<el-option
v-for="item in jyfsList"
:label='item.Name'
......@@ -2294,6 +2295,7 @@ export default {
Unit_PriceList:[],//成交单价下拉数据
LessMoney:0,
addMsg: {
OrderForm: '',
OrderId: "0",
TCID: "0",
CustomerType: "",
......@@ -3046,7 +3048,8 @@ submitYSZEForm(){
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.addMsg.OrderForm = x.OrderForm
this.addMsg.allName = x.ContactName
// this.addMsg_form.OrderId=x.OrderId;
// this.addMsg_form.OpSetLossMoney=x.OpSetLossMoney;//收损金额
// this.addMsg_form.BabyChargePrice=modelPrice.BabyChargePrice;//小孩附加费
......@@ -3090,6 +3093,8 @@ submitYSZEForm(){
this.isShowLayer = false;
this.isShowLayer2 = true;
}
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy);
this.getDdlyList(this.addMsg.CustomerType);
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList=[];
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid, "MaxPeopleNum": MaxPeopleNum}, res => {
......@@ -3137,8 +3142,7 @@ submitYSZEForm(){
},
err => {}
);
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy);
this.getDdlyList(this.addMsg.CustomerType);
} else {
}
},
......
src/components/Supplier/HotelManagement.vue 0 → 100644
View file @ 36e17a32
This diff is collapsed.
src/components/Supplier/HotelQueryList.vue 0 → 100644
View file @ 36e17a32
This diff is collapsed.
src/components/Supplier/HotelSalesBoard.vue 0 → 100644
View file @ 36e17a32
This diff is collapsed.
src/components/Supplier/HotelTotalStock.vue 0 → 100644
View file @ 36e17a32
This diff is collapsed.
src/components/Supplier/roomQuery.vue 0 → 100644
View file @ 36e17a32
This diff is collapsed.
src/components/Ticketing/TicketManager.vue
View file @ 36e17a32
This diff is collapsed.
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 36e17a32
......@@ -211,10 +211,9 @@
<tr>
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
:title="item.alName" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;text-decoration:underline;" :title="item.orderId"
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">
......@@ -224,10 +223,10 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td>
<td class="fz12">
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName">
<p style="max-width: 160px;display: block;text-decoration:underline;cursor:pointer;" title="点击跳转到报名清单" class="over_ellipsis" :title="item.lineName" @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">
<span>{{item.lineName}}</span>
</p>
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
<p style="max-width: 160px;display: block;text-decoration:underline;cursor:pointer;" title="点击跳转到报名清单" class="over_ellipsis" :title="item.ltName" @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.ltName}}</p>
</td>
<td>{{item.guestNum}}</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
......@@ -320,7 +319,7 @@
</div>
</div>
</td>
<td colspan="8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
<td :colspan="userId==1?9:8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div style="white-space: nowrap">{{$t('fnc.skdanju')}}：<span v-if="item.financeList.length===0"
......
src/components/activity/CommodityType.vue 0 → 100644
View file @ 36e17a32
<style>
.height_auto.el-select .el-input {
height: auto;
}
.CommodityType ._addUpload_box {
display: block;
margin: 10px 0 0;
}
.CommodityType ._addUpload_box img {
height: 15px;
display: block;
margin-right: 25px;
}
.CommodityType ._addUpload_box > div.el-upload {
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.CommodityType ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
left: 9px;
top: -5px;
background-color: #f56c6c;
border-radius: 50%;
height: 15px;
width: 15px;
text-align: center;
line-height: 15px;
}
.CommodityType ._addUpload_box > div:hover {
background-color: #f5f5f5;
}
.CommodityType .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.CommodityType .bg_color_delete{
background-color: #ee4454;
border-color: #ee4454;
}
</style>
<template>
<div class="flexOne CommodityType">
<div class="query-box">
<ul class>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" value="查询">
<input
type="button"
@click="outerVisible = true,dialogTitle='新增商品类型', addMsg.reqType = 'add',resetInfo()"
class="normalBtn"
:value="$t('pub.addBtn')"
>
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="120px">类型编号</th>
<th>商品类型名称</th>
<th>商品类型图标</th>
<th>商品类型状态</th>
<th>更新时间</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.id}}</td>
<td>{{item.name}}</td>
<td>
<img :src="item.icon" alt>
</td>
<td>{{item.state === 1 ? '正常' : '禁用'}}</td>
<td>{{item.updateTime.replace('T', ' ')}}</td>
<td>
<el-tooltip
class="item"
effect="dark"
:content="$t('active.ld_editInfo')"
placement="top"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle='修改商品类型',updateData(item)"
></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)"></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog
custom-class="w400"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<el-form-item label="商品类型名称" prop="name">
<el-input v-model="addMsg.name" class="w217"/>
</el-form-item>
<el-form-item label="商品类型状态" prop="state">
<el-select filterable v-model="addMsg.state">
<el-option label="显示" :value="1"></el-option>
<el-option label="不显示" :value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="商品类型图标">
<div class="_addUpload_box">
<div class="_pic_upload">
<template v-if="addMsg.icon!==''">
<div>
<div
style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
>
<img :src="addMsg.icon">
<span
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.icon=''"
>重新上传</span>
</div>
</div>
</template>
<el-upload
v-else
drag
:http-request="uploadFileBtn"
:multiple="false"
:show-file-list="false"
action
>
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button
class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')"
>{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
state: -1,
name: ""
},
addMsg: {
reqType: "add",
name: "",
state: 1,
icon: "",
id: 0
},
rules: {
memberLevel: [
{ required: true, message: "请输入会员等级", trigger: "blur" }
],
name: [
{ required: true, message: "请输入商品类型名称", trigger: "blur" }
]
},
loading: false,
outerVisible: false,
dialogTitle: "",
dataList: [],
awardRelationList: [],
jurisdictionsList: []
};
},
mounted() {
this.getList();
},
filters: {},
methods: {
// 删除
Delete(item) {
this.$confirm("是否删除"+ item.name+"? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: 'delete', id: item.id },
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
})
.catch(() => {});
},
//上传图片
uploadFileBtn(file) {
//上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t("tips.wjdxbncgsz"));
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
let ft = file.file.name
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != "-1") {
fileTypeNumber = x.type;
typeOk = true;
}
});
if (!typeOk) return this.$message.error(this.$t("tips.qsctpian"));
let newArr = [];
newArr.push(file.file);
let path = "/Upload/activity/";
this.$message.info(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => {
let fileSize =
file.file.size < 1024
? file.file.size
: (file.file.size / 1024).toFixed(0);
this.addMsg.icon = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.$message.success(this.$t("tips.scchenggong"));
this.$forceUpdate();
});
},
//获取数据
getList() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: "find" },
res => {
this.loading = false;
console.log(res);
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(this.dataList, "datalist");
} else {
this.Error(res.data.message);
}
},
null
);
},
//提交
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate(valid => {
if (valid) {
this.addAward();
} else {
return false;
}
});
},
//提交添加
addAward() {
if (this.addMsg.icon === "") return this.Error("请上传icon");
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
this.addMsg,
res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
this.getList();
} else {
this.Error(res.data.message);
}
},
null
);
},
//修改信息
updateData(item) {
this.outerVisible = true;
this.addMsg.reqType = "update";
this.addMsg.id = item.id;
this.addMsg.name = item.name;
this.addMsg.state = item.state;
this.addMsg.icon = item.icon;
},
//重置信息
resetInfo() {
var newMsg = {
reqType: "add",
name: "",
state: 1,
icon: "",
id: 0
};
this.addMsg = newMsg;
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
resetForm(formName) {
this.$refs[formName].resetFields();
}
}
};
</script>
\ No newline at end of file
src/components/activity/IntegralMall.vue 0 → 100644
View file @ 36e17a32
<style>
.height_auto.el-select .el-input{
height: auto
}
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul class="user_time_picker">
<li>
<span>
<em>商品名称</em>
<el-input v-model="msg.name" @keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span>
<em>商品类型</em>
<el-select filterable v-model="msg.type">
<el-option label="不限" value="" key="0"></el-option>
<el-option v-for="item in GoodsTypeList" :label="item.name" :value="item.id" :key="item.id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>状态</em>
<el-select filterable v-model="msg.state">
<el-option label="上架" :value="1"></el-option>
<el-option label="下架" :value="0"></el-option>
<el-option label="删除" :value="-1"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>热门商品</em>
<el-select filterable v-model="msg.ishot">
<el-option label="热门" value="Y"></el-option>
<el-option label="非热门" value="N"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" value="查询">
<input type="button" @click="addIntegralMall('addIntegralMall', '', '新增商品')" class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width='80'>商品编号</th>
<th>商品名称</th>
<th>购买等级要求</th>
<th>价格</th>
<th>市场价</th>
<th>限购数</th>
<th>配送说明</th>
<th>是否热门</th>
<th>商品状态</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.id}}</td>
<td>{{item.name}}</td>
<td>{{item.isReqRate === -1 ? '不限' : `${item.isReqRate}级`}}</td>
<td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td>
<td>{{item.marketPrice}}</td>
<td>{{item.quota === 0 ? '不限购' : `限购${item.quota}次`}}</td>
<td>{{item.logistic}}</td>
<td>{{item.ishot === 'Y' ? '热门' : '非热门'}}</td>
<td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="addIntegralMall('addIntegralMall', item, '修改商品')"
></el-button>
</el-tooltip>
</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//请求
msg: {
pageSize: 15,
pageIndex: 1,
state: 1,
name: '',
type: '',
ishot: 'Y'
},
loading:false,
dataList:[],
GoodsTypeList: [],
};
},
mounted() {
this.getList();
this.getGoodsTypeManager();
},
filters: {
},
methods: {
addIntegralMall: function( path, obj, tab){
localStorage.editIntegralMall = JSON.stringify(obj);
this.$router.push({ name: path,query:{blank: 'y', tab: tab} })
},
getGoodsTypeManager() {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: "find" },
res => {
if (res.data.resultCode === 1) {
this.GoodsTypeList = res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
//获取数据
getList() {
this.loading = true;
this.apiJavaPost("/api/IntegralManager/getGoodsPageList", this.msg, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
} else {
this.Error(res.data.message)
}
}, null);
},
}
};
</script>
\ No newline at end of file
src/components/activity/LuckyDraw.vue
View file @ 36e17a32
......@@ -602,9 +602,9 @@ export default {
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.addMsg.image = this.domainManager().ViittoFileUrl + x.data.FilePath
this.addMsg.icon = this.domainManager().ViittoFileUrl + x.data.FilePath
this.$message.success(this.$t('tips.scchenggong'));
this.$forceUpdate();
// this.$forceUpdate();
});
},
}
......
src/components/activity/addIntegralMall.vue 0 → 100644
View file @ 36e17a32
This diff is collapsed.
src/components/administrative/Announcement.vue
View file @ 36e17a32
......@@ -365,7 +365,7 @@
this.addMsg.Title=res.data.data.Title
this.addMsg.Content=res.data.data.Content
this.uploadList=[]
if(res.data.data.File_url!=''){
if(res.data.data.File_url){
let _arr=JSON.parse(res.data.data.File_url);
if(_arr.length>0){
_arr.forEach(item=>{
......@@ -383,10 +383,12 @@
this.apipost('User_get_NoticeGet',{noticeId:id},res=>{
if(res.data.resultCode == 1) {
this.detailMessage=res.data.data
if(res.data.data.File_url){
this.downLoadList=JSON.parse(res.data.data.File_url)
this.downLoadList.forEach(item=>{
item.Url=this.domainManager().ViittoFileUrl+item.Url
})
})
}
}else{
this.$message.error(res.data.message)
}
......@@ -439,7 +441,10 @@
this.resetForm('addMsg');
},
resetForm(formName) { //弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
if (formName) {
this.$refs[formName].resetFields();
}
this.addMsg.Id='-1'
}
}
......
src/components/administrative/ExaminationStatistics.vue
View file @ 36e17a32
......@@ -316,7 +316,7 @@ export default {
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 90,
width: 105,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.lllegalModifyRemarkCount <= 0 ? '' : rowData.lllegalModifyRemarkCount}</span>`
......@@ -328,7 +328,7 @@ export default {
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 80,
width: 95,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.appletOrderCount <= 0 ? '' : rowData.appletOrderCount}</span>`
......@@ -346,6 +346,30 @@ export default {
return `<span>${rowData.discountPrice <= 0 ? '' : that.moneyFormat(rowData.discountPrice)}</span>`
}
};
let shaoJian = {
field: "shaoJian",
title: "违反少价规定",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 95,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return ''
}
};
let shenHeShiJian = {
field: "shenHeShiJian",
title: "违反单据审核时间",
titleAlign: "left",
columnAlign: "left",
isResize: true,
width: 120,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.shenHeShiJian <= 0 ? '' : rowData.shenHeShiJian}</span>`
}
};
this.columns = [];
this.columns.push(company);
this.columns.push(department);
......@@ -353,6 +377,8 @@ export default {
this.columns.push(periods);
this.columns.push(LllegalModifyRemarkCount);
this.columns.push(AppletOrderCount);
this.columns.push(shaoJian);
this.columns.push(shenHeShiJian);
this.columns.push(rejectCount);
this.columns.push(receivedPeopleCount);
this.columns.push(orderCount);
......@@ -373,6 +399,9 @@ export default {
if(param.discountPrice!=''){
this.msg.OrderBy='a.DiscountPrice '+param.discountPrice
}
if(param.shenHeShiJian!=''){
this.msg.OrderBy='a.ShenHeShiJian '+param.shenHeShiJian
}
if(param.lateCount!=''){
this.msg.OrderBy='a.LateCount '+param.lateCount
}
......
src/components/busManagement/BusInfo.vue
View file @ 36e17a32
......@@ -281,7 +281,7 @@
<el-input class='w170' type="text" v-model="scope.row.BookGroup"></el-input>
<el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" v-if="scope.$index!=0"
@click="getBeforeInfo(scope.$index)"></i>
@click="getBeforeInfo(scope.$index),getBusPrice(scope.row)"></i>
</el-tooltip>
</div>
</template>
......@@ -716,9 +716,9 @@
newPlanData.BusType = oldPlanData.BusType;
newPlanData.PayType = oldPlanData.PayType;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
newPlanData.HighSpeedPayType = oldPlanData.HighSpeedPayType;
newPlanData.CostPrice = oldPlanData.CostPrice;
// newPlanData.HighSpeedPrice = oldPlanData.HighSpeedPrice;
// newPlanData.CostPrice = oldPlanData.CostPrice;
}
},
mounted() {
......
src/components/temp/Supplier.vue 0 → 100644
View file @ 36e17a32
This diff is collapsed.
src/router/config.js
View file @ 36e17a32
This diff is collapsed.
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