From 2819b7a655b83917e547ca503cab219922c6bc39 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期五, 30 九月 2022 11:13:50 +0800
Subject: [PATCH] 1

---
 package.json                        |    1 +
 src/views/userManage/roleManage.vue |   26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 80273b0..78b834c 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "esri-loader": "^2.14.0",
     "install": "^0.13.0",
     "jquery": "^3.6.0",
+    "moment": "^2.29.4",
     "npm": "^8.15.1",
     "ol": "^6.15.1",
     "sql.js": "^1.5.0",
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 7d0137e..6c5b752 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -34,7 +34,7 @@
           >
         </el-form-item>
         <el-form-item>
-          <el-button
+          <el-button @click="onSubmit('ruleForm')"
             ><i class="el-icon-search"></i> &nbsp;{{
               $t('userManage.RM.query')
             }}</el-button
@@ -66,7 +66,7 @@
 
         <el-table-column
           align="center"
-          prop="depid"
+          prop="depName"
           :label="$t('userManage.RM.ownedSystem')"
         />
         <el-table-column
@@ -84,6 +84,7 @@
           align="center"
           prop="createTime"
           :label="$t('userManage.RM.creationtime')"
+          :formatter="formatTime"
         />
         <el-table-column
           align="center"
@@ -94,6 +95,7 @@
           align="center"
           prop="updateTime"
           :label="$t('userManage.RM.updateontime')"
+          :formatter="formatTime"
         />
         <el-table-column
           align="center"
@@ -249,6 +251,7 @@
 </template>
 
 <script>
+import moment from 'moment';
 import MyBread from '../../components/MyBread.vue';
 import roleDepTree from './roleDepTree.vue';
 import {
@@ -282,12 +285,21 @@
       count: 0,
       selData: [],
       listData: {
+        name: null,
+        depName: null,
         pageIndex: 1,
         pageSize: 10,
       },
     };
   },
   methods: {
+    formatTime(row, column) {
+      let date = row[column.property]; // 鎴戣繖閲岀殑crtime=1657528899鎵�浠ヨ繖閲�*1000
+      if (date === undefined || date === null) {
+        return '';
+      }
+      return moment(parseInt(date)).format('YYYY-MM-DD HH:mm:ss');
+    },
     showDepTree(res) {
       this.showCata = true;
       this.elTreeFlag = res;
@@ -308,7 +320,7 @@
       switch (this.elTreeFlag) {
         case 1:
           this.roleForm.value = value;
-
+          this.roleForm.depid = this.path_id;
           break;
         case 2:
           this.insertform.depid = this.path_id;
@@ -324,7 +336,10 @@
       if (this.listData.tab == '') {
         delete this.listData.tab;
       }
+      this.listData.name = this.roleForm.username;
+      this.listData.depName = this.roleForm.value;
       const data = await select_Role_ByPageAndCount(this.listData);
+      console.log(data.result);
       if (data.code != 200) {
         this.$message.error('鍒楄〃璋冪敤澶辫触');
       }
@@ -434,10 +449,13 @@
       this.UpdateFormdialog = true;
     },
     onSubmit() {
-      console.log('submit!');
+      console.log(this.roleForm);
+      this.getRoleTabelData();
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();
+      this.roleForm = {};
+      this.getRoleTabelData();
     },
   },
   created() {

--
Gitblit v1.9.3