vue2-client 1.2.115 → 1.3.0

package/src/pages/login/Login.vue

@@ -199,16 +199,20 @@ export default {
       this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
     },
     setAccessToken (data) {
-      localStorage.setItem(ACCESS_TOKEN, data)
-      let timestamp = new Date().getTime()// 当前的时间戳
-      timestamp = timestamp + 12 * 60 * 60 * 1000
-      // 格式化时间获取年月日, 登陆过期时间
-      const dateAfter = new Date(timestamp)
-      setAuthorization({ token: data, expireAt: dateAfter })
+      if (data) {
+        localStorage.setItem(ACCESS_TOKEN, data)
+        let timestamp = new Date().getTime()// 当前的时间戳
+        timestamp = timestamp + 12 * 60 * 60 * 1000
+        // 格式化时间获取年月日, 登陆过期时间
+        const dateAfter = new Date(timestamp)
+        setAuthorization({ token: data, expireAt: dateAfter })
+      }
     },
     setV4AccessToken (data) {
-      localStorage.setItem(ACCESS_TOKEN, data.token)
-      setAuthorization({ token: data.token, expire: data.expire })
+      if (data.token) {
+        localStorage.setItem(ACCESS_TOKEN, data.token)
+        setAuthorization({ token: data.token, expire: data.expire })
+      }
     }
   }
 }

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--   显示成功页抽屉   -->
-    <a-modal v-model="successVisible" title="工单状态" width="70%" :footer="null" destroy-on-close>
+    <a-modal v-model="successVisible" title="工单状态" width="70%" :footer="null" destroy-on-close @cancel="onSuccessCancel">
       <submit-ticket-success v-if="serialNumber" :serialNumber="serialNumber" />
     </a-modal>
     <!--   两个使用手册弹框   -->
@@ -116,7 +116,7 @@
       </div>
     </a-modal>
     <a-modal
-      title="填写信息"
+      title="填写联系方式"
       :visible="infoFormVisible"
       @ok="onInfoFormSubmit"
       @cancel="infoFormVisible = false">
@@ -125,8 +125,8 @@
         :model="infoForm"
         :label-col="{ span: 5 }"
         :wrapper-col="{ span: 18 }">
-        <a-form-model-item label="客户名称" prop="customerName" :rules="{ required: true, message: '请输入客户名称' }">
-          <a-input v-model="infoForm.customerName" placeholder="请输入客户名称查询历史工单" />
+        <a-form-model-item label="联系方式" prop="phone" :rules="{ required: true, message: '请输入联系方式' }">
+          <a-input v-model="infoForm.phone" placeholder="请输入联系方式查询历史工单" />
         </a-form-model-item>
       </a-form-model>
     </a-modal>
@@ -171,7 +171,7 @@
                 <!--     图片上传     -->
                 <a-form-item :wrapper-col="{ span: 12 }" label="问题截图">
                   <div class="clearfix">
-                    <upload :model="uploadModel" @setFiles="setFiles" />
+                    <upload v-if="uploadVisible" :model="uploadModel" @setFiles="setFiles" />
                     <a-modal
                       :visible="previewVisible"
                       :footer="null"
@@ -234,6 +234,7 @@
             :queryParamsName="queryParamsName"
             :fixed-query-form="fixedQueryForm"
             @action="toDetail">
+            <a-button slot="button" type="primary" @click="infoFormVisible = true">填写联系方式</a-button>
           </x-form-table>
         </a-tab-pane>
       </a-tabs>
@@ -293,11 +294,12 @@ export default {
       // 问题类型选项
       ticketCategoryMap: [],
       ticketCategoryMapLoading: false,
-      // 未传入客户名称信息手动输入弹框
+      // 未传入客户名称手动输入联系方式
       infoFormVisible: false,
       infoForm: {
-        customerName: ''
-      }
+        phone: ''
+      },
+      uploadVisible: true
     }
   },
   computed: {
@@ -310,13 +312,11 @@ export default {
     document.title = '奥枫问题反馈平台'
     const dictionary = this.$appdata.getParams()
     if (dictionary && dictionary['ticketCategoryMap']) {
-      console.log('pre', dictionary['ticketCategoryMap'])
       this.ticketCategoryMap = dictionary['ticketCategoryMap']
     } else {
       this.ticketCategoryMapLoading = true
       this.$appdata.load().then(() => {
         this.ticketCategoryMap = this.$appdata.getDictionaryList('ticketCategoryMap')
-        console.log('load', this.ticketCategoryMap)
         this.ticketCategoryMapLoading = false
       })
     }
@@ -378,8 +378,21 @@ export default {
         this.serialNumber = res
         this.successVisible = true
         this.$message.success('创建成功')
+        this.customerName = ''
+        this.form.category = undefined
+        this.form.phone = ''
+        this.form.desc = ''
+        this.fileList = []
+        this.uploadVisible = false
+        if (!this.currUser.ename) {
+          this.fixedQueryForm.t_uploader_phone = form.contact
+          this.infoForm.phone = form.contact
+        }
       })
     },
+    onSuccessCancel () {
+      this.uploadVisible = true
+    },
     // 点击向日葵链接
     toSunClientClick () {
       window.open('https://sunlogin.oray.com/download')
@@ -390,7 +403,7 @@ export default {
     },
     // 切换标签页
     changeTab (id) {
-      if (id === 'workHistory' && !this.fixedQueryForm.t_uploader) {
+      if (id === 'workHistory' && !this.fixedQueryForm.t_uploader && !this.fixedQueryForm.t_uploader_phone) {
         this.infoFormVisible = true
         return
       }
@@ -399,7 +412,9 @@ export default {
     onInfoFormSubmit () {
       this.$refs.infoFormRef.validate(valid => {
         if (valid) {
-          this.fixedQueryForm['t_uploader'] = this.infoForm.customerName
+          this.fixedQueryForm = {
+            t_uploader_phone: this.infoForm.phone
+          }
           this.tabActiveKey = 'workHistory'
           this.infoFormVisible = false
         }

package/src/services/api/common.js

@@ -1,58 +1,58 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-const commonApi = {
-  // 获取表格列配置
-  getColumnsJson: '/webmeterapi/getColumns',
-  // 通用查询
-  query: '/webmeterapi/commonQuery',
-  // 表单通用查询
-  queryWithResource: '/webmeterapi/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: '/webmeterapi/commonAddOrModify',
-  // 通用删除
-  delete: '/webmeterapi/commonDelete',
-  // 获取字典键列表
-  getDictionaryParam: '/webmeterapi/getDictionaryParam',
-  // 获取所有员工及其部门的级联菜单数据
-  getEmpTree: '/webmeterapi/getEmpTree',
-}
-
-/**
- * 带缓存查询的表格配置文件查询
- * @param queryParamsName 配置名称
- * @param callback 回调函数
- */
-export function getColumnsJson (queryParamsName, callback) {
-  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
-}
-
-/**
- * 通用表单查询
- */
-export function query (parameter) {
-  return request(commonApi.query, METHOD.POST, parameter)
-}
-
-/**
- * 通用表单查询
- */
-export function queryWithResource (parameter, api = commonApi.queryWithResource) {
-  return request(api, METHOD.POST, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify (parameter, api = commonApi.addOrModify) {
-  return request(api, METHOD.POST, parameter)
-}
-
-/**
- * 通用删除
- */
-export function remove (parameter) {
-  return request(commonApi.delete, METHOD.POST, parameter)
-}
-
-export { commonApi }
+import { METHOD, request } from '@vue2-client/utils/request'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+const commonApi = {
+  // 获取表格列配置
+  getColumnsJson: '/af-system/getColumns',
+  // 通用查询
+  query: 'commonQuery',
+  // 表单查询
+  queryWithResource: 'commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: 'commonAddOrModify',
+  // 通用删除
+  delete: 'commonDelete',
+  // 获取字典键列表
+  getDictionaryParam: '/af-system/getDictionaryParam',
+  // 获取所有员工及其部门的级联菜单数据
+  getEmpTree: '/af-system/getEmpTree',
+}
+
+/**
+ * 带缓存查询的表格配置文件查询
+ * @param queryParamsName 配置名称
+ * @param callback 回调函数
+ */
+export function getColumnsJson (queryParamsName, callback) {
+  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
+}
+
+/**
+ * 通用查询
+ */
+export function query (parameter, api = commonApi.query, serviceName = 'af-system') {
+  return request('/' + serviceName + '/' + api, METHOD.POST, parameter, null)
+}
+
+/**
+ * 通用表单查询
+ */
+export function queryWithResource (parameter, api = commonApi.queryWithResource, serviceName = 'af-system') {
+  return request('/' + serviceName + '/' + api, METHOD.POST, parameter, null)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify (parameter, api = commonApi.addOrModify, serviceName = 'af-system') {
+  return request('/' + serviceName + '/' + api, METHOD.POST, parameter, null)
+}
+
+/**
+ * 通用删除
+ */
+export function remove (parameter, api = commonApi.delete, serviceName = 'af-system') {
+  return request('/' + serviceName + '/' + api, METHOD.POST, parameter, null)
+}
+
+export { commonApi }