Commit 4421941b authored by 黄媛媛's avatar 黄媛媛

update

parent 83cba45d
This diff is collapsed.
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<th>描述</th> <th>描述</th>
<th>状态</th> <th>状态</th>
<th>签名图片</th> <th>签名图片</th>
<!-- <th>文件列表</th> --> <th>文件列表</th>
<th>签名时间</th> <th>签名时间</th>
<th>创建人/时间</th> <th>创建人/时间</th>
<th>操作</th> <th>操作</th>
...@@ -60,10 +60,14 @@ ...@@ -60,10 +60,14 @@
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<td>{{item.Description}}</td> <td>{{item.Description}}</td>
<td>{{item.ConfirmStatusName}}</td> <td>{{item.ConfirmStatusName}}</td>
<td style="padding:6px 0">
<img style="width:45px;height:45px" :src="item.SignImage" alt="">
</td>
<td> <td>
<img style="width:50px;height:50px" :src="item.SignImage" alt=""> <p v-for="(list,index1) in item.EAddressList" :key="index1">
<a :download="list.Name" style="text-decoration: underline;cursor: pointer;padding-top:4px" :href="list.Path">{{list.Name}}</a>
</p>
</td> </td>
<td> <td>
<span v-if="item.ConfirmStatus==1"></span> <span v-if="item.ConfirmStatus==1"></span>
<span v-else>{{item.UpdateDate}}</span> <span v-else>{{item.UpdateDate}}</span>
...@@ -73,7 +77,6 @@ ...@@ -73,7 +77,6 @@
<p>{{item.CreateDate}}</p> <p>{{item.CreateDate}}</p>
</td> </td>
<td> <td>
<el-button v-if="item.CreateBy==EmployeeId && item.ConfirmStatus==1" @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button> <el-button v-if="item.CreateBy==EmployeeId && item.ConfirmStatus==1" @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button v-if="item.ConfirmStatus==1" @click="SetPic(item)" style="padding:4px" type="warning" icon="el-icon-star-off" circle></el-button> <el-button v-if="item.ConfirmStatus==1" @click="SetPic(item)" style="padding:4px" type="warning" icon="el-icon-star-off" circle></el-button>
<el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button> <el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
...@@ -101,13 +104,13 @@ ...@@ -101,13 +104,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="描述" > <el-form-item label="描述" >
<el-input class="w220" v-model="addMsg.Description"></el-input> <el-input style="width:400px" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" v-model="addMsg.Description"></el-input>
</el-form-item> </el-form-item>
<div class="_addUpload_box clearfix"> <div class="_addUpload_box clearfix">
<template v-for="(file,fIndex) in saveMsg"> <template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3"> <div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;"> <div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)"> <img :src="file.Url?file.Url:file.Content">
</div> </div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div> </div>
...@@ -118,7 +121,7 @@ ...@@ -118,7 +121,7 @@
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div> </div>
<div v-if="file.Type==2"> <div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)"> <div class="iconfont icon-excel">
</div> </div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span> <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
...@@ -249,7 +252,7 @@ export default { ...@@ -249,7 +252,7 @@ export default {
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('financestatistics_post_DelRevenueExcelInfo',{ Id:item.ID},res=>{ this.apipost('financestatistics_post_DelRevenueExcelInfo',{ Id:item.Id},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.Success(res.data.message) this.Success(res.data.message)
this.getList(); this.getList();
...@@ -313,7 +316,7 @@ export default { ...@@ -313,7 +316,7 @@ export default {
let imgUrl =this.$refs.canvasF.toDataURL(); let imgUrl =this.$refs.canvasF.toDataURL();
let newArr = []; let newArr = [];
var fileName = `${that.uuid(10,10)}.png`; var fileName = `${that.uuid(10,10)}.png`;
var path = `/assets/sign/`; var path = `/RevenueFile/`;
newArr.push(this.dataURLtoFile(imgUrl,fileName)) newArr.push(this.dataURLtoFile(imgUrl,fileName))
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
this.addMsgNew.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath; this.addMsgNew.SignImage=that.domainManager().ViittoFileUrl+x.data.FilePath;
...@@ -472,20 +475,39 @@ export default { ...@@ -472,20 +475,39 @@ export default {
addRule(){ addRule(){
this.ruleVisible=true; this.ruleVisible=true;
this.InitaddMsg(); this.InitaddMsg();
this.saveMsg=[];
}, },
SetRules(item){ SetRules(item){
this.ruleVisible=true; this.ruleVisible=true;
this.addMsg=Object.assign({},item); this.addMsg=Object.assign({},item);
this.saveMsg=[];
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
]
this.addMsg.EAddressList.forEach(item=>{ this.addMsg.EAddressList.forEach(item=>{
let ft=item.Name.substring(item.Name.lastIndexOf('.')+1,item.Name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type;
typeOk = true;
}
})
let obj={ let obj={
Content: item, Content: item.Path,
Url: item, Path: item.Path,
Url:item.Path,
Name: item.Name,
Type:fileTypeNumber,
}; };
this.saveMsg.push(obj) this.saveMsg.push(obj)
}) })
this.saveMsg=this.addMsg.EAddressList;
}, },
RulesOk(formName){ RulesOk(formName){
...@@ -497,7 +519,11 @@ export default { ...@@ -497,7 +519,11 @@ export default {
} }
this.addMsg.EAddressList=[]; this.addMsg.EAddressList=[];
this.saveMsg.forEach(item=>{ this.saveMsg.forEach(item=>{
this.addMsg.EAddressList.push(item.Url) let obj={
Path: item.Url,
Name: item.Name,
};
this.addMsg.EAddressList.push(obj)
}) })
this.apipost( this.apipost(
"financestatistics_post_SetRevenueExcelInfo", "financestatistics_post_SetRevenueExcelInfo",
...@@ -565,6 +591,7 @@ export default { ...@@ -565,6 +591,7 @@ export default {
ID:0, ID:0,
Type:fileTypeNumber, Type:fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath, Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
Name:x.data.SourceFileName
}) })
this.$message.success(this.$t('tips.scchenggong')) this.$message.success(this.$t('tips.scchenggong'))
}, 1); }, 1);
...@@ -603,7 +630,6 @@ export default { ...@@ -603,7 +630,6 @@ export default {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
console.log("213231",this.dataList)
this.total=res.data.data.count; this.total=res.data.data.count;
} else { } else {
} }
......
...@@ -1121,7 +1121,7 @@ ...@@ -1121,7 +1121,7 @@
</div> </div>
<div style="text-align:center"> <div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p> <p style="font-size:26px;color:#111111;margin:40px 0">第{{tsNumber}}期投诉案例分享已经发布</p>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/question/21" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a> <a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/question/22" style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">点击查看</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -1178,7 +1178,7 @@ export default { ...@@ -1178,7 +1178,7 @@ export default {
articleId:0, articleId:0,
createEmpId:0, createEmpId:0,
tsState:false, tsState:false,
tsNumber:12, tsNumber:13,
saleRnkShow: false, saleRnkShow: false,
dialogTitleNot: '', dialogTitleNot: '',
outerVisibleNot: false, outerVisibleNot: false,
......
...@@ -3196,7 +3196,16 @@ export default { ...@@ -3196,7 +3196,16 @@ export default {
meta: { meta: {
title: '外币单据查询' title: '外币单据查询'
}, },
}, { //财务 财务单据 应收团款查询 },
{ //财务 财务单据 费用单据
path: '/Costdocuments',
name: 'Costdocuments',
component: resolve => require(['@/components/FinancialModule/Costdocuments'], resolve),
meta: {
title: '费用单据'
},
},
{ //财务 财务单据 应收团款查询
path: '/RecPayQueryTeam', path: '/RecPayQueryTeam',
name: 'RecPayQueryTeam', name: 'RecPayQueryTeam',
component: resolve => require(['@/components/FinancialModule/RecPayQueryTeam'], resolve), component: resolve => require(['@/components/FinancialModule/RecPayQueryTeam'], resolve),
......
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