bugfix-3640,3642

src/views/report_manage/reportlist.vue

@@ -104,7 +104,7 @@
                             style="width:100%;"
                             @change="search"
                         >
-                            <el-option label="未提交" :value="1"></el-option>
+                            <el-option label="待提交" :value="1"></el-option>
                             <el-option label="待审批" :value="2"></el-option>
                             <el-option label="已审批" :value="4"></el-option>
                             <el-option label="已驳回" :value="3"></el-option>
@@ -210,7 +210,7 @@
               style="width: 140px"
               @change="search"
             >
-              <el-option label="未提交" :value="1"></el-option>
+              <el-option label="待提交" :value="1"></el-option>
               <el-option label="待审批" :value="2"></el-option>
               <el-option label="已审批" :value="4"></el-option>
               <el-option label="已驳回" :value="3"></el-option>
@@ -323,7 +323,7 @@
           </el-table-column>
           <el-table-column label="状态" align="center" v-if="isApprove">
             <template slot-scope="scope">
-                <span v-if="scope.row.State == '1'">未提交</span>
+                <span v-if="scope.row.State == '1'">待提交</span>
                 <span v-if="scope.row.State == '2'">待审批</span>
                 <span v-if="scope.row.State == '4'">已审批</span>
                 <span v-if="scope.row.State == '3'">已驳回</span>
@@ -439,7 +439,7 @@
                 </template>
                 <!--走审批流的按钮,权限与原先按钮对应-->
                 <template v-if="isApprove">
-                    <!--未提交-->
+                    <!--待提交-->
                     <template v-if="scope.row.State===1">
                         <span v-permission="permissionBtn.reportManageBtn.reportManage_publish"
                             @click="publishreport(scope.row)"
@@ -457,12 +457,14 @@
                             v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
                             @click="canclepublish(scope.row)"
                             class="editsty">撤销</span>
-                        <span
-                            v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                            style="color: #4099ef; cursor: pointer" @click="messageSend(scope.row)">推送消息</span>
-                        <span
-                            v-else-if="scope.row.MsgIsSend != 0&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
-                            style="color: red">已推送消息</span>
+                        <template v-if="scope.row.State!==2">
+                            <span
+                                v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
+                                style="color: #4099ef; cursor: pointer" @click="messageSend(scope.row)">推送消息</span>
+                            <span
+                                v-else-if="scope.row.MsgIsSend != 0&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
+                                style="color: red">已推送消息</span>
+                        </template>
                     </template>
 
                     <!--已驳回则只显示撤销按钮-->

src/views/smartReport/reportList.vue

@@ -88,7 +88,7 @@
                         style="width: 140px"
                         @change="search"
                     >
-                        <el-option label="未提交" :value="1"></el-option>
+                        <el-option label="待提交" :value="1"></el-option>
                         <el-option label="待审批" :value="2"></el-option>
                         <el-option label="已审批" :value="4"></el-option>
                         <el-option label="已驳回" :value="3"></el-option>
@@ -197,7 +197,7 @@
                 </el-table-column>
                 <el-table-column label="状态" align="center" v-if="isApprove">
                     <template slot-scope="scope">
-                        <span v-if="scope.row.State == '1'">未提交</span>
+                        <span v-if="scope.row.State == '1'">待提交</span>
                         <span v-if="scope.row.State == '2'">待审批</span>
                         <span v-if="scope.row.State == '4'">已审批</span>
                         <span v-if="scope.row.State == '3'">已驳回</span>
@@ -314,7 +314,7 @@
                         </template>
                         <!-- 走审批流的按钮 -->
                         <template v-if="isApprove">
-                            <!-- 未提交 -->
+                            <!-- 待提交 -->
                             <template v-if="scope.row.State == 1">
                                 <span v-permission="permissionBtn.smartReportManageBtn.reportManage_publish"
                                     class="editsty" @click="handlePublishReportOpt(scope.row)"