Compare commits

...

3 Commits

13 changed files with 119 additions and 212 deletions

View File

@ -13,3 +13,12 @@ export function getMonthFirstDay() {
export function getMonthLastDay() { export function getMonthLastDay() {
return dayjs().endOf('month').format('YYYY-MM-DD') return dayjs().endOf('month').format('YYYY-MM-DD')
} }
// 获取本月第一天和当前天前一天的日期,如果当天为本月第一天,则返回上月第一天和上月最后一天
export function getMonthFirstDayAndBeforeDay() {
const isFirstDate = new Date().getDate() === 1
if (isFirstDate) {
return [dayjs().add(-1, 'month').startOf('month').format('YYYY-MM-DD'), dayjs().add(-1, 'month').endOf('month').format('YYYY-MM-DD')]
}
return [getMonthFirstDay(), getBeforeDays(1)]
}

View File

@ -419,12 +419,9 @@ export default {
this.avaerInfoList = res.data this.avaerInfoList = res.data
}) })
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId
}
})
}) })
}, },
// //

View File

@ -385,12 +385,9 @@ export default {
this.avaerInfoList = res.data this.avaerInfoList = res.data
}) })
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId
}
})
}) })
}, },
// //

View File

@ -219,12 +219,9 @@ export default {
}, },
getAvarerInfo() { getAvarerInfo() {
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId
}
})
}) })
}, },
// //

View File

@ -445,12 +445,9 @@ export default {
this.avaerInfoList = res.data this.avaerInfoList = res.data
}) })
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId
}
})
}) })
}, },
// //

View File

@ -2,51 +2,46 @@
<div class="page"> <div class="page">
<topBar <topBar
v-if="topList.length > 0" v-if="topList.length > 0"
:topList="topList" :top-list="topList"
:moren="moren" :moren="moren"
></topBar> />
<div class="thetopbox"> <div class="thetopbox">
<el-form ref="form" :model="queryParams" label-width="100px"> <el-form ref="form" :model="queryParams" label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'会员编号'" prop="memberCode"> <el-form-item :label="'会员编号'" prop="memberCode">
<el-input <el-input
clearable
v-model="queryParams.memberCode" v-model="queryParams.memberCode"
></el-input></el-form-item clearable
></el-col> /></el-form-item></el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'结算期数'" prop="memberSettlePeriodId"> <el-form-item :label="'结算期数'" prop="memberSettlePeriodId">
<el-select <el-select
v-model="queryParams.memberSettlePeriodId"
clearable clearable
:placeholder="'请选择'" :placeholder="'请选择'"
v-model="queryParams.memberSettlePeriodId"
> >
<el-option <el-option
v-for="item in memberSettlePeriodList" v-for="item in memberSettlePeriodList"
:key="item.pkId" :key="item.pkId"
:label="item.settleDate" :label="item.settleDate"
:value="item.pkId" :value="item.pkId"
></el-option> </el-select></el-form-item /> </el-select></el-form-item></el-col>
></el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item :label="'代数'" prop="level"> <el-form-item :label="'代数'" prop="level">
<el-input <el-input
clearable
v-model="queryParams.level" v-model="queryParams.level"
></el-input></el-form-item clearable
></el-col> /></el-form-item></el-col>
<el-col :span="4" style="margin-left: 30px"> <el-col :span="4" style="margin-left: 30px">
<div class="searchbox"> <div class="searchbox">
<el-button class="searchbtn" @click="getSearch"> <el-button class="searchbtn" @click="getSearch">
{{ '搜索' }}</el-button {{ '搜索' }}</el-button>
>
<el-button @click="reChongzhi"> {{ '重置' }}</el-button> <el-button @click="reChongzhi"> {{ '重置' }}</el-button>
<el-button @click="goback"> {{ '返回' }}</el-button> <el-button @click="goback"> {{ '返回' }}</el-button>
</div> </div>
</el-col> </el-col>
</el-row></el-form </el-row></el-form>
>
</div> </div>
<div> <div>
<div class="tree"> <div class="tree">
@ -66,64 +61,64 @@
</template> </template>
<script> <script>
import topBar from "@/components/topBar"; import topBar from '@/components/topBar'
import { getTjFramework, getMemberSettlePeriod } from "@/api/archityecture"; import { getTjFramework, getMemberSettlePeriod } from '@/api/archityecture'
export default { export default {
name: "Tjjg", name: 'Tjjg',
components: { components: {
topBar, topBar
}, },
data() { data() {
return { return {
moren: "tjjg", moren: 'tjjg',
topList: [ topList: [
{ {
name: '方案一', name: '方案一',
path: "tjjg", path: 'tjjg'
}, },
{ {
name: '方案二', name: '方案二',
path: "tjjg2", path: 'tjjg2'
}, },
{ {
name: '方案三', name: '方案三',
path: "tjjg3", path: 'tjjg3'
}, },
{ {
name: '方案四', name: '方案四',
path: "tjjg4", path: 'tjjg4'
}, }
], ],
queryParams: { queryParams: {
memberSettlePeriodId: "", // memberSettlePeriodId: '', //
memberCode: "", // memberCode: '', //
level: "", // level: '', //
type: 1, type: 1
}, },
data: [], data: [],
defaultProps: { defaultProps: {
label: "memberCode", label: 'memberCode',
children: "children", children: 'children'
}, },
memberSettlePeriodList: [], // memberSettlePeriodList: [] //
}; }
}, },
created() { created() {
this.getSearch(); this.getSearch()
this.getAvarerInfo(); this.getAvarerInfo()
}, },
methods: { methods: {
async loadNode(node, resolve) { async loadNode(node, resolve) {
if (node.level == 0) { if (node.level == 0) {
return resolve([]); return resolve([])
} else { } else {
const response = await getTjFramework({ const response = await getTjFramework({
memberCode: node.data.memberCode, memberCode: node.data.memberCode
}); })
if (response.data[0].children && response.data[0].children.length > 0) { if (response.data[0].children && response.data[0].children.length > 0) {
resolve(response.data[0].children); resolve(response.data[0].children)
} else { } else {
resolve([]); resolve([])
} }
} }
// if (!node.data.children) { // if (!node.data.children) {
@ -133,56 +128,53 @@ export default {
}, },
getAvarerInfo() { getAvarerInfo() {
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data; const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId; })
}
});
});
}, },
// //
goback() { goback() {
this.queryParams.memberCode = this.data[0].parentMemberCode; this.queryParams.memberCode = this.data[0].parentMemberCode
this.getSearch(); this.getSearch()
}, },
// //
copyItem(content) { copyItem(content) {
if (window.clipboardData) { if (window.clipboardData) {
window.clipboardData.setData("text", content); window.clipboardData.setData('text', content)
} else { } else {
(function(content) { (function(content) {
// oncopy // oncopy
document.oncopy = function(e) { document.oncopy = function(e) {
e.clipboardData.setData("text", content); e.clipboardData.setData('text', content)
e.preventDefault(); e.preventDefault()
document.oncopy = null; document.oncopy = null
}; }
})(content); })(content)
document.execCommand("Copy"); document.execCommand('Copy')
} }
this.$message({ this.$message({
message: '复制成功', message: '复制成功',
type: "success", type: 'success'
}); })
}, },
handleNodeClick() {}, handleNodeClick() {},
getSearch() { getSearch() {
getTjFramework(this.queryParams).then((res) => { getTjFramework(this.queryParams).then((res) => {
this.data = res.data; this.data = res.data
}); })
}, },
reChongzhi() { reChongzhi() {
this.queryParams = { this.queryParams = {
memberSettlePeriodId: "", // memberSettlePeriodId: '', //
memberCode: "", // memberCode: '', //
level: "", // level: '' //
}; }
this.getSearch(); this.getSearch()
}, }
}, }
}; }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -305,12 +305,9 @@ export default {
}, },
getAvarerInfo() { getAvarerInfo() {
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId
}
})
}) })
}, },
// //

View File

@ -317,12 +317,9 @@ export default {
}, },
getAvarerInfo() { getAvarerInfo() {
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId
}
})
}) })
}, },
// //

View File

@ -315,12 +315,9 @@ export default {
}, },
getAvarerInfo() { getAvarerInfo() {
getMemberSettlePeriod().then((res) => { getMemberSettlePeriod().then((res) => {
this.memberSettlePeriodList = res.data const tempList = res.data || []
this.memberSettlePeriodList.forEach((ele) => { this.memberSettlePeriodList = tempList.filter(ele => ele.isThisDay === 1)
if (ele.isThisDay == 0) { this.queryParams.memberSettlePeriodId = this.memberSettlePeriodList[0]?.pkId
this.queryParams.memberSettlePeriodId = ele.pkId
}
})
}) })
}, },
// //

View File

@ -270,6 +270,8 @@ import { getAwardsListChiose } from '@/api/level'
import { getvertexValue } from '@/api/financialCase' import { getvertexValue } from '@/api/financialCase'
import { userCountryList } from '@/api/site.js' import { userCountryList } from '@/api/site.js'
import TopMemberSelect from '@/components/top-member-select' import TopMemberSelect from '@/components/top-member-select'
import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
export default { export default {
name: 'Bzpz', name: 'Bzpz',
components: { components: {
@ -306,11 +308,10 @@ export default {
} }
}, },
mounted() { mounted() {
var s1 = this.getStartTime() const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
var s2 = this.getEndTime() this.select.startPayTime = startDate
this.select.startPayTime = s1 this.select.endPayTime = endDate
this.select.endPayTime = s2 this.creationTime = [startDate, endDate]
this.creationTime = [s1, s2]
// //
this.getDataList() this.getDataList()
this.getData() this.getData()
@ -323,25 +324,7 @@ export default {
this.getDataList() this.getDataList()
} }
}, },
getStartTime() {
const date = new Date()
date.setDate(1) //
const year = date.getFullYear() //
let month = date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day
},
getEndTime() {
const date = new Date()
const year = date.getFullYear() //
let month = date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day + ' '
},
// //
getData() { getData() {
getAwardsListChiose().then((res) => { getAwardsListChiose().then((res) => {
@ -360,25 +343,7 @@ export default {
this.orderTypeList = res.data this.orderTypeList = res.data
}) })
}, },
getStartTime() {
const date = new Date()
date.setDate(1) //
const year = date.getFullYear() //
let month = date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day
},
getEndTime() {
const date = new Date()
const year = date.getFullYear() //
let month = date.getDate() === 1 ? date.getMonth() : date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day + ' '
},
reset() { reset() {
this.$refs.topMemberSelect.reset() this.$refs.topMemberSelect.reset()
this.select = { this.select = {

View File

@ -230,6 +230,7 @@ import TopMemberSelect from '@/components/top-member-select'
import { getAwardsListChiose } from '@/api/level' import { getAwardsListChiose } from '@/api/level'
import { getvertexValue } from '@/api/financialCase' import { getvertexValue } from '@/api/financialCase'
import { userCountryList } from '@/api/site.js' import { userCountryList } from '@/api/site.js'
import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
export default { export default {
name: 'UnderDirectAddNew', name: 'UnderDirectAddNew',
components: { components: {
@ -268,11 +269,10 @@ export default {
} }
}, },
mounted() { mounted() {
var s1 = this.getStartTime() const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
var s2 = this.getEndTime() this.select.startPayTime = startDate
this.select.startPayTime = s1 this.select.endPayTime = endDate
this.select.endPayTime = s2 this.creationTime = [startDate, endDate]
this.creationTime = [s1, s2]
// //
this.getDataList() this.getDataList()
this.getData() this.getData()

View File

@ -262,6 +262,7 @@ import { getcountryAllList } from '@/api/exchangerate'
import { getvertexValue, getmemberTeamList } from '@/api/financialCase' import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency' import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
import TopMemberSelect from '@/components/top-member-select/index.vue' import TopMemberSelect from '@/components/top-member-select/index.vue'
import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
export default { export default {
name: 'UnderPlacementPer', name: 'UnderPlacementPer',
components: { components: {
@ -297,11 +298,10 @@ export default {
created() { created() {
this.getSearch() this.getSearch()
this.getOthers() this.getOthers()
var s1 = this.getStartTime() const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
var s2 = this.getEndTime() this.queryParams.startPayTime = startDate
this.queryParams.startPayTime = s1 this.queryParams.endPayTime = endDate
this.queryParams.endPayTime = s2 this.queryParams.thetimes = [startDate, endDate]
this.queryParams.thetimes = [s1, s2]
}, },
methods: { methods: {
isLocalSymbol, isLocalSymbol,
@ -312,25 +312,6 @@ export default {
this.getSearch() this.getSearch()
} }
}, },
getStartTime() {
const date = new Date()
date.setDate(1) //
const year = date.getFullYear() //
let month = date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day
},
getEndTime() {
const date = new Date()
const year = date.getFullYear() //
let month = date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day + ' '
},
changeTime(val) { changeTime(val) {
this.queryParams.startPayTime = val[0] this.queryParams.startPayTime = val[0]
this.queryParams.endPayTime = val[1] this.queryParams.endPayTime = val[1]

View File

@ -259,6 +259,7 @@ import { getcountryAllList } from '@/api/exchangerate'
import { getvertexValue, getmemberTeamList } from '@/api/financialCase' import { getvertexValue, getmemberTeamList } from '@/api/financialCase'
import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency' import { isLocals, isLocalSymbol } from '@/utils/numberToCurrency'
import TopMemberSelect from '@/components/top-member-select/index.vue' import TopMemberSelect from '@/components/top-member-select/index.vue'
import { getMonthFirstDayAndBeforeDay } from '@/utils/date'
export default { export default {
name: 'UnderPlacementPerNew', name: 'UnderPlacementPerNew',
components: { components: {
@ -294,11 +295,10 @@ export default {
created() { created() {
this.getSearch() this.getSearch()
this.getOthers() this.getOthers()
var s1 = this.getStartTime() const [startDate, endDate] = getMonthFirstDayAndBeforeDay()
var s2 = this.getEndTime() this.queryParams.startPayTime = startDate
this.queryParams.startPayTime = s1 this.queryParams.endPayTime = endDate
this.queryParams.endPayTime = s2 this.queryParams.thetimes = [startDate, endDate]
this.queryParams.thetimes = [s1, s2]
}, },
methods: { methods: {
isLocalSymbol, isLocalSymbol,
@ -309,25 +309,6 @@ export default {
this.getSearch() this.getSearch()
} }
}, },
getStartTime() {
const date = new Date()
date.setDate(1) //
const year = date.getFullYear() //
let month = date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day
},
getEndTime() {
const date = new Date()
const year = date.getFullYear() //
let month = date.getMonth() + 1 // 0-11+1
month = month >= 10 ? month : '0' + month //
let day = date.getDate() // setDate(1)
day = day >= 10 ? day : '0' + day //
return year + '-' + month + '-' + day + ' '
},
changeTime(val) { changeTime(val) {
this.queryParams.startPayTime = val[0] this.queryParams.startPayTime = val[0]
this.queryParams.endPayTime = val[1] this.queryParams.endPayTime = val[1]