Skip to content

S
SuperMan
Commit 8de07b07 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

解决冲突文件

parent 8e443d2f
Show whitespace changes
Inline Side-by-side
Showing with 554 additions and 267 deletions
src/components/SalesVisa/VisaProduct.vue
View file @ 8de07b07
<style>
.page_MyCustomer ._mc_addbox{height: 52px;width: 100%; margin-top: 20px;}
.page_MyCustomer ._mc_addbox>li{float: left; width: 116px; font-size: 14px; height: 52px; color: #666; text-align: center; line-height: 52px; background: #E9E9E9; cursor: pointer;}
.page_MyCustomer ._mc_addbox>li.active{background: #fff; color: #333;}
.page_MyCustomer ._mc_addbox .divActive{margin: -3px auto; width: 26px; height: 3px; background: #E95252;}
.page_MyCustomer ._mc_edit{overflow: auto;display: none;position:absolute;
z-index: 50; bottom:0;left: 0;border-top:3px solid #38425d;background-color:#f9f9f9; padding: 10px;width: 100%;min-width: 1146px;}
.page_MyCustomer .edHeight{display: block;height: 191px;}
.page_MyCustomer ._mc_list{overflow-x: auto; background: #fff; padding-top: 20px; padding-left: 15px;}
.page_MyCustomer ._scrollbar::-webkit-scrollbar{width: 4px;height: 8px;}
.page_MyCustomer ._scrollbar::-webkit-scrollbar-thumb{border-radius: 4px;-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);background: #c9c9c9;}
.page_MyCustomer ._scrollbar::-webkit-scrollbar-track{-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);border-radius: 4px;background: #EDEDED;}
.page_MyCustomer ._mc_edit ._tit{padding-left: 10px;border-left: 3px solid #E95252; font-size: 16px; font-family: 'PingFangSc-Fine'; color: #000000}
.page_MyCustomer ._mc_edit ._info_box ul._form li{float: left;}
.page_MyCustomer ._check_list{padding-left: 120px;margin-bottom: 20px;}
.page_MyCustomer ._check_box .el-form-item{margin-bottom: 0}
.page_MyCustomer ._info_box .el-form-item__label{font-size: 12px; color: #666;}
._remark textarea{resize: none;width: 646px;height: 100px}
.page_MyCustomer .avatar {
.page_MyCustomer ._mc_addbox {
height: 52px;
width: 100%;
margin-top: 20px;
}
.page_MyCustomer ._mc_addbox > li {
float: left;
width: 116px;
font-size: 14px;
height: 52px;
color: #666;
text-align: center;
line-height: 52px;
background: #e9e9e9;
cursor: pointer;
}
.page_MyCustomer ._mc_addbox > li.active {
background: #fff;
color: #333;
}
.page_MyCustomer ._mc_addbox .divActive {
margin: -3px auto;
width: 26px;
height: 3px;
background: #e95252;
}
.page_MyCustomer ._mc_edit {
overflow: auto;
display: none;
position: absolute;
z-index: 50;
bottom: 0;
left: 0;
border-top: 3px solid #38425d;
background-color: #f9f9f9;
padding: 10px;
width: 100%;
min-width: 1146px;
}
.page_MyCustomer .edHeight {
display: block;
height: 191px;
}
.page_MyCustomer ._mc_list {
overflow-x: auto;
background: #fff;
padding-top: 20px;
padding-left: 15px;
}
.page_MyCustomer ._scrollbar::-webkit-scrollbar {
width: 4px;
height: 8px;
}
.page_MyCustomer ._scrollbar::-webkit-scrollbar-thumb {
border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9;
}
.page_MyCustomer ._scrollbar::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px;
background: #ededed;
}
.page_MyCustomer ._mc_edit ._tit {
padding-left: 10px;
border-left: 3px solid #e95252;
font-size: 16px;
font-family: "PingFangSc-Fine";
color: #000000;
}
.page_MyCustomer ._mc_edit ._info_box ul._form li {
float: left;
}
.page_MyCustomer ._check_list {
padding-left: 120px;
margin-bottom: 20px;
}
.page_MyCustomer ._check_box .el-form-item {
margin-bottom: 0;
}
.page_MyCustomer ._info_box .el-form-item__label {
font-size: 12px;
color: #666;
}
._remark textarea {
resize: none;
width: 646px;
height: 100px;
}
.page_MyCustomer .avatar {
width: 148px;
height: 148px;
display: block;
}
.page_MyCustomerSearch{width: 100%; min-height: auto; overflow: hidden; padding:0 0 20px 0;}
.page_MyCustomerSearch li{float: left; font-size: 12px; color: #666; margin:20px 0 0px 0;}
.page_MyCustomerSearch li>span {display: inline-block; }
.page_MyCustomerSearch li span>em{display: inline-block; min-width: 60px; text-align: right; font-style: normal; margin:0 12px 0 0;}
.page_MyCustomerSearch li:last-child{float: right;}
.VisaProductTable{width: 100%; font-size:14px; color: #333; }
.VisaProductTable tr th{background: #E6E6E6;height:30px; font-size: 12px; text-align: left; text-indent: 25px;}
.VisaProductTable tr{background: #fff;text-align: left;}
.VisaProductTable tr td{height: 60px; padding-left:25px; border: 1px solid #cccccc; font-size: 14px; color: #333;}
.VisaProductTable tr td>img{width:24px;height:24px;border-radius:50%; float: left; margin-right: 5px;}
.VisaProductTable tr td .tuanqian{vertical-align: middle; font-weight:400; display: table-cell; text-align: center; width: 44px;font-size: 12px; height:19px;color: #FFFFFF;background:#2AAEF2;}
.VisaProductTable tr td .geqian{vertical-align: middle; font-weight:400; display: table-cell; text-align: center; width: 44px;font-size: 12px; height:19px;color: #FFFFFF;background:#FF9000;}
.page_MyCustomer ._edHeight{height:340px;}
.dateClass{width: 171px !important;}
.surplusNum{color: #E95252 !important;}
.peopleNum{height:15px;font-size:16px;font-weight:400;color:rgba(51,51,51,1);line-height:24px;}
.orderNum{cursor:pointer;text-decoration:underline;width:18px;height:16px;font-size:16px;font-weight:400;color:rgba(51,51,51,1);line-height:24px;}
.VisaProductTable tr td .createName{vertical-align: middle; display: table-cell;text-align: left;padding-left:3px; height:21px;}
.groupTourOrderIcon button{width: 28px; height:28px;border-radius:4px;}
.groupTourOrderIcon .el-button--primary {padding: 5px; margin: 0; font-size: 14px!important;}
}
.page_MyCustomerSearch {
width: 100%;
min-height: auto;
overflow: hidden;
padding: 0 0 20px 0;
}
.page_MyCustomerSearch li {
float: left;
font-size: 12px;
color: #666;
margin: 20px 0 0px 0;
}
.page_MyCustomerSearch li > span {
display: inline-block;
}
.page_MyCustomerSearch li span > em {
display: inline-block;
min-width: 60px;
text-align: right;
font-style: normal;
margin: 0 12px 0 0;
}
.page_MyCustomerSearch li:last-child {
float: right;
}
.VisaProductTable {
width: 100%;
font-size: 14px;
color: #333;
}
.VisaProductTable tr th {
background: #e6e6e6;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 25px;
}
.VisaProductTable tr {
background: #fff;
text-align: left;
}
.VisaProductTable tr td {
height: 60px;
padding-left: 25px;
border: 1px solid #cccccc;
font-size: 14px;
color: #333;
}
.VisaProductTable tr td > img {
width: 24px;
height: 24px;
border-radius: 50%;
float: left;
margin-right: 5px;
}
.VisaProductTable tr td .tuanqian {
vertical-align: middle;
font-weight: 400;
display: table-cell;
text-align: center;
width: 44px;
font-size: 12px;
height: 19px;
color: #ffffff;
background: #2aaef2;
}
.VisaProductTable tr td .geqian {
vertical-align: middle;
font-weight: 400;
display: table-cell;
text-align: center;
width: 44px;
font-size: 12px;
height: 19px;
color: #ffffff;
background: #ff9000;
}
.page_MyCustomer ._edHeight {
height: 340px;
}
.dateClass {
width: 171px !important;
}
.surplusNum {
color: #e95252 !important;
}
.peopleNum {
height: 15px;
font-size: 16px;
font-weight: 400;
color: rgba(51, 51, 51, 1);
line-height: 24px;
}
.orderNum {
cursor: pointer;
text-decoration: underline;
width: 18px;
height: 16px;
font-size: 16px;
font-weight: 400;
color: rgba(51, 51, 51, 1);
line-height: 24px;
}
.VisaProductTable tr td .createName {
vertical-align: middle;
display: table-cell;
text-align: left;
padding-left: 3px;
height: 21px;
}
.groupTourOrderIcon button {
width: 28px;
height: 28px;
border-radius: 4px;
}
.groupTourOrderIcon .el-button--primary {
padding: 5px;
margin: 0;
font-size: 14px !important;
}
</style>
<template>
<div class="page_MyCustomer">
......@@ -48,39 +220,73 @@
<ul>
<li>
<span>
<em>出团公司</em><el-select class='w210' v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
<em>出团公司</em>
<el-select
class="w210"
v-model="msg.BranchId"
filterable
:placeholder="$t('pub.pleaseSel')"
>
<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>产品ID</em><el-input class='w210' v-model='msg.ProductID' placeholder="请输入" ></el-input>
<em>产品ID</em>
<el-input class="w210" v-model="msg.ProductID" placeholder="请输入"></el-input>
</span>
</li>
<li>
<span>
<em>产品名称</em><el-input class='w210' v-model='msg.ProductName' placeholder="请输入" ></el-input>
<em>产品名称</em>
<el-input class="w210" v-model="msg.ProductName" placeholder="请输入"></el-input>
</span>
</li>
<li> <span>
<em>创建人</em><el-select v-model='msg.EmId'>
<el-option label="不限" value="-1" key='-1'></el-option>
<el-option v-for="item in EmployeeList"
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
<li>
<span>
<em>创建人</em>
<el-select v-model="msg.EmId">
<el-option label="不限" value="-1" key="-1"></el-option>
<el-option
v-for="item in EmployeeList"
:label="item.EmName"
:value="item.EmployeeId"
:key="item.EmployeeId"
></el-option>
</el-select>
</span></li>
<li><span><em>状态</em></span><el-select v-model='msg.VisaStatus'>
<el-option label='不限' value='-1' key='-1'></el-option>
<el-option label='上架' value='1' key='1'></el-option>
<el-option label='下架' value='2' key='2'></el-option>
</span>
</li>
<li>
<span>
<em>状态</em>
</span>
<el-select v-model="msg.VisaStatus">
<el-option label="不限" value="-1" key="-1"></el-option>
<el-option label="上架" value="1" key="1"></el-option>
<el-option label="下架" value="2" key="2"></el-option>
</el-select>
</li>
<li><span><em>价格有效日期</em><el-date-picker v-model='msg.StartTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -
<el-date-picker v-model='msg.EndTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
<li>
<span>
<em>价格有效日期</em>
<el-date-picker
v-model="msg.StartTime"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>-
<el-date-picker
v-model="msg.EndTime"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>
</span>
</li>
<li>
......@@ -90,7 +296,7 @@
</ul>
</div>
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<table class="VisaProductTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="10%">产品名称</th>
<th width="8%">签证类型</th>
......@@ -105,7 +311,7 @@
<th width="10%">广告图</th>
<th width="14%">操作</th>
</tr>
<tr v-for='item in dataList'>
<tr v-for="item in dataList">
<td>{{item.Name}}</td>
<td>
<span v-if="item.VisaType==1" class="geqian">个签</span>
......@@ -129,43 +335,114 @@
{{item.VisaStatus==1?"上架":"下架"}}
</td>
<td>
<span class="orderNum" @click="goUrl(item)" >{{item.OrderNum}}</span>
<span class="orderNum" @click="goUrl(item)">{{item.OrderNum}}</span>
</td>
<!-- <td>
<span class="peopleNum">{{item.PeopleNum}}(<span class="surplusNum">{{item.SurplusNum}}</span>)</span>
</td> -->
</td>-->
<td>
<img v-if='!item.CreatePhoto' src="../../assets/img/litheader.png"/>
<img v-if='item.CreatePhoto' :onerror="defaultImg" :src='item.CreatePhoto'/>
<img v-if="!item.CreatePhoto" src="../../assets/img/litheader.png">
<img v-if="item.CreatePhoto" :onerror="defaultImg" :src="item.CreatePhoto">
<span class="createName">{{item.CreateName}}</span>
</td>
<td>
<p v-for="(item2, index2) in item.AdvertisingFileList" :key="index2">
<span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{item2.Name}}</span><i class="iconfont icon-Close" style="font-size:12px;cursor:pointer;" @click="delUnpload(item.Id,item2)"></i>
<span
style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)"
>{{item2.Name}}</span>
<i
class="iconfont icon-Close"
style="font-size:12px;cursor:pointer;"
@click="delUnpload(item.Id,item2)"
></i>
</p>
<el-upload :http-request="uploadImg" :data='item' ref="upload" :multiple="false" :show-file-list='false' action="">
<span style="color:#00C6FF;cursor:pointer;" @click='saveitem(item.Id)'>上传广告图</span>
<el-upload
:http-request="uploadImg"
:data="item"
ref="upload"
:multiple="false"
:show-file-list="false"
action
>
<span style="color:#00C6FF;cursor:pointer;" @click="saveitem(item.Id)">上传广告图</span>
</el-upload>
</td>
<td class="groupTourOrderIcon">
<el-button-group>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start" v-if="item.SendVisaStatus==1&&msg.isFinacial==1">
<el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item)'></el-button>
<el-tooltip
class="item"
effect="dark"
content="修改"
placement="top-start"
v-if="item.SendVisaStatus==1&&msg.isFinacial==1"
>
<el-button
type="primary"
style="background:#409EFF; border-color:#409EFF"
icon="iconfont icon-img_bianji_small"
@click="getDetail(item)"
></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="查看" placement="top-start" v-if="msg.isFinacial==1">
<el-button type="primary" style='background:#25C1C3; border-color:#25C1C3' @click="goUrl(item)" icon="iconfont icon-img_cz"></el-button>
<el-button
type="primary"
style="background:#25C1C3; border-color:#25C1C3"
@click="goUrl(item)"
icon="iconfont icon-img_cz"
></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="签证列表" placement="top-start" v-if="item.VisaManagementId>0">
<el-button type="primary" @click="goUrlVisaList(item)" style='background:#47BF8C; border-color:#47BF8C' icon="iconfont icon-biaoge"></el-button>
<el-tooltip
effect="dark"
content="签证列表"
placement="top-start"
v-if="item.VisaManagementId>0"
>
<el-button
type="primary"
@click="goUrlVisaList(item)"
style="background:#47BF8C; border-color:#47BF8C"
icon="iconfont icon-biaoge"
></el-button>
</el-tooltip>
<el-tooltip v-if="item.OrderNum>0&&msg.isFinacial==1" effect="dark" content="结算" placement="top-start">
<el-button type="primary" @click="goUrlJS(item)" style='background:#5EBB64; border-color:#5EBB64' icon="iconfont icon-qian"></el-button>
<el-tooltip
v-if="item.OrderNum>0&&msg.isFinacial==1"
effect="dark"
content="结算"
placement="top-start"
>
<el-button
type="primary"
@click="goUrlJS(item)"
style="background:#5EBB64; border-color:#5EBB64"
icon="iconfont icon-qian"
></el-button>
</el-tooltip>
<el-tooltip v-if="item.VisaStatus==1&&msg.isFinacial==1" effect="dark" content="下架" placement="top-start" >
<el-button type="primary" style='background:#F0A748; border-color:#F0A748' icon="iconfont icon-xiajia1" @click='updateVisaStatus(item)'></el-button>
<el-tooltip
v-if="item.VisaStatus==1&&msg.isFinacial==1"
effect="dark"
content="下架"
placement="top-start"
>
<el-button
type="primary"
style="background:#F0A748; border-color:#F0A748"
icon="iconfont icon-xiajia1"
@click="updateVisaStatus(item)"
></el-button>
</el-tooltip>
<el-tooltip v-if="item.VisaStatus==2&&item.SendVisaStatus==1&&msg.isFinacial==1" effect="dark" content="上架" placement="top-start" >
<el-button type="primary" style='background:#F0A748; border-color:#F0A748' icon="iconfont icon-shangjia1" @click='updateVisaStatus(item)'></el-button>
<el-tooltip
v-if="item.VisaStatus==2&&item.SendVisaStatus==1&&msg.isFinacial==1"
effect="dark"
content="上架"
placement="top-start"
>
<el-button
type="primary"
style="background:#F0A748; border-color:#F0A748"
icon="iconfont icon-shangjia1"
@click="updateVisaStatus(item)"
></el-button>
</el-tooltip>
</el-button-group>
</td>
......@@ -181,29 +458,36 @@
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="this.msg.pageSize"
:total="total">
</el-pagination>
:total="total"
></el-pagination>
<div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''">
<p class="_tit">签证产品
<p class="_tit">
签证产品
<span class="fr">
<button class="hollowFixedBtn" type="button" @click="cancelEdit()">{{$t('pub.cancelBtn')}}</button>
<button type="button" class="normalBtn" @click="saveVisa()">{{$t('pub.saveBtn')}}</button>
</span>
</p>
<el-form class="_info_box clearfix" :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<el-form
class="_info_box clearfix"
:model="addMsg"
:rules="rules"
ref="addMsg"
label-width="120px"
>
<el-row :gutter="20">
<el-col :span="5">
<el-form-item label="产品名称" prop="Name" >
<el-form-item label="产品名称" prop="Name">
<el-input v-model="addMsg.Name" placeholder="请输入" class="dateClass"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="类型" prop="VisaType">
<el-select v-model='addMsg.VisaType' @change='getVisaManagementList'>
<el-select v-model="addMsg.VisaType" @change="getVisaManagementList">
<!-- <el-option label='不限' value='-1' key='-1'></el-option> -->
<el-option label='个签' value='1' key='1'></el-option>
<el-option label='团签' value='2' key='2'></el-option>
<el-option label="个签" value="1" key="1"></el-option>
<el-option label="团签" value="2" key="2"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -211,7 +495,7 @@
<el-form-item label="人数" prop="PeopleNum">
<el-input @keyup.native="checkInteger(addMsg,'PeopleNum')" v-model="addMsg.PeopleNum" placeholder="请输入" maxlength="20"></el-input>
</el-form-item>
</el-col> -->
</el-col>-->
<el-col :span="5">
<el-form-item label="成本价" prop="CostPrice">
<el-input v-model="addMsg.CostPrice" placeholder="请输入" maxlength="20"></el-input>
......@@ -219,13 +503,13 @@
</el-col>
<el-col :span="5">
<el-form-item label="签证国家" prop="VisaManagementId">
<el-select v-model='addMsg.VisaManagementId' class="dateClass">
<el-option v-for='item in VisaManagementList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
<el-select v-model="addMsg.VisaManagementId" class="dateClass">
<el-option
v-for="item in VisaManagementList"
:label="item.Name"
:value="item.Id"
:key="item.Id"
></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -242,13 +526,19 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="提成金额" prop="CommissionPrice" >
<el-form-item label="提成金额" prop="CommissionPrice">
<el-input v-model="addMsg.CommissionPrice" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="价格有效日期" prop="SendVisaDate">
<el-date-picker v-model='addMsg.SendVisaDate' class="dateClass" value-format="yyyy-MM-dd" type="date" placeholder="请选择" ></el-date-picker>
<el-date-picker
v-model="addMsg.SendVisaDate"
class="dateClass"
value-format="yyyy-MM-dd"
type="date"
placeholder="请选择"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
......@@ -328,22 +618,19 @@ export default {
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
this.apipost(
"dmc_get_visa_UploadVisaAdvertisingImage",
{
let msg = {
Path: this.domainManager().ViittoFileUrl + x.data.FilePath,
FileName: file.file.name,
Status: 1,
VId: this.uploadTCID
},
res => {
}
this.apipost("dmc_get_visa_UploadVisaAdvertisingImage",msg,res => {
if (res.data.resultCode === 1) {
this.$message.success("上传成功");
this.getList();
} else {
this.$message.error("上传失败");
}
}
})
});
},
......
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