审批提交

.env.production

@@ -13,10 +13,9 @@ VUE_APP_API= '/'
 # 请求环境
 
 # 方楠
-VUE_APP_BASE_API = 'http://139.224.253.31:8081'
 # VUE_APP_BASE_API = 'http://one-h5.lyrfp.com'
 # 开发环境  不要删
-# VUE_APP_BASE_API = 'http://192.168.3.128:58088'
+VUE_APP_BASE_API = 'http://192.168.3.128:58088'
 # VUE_APP_BASE_API = 'http://60.204.223.58:8080'
 
 #线上预览

src/components/BottomBtn/index.vue

@@ -106,50 +106,33 @@ export default {
     hanleCancel() {
       this.isShow = false
     },
-    handleConfirm() {
+    handleConfirm(key) {
       this.$nextTick(() => {
-        this.$refs.form.validate().then(() => {
+        if (key == 2) {
           let obj = {
             id: this.accessId,
-            reason: this.form.reason
+            reason: ''
           }
           this.$loading(true, 'loadingSb')
-          if (this.key == 2) {
+          approveTask(obj)
-            /* approveTask(obj)
+            .then(() => {
-              .then(() => {
+              this.$forceCloseLoading()
-                this.$EventBus.$emit('handleResetLive', 'company-myTrips')
+              this.$EventBus.$emit('handleResetLive', 'company-myTrips')
-                this.$EventBus.$emit('handleResetLive', 'company-myClaim')
+              this.$EventBus.$emit('handleResetLive', 'company-myClaim')
-                history.back()
+              history.back()
-                this.$loading(false, 'loadingSb')
+              this.$loading(false, 'loadingSb')
-              })
+            })
-              .catch(() => {
+            .catch(() => {
-                this.$loading(false, 'loadingSb')
+              this.$forceCloseLoading()
-              })
+              this.$loading(false, 'loadingSb')
-          } else {
+            })
-            rejectTask(obj)
+        } else {
-              .then(() => {
+          this.$refs.form.validate().then(() => {
-                this.$EventBus.$emit('handleResetLive', 'company-myTrips')
+            let obj = {
-                this.$EventBus.$emit('handleResetLive', 'company-myClaim')
+              id: this.accessId,
-                history.back()
+              reason: this.form.reason
-                this.$loading(false, 'loadingSb')
+            }
-              })
+            this.$loading(true, 'loadingSb')
-              .catch(() => {
-                this.$loading(false, 'loadingSb')
-              }) */
-
-            approveTask(obj)
-              .then(() => {
-                this.$forceCloseLoading()
-                this.$EventBus.$emit('handleResetLive', 'company-myTrips')
-                this.$EventBus.$emit('handleResetLive', 'company-myClaim')
-                history.back()
-                this.$loading(false, 'loadingSb')
-              })
-              .catch(() => {
-                this.$forceCloseLoading()
-                this.$loading(false, 'loadingSb')
-              })
-          } else {
             rejectTask(obj)
               .then(() => {
                 this.$forceCloseLoading()
@@ -162,8 +145,8 @@ export default {
                 this.$forceCloseLoading()
                 this.$loading(false, 'loadingSb')
               })
-          }
+          })
-        })
+        }
       })
     },
     handleSubmit(key) {
@@ -172,7 +155,7 @@ export default {
         this.title = '同意'
         this.form.reason = '已同意'
         // 无需原因，直接同意
-        this.handleConfirm()
+        this.handleConfirm(2)
       } else if (key == 3) {
         this.key = key
         this.title = '驳回'

src/views/company/claim/index.vue

@@ -896,7 +896,9 @@ export default {
         projectName: null,
         reason: null,
         remark: null,
-        costDeptId: null,
+        costDeptId: JSON.parse(
+          window.localStorage.getItem('userInfo') || { dept: {} }
+        ).deptId,
         expenseApplyIds: [],
         expenseClaimTrips: [
           {