Browse Source

收入统计-问题处理

fan 2 years ago
parent
commit
266f5d97d8

+ 16 - 1
src/pages/main/incomeExcel/incomeExcelAppendix.vue

@@ -165,7 +165,7 @@
                 </div>
             </el-dialog>
 
-            <el-dialog title="查看" :visible.sync="appendixInfoStatus" width="70%" :close-on-press-escape="false"
+            <el-dialog title="回复详情" :visible.sync="appendixInfoStatus" width="70%" :close-on-press-escape="false"
                        :show-close="true" :before-close="closeAppendixInfo" :destroy-on-close="true"
                        :modal-append-to-body="false"
                        :close-on-click-modal="false" :fullscreen="true">
@@ -309,6 +309,7 @@ export default {
                 excelId: row.appendixId,
                 name: row.appendixName
             }
+            this.appendixInfoPageSize = 1;
             this.getAppendixInfoPage(this.appendixInfoParams, this.appendixInfoPageSize);
             this.appendixInfoStatus = true;
         },
@@ -410,6 +411,20 @@ export default {
                 });
                 return;
             }
+            if (this.addDialogParam.name.length > 240) {
+                this.$message({
+                    message: '名称长度不能大于240字',
+                    type: 'error'
+                });
+                return;
+            }
+            if (this.addDialogParam.remark.length > 300) {
+                this.$message({
+                    message: '材料说明长度不能大于300字',
+                    type: 'error'
+                });
+                return;
+            }
             if (this.attList.length == 0) {
                 this.$message({
                     message: '请上传附件',

+ 10 - 1
src/pages/main/incomeExcel/incomeExcelInfo.vue

@@ -164,7 +164,8 @@ export default {
             //审批人用到的
             treeListonly: {},
             excelData: {},
-            fullscreen: false
+            fullscreen: false,
+            addInfoList: []
         }
     },
     methods: {
@@ -206,6 +207,14 @@ export default {
                     return;
                 }
             }
+            if (this.auditForm.auditRemark
+                && this.auditForm.auditRemark.length > 240) {
+                this.$message({
+                    message: '意见内容长度不能大于240字',
+                    type: 'error'
+                });
+                return;
+            }
             //提交
             var _this = this;
             var url = '/market/cIncomeExcelIssued/excelDataProcessAuth';

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

@@ -5,6 +5,10 @@
             <div class="search">
                 <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
             </div>
+            <br/>
+            <div>
+                <span style="color: red">提示:查看回复信息请点击接收人名称查看</span>
+            </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">
@@ -387,6 +391,14 @@ export default {
                     return;
                 }
             }
+            if (this.auditForm.auditRemark
+                && this.auditForm.auditRemark.length > 240) {
+                this.$message({
+                    message: '意见内容长度不能大于240字',
+                    type: 'error'
+                });
+                return;
+            }
             //提交
             var _this = this;
             var url = '/market/cIncomeExcelIssued/issuedUserProcessAuth';

+ 14 - 0
src/pages/main/incomeExcel/incomeExcelTemplate.vue

@@ -235,6 +235,20 @@ export default {
                 });
                 return;
             }
+            if (this.issuedParam.editReason.length > 240) {
+                this.$message({
+                    message: '填报事由长度不能大于240字',
+                    type: 'error'
+                });
+                return;
+            }
+            if (this.issuedParam.editRemark.length > 240) {
+                this.$message({
+                    message: '填报注意事项长度不能大于240字',
+                    type: 'error'
+                });
+                return;
+            }
             var _this = this;
             //执行下发
             this.$http({

+ 8 - 3
src/pages/main/incomeExcel/incomeExcelViewInfo.vue

@@ -254,9 +254,6 @@ export default {
                         success = false;
                         return;
                     }
-                    console.log(o.editStart);
-                    console.log(o.editEnd);
-                    console.log(o.editStart > o.editEnd);
                     if (parseInt(o.editStart) > parseInt(o.editEnd)) {
                         this.$message({
                             message: '可查看行开始不能大于结束',
@@ -265,6 +262,14 @@ export default {
                         success = false;
                         return;
                     }
+                    if (parseInt(o.editStart) <= parseInt(this.topEnd)) {
+                        this.$message({
+                            message: '可查看行不能包括表头行',
+                            type: 'error'
+                        });
+                        success = false;
+                        return;
+                    }
                 });
             }
             if (success) {