From e6b6483fcd231b9001e825258be6d77eb4b61189 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Mon, 6 Sep 2021 10:31:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{inconmeMeetingApi.js => incomeMeetingApi.js}  |  0
 src/components/jero/JImageUpload.vue               |  1 +
 .../incomePayments/meetManage/AddOrDetailMeet.vue  |  3 ++-
 src/views/system/ConfusionList.vue                 |  2 +-
 src/views/system/DepartList.vue                    | 14 +++++++-------
 src/views/system/DictList.vue                      |  4 ++--
 src/views/system/QuartzJobList.vue                 |  2 +-
 src/views/system/RoleUserList.vue                  |  7 +++----
 src/views/system/UserList.vue                      |  6 +++---
 9 files changed, 20 insertions(+), 19 deletions(-)
 rename src/api/{inconmeMeetingApi.js => incomeMeetingApi.js} (100%)

diff --git a/src/api/inconmeMeetingApi.js b/src/api/incomeMeetingApi.js
similarity index 100%
rename from src/api/inconmeMeetingApi.js
rename to src/api/incomeMeetingApi.js
diff --git a/src/components/jero/JImageUpload.vue b/src/components/jero/JImageUpload.vue
index 16c4bbc..ea6ff82 100644
--- a/src/components/jero/JImageUpload.vue
+++ b/src/components/jero/JImageUpload.vue
@@ -33,6 +33,7 @@
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { getFileAccessHttpUrl } from '@/api/manage'
+  // eslint-disable-next-line
   const Base64 = require('js-base64').Base64
 
   const uidGenerator=()=>{
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 0e57a90..41499aa 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -301,7 +301,7 @@
 </template>
 
 <script>
-import {getUserInfo, getMeetInfoById,getAllWorkProjects} from '@api/inconmeMeetingApi'
+import {getUserInfo, getMeetInfoById,getAllWorkProjects} from '@api/incomeMeetingApi'
 import {isRepeat} from '@/utils/util'
 import {httpAction} from '@api/manage'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
@@ -497,6 +497,7 @@ export default {
           hotelContactsPhone: ''
         }]
       } else {
+        // eslint-disable-next-line
         if (this.model.hasOwnProperty('hotelContactsList')) {
           delete this.model.hotelContactsList
         }
diff --git a/src/views/system/ConfusionList.vue b/src/views/system/ConfusionList.vue
index ae931ab..e24d563 100644
--- a/src/views/system/ConfusionList.vue
+++ b/src/views/system/ConfusionList.vue
@@ -32,7 +32,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('混淆表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 364cd61..5ca9097 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -4,7 +4,7 @@
       <a-card :bordered="false" style="padding: 12px 0;">
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px" class="table-operator">
-          <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
+          <a-button @click="handleAdd(1)" type="primary">新增</a-button>
           <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
           <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
           <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
@@ -170,9 +170,9 @@ import DepartModal from './modules/DepartModal'
 import DeptUserInfo from './modules/DeptUserInfo'
 import pick from 'lodash.pick'
 import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
-import {httpAction, deleteAction} from '@/api/manage'
+import {httpAction,getAction} from '@/api/manage'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import DepartAuthModal from './modules/DepartAuthModal'
+// import DepartAuthModal from './modules/DepartAuthModal'
 import {checkDepartName} from '@/utils/validateOnly'
 // 表头
 const columns = [
@@ -217,7 +217,7 @@ export default {
   name: 'DepartList',
   mixins: [JeroListMixin],
   components: {
-    DepartAuthModal,
+    // DepartAuthModal,
     DepartModal,
     DeptUserInfo
   },
@@ -600,11 +600,11 @@ export default {
       //this.checkedKeys = this.defaultCheckedKeys
       this.checkedKeys = []
     },
-    callback(val){
+    callback(){
       // tab页切换为基本信息时候 清除表单验证
       console.log(this.form)
-      if(val === '1' && this.form){
-      }
+      // if(val === '1' && this.form){
+      // }
       // 可能后期会切换回显之前的数据
     },
     // switchCheckStrictly (v) {
diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index a305cfd..9fbf377 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -25,7 +25,7 @@
       </a-form>
 
       <div class="table-operator" style="border-top: 5px">
-        <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:dict:add'">添加</a-button>
+        <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:dict:add'">新增</a-button>
         <a-button type="primary" icon="download" @click="handleExportXls('字典信息')" v-has="'sys:dict:export'">导出</a-button>
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" v-has="'sys:dict:import'" @change="handleImportExcel">
           <a-button type="primary" icon="import">导入</a-button>
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-  import { filterObj } from '@/utils/util'
+  // import { filterObj } from '@/utils/util'
   import { JeroListMixin } from '@/mixins/JeroListMixin'
   import DictModal from './modules/DictModal'
   import DictItemList from './DictItemList'
diff --git a/src/views/system/QuartzJobList.vue b/src/views/system/QuartzJobList.vue
index 9ea31b0..f7c728f 100644
--- a/src/views/system/QuartzJobList.vue
+++ b/src/views/system/QuartzJobList.vue
@@ -34,7 +34,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel">
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index edd9e5f..16579c2 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -21,7 +21,7 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="margin: 5px 0 10px 2px">
-      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:role:add'">添加角色</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:role:add'">新增</a-button>
       <a-button @click="handleAddLowerLevel" type="primary" icon="plus">添加下级</a-button>
       <a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
     </div>
@@ -58,9 +58,8 @@
 </template>
 <script>
 import {JeroListMixin} from '@/mixins/JeroListMixin'
-import {postAction, getAction} from '@/api/manage'
+import {postAction} from '@/api/manage'
 import RoleModal from './modules/RoleModal'
-import {filterObj} from '@/utils/util'
 import UserRoleModal from './modules/UserRoleModal'
 import JEllipsis from '@comp/jero/JEllipsis'
 import moment from 'moment'
@@ -73,7 +72,6 @@ export default {
     UserRoleModal,
     RoleModal,
     JEllipsis,
-    moment
   },
   data() {
     return {
@@ -145,6 +143,7 @@ export default {
     }
   },
   methods: {
+    moment,
     selectOK(data) {
       let params = {}
       params.roleId = this.currentRoleId
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 8fe1556..d1c352f 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -54,7 +54,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
-      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">添加用户</a-button>
+      <a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">新增</a-button>
       <a-button @click="downTemplate('用户导入模板')" type="primary" icon="download">下载模板</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -103,7 +103,7 @@ import UserModal from './modules/UserModal'
 import {getAction, getFileAccessHttpUrl} from '@/api/manage'
 import '@/assets/less/TableExpand.less'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import JInput from '@/components/jero/JInput'
+// import JInput from '@/components/jero/JInput'
 import JEllipsis from '@comp/jero/JEllipsis'
 import {queryDepartTreeList, resetUserPassword} from '@api/api'
 
@@ -113,7 +113,7 @@ export default {
   mixins: [JeroListMixin],
   components: {
     UserModal,
-    JInput,
+    // JInput,
     JEllipsis
   },
   data() {