Skip to content

S
SuperMan
Commit 7ddf539e authored by 吴春's avatar 吴春
Browse files
Options

没有什么提交的

parents e3b56bcc 207bb545
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1027 additions and 905 deletions
src/App.vue
View file @ 7ddf539e
......@@ -108,7 +108,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_tjcw5hoim2.css";
@import "//at.alicdn.com/t/font_635492_t6jc0sd8qcj.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/assets/css/feture2.css
View file @ 7ddf539e
......@@ -1983,3 +1983,12 @@ div{
.__flower_J{
left: -135px;
}
.template_bg_1{
background-color: #f6dc61 !important
}
.template_bg_2{
background-color: #ffc2ca !important
}
.template_bg_3{
background-color: #9cdaff !important
}
\ No newline at end of file
src/components/FinancialModule/BasicDocuments.vue
View file @ 7ddf539e
......@@ -239,6 +239,7 @@
}
._zhuan_msg{
font-size: 12px;
margin-top:10px;
padding-bottom: 10px;
}
._zhuan_msg span{
......@@ -468,12 +469,6 @@
</div>
</div>
<div class="_right_content" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<span class="_sm" >
<p class="_name">
<span class="_n">{{son.AuditName}}</span>
......@@ -481,6 +476,12 @@
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_m" v-if="son.AuditStatus==4">驳回</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
</span>
</div>
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
......@@ -681,6 +682,12 @@
<p class="_name _mgt_15" v-for="(son,sindex) in item.AuditRecordList">
<span class="_n">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==1">待审</span>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
</p>
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
<!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> -->
......@@ -905,16 +912,16 @@
</div>
<div class="_right_content" v-else>
<div class="_more" v-for="(son,sindex) in item.AuditRecordList">
<p class="_name" v-if="son.AuditStatus==2">{{son.AuditName}}
<span class="_sm">{{item.AuditDescription}}</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name" v-if="son.AuditStatus==2">{{son.AuditName}}
<span class="_sm">{{item.AuditDescription}}</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
</template>
<div class="_right_content" v-if="son.AuditStatus==2">
<div class="_pp_info">
<p>{{son.Remark?son.Remark:'无'}}</p>
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 7ddf539e
......@@ -96,6 +96,7 @@
.w216{
width: 216px;
}
._icon_btn i.icon-tiaozheng{background-color: #1296db;font-size: 16px;}
</style>
<template >
......@@ -506,6 +507,9 @@
<el-tooltip class="item" effect="dark" content="作废" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="iconfont icon-quxiao1" @click="financeRemove(item.FrID)"></i>
</el-tooltip>
<el-tooltip v-if="ActionMenuCode.indexOf('F_Update_TradeDate')!=-1" class="item" content="调整交易日期" placement="top">
<i v-if="msg.Conditon==2 && item.TradeDate" class="iconfont icon-tiaozheng" @click="dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate" ></i>
</el-tooltip>
</td>
</tr>
</table>
......@@ -554,6 +558,32 @@
<button class="hollowFixedBtn" @click="zhuanBox=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog :title="'单号：' + updateMsg.FrID + ' 调整交易日期'" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
<el-form label-width="110px">
<el-form-item label="原交易日期">
<el-date-picker
v-model="updateMsg.OTradeDate"
type="date"
:disabled='true'>
</el-date-picker>
</el-form-item>
<el-form-item label="交易日期">
<el-date-picker
v-model="updateMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="说明">
<el-input type="textarea" v-model="updateMsg.Description" class="w216"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="dialogFormVisible=false">取 消</el-button>
<el-button class="normalBtn" type="primary" @click="UpdateTradeDate()">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -595,7 +625,7 @@ export default {
QEndDate:'',
QStartDate:'',
UpdateBy:'',
Sort:'2',
Sort:'2',
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
......@@ -620,6 +650,12 @@ export default {
WorkFlowId:0,
Description:''
},
updateMsg:{
FrID:0,
OTradeDate:'',
TradeDate:'',
Description:''
},
DataList:[],
GetFinancLogList:[],
StatusList:[],
......@@ -659,8 +695,11 @@ export default {
DepartIDs:'',
zhuanBox:false,
loading2:false,
dialogFormVisible:false,
searchList:[],
minHeight:400,
//当前登录用户功能权限
ActionMenuCode:''
}
},
created(){
......@@ -693,6 +732,7 @@ export default {
},mounted(){
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.ActionMenuCode=userInfo.ActionMenuCode;
this.DepartIDs = userInfo.RB_Department_Id;
this.userId = userInfo.EmployeeId;
this.financeinfo_post_GetList();
......@@ -713,6 +753,7 @@ export default {
},
zhuanBtn(){
if(!this.zhuanMsg.AuditEmId) return this.$message.error('请选择转交人');
if(!this.zhuanMsg.Description)return this.$message.error('请填写转交备注');
let msg = [];
msg.push(this.zhuanMsg);
this.apipost("Financial_post_Transfer",msg,res => {
......@@ -726,6 +767,23 @@ export default {
}
},err => {});
},
goUrl(){
this.dialogFormVisible = true;
},
UpdateTradeDate(){
if(!this.updateMsg.TradeDate) return this.$message.error('请选择调整后的交易日期');
if(!this.updateMsg.Description) return this.$message.error('请填写说明');
this.apipost("Financial_get_SetTradeDate",this.updateMsg,res => {
if(res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.dialogFormVisible = false;
this.msg.Conditon=2;
this.getPageList();
}else{
this.$message.error(res.data.message);
}
},err => {});
},
remoteMethod(query) { // 转交人模糊查询
if (query !== ''||this.addShow) {
this.loading2 = true;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 7ddf539e
......@@ -232,6 +232,7 @@
}
._zhuan_msg{
font-size: 12px;
margin-top:10px;
padding-bottom: 10px;
}
._zhuan_msg span{
......@@ -568,17 +569,17 @@
</p>
<div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus==2">
<div class="_right_content">
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
<span class="_time _time_n">{{son.AduitDate}}</span>
</p>
<div class="_pp_info" v-if="son.AuditStatus!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&son.AuditStatus==2" >
......@@ -597,12 +598,6 @@
</div>
<div class="_more _mgt_15" v-for="(son,sindex) in item.AuditRecordList" v-if="son.AuditStatus!=2">
<div class="_right_content" v-if="item.AuditWay==2&&son.AuditStatus!=2">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sn" v-if="son.AuditStatus==2">通过</span>
......@@ -610,6 +605,12 @@
<span class="_sm" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
......@@ -626,12 +627,6 @@
</div>
</div>
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==1">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
......@@ -639,6 +634,12 @@
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
......@@ -655,12 +656,6 @@
</div>
</div>
<div class="_right_content" v-else-if="item.AuditWay==3 && son.AuditStatus==4">
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<p class="_name">
<span class="_n PingFangSC">{{son.AuditName}}</span>
<span class="_sm" v-if="item.Status==2 && item.Sort!=0">通过</span>
......@@ -668,6 +663,12 @@
<span class="_sm _left_radius_sus" v-else-if="son.AuditStatus==1">待审</span>
<span class="_time _time_n" v-if="item.Status!=1">{{son.AduitDate}}</span>
</p>
<template v-if="son.CareOfRemarks">
<div class="_zhuan_msg" v-for="(z,zIndex) in JSON.parse(son.CareOfRemarks)">
<p><span>由</span>{{z.BeFrom}}<span><i class="_color_green">转交</i>给</span>{{z.Target}}</p>
<p class="_pp_info">转交备注：{{z.Remarks?z.Remarks:'无'}}</p>
</div>
</template>
<div class="_pp_info" v-if="item.Status!=1">
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&item.Status!=1" >
......
src/components/SalesModule/saleReceivablesTotal.vue
View file @ 7ddf539e
......@@ -142,9 +142,9 @@
</script>
<style>
._bank_type{background-color: #2AAEF2}
.workTotalSearch ._bank_type{background-color: #2AAEF2}
._bank_type2{background-color: #FF9C01}
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
.workTotalSearch ._bank_name,.workTotalSearch ._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
._fex_cen{display: flex;align-items: center}
.workTotalSearch{width: 100%; min-height: auto; padding:0 0 20px 0;}
.workTotalSearch li{float: left; font-size: 12px; color: #666; margin:20px 10px 0px 0;}
......
src/components/confirmationOrderDownLoad.vue
View file @ 7ddf539e
......@@ -214,7 +214,7 @@
<div class="zidingyi" v-if="showType==3&&loadNone==false&&vshowC">
<div v-html="feature.featureContent"></div>
</div>
<div class="template-box" v-if="(showType==4||showType==5)&&loadNone==false&&vshowC">
<div class="template-box" v-if="(showType>=4)&&loadNone==false&&vshowC">
<div v-if="vshowC" class="module-title">
<h2>行程特色</h2>
<div class="short-line"></div>
......@@ -648,7 +648,7 @@
let tcid = this.$route.query.tcid;
let UploadUrl = this.domainManager().UploadUrl
let _this = this
if (this.showType===4 || this.showType===5) { // 判断是否为行程特色
if (this.showType>=4) { // 判断是否为行程特色
$.ajax({ //调用是否已经存在文件夹接口判断是否进行上传图片操作
url: UploadUrl + '/Upload/GetImage?filePath=Feature/' + tcid,
type: "POST",
......@@ -658,7 +658,6 @@
if (msg.ResultCode) { // 已经存在文件 直接调用下载
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
} else { // 不存在图片保存图片后下载
console.log(document.querySelector("#gernalCanvas").querySelectorAll('img').length)
if (document.querySelector("#gernalCanvas").querySelectorAll('img').length === 0) {
_this.ToWord(_this.orderMsg.startDate + _this.orderMsg.lineteamName + _this.orderMsg.dayNum + '日游',isPc)
return
......@@ -674,7 +673,7 @@
let cName=''
if(_this.showType==4){
cName='.feature-box'
}else if(_this.showType==5){
}else if(_this.showType>4){
cName='.travle_page'
}
if(cName!=''){
......@@ -942,6 +941,8 @@
isShowVisa:this.vshowH?1:0,
//isPc是否PC下载
isPc: isPc,
//模板参数
templateId: this.showType,
};
this.GetLocalFile("DownLoadTripWord", msg,title+ ".doc", res=>{
this.pdfLoading = false
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 7ddf539e
......@@ -155,7 +155,7 @@
</div> -->
<new-feature ref='newFeature' :data='FeatureData'></new-feature>
</div>
<div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial2 && FeatureDataFlag">
<div v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
<!--<newFeature2 ref='newFeature2' :data='FeatureData'></newFeature2>-->
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div>
......@@ -222,7 +222,7 @@
nineGrid: 2,
userDefined: 3,
travelSpecial: 4,
travelSpecial2: 5
travelSpecial2: 5,
},
TypeArray: [{
ckTitle: "自定义",
......@@ -249,27 +249,40 @@
TypeState: 4
},
{
ckTitle: "行程特色2",
ckTitle: "行程特色-黄",
isShow: false,
imgUrl: Travelslider,
TypeState: 5
},
{
ckTitle: "行程特色-粉",
isShow: false,
imgUrl: Travelslider,
TypeState: 6
},
{
ckTitle: "行程特色-蓝",
isShow: false,
imgUrl: Travelslider,
TypeState: 7
}
], //tab数组
templateColorArray:[
{
id: 1,
color: 'yellow',
text: '黄色'
text: '土黄黄'
},
{
id: 2,
color: 'pink',
text: '粉色'
text: '樱桃粉'
},
{
id: 3,
color: 'blue',
text: '蓝色'
text: '水蓝蓝'
},
],
travelsList: [],
......@@ -383,7 +396,6 @@
}
setTimeout(() => {
try {
FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML;
} catch (err) {
}
......@@ -473,7 +485,7 @@
//切换tab事件
clickFeature(item) {
let state = this.FeatureData.FeatureType
if (state === 4 && item.TypeState === 5) {
if ((state === 4 && item.TypeState === 5) || (state === 4 && item.TypeState === 6) || (state === 4 && item.TypeState === 7)) {
this.$confirm('尊敬的用户，行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容，您确定切换吗？', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......
src/plug/index.js
View file @ 7ddf539e
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