收入统计-问题处理

src/pages/main/incomeExcel/incomeExcelAppendix.vue

@@ -17,7 +17,7 @@
                           tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
                     <el-table-column prop="appendixName" label="名称" align="center">
                     </el-table-column>
-                    <el-table-column prop="opTime" label="发起时间" align="center">
+                    <el-table-column prop="opTime" label="发起时间" align="center" width="90">
                     </el-table-column>
                     <el-table-column prop="deptName" label="发起部门" align="center">
                     </el-table-column>
@@ -60,7 +60,8 @@
                     <div class="info-line">
                         <el-form-item prop="testInfo">
                             <span>名称</span>
-                            <el-input v-model="addDialogParam.name" placeholder="名称" :disabled="addDisabled"></el-input>
+                            <el-input v-model="addDialogParam.name" placeholder="名称" v-if="!addDisabled"></el-input>
+                            <label v-else>{{addDialogParam.name}}</label>
                         </el-form-item>
                     </div>
                     <div class="info-line">
@@ -68,14 +69,16 @@
                             <span>截止日期</span>
                             <el-date-picker type="date" placeholder="截止日期" v-model="addDialogParam.endTime"
                                             :picker-options="pickerOptions" value-format="yyyy-MM-dd"
-                                            :disabled="addDisabled"></el-date-picker>
+                                            v-if="!addDisabled"></el-date-picker>
+                            <label v-else>{{addDialogParam.endTime}}</label>
                         </el-form-item>
                     </div>
                     <div class="info-line">
                         <el-form-item prop="testInfo">
                             <span>材料说明</span>
                             <el-input v-model="addDialogParam.remark" placeholder="材料说明"
-                                      :disabled="addDisabled"></el-input>
+                                      v-if="!addDisabled"></el-input>
+                            <label v-else>{{addDialogParam.remark}}</label>
                         </el-form-item>
                     </div>
                     <div class="info-line" v-if="addDialogParam.type == '1'">
@@ -106,21 +109,19 @@
                     <div class="info-line">
                         <el-form-item prop="testInfo">
                             <span>名称</span>
-                            <el-input v-model="addDialogParam.name" placeholder="名称" :disabled="true"></el-input>
+                            {{addDialogParam.name}}
                         </el-form-item>
                     </div>
                     <div class="info-line">
                         <el-form-item prop="testInfo">
                             <span>截止日期</span>
-                            <el-date-picker type="date" placeholder="截止日期" v-model="addDialogParam.endTime"
-                                            :picker-options="pickerOptions" value-format="yyyy-MM-dd"
-                                            :disabled="true"></el-date-picker>
+                            {{addDialogParam.endTime}}
                         </el-form-item>
                     </div>
                     <div class="info-line">
                         <el-form-item prop="testInfo">
                             <span>材料说明</span>
-                            <el-input v-model="addDialogParam.remark" placeholder="材料说明" :disabled="true"></el-input>
+                            {{addDialogParam.remark}}
                         </el-form-item>
                     </div>
                     <div class="info-line">
@@ -429,6 +430,7 @@ export default {
             this.addDialogParam = {
                 type: '1'
             };
+            this.addDisabled = false;
             this.addDialogStatus = true;
         },
         processAddNew() {

src/pages/main/incomeExcel/incomeExcelIssued.vue

@@ -33,7 +33,8 @@
                     </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 == 0 && scope.row.type != '3'">待处理</span>
+                            <span v-if="scope.row.state == 0 && scope.row.type == '3'">待审批</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>

src/pages/main/incomeExcel/incomeExcelViewInfo.vue

@@ -224,7 +224,7 @@ export default {
                     success = false;
                     return;
                 }
-                if (this.topStart > this.topEnd) {
+                if (parseInt(this.topStart) > parseInt(this.topEnd)) {
                     this.$message({
                         message: '表头行开始不能大于结束',
                         type: 'error'
@@ -241,7 +241,10 @@ export default {
                         success = false;
                         return;
                     }
-                    if (o.editStart > o.editEnd) {
+                    console.log(o.editStart);
+                    console.log(o.editEnd);
+                    console.log(o.editStart > o.editEnd);
+                    if (parseInt(o.editStart) > parseInt(o.editEnd)) {
                         this.$message({
                             message: '可查看行开始不能大于结束',
                             type: 'error'