Commit 5e8ae1e1 authored by 黄奎's avatar 黄奎

页面修改

parent 65ad92a1
...@@ -22,12 +22,14 @@ ...@@ -22,12 +22,14 @@
height: 3px; height: 3px;
background-color: #F5F5F5; background-color: #F5F5F5;
} }
/*!*定义滚动条轨道 内阴影+圆角*!*/ /*!*定义滚动条轨道 内阴影+圆角*!*/
.EmployeeRemark .LogList::-webkit-scrollbar-track { .EmployeeRemark .LogList::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px; border-radius: 10px;
background-color: #F5F5F5; background-color: #F5F5F5;
} }
/*!*定义滑块 内阴影+圆角*!*/ /*!*定义滑块 内阴影+圆角*!*/
.EmployeeRemark .LogList::-webkit-scrollbar-thumb { .EmployeeRemark .LogList::-webkit-scrollbar-thumb {
border-radius: 10px; border-radius: 10px;
...@@ -157,6 +159,15 @@ ...@@ -157,6 +159,15 @@
}) })
} }
}, },
watch: {
saveObj: function (val, oldval) {
this.saveMsg.AccountId = this.saveObj.AccountId;
this.saveMsg.AccountType = this.saveObj.AccountType;
this.qMsg.AccountId = this.saveObj.AccountId;
this.qMsg.AccountType = this.saveObj.AccountType;
this.getRemarkPage();
}
}
} }
</script> </script>
<style> <style>
.EmployeeDetails{ .EmployeeDetails {
margin:0 20px; margin: 0 20px;
} }
.EmployeeDetails .role_Line{
.EmployeeDetails .role_Line {
width: 3px; width: 3px;
height: 11px; height: 11px;
margin-right: 10px; margin-right: 10px;
background-color: #3FC4FF; background-color: #3FC4FF;
display: inline-block; display: inline-block;
} }
.EmployyBaseInfo div{
height:50px; .EmployyBaseInfo div {
height: 50px;
background-color: #F7F7F7; background-color: #F7F7F7;
margin-right:10px; margin-right: 10px;
} }
.EmployeeDetails .EmpList{
.EmployeeDetails .EmpList {
background-color: #F7F7F7; background-color: #F7F7F7;
height:70px; height: 70px;
margin-right:15px; margin-right: 15px;
border-radius:3px; border-radius: 3px;
padding:15px; padding: 15px;
} }
.EmployeeDetails .EmpList:last-child{
margin-right:0; .EmployeeDetails .EmpList:last-child {
margin-right: 0;
} }
.EmployeeDetails .baseInfo_Item{
margin-bottom:20px; .EmployeeDetails .baseInfo_Item {
margin-bottom: 20px;
} }
</style> </style>
<template> <template>
<div class="EmployeeDetails"> <div class="EmployeeDetails">
...@@ -144,6 +150,13 @@ ...@@ -144,6 +150,13 @@
}) })
} }
}, },
watch: {
saveObj: function (val, oldval) {
this.qMsg.AccountId = this.saveObj.AccountId;
this.qMsg.AccountType = this.saveObj.AccountType;
this.getEmpInfo();
}
}
} }
</script> </script>
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
</template> </template>
<template v-slot:body-cell-Money="props"> <template v-slot:body-cell-Money="props">
<q-td :props="props"> <q-td :props="props">
<p>{{props.row.Type==1 ? "应收" : "应付" }}<span class="">{{props.row.Money}}</span></p> <p>{{props.row.Type==1 ? "应收" : "应付" }}<span class="">{{moneyFormat(props.row.Money)}}</span></p>
<p>{{props.row.Type==1 ? "实收" : "实付" }}<span class="">{{props.row.PayMoney}}</span></p> <p>{{props.row.Type==1 ? "实收" : "实付" }}<span class="">{{moneyFormat(props.row.PayMoney)}}</span></p>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-RemitterName="props"> <template v-slot:body-cell-RemitterName="props">
...@@ -78,7 +78,8 @@ ...@@ -78,7 +78,8 @@
UpdateBy: '', UpdateBy: '',
Sort: '2', Sort: '2',
IsSpecial: 0, IsSpecial: 0,
Remark: '' Remark: '',
IsSellOrderForm: 1,
}, },
columns: [{ columns: [{
name: '单号', name: '单号',
...@@ -130,10 +131,6 @@ ...@@ -130,10 +131,6 @@
} }
}, },
created() { created() {
console.log("this.saveObj", this.saveObj)
if (this.saveObj.EmAccountId && this.saveObj.EmAccountId > 0) {
this.msg.UpdateBy = this.saveObj.EmAccountId;
}
}, },
mounted() { mounted() {
this.getPageList(); this.getPageList();
...@@ -145,6 +142,11 @@ ...@@ -145,6 +142,11 @@
this.getPageList(); this.getPageList();
}, },
getPageList() { // 获取列表数据 getPageList() { // 获取列表数据
if (this.saveObj.EmAccountId && this.saveObj.EmAccountId > 0) {
this.msg.UpdateBy = this.saveObj.EmAccountId;
} else {
this.msg.UpdateBy = 99999999;
}
if (!this.msg.ClientID) this.msg.ClientID = 0; if (!this.msg.ClientID) this.msg.ClientID = 0;
if (!this.msg.ClientType) this.msg.ClientType = 0; if (!this.msg.ClientType) this.msg.ClientType = 0;
if (!this.msg.CurrencyId) this.msg.CurrencyId = 0; if (!this.msg.CurrencyId) this.msg.CurrencyId = 0;
...@@ -160,10 +162,10 @@ ...@@ -160,10 +162,10 @@
if (!this.msg.Conditon) this.msg.Conditon = 1; if (!this.msg.Conditon) this.msg.Conditon = 1;
if (!this.msg.TradeWay) this.msg.TradeWay = 0; if (!this.msg.TradeWay) this.msg.TradeWay = 0;
if (!this.msg.AccountType) this.msg.AccountType = 0; if (!this.msg.AccountType) this.msg.AccountType = 0;
this.apipost('Financial_post_GetPageList', this.msg, res => { this.apipost('Financial_post_GetALLPageList', this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData.list;
this.pageCount = res.data.data.pageCount; this.pageCount = res.data.data.pageCount;
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
...@@ -171,6 +173,15 @@ ...@@ -171,6 +173,15 @@
}) })
} }
}, },
watch: {
saveObj: function (val, oldval) {
this.msg.pageIndex = 1;
if (this.saveObj.EmAccountId && this.saveObj.EmAccountId > 0) {
this.msg.UpdateBy = this.saveObj.EmAccountId;
}
this.getPageList();
}
}
} }
</script> </script>
<style> <style>
.EmployeeLog{ .EmployeeLog {
margin:20px; margin: 20px;
font-size:13px; font-size: 13px;
} }
.Employee_TimeLine{
.Employee_TimeLine {
display: flex; display: flex;
align-items: center; align-items: center;
font-size:13px; font-size: 13px;
} }
</style> </style>
<template> <template>
<div class="EmployeeLog"> <div class="EmployeeLog">
...@@ -19,14 +21,15 @@ ...@@ -19,14 +21,15 @@
<template v-slot:title> <template v-slot:title>
<div class="Employee_TimeLine"> <div class="Employee_TimeLine">
{{subItem.TimeStr}} {{subItem.TimeStr}}
<q-avatar size="sm" v-if="subItem.UserIcon" style="margin:0 5px 0 10px" > <q-avatar size="sm" v-if="subItem.UserIcon" style="margin:0 5px 0 10px">
<img :src="subItem.UserIcon"/> <img :src="subItem.UserIcon" />
</q-avatar> </q-avatar>
<q-avatar size="sm" color="teal-10" text-color="white" style="margin:0 5px 0 10px" v-if="!subItem.UserIcon"> <q-avatar size="sm" color="teal-10" text-color="white" style="margin:0 5px 0 10px"
v-if="!subItem.UserIcon">
{{setingObj.CreateName.substring(0,1)}} {{setingObj.CreateName.substring(0,1)}}
</q-avatar> </q-avatar>
{{subItem.CreateName}} {{subItem.CreateName}}
</div> </div>
</template> </template>
<div> <div>
{{subItem.LogContent}} {{subItem.LogContent}}
...@@ -78,6 +81,13 @@ ...@@ -78,6 +81,13 @@
}); });
} }
}, },
watch: {
saveObj: function (val, oldval) {
this.qMsg.AccountId = this.saveObj.AccountId;
this.qMsg.AccountType = this.saveObj.AccountType;
this.getEmpLog();
}
}
} }
</script> </script>
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