Skip to content

S
SuperMan
Commit 70075e84 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 6d5f5c6d 2e6254a9
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 36 deletions
src/App.vue
View file @ 70075e84
......@@ -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/components/FinancialModule/BasicDocuments.vue
View file @ 70075e84
......@@ -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>
<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 @ 70075e84
......@@ -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>
......@@ -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 @ 70075e84
......@@ -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" >
......
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