收入统计-问题处理

public/static/views/incomeTemplateExcel.html

@@ -94,6 +94,7 @@
     var type = '';
     var emptyExcel = false;
     var showToolBar = true;
+    var fullScreen = false;
     $(function () {
         userId = JSON.parse(window.top.sessionStorage.userInfo).loginNo
     })
@@ -316,22 +317,38 @@
         // 绑定按钮事件
         function initHandel() {
             $("#fullScreen").on("click", function () {
-                fullScreen();
+                if (fullScreen){
+                    fullScreen = false;
+                    $("#fullScreen").html('全屏显示');
+                } else {
+                    fullScreen = true;
+                    $("#fullScreen").html('退出全屏');
+                }
+                window.parent['fullScreen']('true');
+                //fullScreen();
                 $('#monthSelect').show()
             })
             //退出全屏
             $("#exitFullScreen").on("click", function () {
-                exitFullscreen();
+                $("#exitFullScreen").css("display", "");
+                $("#fullScreen").css("display", "show");
+                //exitFullscreen();
+                window.parent['exitFullScreen']('true');
             })
             //分享
             $('#share').off("click").click(function () {
+                if (fullScreen){
+                    fullScreen = false;
+                    $("#fullScreen").html('全屏显示');
+                    window.parent['fullScreen']('true');
+                }
                 window.parent['showAuthDialog']('true');
                 if (type == '1') {
                     disableUpload();
                 } else if (type == '2') {
                     disableSave();
                 }
-                realExitFullScreen();
+                //realExitFullScreen();
             });
             //修改
             $('#enableSave').off("click").click(function () {

public/static/views/incomeViewExcel.html

@@ -94,6 +94,7 @@
     var type = '';
     var emptyExcel = false;
     var showToolBar = true;
+    var fullScreen = false;
     $(function () {
         userId = JSON.parse(window.top.sessionStorage.userInfo).loginNo
     })
@@ -316,7 +317,15 @@
         // 绑定按钮事件
         function initHandel() {
             $("#fullScreen").on("click", function () {
-                fullScreen();
+                if (fullScreen){
+                    fullScreen = false;
+                    $("#fullScreen").html('全屏显示');
+                } else {
+                    fullScreen = true;
+                    $("#fullScreen").html('退出全屏');
+                }
+                window.parent['fullScreen']('true');
+                //fullScreen();
                 $('#monthSelect').show()
             })
             //退出全屏
@@ -325,13 +334,18 @@
             })
             //分享
             $('#share').off("click").click(function () {
+                if (fullScreen){
+                    fullScreen = false;
+                    $("#fullScreen").html('全屏显示');
+                    window.parent['fullScreen']('true');
+                }
                 window.parent['showAuthDialog']('true');
                 if (type == '1') {
                     disableUpload();
                 } else if (type == '2') {
                     disableSave();
                 }
-                realExitFullScreen();
+                //realExitFullScreen();
             });
             //修改
             $('#enableSave').off("click").click(function () {

src/pages/main/incomeExcel/incomeExcelInfo.vue

@@ -1,7 +1,9 @@
 <template>
     <div class="container" id="container" v-loading="loading">
-        <iframe height="100%" width="100%" src="/marketfront/static/views/incomeTemplateExcel.html" frameborder="0"
-                ref="iframe" name="excelIframe" id="excelIframe"></iframe>
+        <fullscreen :fullscreen.sync="fullscreen" class="container" style="margin: 0;width: 100%;">
+            <iframe height="100%" width="100%" src="/marketfront/static/views/incomeTemplateExcel.html" frameborder="0"
+                    ref="iframe" name="excelIframe" id="excelIframe"></iframe>
+        </fullscreen>
         <el-dialog :title="'权限设置'" :visible.sync="authSettingStatus" width="70%" :destroy-on-close="true"
                    :modal-append-to-body="false" :close-on-click-modal="false">
             <el-form :model="testModel" ref="addInfoList">
@@ -22,9 +24,11 @@
                                 <el-button type="primary" @click="limitUserAdd(index)">组织机构</el-button>
                                 <span style="margin-right: 20px;margin-left: 20px">{{ item.userName }}</span>
                                 <span style="margin-right: 10px;margin-left: 10px">可编辑行：从</span>
-                                <el-input v-model="item.editStart" style="width: 80px;" type="number" min="1" oninput="value=value.replace('-','')"></el-input>
+                                <el-input v-model="item.editStart" style="width: 80px;" type="number" min="1"
+                                          oninput="value=value.replace('-','')"></el-input>
                                 <span style="margin-right: 10px;margin-left: 10px">到</span>
-                                <el-input v-model="item.editEnd" style="width: 80px;" type="number" min="1" oninput="value=value.replace('-','')"></el-input>
+                                <el-input v-model="item.editEnd" style="width: 80px;" type="number" min="1"
+                                          oninput="value=value.replace('-','')"></el-input>
                                 <br/><br/>
                             </div>
                             <el-button style="width: 80px;margin-right: 20px;margin-left: 40px"
@@ -154,6 +158,7 @@ export default {
             //审批人用到的
             treeListonly: {},
             excelData: {},
+            fullscreen: false
         }
     },
     methods: {
@@ -210,7 +215,7 @@ export default {
                     excelData: this.excelData,
                     issuedUserId: this.getUrlKey("id"),
                     nextUserId: this.auditUserId,
-                    auditRemark:this.auditForm.auditRemark
+                    auditRemark: this.auditForm.auditRemark
                 },
             }).then((res) => {
                 this.loading = false;
@@ -507,11 +512,17 @@ export default {
                 ) || null
             );
         },
+        processFullScreen() {
+            this.fullscreen = !this.fullscreen;
+        },
     },
     mounted() {
         this.type = this.getUrlKey("type")
     },
     created() {
+        window['fullScreen'] = (rp) => {
+            this.processFullScreen(rp);
+        }
         window['showAuthDialog'] = (rp) => {
             this.showAuthDialog(rp);
         }

src/pages/main/incomeExcel/incomeExcelIssued.vue

@@ -43,6 +43,9 @@
                     <el-table-column label="操作" width="220px" align="center" fixed="right">
                         <template slot-scope="scope">
                             <el-button size="mini" @click="toView(scope.row)">查看</el-button>
+                            <el-button size="mini" v-if="scope.row.state == 0 && scope.row.type == '1'"
+                                       @click="checkDelete(scope.row)">删除
+                            </el-button>
                             <el-button size="mini" @click="toEdit(scope.row)"
                                        v-if="scope.row.type == 2 && (scope.row.state == 0 || scope.row.state == 3)">处理
                             </el-button>
@@ -138,6 +141,8 @@
                 </div>
             </el-dialog>
         </div>
+        <myMessageNew :messTit='deleteTag' @closeMessage="processDelete" :centerDialogVisible="centerDialogVisible"
+                      v-if="centerDialogVisible" yes-btn-name="是" no-btn-name="否"></myMessageNew>
     </fullscreen>
 </template>
 
@@ -145,7 +150,7 @@
 import mySearch from "../../../components/search.vue";
 import myUpload from "../../../components/upload";
 import toolList from "../../../components/toolList";
-import myMessage from "../../../components/myMessage.vue"
+import myMessageNew from "../../../components/myMessageNew.vue"
 import deptTreeOnly from "../../../components/deptTreeOnly.vue"
 
 export default {
@@ -153,7 +158,7 @@ export default {
         myUpload,
         mySearch,
         toolList,
-        myMessage,
+        myMessageNew,
         deptTreeOnly
     },
     data() {
@@ -220,6 +225,7 @@ export default {
             issuedLogPageSize: 1,
             issuedLogParams: {},
             issuedLogTotal: 0,
+            delIssuedUserId: ''
         }
     },
     methods: {
@@ -301,6 +307,38 @@ export default {
             var _this = this;
             _this.jumpinfop('/incomeExcelInfo', 4, '查看收入信息', row.id);
         },
+        checkDelete(row) {
+            this.deleteTag = '确认删除吗？';
+            this.centerDialogVisible = true;
+            this.delIssuedUserId = row.id;
+        },
+        processDelete(v) {
+            this.centerDialogVisible = false;
+            var _this = this;
+            if (v === 1) {
+                this.$http({
+                    url: "/market/cIncomeExcelIssued/deleteIssued",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: {issuedUserId: this.delIssuedUserId},
+                }).then((res) => {
+                    if (res.data.result === 1) {
+                        _this.$message({
+                            message: '删除失败',
+                            type: 'error'
+                        });
+                    } else {
+                        _this.$message({
+                            message: '删除成功',
+                            type: 'success'
+                        });
+                        _this.getList({}, _this.pageSize);
+                    }
+                });
+            }
+        },
         toEdit(row) {
             var _this = this;
             _this.jumpinfop('/incomeExcelInfo', 5, '处理收入信息', row.id);

src/pages/main/incomeExcel/incomeExcelViewInfo.vue

@@ -1,7 +1,9 @@
 <template>
     <div class="container" id="container" v-loading="loading">
-        <iframe height="100%" width="100%" src="/marketfront/static/views/incomeViewExcel.html" frameborder="0"
-                ref="iframe" name="excelIframe" id="excelIframe"></iframe>
+        <fullscreen :fullscreen.sync="fullscreen" class="container" style="margin: 0;width: 100%;">
+            <iframe height="100%" width="100%" src="/marketfront/static/views/incomeViewExcel.html" frameborder="0"
+                    ref="iframe" name="excelIframe" id="excelIframe"></iframe>
+        </fullscreen>
         <el-dialog :title="'权限设置'" :visible.sync="authSettingStatus" width="70%" :destroy-on-close="true"
                    :modal-append-to-body="false" :close-on-click-modal="false">
             <el-form :model="testModel" ref="addInfoList">
@@ -9,9 +11,12 @@
                     <div class="info-line">
                         <div id="noLimit" class="info-line">
                             <span style="margin-right: 10px;margin-left: 40px">请设置表头范围：从</span>
-                            <el-input v-model="topStart" style="width: 80px;" type="number" min="1" oninput="value=value.replace('-','')"></el-input>
+                            <el-input v-model="topStart" style="width: 80px;" type="number" min="1"
+                                      oninput="value=value.replace('-','')"></el-input>
                             <span style="margin-right: 10px;margin-left: 10px">到</span>
-                            <el-input v-model="topEnd" style="width: 80px;" type="number" min="1" oninput="value=value.replace('-','')"></el-input>行
+                            <el-input v-model="topEnd" style="width: 80px;" type="number" min="1"
+                                      oninput="value=value.replace('-','')"></el-input>
+                            行
                             <br/><br/>
                             <span style="margin-right: 10px;margin-left: 40px;font-size: 12px;color: red">注意：表头跟随可查看行进行组合下发，可查看行不填写，默认可查看整个表</span>
                             <br/><br/>
@@ -24,9 +29,11 @@
                                 <el-button type="primary" @click="limitUserAdd(index)">组织机构</el-button>
                                 <span style="margin-right: 20px;margin-left: 20px">{{ item.userName }}</span>
                                 <span style="margin-right: 10px;margin-left: 10px">可查看行：从</span>
-                                <el-input v-model="item.editStart" style="width: 80px;" type="number" min="1" oninput="value=value.replace('-','')"></el-input>
+                                <el-input v-model="item.editStart" style="width: 80px;" type="number" min="1"
+                                          oninput="value=value.replace('-','')"></el-input>
                                 <span style="margin-right: 10px;margin-left: 10px">到</span>
-                                <el-input v-model="item.editEnd" style="width: 80px;" type="number" min="1" oninput="value=value.replace('-','')"></el-input>
+                                <el-input v-model="item.editEnd" style="width: 80px;" type="number" min="1"
+                                          oninput="value=value.replace('-','')"></el-input>
                                 <br/><br/>
                             </div>
                             <el-button style="width: 80px;margin-right: 20px;margin-left: 40px"
@@ -76,6 +83,8 @@ export default {
     },
     data() {
         return {
+            deleteTag: '',
+            centerDialogVisible: false,
             testModel: {},
             authSettingStatus: false,
             authType: '1',
@@ -101,8 +110,9 @@ export default {
             //审批人用到的
             treeListonly: {},
             excelData: {},
-            topStart:'',
-            topEnd:'',
+            topStart: '',
+            topEnd: '',
+            fullscreen: false,
         }
     },
     methods: {
@@ -169,8 +179,8 @@ export default {
                     userList: authUser,
                     templateType: templateType,
                     excelId: this.getUrlKey('id'),
-                    topStart:this.topStart,
-                    topEnd:this.topEnd
+                    topStart: this.topStart,
+                    topEnd: this.topEnd
                 },
             }).then((res) => {
                 this.loading = false;
@@ -392,11 +402,17 @@ export default {
                 ) || null
             );
         },
+        processFullScreen() {
+            this.fullscreen = !this.fullscreen;
+        },
     },
     mounted() {
         this.type = this.getUrlKey("type")
     },
     created() {
+        window['fullScreen'] = (rp) => {
+            this.processFullScreen(rp);
+        }
         window['showAuthDialog'] = (rp) => {
             this.showAuthDialog(rp);
         }