vue2-client 1.4.24 → 1.4.26

package/CHANGELOG.md

@@ -1,7 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.4.23 - 1.4.24 -2022-09-29 @江超**
+**1.4.26 -2022-09-29 @苗艳强**
+- 功能修改：
+- 售后工单页面接收到客户信息传参后还可修改
+- 接收到客户信息后查询历史工单无需填写联系方式
+
+**1.4.23 - 1.4.25 -2022-09-29 @江超**
 - 功能修改：
 - 新增单点登录相关逻辑
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.24",
+  "version": "1.4.26",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -155,12 +155,12 @@
                   <strong v-show="showCustomerNameAlert" style="color: red">公司名称不能为空！</strong>
                 </a-form-item>
                 <!--     联系人     -->
-                <a-form-item v-if="!currUser.contact" label="联系人">
+                <a-form-item label="联系人">
                   <a-input v-model="form.contact" placeholder="请输入联系人姓名"></a-input>
                   <strong v-show="showContactAlert" style="color: red">请填写联系人！</strong>
                 </a-form-item>
                 <!--     联系方式     -->
-                <a-form-item v-if="!currUser.phone" label="联系方式">
+                <a-form-item label="联系方式">
                   <a-input v-model="form.phone" placeholder="请输入联系方式"></a-input>
                   <strong v-show="showPhoneAlert" style="color: red">请填写联系方式！</strong>
                 </a-form-item>
@@ -242,7 +242,7 @@
             :queryParamsName="queryParamsName"
             title="已提交工单"
             @action="toDetail">
-            <a-button slot="button" type="primary" @click="infoFormVisible = true">填写联系方式</a-button>
+            <a-button slot="button" v-if="!currUser.orgName" type="primary" @click="infoFormVisible = true">填写联系方式</a-button>
           </x-form-table>
         </a-tab-pane>
       </a-tabs>

package/src/services/api/cas.js

@@ -18,15 +18,28 @@ function setTGTCookie (cookie) {
 function removeTGTCookie () {
   return Cookie.remove('TGT-Cookie')
 }
-function getTGTCookie () {
+export function getTGTCookie () {
   return Cookie.get('TGT-Cookie')
 }
 
-export function CASLogin (serviceKey) {
+export function CASLoginByAuth (serviceKey) {
   return new Promise((resolve, reject) => {
-    // 从第三方跳转登录
-    const tgc = getTGTCookie()
-    if (tgc) {
+    post(casApi.createSTByUserInfo, {
+      serviceKey: serviceKey
+    }).then(res => {
+      setTGTCookie(res.tgc)
+      resolve(res)
+    }).catch(msg => {
+      reject(msg)
+    })
+  })
+}
+
+export function CASLogin (serviceKey, ticket) {
+  // 从第三方跳转登录
+  const tgc = getTGTCookie()
+  if (tgc && !ticket) {
+    return new Promise((resolve, reject) => {
       post(casApi.createSTByTGC, {
         serviceKey: serviceKey,
         tgc: tgc
@@ -41,24 +54,17 @@ export function CASLogin (serviceKey) {
           })
           logout().then(() => {
             setTimeout(() => {
-              window.location.href = '/login'
+              window.location.href = '/login?serviceKey=' + serviceKey
             }, 1500)
           })
         } else {
           reject(msg)
         }
       })
-    } else {
-      post(casApi.createSTByUserInfo, {
-        serviceKey: serviceKey
-      }).then(res => {
-        setTGTCookie(res.tgc)
-        resolve(res)
-      }).catch(msg => {
-        reject(msg)
-      })
-    }
-  })
+    })
+  } else {
+    return CASLoginByAuth(serviceKey)
+  }
 }
 
 export default casApi