收入统计

public/static/views/incomeTemplateExcel.html

@@ -61,15 +61,7 @@
 <div class="layui-inline" id="monthSelect" style="width: 100%">
     <div class="layui-input-inline">
         <form>
-            <label>控制权限</label>
-            <select name="city" id="editStatus" style="width: 70px">
-                <option value="0">开启</option>
-                <option value="1">关闭</option>
-            </select>
-            <label> 可编辑列：从 </label><input type="text" id="editFrom" style="width: 50px"
-                                          onkeyup="this.value=this.value.replace('-','')"></input> 到 <input
-            type="text" id="editTo" style="width: 50px"
-            onkeyup="this.value=this.value.replace('-','')"></input>
+
         </form>
     </div>
     <div style="float: right;padding-right: 10px" id="shareBtn">
@@ -125,13 +117,16 @@
                 window.luckysheet.destroy();
             }
             //拿参数的
-            var excelId = $(window.parent.document).find("#excelId").attr("value");
-            console.log(excelId);
-            type = '2';
+            var r = window.top.location.href.split('?')[1];
+            var excelId = r.split('&')[1].split('=')[1];
+            type = r.split('&')[0].split('=')[1];
+            console.log("id:" + excelId);
+            console.log("type:" + type);
             toolBar = '';
-            var url = '/market/cOnlineExcel/getExcelInfo';
-            util.ajaxJson("数据加载中", ctx + url, {
-                "id": excelId ? excelId : '',
+            var url = '/market/cIncomeExcelTemplate/getExcelInfo';
+            util.ajaxJson("数据加载中", ctx + url,
+                {
+                "id": excelId ? excelId : '', "type": type
             }, function (res) {
                 if (res.result == 0) {
                     // 查看和修改时 下拉框赋值
@@ -139,9 +134,6 @@
                     excelLevel = res.body.excelLevel;
                     isAdmin = res.body.isExcelAdmin;
                     emptyExcel = res.body.emptyExcel;
-                    $("#editFrom").val(excelInfo.editConStart);
-                    $("#editTo").val(excelInfo.editConEnd);
-                    $("#editStatus").val(excelInfo.editStatus);
                     console.log(type);
                     if (type == '2') {
                         if (isAdmin) {
@@ -167,14 +159,14 @@
         // 表格初始化
         function initExcel(data,name) {
             if (type == '1') {
-                flag = false
+                flag = true
             } else {
                 flag = true
             }
             if (isAdmin) {
                 adminFlag = true;
             }
-            var fileName = excelInfo.fileName;
+            var fileName = excelInfo.name;
             if ($.trim(name)!=''){
                 fileName = name;
             }
@@ -288,29 +280,19 @@
                 console.log(err)
             }
             if (isAdmin == false) {
-                $("#editStatus").attr('disabled', true);
-                $("#editFrom").attr('disabled', true);
-                $("#editTo").attr('disabled', true);
-                $("#shareBtn").hide();
+
             } else {
-                $("#editStatus").attr('disabled', false);
-                $("#editFrom").attr('disabled', false);
-                $("#editTo").attr('disabled', false);
-                $("#shareBtn").show();
+
             }
             if (emptyExcel == true) {
-                $("#shareBtn").show();
-                $("#saves").hide();
+
             } else {
-                $("#shareBtn").hide();
-                $("#saves").show();
+
             }
             if (excelInfo.shareStatus == '1') {
-                $("#editTo").attr('disabled', true);
-                $("#editFrom").attr('disabled', true);
+
             } else {
-                $("#editTo").attr('disabled', false);
-                $("#editFrom").attr('disabled', false);
+
             }
             initHandel();
         }

src/pages/main/incomeExcel/incomeExcelTemplate.vue

@@ -7,7 +7,8 @@
                     <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
                 </div>
                 <div style="margin-top: 20px;float: right;" class="bigbtns">
-                    <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary">新建模板
+                    <el-button style="margin-left: 20px;" class="btn-check" size="medium" type="primary"
+                               @click="addNew()">新增模板
                     </el-button>
                 </div>
             </div>
@@ -26,7 +27,7 @@
                     </el-table-column>
                     <el-table-column prop="name" label="状态">
                     </el-table-column>
-                    <el-table-column label="操作" width="180px" align="center" fixed="right">
+                    <el-table-column label="操作" width="220px" align="center" fixed="right">
                         <template slot-scope="scope">
                             <el-button size="mini" type="primary">下发</el-button>
                             <el-button size="mini">编辑</el-button>
@@ -125,7 +126,40 @@ export default {
             if (v === 1) {
                 console.log("删除")
             }
-        }
+        },
+        addNew() {
+            var _this = this;
+            _this.jumpinfop('/incomeExcelInfo', 1, '新增模板', "853884899099357184")
+        },
+        //跳转页面
+        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() {
 

src/router/index.js

@@ -1995,6 +1995,48 @@ const routes = [{
             name: 'apkTestMain',
             component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/apkTestMain/index'], resolve)
         },
+        {
+            meta: { name:  '收入模板', keepAlive: false },
+            path: '/incomeExcelHome',
+            name: 'incomeExcelHome',
+            redirect: 'incomeExcelTemplate',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/incomeExcel/home.vue'], resolve),
+            children: [
+                {
+                    meta: { name:  '收入模板管理', keepAlive: false },
+                    path: '/incomeExcelTemplate',
+                    name: 'incomeExcelTemplate',
+                    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/incomeExcel/incomeExcelTemplate'], resolve)
+                },
+                {
+                    meta: { name:  '收入信息收集', keepAlive: false },
+                    path: '/b',
+                    name: 'b',
+                    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/incomeExcel/incomeExcelTemplate'], resolve)
+                },{
+                    meta: { name:  '收入信息发布', keepAlive: false },
+                    path: '/c',
+                    name: 'c',
+                    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/incomeExcel/incomeExcelTemplate'], resolve)
+                },
+                {
+                    meta: { name:  '收入附件收集', keepAlive: false },
+                    path: '/d',
+                    name: 'd',
+                    component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/incomeExcel/incomeExcelTemplate'], resolve)
+                },
+            ]
+        },
+        {
+            meta: {
+                name: '模板详情',
+                keepAlive: false
+            },
+            path: '/incomeExcelInfo',
+            name: 'incomeExcelInfo',
+            component: (resolve) => require( /* webpackChunkName: "system" */ ['../pages/main/incomeExcel/incomeExcelInfo'], resolve)
+        },
     ]
 },
 {