فهرست منبع

bug修复一波

cxmo 1 سال پیش
والد
کامیت
8f776ccf32

+ 2 - 2
src/views/approve_manage/approveDetail.vue

@@ -28,7 +28,7 @@
                 <el-button type="danger" @click="changeApprove('reject')"
                 <el-button type="danger" @click="changeApprove('reject')"
                     v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_reject')">驳回</el-button>
                     v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_reject')">驳回</el-button>
                 <el-button type="primary" @click="changeApprove('pass')"
                 <el-button type="primary" @click="changeApprove('pass')"
-                    v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_agree')">通过</el-button>
+                    v-if="formType==='approve'&&approveInfo.isCurrentApprover&&permissionBtn.isShowBtn('approvePermission','reportApprove_agree')">同意</el-button>
                 <el-button type="primary" @click="changeApprove('return')"
                 <el-button type="primary" @click="changeApprove('return')"
                     v-if="formType==='myself'&&approveInfo.state!==4&&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')">撤销</el-button>
                     v-if="formType==='myself'&&approveInfo.state!==4&&permissionBtn.isShowBtn('approvePermission','reportApprove_repeal')">撤销</el-button>
                 <el-button type="primary" plain @click="$router.replace(`/approveList?formType=${formType}`)">返回</el-button>
                 <el-button type="primary" plain @click="$router.replace(`/approveList?formType=${formType}`)">返回</el-button>
@@ -66,7 +66,7 @@ import {approveInterence} from '@/api/modules/approve.js';
 import reportApproveConfig from "@/mixins/reportApproveConfig.js"
 import reportApproveConfig from "@/mixins/reportApproveConfig.js"
 
 
 const ApproveType = ['','依次审批','会签','或签']
 const ApproveType = ['','依次审批','会签','或签']
-const ApproveState = ['','待审批','已通过','已驳回']
+const ApproveState = ['','待审批','已同意','已驳回']
 export default {
 export default {
     mixins:[reportApproveConfig],
     mixins:[reportApproveConfig],
     components: { RejectDialog },
     components: { RejectDialog },

+ 1 - 1
src/views/approve_manage/approveList.vue

@@ -116,7 +116,7 @@
             @close="isDetailDialogShow=false;currentData={};"
             @close="isDetailDialogShow=false;currentData={};"
         />
         />
     </div>
     </div>
-    <div class="approve-page-wrap"v-else>
+    <div class="approve-page-wrap" v-else>
         <tableNoData :text="pageLoading?'':'系统暂未开通审批流程,请开启审批流程后再进行操作!'"></tableNoData>
         <tableNoData :text="pageLoading?'':'系统暂未开通审批流程,请开启审批流程后再进行操作!'"></tableNoData>
     </div>
     </div>
 </template>
 </template>

+ 1 - 1
src/views/report_manage/reportEn/reportlist.vue

@@ -38,7 +38,7 @@
                             size="medium"
                             size="medium"
                             style="width:100%;"
                             style="width:100%;"
                         >
                         >
-                            <el-option label="发布时间" value="publish_time"></el-option>
+                            <el-option :label="isApprove?'审批时间':'发布时间'" value="publish_time"></el-option>
                             <el-option label="更新时间" value="modify_time"></el-option>
                             <el-option label="更新时间" value="modify_time"></el-option>
                         </el-select>
                         </el-select>
                     </div>
                     </div>