vue2-client 1.2.21 → 1.2.24

package/package.json

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

package/src/base-client/components/ticket/TicketDetailsView/TicketDetailsView.vue

@@ -276,7 +276,9 @@
         // 描述加载控制
         descriptionLoading: false,
         // 用于刷新按钮倒计时显示
-        btnCountdownText: 5
+        btnCountdownText: 5,
+        // 当前登陆用户在数据库表中id，临时使用，之后会替换
+        empIdInDataBase: undefined
       }
     },
     mounted () {
@@ -492,11 +494,11 @@
       },
       // 确认工单按钮业务逻辑
       confirmTicketBtn () {
-        const currentEmpId = this.getCurrentEmpId()
+        this.getCurrentEmpId()
         return post(TicketDetailsViewApi.confirmTicket, {
           ticketId: this.ticketId,
-          empId: currentEmpId,
-          time: new Date()
+          time: new Date(),
+          empId: this.empIdInDataBase
         })
           .then(res => {
             if (res !== 0) {
@@ -513,11 +515,11 @@
       },
       // 获取当前登陆员工ID
       getCurrentEmpId () {
-        post(EmployeeDetailsViewApi.getEmployeeId, {
+        return post(EmployeeDetailsViewApi.getEmployeeId, {
           name: this.currUser.ename
         })
           .then(res => {
-            return res
+            this.empIdInDataBase = res
           }, err => {
             console.log(err)
           })