From 62b642aab5475ca6b1f821c6c34eee43a2e9b44b Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 17 Apr 2024 11:32:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue | 5 +++--
 src/views/system/user/authRole.vue | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 028378d3..b6bbf4d2 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -883,7 +883,7 @@ export default {
 			if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){
 				this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}**/
+			}
 
       if (
         this.queryParams.feedbackTimeArray != null &&
@@ -895,7 +895,7 @@ export default {
         this.queryParams.feedbackTimeEnd = moment(
           this.queryParams.feedbackTimeArray[1]
         ).format("YYYY-MM-DD");
-      }
+      }**/
       this.loading = true;
       listReportWork(this.queryParams).then((response) => {
         this.reportWorkList = response.rows;
@@ -922,6 +922,7 @@ export default {
       this.openConsume = false;
       this.loading = false;
       this.reset();
+      this.getList();
     },
     getSummaries(param) {
       const { columns, data } = param;
diff --git a/src/views/system/user/authRole.vue b/src/views/system/user/authRole.vue
index ab5e72fc..bf6a2f86 100644
--- a/src/views/system/user/authRole.vue
+++ b/src/views/system/user/authRole.vue
@@ -39,7 +39,7 @@
     <el-form label-width="100px">
       <el-form-item style="text-align: center;margin-left:-120px;margin-top:30px;">
         <el-button type="primary" @click="submitForm()">提交</el-button>
-        <el-button @click="close()">返回</el-button>
+        <!--<el-button @click="close()">返回</el-button>-->
       </el-form-item>
     </el-form>
   </div>
@@ -104,13 +104,13 @@ export default {
       const roleIds = this.roleIds.join(",");
       updateAuthRole({ userId: userId, roleIds: roleIds }).then((response) => {
         this.$modal.msgSuccess("授权成功");
-        this.close();
+        //this.close();
       });
     },
     /** 关闭按钮 */
     close() {
-      const obj = { path: "/system/user" };
-      this.$tab.closeOpenPage(obj);
+      //const obj = { path: "/system/user" };
+      //this.$tab.closeOpenPage(obj);
     },
   },
 };