vue2-client 1.2.101 → 1.2.105

package/CHANGELOG.md

@@ -1,7 +1,18 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.2.94 -2022-08-05  - 1.2.100 @张振宇**
+**1.2.105 -2022-08-16 @杨亚文**
+- 设置用户登录失效时间为12小时
+
+**1.2.104 -2022-08-16 @杨亚文**
+- Upload 设置上传文件超时时间为1分钟
+- XFormItem 修复删除上传的文件不生效的bug
+- XFormTable XTable STable 数据只有一页时可以自定义是否隐藏分页
+
+**1.2.103 -2022-08-11 @苗艳强**
+- xform-table的afterSubmit事件增加表单参数
+
+**1.2.94 -2022-08-05  - 1.2.102 @张振宇**
 - 功能新增：
 - 新增表单组件 人员选择框
 - 新增表单配置可以配置自定义请求
@@ -9,6 +20,7 @@
 - 文件表单项cascader 修改了一下能用了
 - xformitem修改了两个文件上传框时得bug
 - 新增制度待确认提示
+- 修改制度待确认提示
 
 **1.2.93 -2022-08-03 @江超**
 - 功能新增：

package/package.json

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

package/src/base-client/components/common/Upload/Upload.vue

@@ -116,7 +116,7 @@ export default {
       // if (process.env.NODE_ENV === 'production') {
       //   url = `/${this.model.stockAlias}/webmeteruploadapi/resource`
       // }
-      post('/webmeterresourceapi/upload', formData, { headers }).then(res => {
+      post('/webmeterresourceapi/upload', formData, { headers, timeout: 60*1000 }).then(res => {
         // 根据服务端返回的结果判断成功与否，设置文件条目的状态
         if (res.success) {
           fileInfo.status = 'done'

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -327,7 +327,7 @@ export default {
       if (!this.form[this.attr.model]) {
         this.form[this.attr.model] = []
       }
-      this.form[this.attr.model] = [...this.form[this.attr.model], ...fileIds]
+      this.form[this.attr.model] = [...fileIds]
     },
     // 懒加载检索方法
     fetchFunction (value) {

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -25,6 +25,7 @@
         :json-data="tableColumns"
         :queryParams="queryParams"
         :queryParamsName="queryParamsName"
+        :show-pagination="showPagination"
         @action="action"
         @loadData="loadData"
         @selectRow="selectRow"
@@ -176,6 +177,11 @@ export default {
     tempTableData: {
       type: Object,
       default: null
+    },
+    // 数据只有一页时是否展示分页，true：展示，auto：隐藏
+    showPagination: {
+      type: String | Boolean,
+      default: true
     }
   },
   watch: {
@@ -303,7 +309,7 @@ export default {
           this.modelVisible = false
           this.$refs.xTable.refresh(true)
           // commit
-          this.$emit('afterSubmit', { type: this.businessType, id: res.id })
+          this.$emit('afterSubmit', { type: this.businessType, id: res.id, form: requestParameters.form })
         }).catch(e => {
           this.loading = false
           this.modelVisible = false

package/src/base-client/components/common/XTable/XTable.vue

@@ -37,7 +37,7 @@
       :rowKey="rowKey"
       :rowSelection="rowSelection"
       :scroll="{ x: scrollXWidth, y: scrollYWidth }"
-      showPagination="auto"
+      :showPagination="showPagination"
       size="default"
     >
       <template
@@ -171,6 +171,11 @@ export default {
       default: () => {
         return undefined
       }
+    },
+    // 数据只有一页时是否展示分页，true：展示，auto：隐藏
+    showPagination: {
+      type: String | Boolean,
+      default: true
     }
   },
   computed: {

package/src/components/STable/index.js

@@ -171,10 +171,10 @@ export default {
             return
           }
 
-          // 这里用于判断接口是否有返回 r.totalCount 且 this.showPagination = true 且 pageNo 和 pageSize 存在 且 totalCount 小于等于 pageNo * pageSize 的大小
+          // 这里用于判断接口是否有返回 r.totalCount 且 this.showPagination = 'auto' 且 pageNo 和 pageSize 存在 且 totalCount 小于等于 pageNo * pageSize 的大小
           // 当情况满足时，表示数据不满足分页大小，关闭 table 分页功能
           try {
-            if ((['auto', true].includes(this.showPagination) && r.totalCount <= (r.pageNo * this.localPagination.pageSize))) {
+            if ((['auto'].includes(this.showPagination) && r.totalCount <= (r.pageNo * this.localPagination.pageSize))) {
               this.localPagination.hideOnSinglePage = true
             }
           } catch (e) {

package/src/layouts/header/HeaderNotice.vue

@@ -2,7 +2,11 @@
   <a-dropdown :trigger="['click']" v-model="show">
     <div slot="overlay">
       <a-spin :spinning="loading">
-        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
+        <a-tabs
+          class="dropdown-tabs"
+          :tabBarStyle="{textAlign: 'center'}"
+          :style="{width: '297px'}"
+          v-model="activeKey">
           <a-tab-pane tab="通知" key="1">
             <a-list>
               <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
@@ -24,7 +28,7 @@
           <a-tab-pane tab="待办" key="3">
             <a-list item-layout="horizontal" :data-source="backlog" :bordered="true">
               <a-list-item slot="renderItem" slot-scope="item, index">
-                <a slot="actions" v-if="item.type==='制度待确认'" @click="confirm_institution(item)">确认</a>
+                <a slot="actions" v-if="item.type==='制度待确认'" @click="confirm_institution(item)">查看</a>
                 <a-list-item-meta :title="item.title" :description="item.description"/>
               </a-list-item>
             </a-list>
@@ -67,7 +71,8 @@ export default {
       institution: undefined,
       affirmInstitution: undefined,
       exception: [],
-      backlog: []
+      backlog: [],
+      activeKey: '1'
     }
   },
   components: { InstitutionDetail },
@@ -96,12 +101,42 @@ export default {
         if (this.$login.f.name) {
           post('/webmetersql/getToBeConfirmed', { data: { condition: `state = '待确认' and f_affirm_by  = '${this.$login.f.name}'` } }).then(res => {
             this.backlog = [...res]
+            if (this.backlog.length > 0) {
+              const key = `open${Date.now()}`
+              this.$notification.open({
+                key,
+                message: `您有${this.backlog.length}条待办需要确认`,
+                top: '50px',
+                description: this.backlog.map((item, index) => index + 1 + '、' + item.title).join('；'),
+                icon: <a-icon type="container" style="color: #f5222d"/>,
+                btn: h => {
+                  return h(
+                    'a-button',
+                    {
+                      props: {
+                        type: 'primary',
+                        size: 'small',
+                      },
+                      on: {
+                        click: () => this.viewBacklog(key),
+                      },
+                    },
+                    '查看',
+                  )
+                }
+              })
+            }
           })
         }
       } catch (e) {
         console.log(e)
       }
     },
+    viewBacklog (key) {
+      this.$notification.close(key)
+      this.show = true
+      this.activeKey = '3'
+    },
     confirm_institution (item) {
       this.institutionDetailVisible = true
       this.show = false

package/src/pages/login/Login.vue

@@ -201,7 +201,7 @@ export default {
     setACCESSTOKEN (data) {
       localStorage.setItem(ACCESS_TOKEN, data)
       let timestamp = new Date().getTime()// 当前的时间戳
-      timestamp = timestamp + 60 * 60 * 1000
+      timestamp = timestamp + 12 * 60 * 60 * 1000
       // 格式化时间获取年月日, 登陆过期时间
       const dateAfter = new Date(timestamp)
       setAuthorization({ token: data, expireAt: dateAfter })

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,19 +131,6 @@
           <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">
@@ -166,7 +153,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"
@@ -180,8 +167,7 @@
                         <a-icon type="plus" />
                         <div class="ant-upload-text">点击上传</div>
                       </div>
-                    </a-upload> -->
-                    <upload :model="uploadModel" @setFiles="setFiles" />
+                    </a-upload>
                     <a-modal
                       :visible="previewVisible"
                       :footer="null"
@@ -193,7 +179,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 || !validCustomerName">
+                  <a-button type="primary" @click="onSubmit" style="margin-right: 20px" :disabled="showCategoryAlert || showPhoneAlert">
                     提交
                   </a-button>
                 </a-form-item>
@@ -292,7 +278,6 @@ export default {
       // 类别未填写警告信息控制
       showCategoryAlert: true,
       showPhoneAlert: true,
-      showCustomerNameAlert: true,
       // 向日葵使用指南可见性
       sunClientManualVisible: false,
       // 向日葵使用指南可见性
@@ -307,16 +292,7 @@ export default {
         phoneNumber: ''
       },
       visible: false,
-      tabActiveKey: 'workSubmit',
-      uploadModel,
-      customerName: undefined,
-      customerOptions: []
-    }
-  },
-  computed: {
-    // 检查客户名称是否为空
-    validCustomerName () {
-      return this.currUser.ename || this.customerName ? true : false
+      tabActiveKey: 'workSubmit'
     }
   },
   created () {
@@ -341,9 +317,6 @@ export default {
         reader.onerror = error => reject(error)
       })
     },
-    setFiles (fileIds) {
-      this.fileList = fileIds
-    },
     // 图像修改检测
     handleChange ({ fileList }) {
       this.fileList = fileList.filter((item) => {
@@ -394,29 +367,6 @@ 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,
@@ -447,7 +397,6 @@ export default {
               this.form.desc = ''
               this.showCategoryAlert = true
               this.showPhoneAlert = true
-              this.showCustomerNameAlert = true
             }, err => {
               console.log(err)
             })
@@ -478,14 +427,6 @@ export default {
     // 切换标签页
     changeTab (id) {
       this.tabActiveKey = id
-    },
-    // 客户名称搜索
-    onCustomerSearch (value) {
-      post('/webmeterapi/getCustomerBySearch', {
-        word: value
-      }).then(res => {
-        this.customerOptions = res
-      })
     }
   },
   watch: {
@@ -497,13 +438,9 @@ 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/services/api/TicketDetailsViewApi.js

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