vue2-client 1.4.20 → 1.4.22

package/src/pages/system/monitor/loginInfor/index.vue

@@ -1,36 +1,36 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="登录日志"
-      :queryParamsName="queryParamsName"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'loginInfor',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'loginInforQueryParams',
-      // 是否显示详情抽屉
-      detailVisible: false
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="登录日志"
+      :queryParamsName="queryParamsName"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'loginInfor',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 选中的编号
+      selectNo: undefined,
+      // 查询配置文件名
+      queryParamsName: 'loginInforQueryParams',
+      // 是否显示详情抽屉
+      detailVisible: false
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      this.selectNo = id + ''
+      this.detailVisible = true
+    }
+  }
+}
+</script>

package/src/pages/system/monitor/operLog/index.vue

@@ -1,36 +1,36 @@
-<template>
-  <a-card :bordered="false">
-    <x-form-table
-      title="操作日志"
-      :queryParamsName="queryParamsName"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-
-export default {
-  name: 'operLog',
-  components: {
-    XFormTable
-  },
-  data () {
-    return {
-      // 选中的编号
-      selectNo: undefined,
-      // 查询配置文件名
-      queryParamsName: 'operLogQueryParams',
-      // 是否显示详情抽屉
-      detailVisible: false
-    }
-  },
-  methods: {
-    toDetail (record, id) {
-      this.selectNo = id + ''
-      this.detailVisible = true
-    }
-  }
-}
-</script>
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="操作日志"
+      :queryParamsName="queryParamsName"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+
+export default {
+  name: 'operLog',
+  components: {
+    XFormTable
+  },
+  data () {
+    return {
+      // 选中的编号
+      selectNo: undefined,
+      // 查询配置文件名
+      queryParamsName: 'operLogQueryParams',
+      // 是否显示详情抽屉
+      detailVisible: false
+    }
+  },
+  methods: {
+    toDetail (record, id) {
+      this.selectNo = id + ''
+      this.detailVisible = true
+    }
+  }
+}
+</script>

package/src/pages/system/queryParams/index.vue

@@ -1,43 +1,43 @@
-<template>
-  <a-card :bordered="false">
-    <query-params-details-view
-      v-if="selectId"
-      :id="selectId"
-      :visible.sync="detailVisible"
-    />
-    <x-form-table
-      :queryParamsName="queryParamsName"
-      title="查询配置"
-      @action="toDetail">
-    </x-form-table>
-  </a-card>
-</template>
-
-<script>
-  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
-  import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
-
-  export default {
-    name: 'QueryParams',
-    components: {
-      XFormTable,
-      QueryParamsDetailsView
-    },
-    data () {
-      return {
-        // 选中的编号
-        selectId: undefined,
-        // 查询配置文件名
-        queryParamsName: 'queryParams',
-        // 是否显示详情抽屉
-        detailVisible: false
-      }
-    },
-    methods: {
-      toDetail (record, id) {
-        this.selectId = id + ''
-        this.detailVisible = true
-      }
-    }
-  }
-</script>
+<template>
+  <a-card :bordered="false">
+    <query-params-details-view
+      v-if="selectId"
+      :id="selectId"
+      :visible.sync="detailVisible"
+    />
+    <x-form-table
+      :queryParamsName="queryParamsName"
+      title="查询配置"
+      @action="toDetail">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+  import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+  import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
+
+  export default {
+    name: 'QueryParams',
+    components: {
+      XFormTable,
+      QueryParamsDetailsView
+    },
+    data () {
+      return {
+        // 选中的编号
+        selectId: undefined,
+        // 查询配置文件名
+        queryParamsName: 'queryParams',
+        // 是否显示详情抽屉
+        detailVisible: false
+      }
+    },
+    methods: {
+      toDetail (record, id) {
+        this.selectId = id + ''
+        this.detailVisible = true
+      }
+    }
+  }
+</script>

package/src/pages/system/ticket/index.vue

@@ -138,7 +138,7 @@
     </a-modal>
     <a-card>
       <div style="text-align: right">
-        <p>欢迎您！{{ currUser.ename }}</p>
+        <p>欢迎您！{{ currUser.orgName }}</p>
       </div>
       <div class="submitTicketTitle">
         <span>售后问题反馈平台</span>
@@ -150,19 +150,19 @@
             <a-col :span="18">
               <a-form :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
                 <!-- 客户名称输入 -->
-                <a-form-item v-if="!currUser.ename" label="客户名称">
-                  <a-input v-model="customerName" placeholder="请输入客户名称（总公司名+分公司名）"/>
-                  <strong v-show="showCustomerNameAlert" style="color: red">客户名称不能为空！</strong>
+                <a-form-item v-if="!currUser.orgName" label="公司名称">
+                  <a-input v-model="form.name" placeholder="请输入公司名称（总公司名+分公司名）"/>
+                  <strong v-show="showCustomerNameAlert" style="color: red">公司名称不能为空！</strong>
                 </a-form-item>
                 <!--     联系人     -->
-                <a-form-item label="联系人">
-                  <a-input v-model="form.contact"></a-input>
+                <a-form-item v-if="!currUser.contact" label="联系人">
+                  <a-input v-model="form.contact" placeholder="请输入联系人姓名"></a-input>
                   <strong v-show="showContactAlert" style="color: red">请填写联系人！</strong>
                 </a-form-item>
                 <!--     联系方式     -->
-                <a-form-item label="联系方式">
-                  <a-input v-model="form.phone"></a-input>
-                  <strong v-show="showPhoneAlert" style="color: red">联系方式填写有误！</strong>
+                <a-form-item v-if="!currUser.phone" label="联系方式">
+                  <a-input v-model="form.phone" placeholder="请输入联系方式"></a-input>
+                  <strong v-show="showPhoneAlert" style="color: red">请填写联系方式！</strong>
                 </a-form-item>
                 <!--     问题描述框     -->
                 <a-form-item label="问题详情描述">
@@ -191,7 +191,7 @@
                 </a-form-item>
                 <!--     表单底部按钮     -->
                 <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-                  <a-button :disabled="showPhoneAlert || !validCustomerName || showContactAlert || showDescAlert || !imageList.length" style="margin-right: 20px" type="primary" @click="onSubmit">
+                  <a-button :disabled="showPhoneAlert || showCustomerNameAlert || showContactAlert || showDescAlert || !imageList.length" style="margin-right: 20px" type="primary" @click="onSubmit">
                     提交
                   </a-button>
                 </a-form-item>
@@ -299,13 +299,13 @@ export default {
       fixedQueryForm: {},
       // 用户信息
       currUser: {
-        ename: ''
+        orgName: '',
+        contact: '',
+        phone: ''
       },
       tabActiveKey: 'workSubmit',
       imageUploadModel,
       fileUploadModel,
-      // 客户名称
-      customerName: undefined,
       // 未传入客户名称手动输入联系方式
       infoFormVisible: false,
       infoForm: {
@@ -314,27 +314,15 @@ export default {
       uploadVisible: true
     }
   },
-  computed: {
-    // 检查客户名称是否为空
-    validCustomerName () {
-      if (this.currUser.ename || this.customerName) {
-        return true
-      }
-      return false
-    }
-  },
   created () {
     document.title = '售后问题反馈平台'
-    let customerName = this.$route.query.orgName
-    // 分割客户名称
-    if (customerName) {
-      const partArr = customerName.split('.')
-      if (partArr.length === 5) {
-        customerName = `${partArr[1]}.${partArr[4]}`
-      }
-    }
-    this.currUser.ename = customerName
-    this.fixedQueryForm['t_uploader'] = this.currUser.ename
+    this.currUser.orgName = this.$route.query.orgName
+    this.currUser.contact = this.$route.query.contact
+    this.currUser.phone = this.$route.query.phone
+    this.form.name = this.$route.query.orgName
+    this.form.contact = this.$route.query.contact
+    this.form.phone = this.$route.query.phone
+    this.fixedQueryForm['t_uploader'] = this.currUser.orgName
   },
   methods: {
     toDetail (record, id) {
@@ -368,22 +356,14 @@ export default {
     },
     // 提交按钮逻辑
     onSubmit () {
-      let customerName = this.currUser.ename
-      if (!customerName) {
-        customerName = this.customerName
-      }
       const form = {
-        customerName,
+        customerName: this.form.name,
         contact: this.form.contact,
         phone: this.form.phone,
         problemDetail: this.form.desc,
         Images: this.imageList,
         FilesId: this.fileList
       }
-      if (form.customerName.length > 100) {
-        this.$message.error('客户名称长度超出限制')
-        return
-      }
       if (form.problemDetail.length > 300) {
         this.$message.error('问题详情长度超出限制')
         return
@@ -396,14 +376,11 @@ export default {
         this.serialNumber = res
         this.successVisible = true
         this.$message.success('创建成功')
-        this.customerName = ''
-        this.form.contact = ''
-        this.form.phone = ''
         this.form.desc = ''
         this.imageList = []
         this.fileList = []
         this.uploadVisible = false
-        if (!this.currUser.ename) {
+        if (!this.currUser.orgName) {
           this.fixedQueryForm.t_uploader_phone = form.phone
           this.infoForm.phone = form.phone
         }
@@ -443,17 +420,16 @@ export default {
   watch: {
     // 监控类别的改变，当类别改变，校验通过
     'form.contact' (newVal) {
-      this.showContactAlert = newVal.trim().length === 0
+      this.showContactAlert = !newVal || newVal.trim().length === 0
     },
     'form.phone' (newVal) {
-      const numReg = new RegExp(/^[0-9]+$/)
-      this.showPhoneAlert = !numReg.test(newVal)
+      this.showPhoneAlert = !newVal || newVal.trim().length === 0
     },
     'form.desc' (newVal) {
       this.showDescAlert = newVal.trim().length === 0
     },
-    'customerName' (newVal) {
-      this.showCustomerNameAlert = !newVal
+    'form.name' (newVal) {
+      this.showCustomerNameAlert = !newVal || newVal.trim().length === 0
     }
   }
 }

package/src/router/async/config.async.js

@@ -1,27 +1,27 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@vue2-client/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'submitTicket',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  routes: parseRoutes(routesConfig, routerMap),
-  config: routesConfig
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'submitTicket',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  routes: parseRoutes(routesConfig, routerMap),
+  config: routesConfig
+}
+
+export default options

package/src/router/async/router.map.js

@@ -1,65 +1,65 @@
-// 视图组件
-const view = {
-  tabs: () => import('@vue2-client/layouts/tabs'),
-  blank: () => import('@vue2-client/layouts/BlankView'),
-  page: () => import('@vue2-client/layouts/PageView')
-}
-// 动态路由对象定义
-const routerResource = {}
-// --------------------------------------基本视图组件--------------------------------------
-// 空白视图
-routerResource.blank = view.blank
-// 单页面视图
-routerResource.singlePage = view.blank
-
-// --------------------------------------仪表盘--------------------------------------
-routerResource.dashboard = view.blank
-// 工作台
-routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
-// --------------------------------------系统配置--------------------------------------
-routerResource.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
-// 文件管理
-routerResource.fileManager = () => import('@vue2-client/pages/system/file')
-// 登录日志
-routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
-// 操作日志
-routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
-
-// 基础路由组件注册
-const routerMap = {
-  login: {
-    authority: '*',
-    path: '/login',
-    component: () => import('@vue2-client/pages/login')
-  },
-  root: {
-    path: '/',
-    name: '首页',
-    redirect: '/login',
-    component: view.tabs
-  },
-  exp403: {
-    authority: '*',
-    name: 'exp403',
-    path: '403',
-    component: () => import('@vue2-client/pages/exception/403')
-  },
-  exp404: {
-    name: 'exp404',
-    path: '404',
-    component: () => import('@vue2-client/pages/exception/404')
-  },
-  exp500: {
-    name: 'exp500',
-    path: '500',
-    component: () => import('@vue2-client/pages/exception/500')
-  }
-}
-Object.assign(routerMap, routerResource)
-export default routerMap
+// 视图组件
+const view = {
+  tabs: () => import('@vue2-client/layouts/tabs'),
+  blank: () => import('@vue2-client/layouts/BlankView'),
+  page: () => import('@vue2-client/layouts/PageView')
+}
+// 动态路由对象定义
+const routerResource = {}
+// --------------------------------------基本视图组件--------------------------------------
+// 空白视图
+routerResource.blank = view.blank
+// 单页面视图
+routerResource.singlePage = view.blank
+
+// --------------------------------------仪表盘--------------------------------------
+routerResource.dashboard = view.blank
+// 工作台
+routerResource.workplace = () => import('@vue2-client/pages/dashboard/workplace')
+// --------------------------------------系统配置--------------------------------------
+routerResource.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
+// 文件管理
+routerResource.fileManager = () => import('@vue2-client/pages/system/file')
+// 登录日志
+routerResource.loginInfor = () => import('@vue2-client/pages/system/monitor/loginInfor')
+// 操作日志
+routerResource.operLog = () => import('@vue2-client/pages/system/monitor/operLog')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
+
+// 基础路由组件注册
+const routerMap = {
+  login: {
+    authority: '*',
+    path: '/login',
+    component: () => import('@vue2-client/pages/login')
+  },
+  root: {
+    path: '/',
+    name: '首页',
+    redirect: '/login',
+    component: view.tabs
+  },
+  exp403: {
+    authority: '*',
+    name: 'exp403',
+    path: '403',
+    component: () => import('@vue2-client/pages/exception/403')
+  },
+  exp404: {
+    name: 'exp404',
+    path: '404',
+    component: () => import('@vue2-client/pages/exception/404')
+  },
+  exp500: {
+    name: 'exp500',
+    path: '500',
+    component: () => import('@vue2-client/pages/exception/500')
+  }
+}
+Object.assign(routerMap, routerResource)
+export default routerMap

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/services/api/DictionaryDetailsViewApi.js

@@ -1,6 +1,6 @@
-const DictionaryDetailsViewApi = {
-  // 查询：获取字典详情
-  getDictionaryDetails: '/api/af-system/logic/getDictionaryDetails'
-}
-
-export { DictionaryDetailsViewApi }
+const DictionaryDetailsViewApi = {
+  // 查询：获取字典详情
+  getDictionaryDetails: '/api/af-system/logic/getDictionaryDetails'
+}
+
+export { DictionaryDetailsViewApi }

package/src/services/api/LogDetailsViewApi.js

@@ -1,10 +1,10 @@
-const LogDetailsViewApi = {
-  // 查询：获取日志详情
-  getLogDetails: '/api/af-system/logic/foreignaidGetLogDetails',
-  // 查询：获取日志维护记录
-  getLogRecordList: '/api/af-system/logic/foreignaidGetRecordList',
-  // 操作：更新日志状态
-  updateLogStatusData: '/api/af-system/logic/foreignaidUpdateLogStatus'
-}
-
-export { LogDetailsViewApi }
+const LogDetailsViewApi = {
+  // 查询：获取日志详情
+  getLogDetails: '/api/af-system/logic/foreignaidGetLogDetails',
+  // 查询：获取日志维护记录
+  getLogRecordList: '/api/af-system/logic/foreignaidGetRecordList',
+  // 操作：更新日志状态
+  updateLogStatusData: '/api/af-system/logic/foreignaidUpdateLogStatus'
+}
+
+export { LogDetailsViewApi }