fan 2 rokov pred
rodič
commit
722b6ce7ce

+ 1 - 1
public/static/views/incomeTemplateExcel.html

@@ -164,7 +164,7 @@
                                 toolBar += '<button id="enableSave" class="btn btn-primary btn-primary" style="padding:3px 6px;font-size: 16px;margin-right: 10px;">保存</button>';
                             }
                         }
-                        if (type == '3') {
+                        if (type == '3' || type == '4') {
                             toolBar =  '<button id="fullScreen" class="btn btn-primary" style="padding:3px 6px;font-size: 16px;margin-right: 10px;">全屏显示</button>' +
                                 '<button id="exitFullScreen" class="btn btn-primary" style="padding:3px 6px;font-size: 16px;margin-right: 10px;display:none">退出全屏</button>';
                             showToolBar = false;

+ 1 - 1
src/pages/main/incomeExcel/home.vue

@@ -28,7 +28,7 @@ export default {
             showList: [],
             routerList: [
                 {label: "收入模板管理", path: "/incomeExcelTemplate", name: "incomeExcelTemplate"},
-                {label: "收入信息收集", path: "/b", name: "b"},
+                {label: "收入信息收集", path: "/incomeExcelIssued", name: "incomeExcelIssued"},
                 {label: "收入信息发布", path: "/c", name: "c"},
                 {label: "收入附件收集", path: "/d", name: "d"},
             ],

+ 245 - 0
src/pages/main/incomeExcel/incomeExcelIssued.vue

@@ -0,0 +1,245 @@
+<template>
+    <fullscreen :fullscreen.sync="fullscreen" class="container" style="margin: 0;width: 100%;">
+        <div class="container-box" style="padding: 0 20px 0 0;">
+            <toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
+            <div style="overflow: hidden;">
+                <div class="search" style="float: left;">
+                    <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
+                </div>
+            </div>
+            <div class="tabbox">
+                <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
+                          tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
+                    <el-table-column prop="templateName" label="模板名称" align="center">
+                    </el-table-column>
+                    <el-table-column prop="editReason" label="填报事由" align="center">
+                    </el-table-column>
+                    <el-table-column prop="editRemark" label="填报注意事项" align="center">
+                    </el-table-column>
+                    <el-table-column prop="endTime" label="截止时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="addUserName" label="发起人" align="center">
+                    </el-table-column>
+                    <el-table-column label="接收人" align="center">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.userList == null" style="color: #0b82ff;cursor: pointer">{{scope.row.userName}}</span>
+                            <div v-else v-for="item in scope.row.userList">
+                                <span style="color: #0b82ff;cursor: pointer">{{item.userName}}&nbsp;</span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="opTime" label="发起时间" align="center">
+                    </el-table-column>
+                    <el-table-column prop="state" label="状态" align="center">
+                        <template slot-scope="scope">
+                            <span v-if="scope.row.state == 0">待处理</span>
+                            <span v-if="scope.row.state == 1">已完成</span>
+                            <span v-if="scope.row.state == 2">待审批</span>
+                            <span v-if="scope.row.state == 3">驳回</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="220px" align="center" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button size="mini" @click="toView(scope.row)">查看</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
+                               :total="total">
+                </el-pagination>
+            </div>
+        </div>
+    </fullscreen>
+</template>
+
+<script>
+import mySearch from "../../../components/search.vue";
+import myUpload from "../../../components/upload";
+import toolList from "../../../components/toolList";
+import myMessage from "../../../components/myMessage.vue"
+
+export default {
+    components: {
+        myUpload,
+        mySearch,
+        toolList,
+        myMessage
+    },
+    data() {
+        return {
+            tableData: [{}],
+            total: 0,
+            params: {},
+            deleteTag: '',
+            centerDialogVisible: false,
+            loading: false,
+            tooltit: '收入信息收集',
+            searchList: [{
+                type: 'input',
+                tit: '模板名称',
+                value: '',
+                width: '100%',
+            },{
+                type: 'input',
+                tit: '截止时间',
+                value: '',
+                width: '100%',
+            }, {
+                type: 'input',
+                tit: '状态',
+                value: '',
+                width: '100%',
+            },],
+        }
+    },
+    methods: {
+        //搜索数据
+        searchInfo(v) {
+            this.params = {};
+            v[0] ? this.params.name = v[0] : '';
+            v[1] ? this.params.templateType = v[1] : '';
+            this.getList(this.params, this.pageSize);
+        },
+        //功能栏
+        iconCli(v) {
+            if (v === 1) {
+                this.getList(this.params, this.pageSize);
+            }
+            if (v === 2) {
+                this.fullscreen = !this.fullscreen
+            }
+        },
+        // 分页
+        currchange(v) {
+            this.pageSize = v;
+            this.getList(this.params, this.pageSize);
+        },
+        getList(v, n) {
+            this.pageSize = n;
+            this.loading = true;
+            this.tableData = [];
+            let _this = this;
+            this.$http({
+                url: "/market/cIncomeExcelIssued/getIssuedList",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                    "page": '{"pageNo":"' + n + '","pageSize":"10"}'
+                },
+                data: v,
+            }).then((res) => {
+                this.tableData = res.data.data;
+                this.total = res.data.totalRecord;
+                this.loading = false;
+            });
+        },
+        toView(row) {
+            var _this = this;
+            _this.jumpinfop('/incomeExcelInfo', 4, '查看收入信息', row.issuedId);
+        },
+        //跳转页面
+        jumpinfop(p, v, n, id) {
+            this.$router.push({
+                path: p,
+                query: {
+                    type: v,
+                    id: id
+                }
+            });
+            this.setabList(n, p + '?type=' + v + '&id=' + id);
+        },
+        //新建一个页面
+        setabList(n, p) {
+            let params = {
+                children: "",
+                name: n,
+                rountPath: p,
+                target: "_self",
+            };
+            for (let i = 0; i < this.$store.state.tabList.length; i++) {
+                if (this.$store.state.tabList[i].name === params.name) {
+                    this.$store.state.tabList[i] = params;
+                }
+            }
+            let set = new Set([...this.$store.state.tabList, params]);
+            set.add(params);
+            this.$store.commit("setDefaultActive", params.rountPath);
+            this.$store.commit("setTabList", Array.from(set));
+        },
+    },
+    mounted() {
+        this.getList({}, 1);
+    },
+    created() {
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.titbox {
+    div {
+        float: right;
+
+        i {
+            font-size: 22px;
+            margin-left: 20px;
+            cursor: pointer;
+        }
+    }
+}
+
+.tabbox {
+    margin-top: 16px;
+}
+
+.pageBox {
+    text-align: right;
+    margin-top: 10px;
+}
+
+.info-line {
+    width: 100%;
+    display: block;
+    padding-left: 20px;
+
+    div {
+        width: 90%;
+        display: inline-block;
+    }
+
+    span {
+        width: 100px;
+        display: inline-block;
+        text-align: left;
+
+        i {
+            color: red;
+            display: inline-block;
+            padding-right: 5px;
+        }
+    }
+
+    .el-select,
+    .el-input {
+        width: calc(100% - 150px);
+    }
+}
+
+.online {
+    width: 100%;
+
+    .el-select {
+        width: calc(100% - 100px);
+    }
+
+    span {
+        vertical-align: top;
+    }
+
+    .el-textarea {
+        width: calc(100% - 100px);
+    }
+}
+</style>
+

+ 2 - 1
src/pages/main/incomeExcel/incomeExcelTemplate.vue

@@ -62,7 +62,8 @@
                     <div class="info-line">
                         <el-form-item prop="testInfo">
                             <span style="width: 6px;color: red">*</span><span>截止时间</span>
-                            <el-date-picker type="date" placeholder="截止时间" v-model="issuedParam.endTime" :picker-options="pickerOptions"></el-date-picker>
+                            <el-date-picker type="date" placeholder="截止时间" v-model="issuedParam.endTime"
+                                            :picker-options="pickerOptions" value-format="yyyy-MM-dd"></el-date-picker>
                         </el-form-item>
                     </div>
                 </el-form>

+ 3 - 3
src/router/index.js

@@ -2011,9 +2011,9 @@ const routes = [{
                 },
                 {
                     meta: { name:  '收入信息收集', keepAlive: false },
-                    path: '/b',
-                    name: 'b',
-                    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/incomeExcel/incomeExcelTemplate'], resolve)
+                    path: '/incomeExcelIssued',
+                    name: 'incomeExcelIssued',
+                    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/incomeExcel/incomeExcelIssued'], resolve)
                 },{
                     meta: { name:  '收入信息发布', keepAlive: false },
                     path: '/c',