修订版本3.0

李林

2024-01-09 0dc1e26569ab570259fef29cd5cde70cb96d7f2c

修订版本3.0

 src/assets/api/controller.js

@@ -37,20 +37,22 @@
    downRegistrantCountFile: "/dataReporting/downRegistrantCountFile", //导出员工数据统计
    downFansSubmitFile: "/dataReporting/downFansSubmitFile", //导出进粉上报
    inputFansSubmitCsv: "/dataReporting/inputFansSubmitCsv", //导入进粉上报
    downFinanceSubmitFile: "/dataReporting/downFinanceSubmitFile", //导出财务上报
    inputFinanceSubmitCsv: "/dataReporting/inputFinanceSubmitCsv", //导入财务上报
    selectDataComparisonDtoPageList: "/dataReporting/selectDataComparisonDtoPageList", //获取数据对比列表
	

    selectFansSubmitList: "/dataReporting/selectFansSubmitList", //获取进粉上报列表
    delFansSubmit: "/dataReporting/delFansSubmit", //删除进粉上报信息
    updateFansSubmit: "/dataReporting/updateFansSubmit", //修改进粉上报信息
    addFansSubmit: "/dataReporting/addFansSubmit", //添加进粉上报信息
	

    selectFinanceSubmitList: "/dataReporting/selectFinanceSubmitList", //获取财务上报列表
    delFinanceSubmit: "/dataReporting/delFinanceSubmit", //删除财务上报信息
    updateFinanceSubmit: "/dataReporting/updateFinanceSubmit", //修改财务上报信息
    addFinanceSubmit: "/dataReporting/addFinanceSubmit", //添加财务上报信息
	

    getDataList: "/dataReporting/getDataList", //获取首页数据
	

    inputCsv: "/dataReporting/inputCsv", //导入
}

@@ -60,10 +62,10 @@
    delCustomEnum: "/enum/delCustomEnum", //删除客户信息
    updateCustomEnum: "/enum/updateCustomEnum", //修改客户信息
    addCustomEnum: "/enum/addCustomEnum", //添加客户信息
	

    selectProductEnumLists: "/enum/selectProductEnumLists", //获取项目列表
    selectProductEnumList: "/enum/selectProductEnumList", //获取项目枚举
    delProductEnum: "/enum/delProductEnum", //删除项目信息
    updateProductEnum: "/enum/updateProductEnum", //修改项目信息
    addProductEnum: "/enum/addProductEnum", //添加项目信息
}
}

 src/components/view/data-comparison.vue

@@ -45,19 +45,20 @@
        </div>
        <div class="search">
            <div class="search_thing">
                <div class="search_label">账户名称：</div>
                <div class="search_input"><el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.name"
                    ></el-input></div>
                <div class="search_label">主账户名称：</div>
                <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                        v-model="componentData.entity.name"></el-input></div>
            </div>
            <div class="search_thing">
                <div class="search_label">对比的账户名称：</div>
                <div class="search_input"><el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.comparisonName"
                    ></el-input></div>
            <div class="search_thing">
                <div class="search_label">子账户名称：</div>
                <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                        v-model="componentData.entity.comparisonName"></el-input></div>
            </div>
            <div class="search_thing">
            <div class="search_thing">
                <div class="search_label">登记日期：</div>
                <div class="search_input">
                    <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" clearable></el-date-picker>
                    <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="选择日期"
                        value-format="yyyy-MM-dd" clearable></el-date-picker>
                </div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
@@ -66,7 +67,8 @@
            </div>
        </div>
        <div class="table">
            <ValueTable ref="ValueTable" :url="$api.dataReporting.selectDataComparisonDtoPageList" :componentData="componentData" :key="upIndex"/>
            <ValueTable ref="ValueTable" :url="$api.dataReporting.selectDataComparisonDtoPageList"
                :componentData="componentData" :key="upIndex" />
        </div>
    </div>
</template>
@@ -82,8 +84,8 @@
                componentData: {
                    entity: {
                        name: null,
                        comparisonName:null,
                        createTime: null,
                        comparisonName: null,
                        createTime: null,
                        orderBy: {
                            field: 'createTime',
                            order: 'desc'
@@ -102,7 +104,7 @@
                outPower: true
            }
        },
        created() {
        created() {
            var today = new Date();
            var yesterday = new Date(today);
            yesterday.setDate(today.getDate() - 1);
@@ -119,28 +121,32 @@
        },
        mounted() {
            this.entityCopy = this.HaveJson(this.componentData.entity)
            this.selectDataComparisonDtoPageList()
            // this.selectDataComparisonDtoPageList()
        },
        methods: {
            refreshTable() {
                if(this.componentData.entity.name == null || this.componentData.entity.name == '') {
                    this.$message.error('账户名称是必填项')
                }else if(this.componentData.entity.comparisonName == null || this.componentData.entity.comparisonName == '') {
                    this.$message.error('对比的账户名称是必填项')
                }else if(this.componentData.entity.createTime == null) {
                    this.$message.error('登记时间是必填项')
                }else if(this.componentData.entity.name === this.componentData.entity.comparisonName) {
                    this.$message.error('对比的账户不能重复')
                }else {
                    this.$refs['ValueTable'].selectList()
                }
                if (this.componentData.entity.name == null || this.componentData.entity.name == '') {
                    this.$message.error('账户名称是必填项')
                } else if (this.componentData.entity.comparisonName == null || this.componentData.entity.comparisonName == '') {
                    this.$message.error('对比的账户名称是必填项')
                } else if (this.componentData.entity.createTime == null) {
                    this.$message.error('登记时间是必填项')
                } else if (this.componentData.entity.name === this.componentData.entity.comparisonName) {
                    this.$message.error('对比的账户不能重复')
                } else {
                    this.$refs['ValueTable'].selectList()
                }
            },
            refresh() {
                this.componentData.entity = this.HaveJson(this.entityCopy)
                this.upIndex++
            },
            selectDataComparisonDtoPageList() {
                this.$axios.get(this.$api.dataReporting.selectDataComparisonDtoPageList).then(res => {
                this.$axios.post(this.$api.dataReporting.selectDataComparisonDtoPageList, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
                }).then(res => {
                    res.data.forEach(a => {
                        a.isClick = false
                        a.look = false

 src/components/view/data-reporting.vue

@@ -207,7 +207,7 @@
                    <el-col :span="7">
                        <el-input v-model="upData.customerRebate" size="small"></el-input>
                    </el-col>
                    <el-col :span="4" style="text-align: right;padding-right: 8px;">备用字段</el-col>
                    <el-col :span="4" style="text-align: right;padding-right: 8px;">做进来</el-col>
                    <el-col :span="7">
                        <el-input v-model="upData.remark" size="small"></el-input>
                    </el-col>
@@ -424,4 +424,4 @@
            }
        }
    }
</script>
</script>

 src/components/view/fans-submit.vue

@@ -156,6 +156,19 @@
                outPower: true
            }
        },
        created() {
            var today = new Date();
            var yyyy = today.getFullYear();
            var mm = today.getMonth() + 1;
            var dd = today.getDate()
            if (dd < 10) {
                dd = "0" + dd;
            }
            if (mm < 10) {
                mm = "0" + mm;
            }
            this.componentData.entity.createTime = this.HaveJson(`${yyyy}-${mm}-${dd} 00:00:00`)
        },
        mounted() {
            this.entityCopy = this.HaveJson(this.componentData.entity)
            this.selectProductEnumList()
@@ -205,6 +218,8 @@
                let up = false
                let del = false
                let add = false
                let inPower = false
                let outPower = false
                for (var i = 0; i < power.length; i++) {
                    if (power[i].menuMethod == 'upDataReporting') {
                        up = true
@@ -215,6 +230,12 @@
                    if (power[i].menuMethod == 'addFansSubmit') {
                        add = true
                    }
                    if (power[i].menuMethod == 'inputFansSubmitCsv') {
                        inPower = true
                    }
                    if (power[i].menuMethod == 'downFansSubmitFile') {
                        outPower = true
                    }
                }
                if (!del) {
                    this.componentData.do.splice(1, 1)
@@ -223,10 +244,10 @@
                    this.componentData.do.splice(0, 1)
                }
                this.addPower = add
                this.inPower = inPower
                this.outPower = outPower
            },
            openUpload() {

            }
            openUpload() {}
        }
    }
</script>
</script>

 src/components/view/finance-submit.vue

@@ -42,15 +42,31 @@
            <el-row class="title">
                <el-col :span="12" style="padding-left: 20px;">财务上报</el-col>
                <el-col :span="12" style="text-align: right;">
                    <el-button size="medium" @click="$refs.ValueTable.openUpload()" v-if="inPower">
                        <i class="el-icon-upload2" style="color: #3A7BFA;"></i>
                        <span style="color: #3A7BFA;">导入</span>
                    </el-button>
                    <el-button size="medium" @click="$refs.ValueTable.openDownDia()" v-if="outPower">
                        <i class="el-icon-download" style="color: #3A7BFA;"></i>
                        <span style="color: #3A7BFA;">导出</span>
                    </el-button>
                    <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">新增</el-button>
                </el-col>
            </el-row>
        </div>
        <div class="search">
            <div class="search_thing">
                <div class="search_label">系统日期：</div>
                <div class="search_input">
                    <el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="选择日期"
                        value-format="yyyy-MM-dd HH:mm:ss" clearable></el-date-picker>
                </div>
            </div>
            <div class="search_thing">
                <div class="search_label">账户名：</div>
                <div class="search_input">
                    <el-input size="small" v-model="componentData.entity.name" clearable placeholder="账户名" @keyup.enter.native="refreshTable()"></el-input>
                    <el-input size="small" v-model="componentData.entity.name" clearable placeholder="账户名"
                        @keyup.enter.native="refreshTable()"></el-input>
                </div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
@@ -59,7 +75,9 @@
            </div>
        </div>
        <div class="table">
            <ValueTable ref="ValueTable" :url="$api.dataReporting.selectFinanceSubmitList" :upUrl="$api.dataReporting.updateFinanceSubmit" :delUrl="$api.dataReporting.delFinanceSubmit" :componentData="componentData" :key="upIndex"/>
            <ValueTable ref="ValueTable" :url="$api.dataReporting.selectFinanceSubmitList"
                :upUrl="$api.dataReporting.updateFinanceSubmit" :delUrl="$api.dataReporting.delFinanceSubmit"
                :componentData="componentData" :key="upIndex" :downUrl="$api.dataReporting.downFinanceSubmitFile" :inputUrl="$api.dataReporting.inputFinanceSubmitCsv"/>
        </div>
    </div>
</template>
@@ -75,6 +93,7 @@
                componentData: {
                    entity: {
                        name: null,
                        createTime: null,
                        orderBy: {
                            field: 'id',
                            order: 'asc'
@@ -88,8 +107,8 @@
                        font: '编辑',
                        type: 'text',
                        method: 'doDiy',
                        field:['createUserName']
                    },{
                        field: ['createUserName']
                    }, {
                        id: 'delete',
                        font: '删除',
                        type: 'text',
@@ -100,7 +119,9 @@
                        product: {
                            select: []
                        },
                        custom: {select: []}
                        custom: {
                            select: []
                        }
                    },
                    requiredAdd: ['company', 'name', 'employeeRebate'],
                    requiredUp: ['company', 'name', 'employeeRebate']
@@ -109,8 +130,23 @@
                upIndex: 0,
                product: [],
                custom: [],
                addPower: true
                addPower: true,
                inPower: true,
                outPower: true
            }
        },
        created() {
            var today = new Date();
            var yyyy = today.getFullYear();
            var mm = today.getMonth() + 1;
            var dd = today.getDate()
            if (dd < 10) {
                dd = "0" + dd;
            }
            if (mm < 10) {
                mm = "0" + mm;
            }
            this.componentData.entity.createTime = this.HaveJson(`${yyyy}-${mm}-${dd} 00:00:00`)
        },
        mounted() {
            this.entityCopy = this.HaveJson(this.componentData.entity)
@@ -126,14 +162,14 @@
                this.componentData.entity = this.HaveJson(this.entityCopy)
                this.upIndex++
            },
            openAdd(){
            openAdd() {
                this.$refs.ValueTable.openAddDia(this.$api.dataReporting.addFinanceSubmit);
            },
            selectProductEnumList(){
                this.$axios.get(this.$api.enums.selectProductEnumList).then(res=>{
            selectProductEnumList() {
                this.$axios.get(this.$api.enums.selectProductEnumList).then(res => {
                    this.product = res.data
                    var str = []
                    res.data.forEach(a=>{
                    res.data.forEach(a => {
                        str.push({
                            label: a.product,
                            value: a.product
@@ -142,11 +178,11 @@
                    this.componentData.selectField.product.select = str
                })
            },
            selectCustomEnumList(){
                this.$axios.get(this.$api.enums.selectCustomEnumList).then(res=>{
            selectCustomEnumList() {
                this.$axios.get(this.$api.enums.selectCustomEnumList).then(res => {
                    this.custom = res.data
                    var str = []
                    res.data.forEach(a=>{
                    res.data.forEach(a => {
                        str.push({
                            label: a.name,
                            value: a.name
@@ -156,30 +192,40 @@
                })
            },
            // 权限分配
            getPower(){
            getPower() {
                let power = JSON.parse(sessionStorage.getItem('power'))
                let up = false
                let del = false
                let add = false
                let inPower = false
                let outPower = false
                for (var i = 0; i < power.length; i++) {
                    if(power[i].menuMethod=='updateFinanceSubmit'){
                    if (power[i].menuMethod == 'updateFinanceSubmit') {
                        up = true
                    }
                    if(power[i].menuMethod=='delFinanceSubmit'){
                    if (power[i].menuMethod == 'delFinanceSubmit') {
                        del = true
                    }
                    if(power[i].menuMethod=='addFinanceSubmit'){
                    if (power[i].menuMethod == 'addFinanceSubmit') {
                        add = true
                    }
                    if (power[i].menuMethod == 'inputFinanceSubmitCsv') {
                        inPower = true
                    }
                    if (power[i].menuMethod == 'downFinanceSubmitFile') {
                        outPower = true
                    }
                }
                if(!del){
                if (!del) {
                    this.componentData.do.splice(1, 1)
                }
                if(!up){
                if (!up) {
                    this.componentData.do.splice(0, 1)
                }
                this.addPower = add
                this.inPower = inPower
                this.outPower = outPower
            }
        }
    }
</script>
</script>

 src/components/view/index-index.vue

@@ -193,7 +193,7 @@
                <div class="left-2">
                    <div class="card card-1">
                        <div class="label">
                            <p class="p1">今日客户消费</p>
                            <p class="p1">昨日客户消费</p>
                            <p class="p2">{{data.data1.data1}}</p>
                        </div>
                        <div class="icon">
@@ -202,7 +202,7 @@
                    </div>
                    <div class="card card-1">
                        <div class="label">
                            <p class="p1">今日实际消费</p>
                            <p class="p1">昨日实际消费</p>
                            <p class="p2">{{data.data1.data2}}</p>
                        </div>
                        <div class="icon">
@@ -211,7 +211,7 @@
                    </div>
                    <div class="card card-1">
                        <div class="label">
                            <p class="p1">今日成本</p>
                            <p class="p1">昨日成本</p>
                            <p class="p2">{{data.data1.data3}}</p>
                        </div>
                        <div class="icon">
@@ -220,7 +220,7 @@
                    </div>
                    <div class="card card-1" style="margin-right: 0;">
                        <div class="label">
                            <p class="p1">今日实际成本</p>
                            <p class="p1">昨日实际成本</p>
                            <p class="p2">{{data.data1.data4}}</p>
                        </div>
                        <div class="icon">