From 0a5d8cc23b07868782e712baa6fcc10d8a392354 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 6 Mar 2025 16:54:57 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/Abnormal/AbnormalFeedBack.vue | 10 ++++++----
 src/views/modules/sys/user.vue                  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue
index 0755839..b3d9624 100644
--- a/src/views/modules/Abnormal/AbnormalFeedBack.vue
+++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue
@@ -184,7 +184,7 @@
         width="340"
         label="操作">
         <template slot-scope="scope">
-          <a type="text" size="small" v-if="searchData.userId==='admin'||searchData.userId==='E0002'" @click="updateModel(scope.row)">修改</a>
+          <a type="text" size="small"  v-if="(searchData.userId==='admin'||searchData.userId==='E0002')&&scope.row.status!='已完结'" @click="updateModel(scope.row)">修改</a>
           <a type="text" size="small" @click="getFileModel(scope.row)">整改文件</a>
           <a type="text" size="small" @click="getDetailModel(scope.row)">查看</a>
           <a type="text" size="small" @click="doPrint(scope.row)">打印</a>
@@ -431,7 +431,7 @@
     </el-dialog>
     <el-dialog title="整改文件" :close-on-click-modal="false" v-drag :visible.sync="fileModalFlag" width="650px" >
       <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
-        <el-form :inline="true" label-position="top" style="margin-top: 0px">
+        <el-form :inline="true" label-position="top" style="margin-top: 0px" v-if="fileSearchData.status!=='已完结'">
           <el-button type="primary" @click="addUploadFileModal">上传文件</el-button>
         </el-form>
       </el-form>
@@ -466,7 +466,7 @@
           <template slot-scope="scope">
             <!--              <a :href="'http://192.168.1.130:80/file/'+scope.row.url" :download="scope.row.fileName">下载</a>-->
             <a  @click="downloadFile(scope.row)" >下载</a>
-            <a type="text" size="small"  @click="deleteHandle(scope.row.id)">删除</a>
+            <a type="text" size="small" v-if="fileSearchData.status!=='已完结'" @click="deleteHandle(scope.row.id)">删除</a>
           </template>
         </el-table-column>
       </el-table>
@@ -600,7 +600,8 @@
         fileSearchData:{
           fileTypeCode:'Abnormal',
           orderRef1:'',
-          orderRef2:''
+          orderRef2:'',
+          status:'',
         },
         tableData:[],
         addData:{
@@ -1043,6 +1044,7 @@
           fileTypeCode:'Abnormal',
           orderRef1:row.site,
           orderRef2:row.id,
+          status:row.status,
         }
         this.getFileList()
         this.fileModalFlag=true;
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index dd0204c..5fc2d77 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -64,8 +64,8 @@
         width="150"
         label="操作">
         <template slot-scope="scope">
+          <a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</a>
           <span v-if="scope.row.userId !==1">
-            <a v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</a>
 <!--            <a v-if="isAuth('sys:user:update')&&scope.row.status==1 " type="text" size="small" @click="updateHandle(scope.row.userId,0)">禁用</a>-->
 <!--            <a v-if="isAuth('sys:user:update')&&scope.row.status==0 " type="text" size="small" @click="updateHandle(scope.row.userId,1)">启用</a>-->
             <a v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</a>