vue2-client 1.2.99-test → 1.2.101

package/src/layouts/header/InstitutionDetail.vue

@@ -1,176 +1,177 @@
-<template>
-  <div>
-    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
-    <p>简述: {{ institutionData.f_sketch }}</p>
-    <p>生效时间: {{ format(institutionData.f_effective_date) }}</p>
-    <div v-if="showDocument" class="content">
-      <iframe :src="institutionDocUrl" width="100%" height="100%" frameborder="0"></iframe>
-    </div>
-    <!-- 其他附件 -->
-    <div class="other-file">
-      <div class="title">其他附件</div>
-      <div v-for="file in otherFiles" :key="file.id">
-        <a class="file-item">
-          <span class="file-action" @click="handlePreviewDoc(file.url)">
-            <a-icon type="link" />{{ file.name }}
-          </span>
-          <span class="file-action" @click="handlePreviewDoc(file.url)">
-            <a-icon type="eye" />预览
-          </span>
-          <a class="file-action" @click="handlePreDowDoc(file)" target="_blank"><a-icon type="download" />下载</a>
-        </a>
-      </div>
-    </div>
-    <!-- 其他附件预览 -->
-    <a-modal v-model="previewDocVisible" :footer="null" :dialog-style="{ top: '20px' }" width="97%" :z-index="1001">
-      <div class="preview-doc-container">
-        <a-spin size="large" :spinning="previewDocLoading" />
-        <iframe
-          v-show="!previewDocLoading"
-          :src="previewDocUrl"
-          width="100%"
-          height="100%"
-          frameborder="0"
-          @load="previewDocLoading = false" />
-      </div>
-    </a-modal>
-  </div>
-</template>
-
-<script>
-import { Base64 } from 'js-base64'
-import { post } from '@vue2-client/services/api/restTools'
-import { formatDate } from '@vue2-client/utils/util'
-
-export default {
-  name: 'InstitutionDetail',
-  props: {
-    institutionId: {
-      type: Number,
-      default: undefined
-    },
-    affirmInstitution: {
-      type: Number,
-      default: undefined
-    }
-  },
-  data () {
-    return {
-      institutionDocUrl: undefined,
-      showDocument: false,
-      otherFiles: [],
-      institutionData: {},
-      previewDocVisible: false,
-      previewDocUrl: undefined,
-      previewDocLoading: false
-    }
-  },
-  watch: {
-    institutionId () {
-      this.getDetailData()
-    }
-  },
-  mounted () {
-    this.getDetailData()
-  },
-  methods: {
-    // 获取详情数据
-    getDetailData () {
-      if (!this.institutionId) {
-        return
-      }
-      const otherFiles = []
-      post('/webmeterapi/getInstitutionDetail', {
-        id: this.institutionId
-      }).then(res => {
-        res.files.forEach(item => {
-          if (item.use_type === '制度文件') {
-            const institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
-            this.institutionDocUrl = institutionDocUrl
-            this.showDocument = true
-          } else {
-            otherFiles.push(item)
-          }
-        })
-        this.institutionData = res.institution
-        this.otherFiles = otherFiles
-      })
-    },
-    format (dateStr) {
-      return formatDate(dateStr, 'yyyy-MM-dd')
-    },
-    // 其他附件预览
-    handlePreviewDoc (url) {
-      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
-      if (this.previewDocUrl != previewDocUrl) {
-        this.previewDocLoading = true
-        this.previewDocUrl = previewDocUrl
-      }
-      this.previewDocVisible = true
-    },
-    // 下载文档
-    handlePreDowDoc (file) {
-      const a = document.createElement('a')
-      a.href = file.url
-      a.download = file.name
-      a.click()
-    },
-    confirm_institution (item) {
-      this.institution = item.institution
-      post('/webmeterapi/affirmInstitution', {
-        data: {
-          tobe: [
-            {
-              id: item.id,
-              f_affirm_type: '系统确认'
-            }
-          ]
-        }
-      }).then(res => {
-        this.$emit('get_to_be_confirmed')
-      })
-    },
-  }
-}
-// 文档预览服务 API
-const previewDocService = 'http://123.60.214.109:8012/onlinePreview?url='
-// 文件服务器地址
-const fileServer = 'http://123.60.214.109:8406'
-</script>
-
-<style lang="less" scoped>
-.content {
-  height: 80vh;
-  img {
-    max-width: 100%;
-  }
-}
-.other-file {
-  margin: 16px 0;
-  .title {
-    margin-bottom: 6px;
-  }
-}
-.file-item {
-  .file-action {
-    padding: 3px 4px;
-    color: #1890ff;
-    &:hover {
-      background: #e6f7ff;
-    }
-  }
-  .anticon {
-    margin-right: 3px;
-  }
-}
-.file-list-title {
-  color: rgba(0, 0, 0, 0.85);
-  font-weight: bold;
-  font-size: 16px;
-  margin-bottom: 8px;
-}
-.preview-doc-container {
-  height: calc(100vh - 92px);
-  padding-top: 20px;
-}
-</style>
+<template>
+  <div>
+    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
+    <p>简述: {{ institutionData.f_sketch }}</p>
+    <p>生效时间: {{ format(institutionData.f_effective_date) }}</p>
+    <div v-if="showDocument" class="content">
+      <iframe :src="institutionDocUrl" width="100%" height="100%" frameborder="0"></iframe>
+    </div>
+    <!-- 其他附件 -->
+    <div class="other-file">
+      <div class="title">其他附件</div>
+      <div v-for="file in otherFiles" :key="file.id">
+        <a class="file-item">
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="link" />{{ file.name }}
+          </span>
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="eye" />预览
+          </span>
+          <a class="file-action" @click="handlePreDowDoc(file)" target="_blank"><a-icon type="download" />下载</a>
+        </a>
+      </div>
+    </div>
+    <!-- 其他附件预览 -->
+    <a-modal v-model="previewDocVisible" :footer="null" :dialog-style="{ top: '20px' }" width="97%" :z-index="1001">
+      <div class="preview-doc-container">
+        <a-spin size="large" :spinning="previewDocLoading" />
+        <iframe
+          v-show="!previewDocLoading"
+          :src="previewDocUrl"
+          width="100%"
+          height="100%"
+          frameborder="0"
+          @load="previewDocLoading = false" />
+      </div>
+    </a-modal>
+    <a-button type="primary" @click="confirm_institution">确认</a-button>
+  </div>
+</template>
+
+<script>
+import { Base64 } from 'js-base64'
+import { post } from '@vue2-client/services/api/restTools'
+import { formatDate } from '@vue2-client/utils/util'
+
+export default {
+  name: 'InstitutionDetail',
+  props: {
+    institutionId: {
+      type: Number,
+      default: undefined
+    },
+    affirmInstitution: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data () {
+    return {
+      institutionDocUrl: undefined,
+      showDocument: false,
+      otherFiles: [],
+      institutionData: {},
+      previewDocVisible: false,
+      previewDocUrl: undefined,
+      previewDocLoading: false
+    }
+  },
+  watch: {
+    institutionId () {
+      this.getDetailData()
+    }
+  },
+  mounted () {
+    this.getDetailData()
+  },
+  methods: {
+    // 获取详情数据
+    getDetailData () {
+      if (!this.institutionId) {
+        return
+      }
+      const otherFiles = []
+      post('/webmeterapi/getInstitutionDetail', {
+        id: this.institutionId
+      }).then(res => {
+        res.files.forEach(item => {
+          if (item.use_type === '制度文件') {
+            const institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
+            this.institutionDocUrl = institutionDocUrl
+            this.showDocument = true
+          } else {
+            otherFiles.push(item)
+          }
+        })
+        this.institutionData = res.institution
+        this.otherFiles = otherFiles
+      })
+    },
+    format (dateStr) {
+      return formatDate(dateStr, 'yyyy-MM-dd')
+    },
+    // 其他附件预览
+    handlePreviewDoc (url) {
+      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
+      if (this.previewDocUrl != previewDocUrl) {
+        this.previewDocLoading = true
+        this.previewDocUrl = previewDocUrl
+      }
+      this.previewDocVisible = true
+    },
+    // 下载文档
+    handlePreDowDoc (file) {
+      const a = document.createElement('a')
+      a.href = file.url
+      a.download = file.name
+      a.click()
+    },
+    confirm_institution () {
+      post('/webmeterapi/affirmInstitution', {
+        data: {
+          tobe: [
+            {
+              id: this.affirmInstitution,
+              f_affirm_type: '系统确认'
+            }
+          ]
+        }
+      }).then(res => {
+        this.$message.success('确认成功')
+        this.$emit('get_to_be_confirmed')
+      })
+    },
+  }
+}
+// 文档预览服务 API
+const previewDocService = 'http://123.60.214.109:8012/onlinePreview?url='
+// 文件服务器地址
+const fileServer = 'http://123.60.214.109:8406'
+</script>
+
+<style lang="less" scoped>
+.content {
+  height: 80vh;
+  img {
+    max-width: 100%;
+  }
+}
+.other-file {
+  margin: 16px 0;
+  .title {
+    margin-bottom: 6px;
+  }
+}
+.file-item {
+  .file-action {
+    padding: 3px 4px;
+    color: #1890ff;
+    &:hover {
+      background: #e6f7ff;
+    }
+  }
+  .anticon {
+    margin-right: 3px;
+  }
+}
+.file-list-title {
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: bold;
+  font-size: 16px;
+  margin-bottom: 8px;
+}
+.preview-doc-container {
+  height: calc(100vh - 92px);
+  padding-top: 20px;
+}
+</style>

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

@@ -120,7 +120,7 @@
     </a-modal>
     <a-card v-if="visible">
       <div style="text-align: right">
-        <p>欢迎您：{{ currUser.ename }}</p>
+        <p>欢迎您！{{ currUser.ename }}</p>
       </div>
       <div class="submitTicketTitle">
         <span>奥枫问题反馈平台</span>
@@ -131,6 +131,19 @@
           <a-row v-if="tabActiveKey === 'workSubmit'">
             <a-col :span="18">
               <a-form :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
+                <!-- 客户名称选择 -->
+                <a-form-item v-if="!currUser.ename" label="客户名称">
+                  <a-select
+                    v-model="customerName"
+                    :options="customerOptions"
+                    :filter-option="false"
+                    :default-active-first-option="false"
+                    placeholder="请搜索客户名称"
+                    show-search
+                    @search="onCustomerSearch"
+                  ></a-select>
+                  <strong v-show="showCustomerNameAlert" style="color: red">客户名称不能为空！</strong>
+                </a-form-item>
                 <!--     问题类型单选框     -->
                 <a-form-item label="问题类型">
                   <a-radio-group v-model="form.category" v-for="(item,index) in $appdata.getDictionaryList('ticketCategoryMap')" :key="index">
@@ -153,7 +166,7 @@
                 <!--     图片上传     -->
                 <a-form-item :wrapper-col="{ span: 12 }" label="问题截图">
                   <div class="clearfix">
-                    <a-upload
+                    <!-- <a-upload
                       name="avatar"
                       list-type="picture-card"
                       :before-upload="beforeUpload"
@@ -167,7 +180,8 @@
                         <a-icon type="plus" />
                         <div class="ant-upload-text">点击上传</div>
                       </div>
-                    </a-upload>
+                    </a-upload> -->
+                    <upload :model="uploadModel" @setFiles="setFiles" />
                     <a-modal
                       :visible="previewVisible"
                       :footer="null"
@@ -179,7 +193,7 @@
                 </a-form-item>
                 <!--     表单底部按钮     -->
                 <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
-                  <a-button type="primary" @click="onSubmit" style="margin-right: 20px" :disabled="showCategoryAlert || showPhoneAlert">
+                  <a-button type="primary" @click="onSubmit" style="margin-right: 20px" :disabled="showCategoryAlert || showPhoneAlert || !validCustomerName">
                     提交
                   </a-button>
                 </a-form-item>
@@ -278,6 +292,7 @@ export default {
       // 类别未填写警告信息控制
       showCategoryAlert: true,
       showPhoneAlert: true,
+      showCustomerNameAlert: true,
       // 向日葵使用指南可见性
       sunClientManualVisible: false,
       // 向日葵使用指南可见性
@@ -292,7 +307,16 @@ export default {
         phoneNumber: ''
       },
       visible: false,
-      tabActiveKey: 'workSubmit'
+      tabActiveKey: 'workSubmit',
+      uploadModel,
+      customerName: undefined,
+      customerOptions: []
+    }
+  },
+  computed: {
+    // 检查客户名称是否为空
+    validCustomerName () {
+      return this.currUser.ename || this.customerName ? true : false
     }
   },
   created () {
@@ -317,6 +341,9 @@ export default {
         reader.onerror = error => reject(error)
       })
     },
+    setFiles (fileIds) {
+      this.fileList = fileIds
+    },
     // 图像修改检测
     handleChange ({ fileList }) {
       this.fileList = fileList.filter((item) => {
@@ -367,6 +394,29 @@ export default {
     },
     // 提交按钮逻辑
     onSubmit () {
+      let customerName = this.currUser.ename
+      if (!customerName) {
+        customerName = this.customerName
+      }
+      const form = {
+        customerName,
+        problemType: this.form.category,
+        contact: this.form.phone,
+        problemDetail: this.form.desc,
+        Images: this.fileList
+      }
+      if (this.form.desc === undefined) {
+        form.problemDetail = '该用户没有填写描述信息'
+      }
+      // console.log(data)
+      // if (customerName) return
+      post(TicketDetailsViewApi.createTicket, { form }).then((res) => {
+        this.serialNumber = res
+        this.successVisible = true
+        this.$message.success('创建成功')
+      })
+    },
+    onSubmitOld () {
       // 根据当前日期调用logic获取订单序列号
       return post(TicketDetailsViewApi.getTicketSerialNumber, {
         priority: this.data.priority,
@@ -397,6 +447,7 @@ export default {
               this.form.desc = ''
               this.showCategoryAlert = true
               this.showPhoneAlert = true
+              this.showCustomerNameAlert = true
             }, err => {
               console.log(err)
             })
@@ -427,6 +478,14 @@ export default {
     // 切换标签页
     changeTab (id) {
       this.tabActiveKey = id
+    },
+    // 客户名称搜索
+    onCustomerSearch (value) {
+      post('/webmeterapi/getCustomerBySearch', {
+        word: value
+      }).then(res => {
+        this.customerOptions = res
+      })
     }
   },
   watch: {
@@ -438,9 +497,13 @@ export default {
     'form.phone' (newVal) {
       const numReg = new RegExp(/^[0-9]+$/)
       this.showPhoneAlert = !numReg.test(newVal)
+    },
+    customerName (newVal) {
+      this.showCustomerNameAlert = !newVal
     }
   }
 }
+const uploadModel = JSON.parse('{"addOrEdit":"all","resUploadStock":1,"pathKey":"cs","rule":{"type":"string","required":"false"},"isOnlyAddOrEdit":true,"acceptCount":5,"type":"image","accept":[".jpg,.jpeg,.ico,.gif,svg,.webp,.png,.bmp,.pjpeg,"],"stockAlias":"webmeter","fileRootPath":"D:\\\\nginx-resource\\\\resource\\\\","name":"图片","resUploadMode":"server","model":"Images"}')
 </script>
 
 <style scoped>

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

@@ -1,60 +1,60 @@
-// 视图组件
-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.system = view.blank
-// 字典管理
-routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
-// 查询配置管理
-routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
-// 查询配置生成
-routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage.vue')
-// 系统问题反馈工单
-routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
-// --------------------------------------报表组件--------------------------------------
-routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
-// --------------------------------------资源管理--------------------------------------
-routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
-
-// 基础路由组件注册
-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.system = view.blank
+// 字典管理
+routerResource.dictionaryManage = () => import(/* webpackChunkName: "dictionary" */ '@vue2-client/pages/system/dictionary')
+// 查询配置管理
+routerResource.queryParamsManage = () => import(/* webpackChunkName: "queryParams" */ '@vue2-client/pages/system/queryParams')
+// 查询配置生成
+routerResource.createQuery = () => import('@vue2-client/pages/CreateQueryPage.vue')
+// 系统问题反馈工单
+routerResource.submitTicket = () => import(/* webpackChunkName: "submitTicket" */ '@vue2-client/pages/system/ticket')
+// --------------------------------------报表组件--------------------------------------
+routerResource.reportTable = () => import(/* webpackChunkName: "ReportTableHome" */ '@vue2-client/pages/report/ReportTableHome')
+// --------------------------------------资源管理--------------------------------------
+routerResource.resourceManageMain = () => import(/* webpackChunkName: "resourceManageMain" */ '@vue2-client/pages/resourceManage/resourceManageMain')
+
+// 基础路由组件注册
+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/services/api/TicketDetailsViewApi.js

@@ -32,7 +32,9 @@ const TicketDetailsViewApi = {
   // 提交用户填写附加信息
   AddonDescriptionToTicket: '/webmeterapi/AddonDescriptionToTicket',
   // 获取用户填写附加信息
-  getAddonDescription: '/webmeterapi/getAddonDescription'
+  getAddonDescription: '/webmeterapi/getAddonDescription',
+  // 发起售后工单流程
+  createTicket: '/webmeterapi/createTicket'
 }
 
 export { TicketDetailsViewApi }