vue2-client 1.4.16 → 1.4.18

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.4.18 -2022-09-28 @江超**
+- 功能修改：
+- V4登录获取路由提取到后端处理
+
+**1.4.17 -2022-09-28 @苗艳强**
+- 售后工单删除问题类型选择
+
 **1.4.15 - 1.4.16 -2022-09-26 @江超**
 - 功能修改：
 - 新增操作日志，登录日志页面

package/package.json

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

package/src/pages/login/Login.vue

@@ -1,346 +1,342 @@
-<template>
-  <common-layout>
-    <div class="loginContent">
-      <div class="illustration"/>
-      <div class="business">
-        <div class="top">
-          <div class="header">
-            <span class="title">{{ systemName }}</span>
-          </div>
-        </div>
-        <div class="login" id="loginForm">
-          <a-form :form="form" @submit="onSubmit">
-            <a-tabs :tabBarStyle="{textAlign: 'center'}" size="large" style="padding: 0 2px;">
-              <a-tab-pane key="1" tab="账户密码登录">
-                <a-alert
-                  v-show="error"
-                  :closable="false"
-                  :message="error"
-                  showIcon
-                  style="margin-bottom: 2.8vh;"
-                  type="error" />
-                <a-form-item>
-                  <a-input
-                    v-decorator="['name', {rules: [{ required: true, message: '请输入账户名', whitespace: true}]}]"
-                    autocomplete="autocomplete"
-                    placeholder="请输入账户名"
-                    size="large"
-                  >
-                    <a-icon slot="prefix" type="user" />
-                  </a-input>
-                </a-form-item>
-                <a-form-item>
-                  <a-input
-                    v-decorator="['password', {rules: [{ required: true, message: '请输入密码', whitespace: true}]}]"
-                    autocomplete="autocomplete"
-                    placeholder="请输入密码"
-                    size="large"
-                    type="password"
-                  >
-                    <a-icon slot="prefix" type="lock" />
-                  </a-input>
-                </a-form-item>
-                <a-form-item>
-                  <a-button :loading="logging" htmlType="submit" size="large" class="btn" type="primary">登录</a-button>
-                </a-form-item>
-              </a-tab-pane>
-            </a-tabs>
-          </a-form>
-        </div>
-      </div>
-    </div>
-  </common-layout>
-</template>
-
-<script>
-import CommonLayout from '@vue2-client/layouts/CommonLayout'
-import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
-import { setAuthorization } from '@vue2-client/utils/request'
-import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
-import { mapMutations, mapState } from 'vuex'
-import JSEncrypt from 'jsencrypt'
-import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import { positions } from '@vue2-client/mock/common'
-import { timeFix } from '@vue2-client/utils/util'
-import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
-
-export default {
-  name: 'Login',
-  components: { CommonLayout },
-  data () {
-    return {
-      logging: false,
-      error: '',
-      form: this.$form.createForm(this)
-    }
-  },
-  computed: {
-    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible'])
-  },
-  methods: {
-    ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
-    onSubmit (e) {
-      e.preventDefault()
-      this.form.validateFields((err) => {
-        if (!err) {
-          this.logging = true
-          const name = this.form.getFieldValue('name')
-          const password = this.form.getFieldValue('password')
-          switch (this.compatible) {
-            case 'V3': {
-              login(name, password).then(this.afterLogin).finally(() => { this.logging = false })
-              break
-            }
-            case 'OA' : {
-              loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
-              break
-            }
-            case 'V4' : {
-              V4Login(name, password).then(this.afterLoginV4).catch(msg => {
-                this.error = msg
-              }).finally(() => { this.logging = false })
-              break
-            }
-          }
-        }
-      })
-    },
-    afterLoginOA (result) {
-      // 默认第一个是旧OA地址
-      result.functions[0].navigate = result.functions[0].link
-      result.functions[0].link = null
-      this.afterGeneral(result)
-      this.setAccessToken(result.password)
-      this.$router.push(this.homePage).catch(() => {})
-    },
-    afterLoginV4 (res) {
-      const name = this.form.getFieldValue('name')
-      const password = this.form.getFieldValue('password')
-      this.logging = false
-      this.setV4AccessToken(res)
-      const encrypt = new JSEncrypt()
-      encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
-      const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
-      // 获取路由配置
-      getRoutesConfig(data).then(result => {
-        this.$login.login(result).then(() => {
-          this.afterGeneral(result)
-          if (result.deps === '用户工单登记') {
-            this.$router.push(this.ticketPage).catch(() => {
-            })
-          } else {
-            this.$router.push(this.homePage).catch(() => {
-            })
-          }
-        })
-      })
-    },
-    afterLogin (res) {
-      const name = this.form.getFieldValue('name')
-      const password = this.form.getFieldValue('password')
-      this.logging = false
-      const loginRes = res.states
-      if (loginRes === '登录成功') {
-        const encrypt = new JSEncrypt()
-        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
-        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
-        // 获取路由配置
-        getRoutesConfig(data).then(result => {
-          this.$login.login(result).then(() => {
-            // V3任何情况首位加入资源管理
-            const resourceManageMain = {
-              name: '资源管理',
-              icon: 'api',
-              position: 1,
-              link: 'resourceManageMain'
-            }
-            result.functions.unshift(resourceManageMain)
-            this.afterGeneral(result)
-            this.setAccessToken(data)
-            if (result.deps === '用户工单登记') {
-              this.$router.push(this.ticketPage).catch(() => {})
-            } else {
-              this.$router.push(this.homePage).catch(() => {})
-            }
-          })
-        })
-      } else {
-        this.error = loginRes
-      }
-    },
-    afterGeneral (result) {
-      const user = Object.assign({
-        username: result.ename,
-        name: result.name,
-        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
-        address: '西安市',
-        position: positions[0]
-      }, result)
-      this.setUser(user)
-      this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
-      this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-      loadRoutes(funcToRouter(user.functions))
-      this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
-    },
-    setAccessToken (data) {
-      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 (res) {
-      localStorage.setItem(ACCESS_TOKEN, res.access_token)
-      let timestamp = new Date().getTime()// 当前的时间戳
-      timestamp = timestamp + res.expire * 60 * 1000
-      // 格式化时间获取年月日, 登陆过期时间
-      const dateAfter = new Date(timestamp)
-      setAuthorization({ token: res.access_token, expireAt: dateAfter })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.common-layout {
-  background-image: url('/img/login/background.webp');
-  background-size: cover;
-  background-position: center;
-  .content {
-    .loginContent {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      width: 63vw;
-      padding: 12.4vh 4.8vw 13.4vh 3.5vw;
-      @media screen and (max-width: 479px) {
-        padding: 6.4vh 4.8vw 4.4vh 3.5vw;
-      }
-      transform: translate(-50%, -50%);
-      background: #fff;
-      border-radius: 30px;
-      display: flex;
-      .illustration {
-        flex: 1;
-        background-image: url("/img/login/illustration.webp");
-        background-size: contain;
-        background-position: center;
-        background-repeat: no-repeat;
-        @media screen and (max-width: 959px) {
-          flex: 0;
-        }
-      }
-      .business {
-        flex: 1;
-        .top {
-          text-align: center;
-          .header {
-            height: 2vh;
-            line-height: 2.7vh;
-            padding-bottom: 5.4vh;
-            .title {
-              font-size: 1.5rem;
-              @media screen and (max-width: 479px) {
-                font-size: 1rem;
-              }
-              @media screen and (min-width: 480px) and (max-width: 767px) {
-                font-size: 1.3rem;
-              }
-              @media screen and (min-width: 768px) and (max-width: 959px) {
-                font-size: 1.5rem;
-              }
-              @media screen and (min-width: 960px) {
-                font-size: 1.3rem;
-              }
-              @media screen and (min-width: 1200px) {
-                font-size: 1.5rem;
-              }
-              color: #333333;
-              font-weight: bold;
-              font-family: 'Microsoft YaHei UI Light', 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
-              letter-spacing: 0.13rem;
-            }
-          }
-        }
-        .login{
-          width: 20vw;
-          margin: 0 auto;
-          @media screen and (max-width: 479px) {
-            width: 50vw;
-          }
-          @media screen and (min-width: 480px) and (max-width: 767px) {
-            width: 50vw;
-          }
-          @media screen and (min-width: 768px) and (max-width: 959px) {
-            width: 40vw;
-          }
-          @media screen and (min-width: 960px) {
-            width: 20vw;
-          }
-          @media screen and (min-width: 1200px) {
-            width: 20vw;
-          }
-          .btn {
-            width: 100%;
-            min-height: 43px;
-            height: 5.4vh;
-            border-radius: 30px;
-            background-color: #4F93FE;
-          }
-        }
-      }
-    }
-  }
-}
-</style>
-<style lang="less">
-.common-layout {
-  .footer {
-    .copyright {
-      color: #fff !important;
-    }
-  }
-}
-#loginForm {
-  .ant-input {
-    border-radius: 30px;
-  }
-  .ant-input-lg {
-    min-height: 43px;
-    height: 5.4vh;
-  }
-  .ant-tabs-bar {
-    margin-bottom: 24px;
-  }
-  .ant-input-affix-wrapper {
-    font-size: 1.15rem;
-  }
-  .ant-input-affix-wrapper .ant-input:not(:first-child) {
-    padding-left: 2.4vw;
-    @media screen and (max-width: 479px) {
-      padding-left: 10vw;
-    }
-    @media screen and (min-width: 480px) and (max-width: 767px) {
-      padding-left: 8vw;
-    }
-    @media screen and (min-width: 768px) and (max-width: 959px) {
-      padding-left: 5vw;
-    }
-    @media screen and (min-width: 960px) {
-      padding-left: 4vw;
-    }
-    @media screen and (min-width: 1200px) {
-      padding-left: 2.4vw;
-    }
-  }
-  .ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix {
-    color: #4F93FE;
-  }
-  .ant-alert {
-    border-radius: 12px;
-  }
-}
-</style>
+<template>
+  <common-layout>
+    <div class="loginContent">
+      <div class="illustration"/>
+      <div class="business">
+        <div class="top">
+          <div class="header">
+            <span class="title">{{ systemName }}</span>
+          </div>
+        </div>
+        <div class="login" id="loginForm">
+          <a-form :form="form" @submit="onSubmit">
+            <a-tabs :tabBarStyle="{textAlign: 'center'}" size="large" style="padding: 0 2px;">
+              <a-tab-pane key="1" tab="账户密码登录">
+                <a-alert
+                  v-show="error"
+                  :closable="false"
+                  :message="error"
+                  showIcon
+                  style="margin-bottom: 2.8vh;"
+                  type="error" />
+                <a-form-item>
+                  <a-input
+                    v-decorator="['name', {rules: [{ required: true, message: '请输入账户名', whitespace: true}]}]"
+                    autocomplete="autocomplete"
+                    placeholder="请输入账户名"
+                    size="large"
+                  >
+                    <a-icon slot="prefix" type="user" />
+                  </a-input>
+                </a-form-item>
+                <a-form-item>
+                  <a-input
+                    v-decorator="['password', {rules: [{ required: true, message: '请输入密码', whitespace: true}]}]"
+                    autocomplete="autocomplete"
+                    placeholder="请输入密码"
+                    size="large"
+                    type="password"
+                  >
+                    <a-icon slot="prefix" type="lock" />
+                  </a-input>
+                </a-form-item>
+                <a-form-item>
+                  <a-button :loading="logging" htmlType="submit" size="large" class="btn" type="primary">登录</a-button>
+                </a-form-item>
+              </a-tab-pane>
+            </a-tabs>
+          </a-form>
+        </div>
+      </div>
+    </div>
+  </common-layout>
+</template>
+
+<script>
+import CommonLayout from '@vue2-client/layouts/CommonLayout'
+import { getRoutesConfig, login, V4GetInfo, V4Login } from '@vue2-client/services/user'
+import { setAuthorization } from '@vue2-client/utils/request'
+import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
+import { mapMutations, mapState } from 'vuex'
+import JSEncrypt from 'jsencrypt'
+import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
+import { positions } from '@vue2-client/mock/common'
+import { timeFix } from '@vue2-client/utils/util'
+import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
+
+export default {
+  name: 'Login',
+  components: { CommonLayout },
+  data () {
+    return {
+      logging: false,
+      error: '',
+      form: this.$form.createForm(this)
+    }
+  },
+  computed: {
+    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible'])
+  },
+  methods: {
+    ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
+    onSubmit (e) {
+      e.preventDefault()
+      this.form.validateFields((err) => {
+        if (!err) {
+          this.logging = true
+          const name = this.form.getFieldValue('name')
+          const password = this.form.getFieldValue('password')
+          switch (this.compatible) {
+            case 'V3': {
+              login(name, password).then(this.afterLogin).finally(() => { this.logging = false })
+              break
+            }
+            case 'OA' : {
+              loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
+              break
+            }
+            case 'V4' : {
+              V4Login(name, password).then(this.afterLoginV4).catch(msg => {
+                this.error = msg
+              }).finally(() => { this.logging = false })
+              break
+            }
+          }
+        }
+      })
+    },
+    afterLoginOA (result) {
+      // 默认第一个是旧OA地址
+      result.functions[0].navigate = result.functions[0].link
+      result.functions[0].link = null
+      this.afterGeneral(result)
+      this.setAccessToken(result.password)
+      this.$router.push(this.homePage).catch(() => {})
+    },
+    afterLoginV4 (res) {
+      this.logging = false
+      this.setV4AccessToken(res)
+      // 获取用户信息
+      V4GetInfo().then(result => {
+        const data = result.routes
+        this.$login.login(data).then(() => {
+          this.afterGeneral(data)
+          if (data.deps === '用户工单登记') {
+            this.$router.push(this.ticketPage).catch(() => {
+            })
+          } else {
+            this.$router.push(this.homePage).catch(() => {
+            })
+          }
+        })
+      })
+    },
+    afterLogin (res) {
+      const name = this.form.getFieldValue('name')
+      const password = this.form.getFieldValue('password')
+      this.logging = false
+      const loginRes = res.states
+      if (loginRes === '登录成功') {
+        const encrypt = new JSEncrypt()
+        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
+        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        // 获取路由配置
+        getRoutesConfig(data).then(result => {
+          this.$login.login(result).then(() => {
+            // V3任何情况首位加入资源管理
+            const resourceManageMain = {
+              name: '资源管理',
+              icon: 'api',
+              position: 1,
+              link: 'resourceManageMain'
+            }
+            result.functions.unshift(resourceManageMain)
+            this.afterGeneral(result)
+            this.setAccessToken(data)
+            if (result.deps === '用户工单登记') {
+              this.$router.push(this.ticketPage).catch(() => {})
+            } else {
+              this.$router.push(this.homePage).catch(() => {})
+            }
+          })
+        })
+      } else {
+        this.error = loginRes
+      }
+    },
+    afterGeneral (result) {
+      const user = Object.assign({
+        username: result.ename,
+        name: result.name,
+        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+        address: '西安市',
+        position: positions[0]
+      }, result)
+      this.setUser(user)
+      this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+      this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
+      loadRoutes(funcToRouter(user.functions))
+      this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
+    },
+    setAccessToken (data) {
+      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 (res) {
+      localStorage.setItem(ACCESS_TOKEN, res.access_token)
+      let timestamp = new Date().getTime()// 当前的时间戳
+      timestamp = timestamp + res.expire * 60 * 1000
+      // 格式化时间获取年月日, 登陆过期时间
+      const dateAfter = new Date(timestamp)
+      setAuthorization({ token: res.access_token, expireAt: dateAfter })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.common-layout {
+  background-image: url('/img/login/background.webp');
+  background-size: cover;
+  background-position: center;
+  .content {
+    .loginContent {
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      width: 63vw;
+      padding: 12.4vh 4.8vw 13.4vh 3.5vw;
+      @media screen and (max-width: 479px) {
+        padding: 6.4vh 4.8vw 4.4vh 3.5vw;
+      }
+      transform: translate(-50%, -50%);
+      background: #fff;
+      border-radius: 30px;
+      display: flex;
+      .illustration {
+        flex: 1;
+        background-image: url("/img/login/illustration.webp");
+        background-size: contain;
+        background-position: center;
+        background-repeat: no-repeat;
+        @media screen and (max-width: 959px) {
+          flex: 0;
+        }
+      }
+      .business {
+        flex: 1;
+        .top {
+          text-align: center;
+          .header {
+            height: 2vh;
+            line-height: 2.7vh;
+            padding-bottom: 5.4vh;
+            .title {
+              font-size: 1.5rem;
+              @media screen and (max-width: 479px) {
+                font-size: 1rem;
+              }
+              @media screen and (min-width: 480px) and (max-width: 767px) {
+                font-size: 1.3rem;
+              }
+              @media screen and (min-width: 768px) and (max-width: 959px) {
+                font-size: 1.5rem;
+              }
+              @media screen and (min-width: 960px) {
+                font-size: 1.3rem;
+              }
+              @media screen and (min-width: 1200px) {
+                font-size: 1.5rem;
+              }
+              color: #333333;
+              font-weight: bold;
+              font-family: 'Microsoft YaHei UI Light', 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+              letter-spacing: 0.13rem;
+            }
+          }
+        }
+        .login{
+          width: 20vw;
+          margin: 0 auto;
+          @media screen and (max-width: 479px) {
+            width: 50vw;
+          }
+          @media screen and (min-width: 480px) and (max-width: 767px) {
+            width: 50vw;
+          }
+          @media screen and (min-width: 768px) and (max-width: 959px) {
+            width: 40vw;
+          }
+          @media screen and (min-width: 960px) {
+            width: 20vw;
+          }
+          @media screen and (min-width: 1200px) {
+            width: 20vw;
+          }
+          .btn {
+            width: 100%;
+            min-height: 43px;
+            height: 5.4vh;
+            border-radius: 30px;
+            background-color: #4F93FE;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
+<style lang="less">
+.common-layout {
+  .footer {
+    .copyright {
+      color: #fff !important;
+    }
+  }
+}
+#loginForm {
+  .ant-input {
+    border-radius: 30px;
+  }
+  .ant-input-lg {
+    min-height: 43px;
+    height: 5.4vh;
+  }
+  .ant-tabs-bar {
+    margin-bottom: 24px;
+  }
+  .ant-input-affix-wrapper {
+    font-size: 1.15rem;
+  }
+  .ant-input-affix-wrapper .ant-input:not(:first-child) {
+    padding-left: 2.4vw;
+    @media screen and (max-width: 479px) {
+      padding-left: 10vw;
+    }
+    @media screen and (min-width: 480px) and (max-width: 767px) {
+      padding-left: 8vw;
+    }
+    @media screen and (min-width: 768px) and (max-width: 959px) {
+      padding-left: 5vw;
+    }
+    @media screen and (min-width: 960px) {
+      padding-left: 4vw;
+    }
+    @media screen and (min-width: 1200px) {
+      padding-left: 2.4vw;
+    }
+  }
+  .ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix {
+    color: #4F93FE;
+  }
+  .ant-alert {
+    border-radius: 12px;
+  }
+}
+</style>

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

@@ -154,17 +154,6 @@
                   <a-input v-model="customerName" placeholder="请输入客户名称（总公司名+分公司名）"/>
                   <strong v-show="showCustomerNameAlert" style="color: red">客户名称不能为空！</strong>
                 </a-form-item>
-                <!--     问题类型单选框     -->
-                <a-form-item label="问题类型">
-                  <a-radio-group v-for="(item,index) in ticketCategoryMap" :key="index" v-model="form.category">
-                    <a-radio :value="item.value" class="radio-item">
-                      {{ item.label }}
-                    </a-radio>
-                  </a-radio-group>
-                  <a-spin :spinning="ticketCategoryMapLoading" />
-                  <br/>
-                  <strong v-show="showCategoryAlert" style="color: red">类型不允许为空！</strong>
-                </a-form-item>
                 <!--     联系人     -->
                 <a-form-item label="联系人">
                   <a-input v-model="form.contact"></a-input>
@@ -178,6 +167,7 @@
                 <!--     问题描述框     -->
                 <a-form-item label="问题详情描述">
                   <a-textarea v-model="form.desc" allow-clear placeholder="请用一句话描述您的问题，必要时请注明客户编号，表号，系统功能项等信息"/>
+                  <strong v-show="showDescAlert" style="color: red">问题详情描述不能为空！</strong>
                 </a-form-item>
                 <!--     图片上传     -->
                 <a-form-item :wrapper-col="{ span: 12 }" label="问题截图">
@@ -201,7 +191,7 @@
                 </a-form-item>
                 <!--     表单底部按钮     -->
                 <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-                  <a-button :disabled="showCategoryAlert || showPhoneAlert || !validCustomerName || showContactAlert || !imageList.length" style="margin-right: 20px" type="primary" @click="onSubmit">
+                  <a-button :disabled="showPhoneAlert || !validCustomerName || showContactAlert || showDescAlert || !imageList.length" style="margin-right: 20px" type="primary" @click="onSubmit">
                     提交
                   </a-button>
                 </a-form-item>
@@ -290,7 +280,6 @@ export default {
       // 表单数据
       form: {
         name: '',
-        category: undefined,
         desc: undefined,
         contact: '',
         phone: ''
@@ -298,9 +287,9 @@ export default {
       // 工单序列号
       serialNumber: '',
       // 类别未填写警告信息控制
-      showCategoryAlert: true,
       showContactAlert: true,
       showPhoneAlert: true,
+      showDescAlert: true,
       showCustomerNameAlert: true,
       // 向日葵使用指南可见性
       sunClientManualVisible: false,
@@ -317,9 +306,6 @@ export default {
       fileUploadModel,
       // 客户名称
       customerName: undefined,
-      // 问题类型选项
-      ticketCategoryMap: [],
-      ticketCategoryMapLoading: false,
       // 未传入客户名称手动输入联系方式
       infoFormVisible: false,
       infoForm: {
@@ -339,16 +325,6 @@ export default {
   },
   created () {
     document.title = '售后问题反馈平台'
-    const dictionary = this.$appdata.getParams()
-    if (dictionary && dictionary['ticketCategoryMap']) {
-      this.ticketCategoryMap = dictionary['ticketCategoryMap']
-    } else {
-      this.ticketCategoryMapLoading = true
-      this.$appdata.load().then(() => {
-        this.ticketCategoryMap = this.$appdata.getDictionaryList('ticketCategoryMap')
-        this.ticketCategoryMapLoading = false
-      })
-    }
     let customerName = this.$route.query.orgName
     // 分割客户名称
     if (customerName) {
@@ -398,7 +374,6 @@ export default {
       }
       const form = {
         customerName,
-        problemType: this.form.category,
         contact: this.form.contact,
         phone: this.form.phone,
         problemDetail: this.form.desc,
@@ -417,15 +392,11 @@ export default {
         this.$message.error('问题详情不能包含特殊符号')
         return
       }
-      if (!this.form.desc) {
-        form.problemDetail = '该用户没有填写描述信息'
-      }
       post(TicketDetailsViewApi.createTicket, { form }).then((res) => {
         this.serialNumber = res
         this.successVisible = true
         this.$message.success('创建成功')
         this.customerName = ''
-        this.form.category = undefined
         this.form.contact = ''
         this.form.phone = ''
         this.form.desc = ''
@@ -471,10 +442,6 @@ export default {
   },
   watch: {
     // 监控类别的改变，当类别改变，校验通过
-    'form.category' (newVal) {
-      const numReg = new RegExp(/^[0-9]+$/)
-      this.showCategoryAlert = !numReg.test(newVal)
-    },
     'form.contact' (newVal) {
       this.showContactAlert = newVal.trim().length === 0
     },
@@ -482,6 +449,9 @@ export default {
       const numReg = new RegExp(/^[0-9]+$/)
       this.showPhoneAlert = !numReg.test(newVal)
     },
+    'form.desc' (newVal) {
+      this.showDescAlert = newVal.trim().length === 0
+    },
     'customerName' (newVal) {
       this.showCustomerNameAlert = !newVal
     }

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

@@ -75,7 +75,7 @@ export default {
       // 工单详情
       details: {
         uploader: '',
-        status: '',
+        status: 0,
         name: '',
         phone: '',
         createdTime: '',

package/src/services/apiService.js

@@ -1,13 +1,14 @@
-// 跨域代理前缀
-// const API_PROXY_PREFIX='/api'
-// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
-
-module.exports = {
-  LOGIN: `/rs/logic/getLogin`,
-  V4_LOGIN: '/auth/login',
-  V4_LOGOUT: '/auth/logout',
-  ROUTES: `/rs/user/userLogin/智慧燃气`,
-  SEARCH: `/rs/search`,
-  GOODS: `/goods`,
-  GOODS_COLUMNS: `/columns`
-}
+// 跨域代理前缀
+// const API_PROXY_PREFIX='/api'
+// const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
+
+module.exports = {
+  LOGIN: `/rs/logic/getLogin`,
+  V4_LOGIN: '/auth/login',
+  V4_LOGOUT: '/auth/logout',
+  V4_GET_INFO: '/api/af-system/logic/getInfo',
+  ROUTES: `/rs/user/userLogin/智慧燃气`,
+  SEARCH: `/rs/search`,
+  GOODS: `/goods`,
+  GOODS_COLUMNS: `/columns`
+}

package/src/services/user.js

@@ -1,49 +1,53 @@
-import { LOGIN, ROUTES, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  return request(LOGIN, METHOD.POST, {
-    name: name,
-    password: password
-  })
-}
-
-export async function getRoutesConfig (value) {
-  return request(ROUTES, METHOD.POST, value)
-}
-
-export async function V4Login (name, password) {
-  return request(V4_LOGIN, METHOD.POST, {
-    username: name,
-    password: password
-  })
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  return new Promise((resolve, reject) => {
-    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
-      resolve()
-    }).catch(error => {
-      reject(error)
-    }).finally(() => {
-      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-      removeAuthorization()
-    })
-  })
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig
-}
+import { LOGIN, ROUTES, V4_GET_INFO, V4_LOGIN, V4_LOGOUT } from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  return request(LOGIN, METHOD.POST, {
+    name: name,
+    password: password
+  })
+}
+
+export async function V4Login (name, password) {
+  return request(V4_LOGIN, METHOD.POST, {
+    username: name,
+    password: password
+  })
+}
+
+export async function V4GetInfo () {
+  return request(V4_GET_INFO, METHOD.POST, {})
+}
+
+export async function getRoutesConfig (value) {
+  return request(ROUTES, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  return new Promise((resolve, reject) => {
+    request(V4_LOGOUT, METHOD.DELETE, {}).then(() => {
+      resolve()
+    }).catch(error => {
+      reject(error)
+    }).finally(() => {
+      localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+      localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+      localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+      removeAuthorization()
+    })
+  })
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig
+}