src/components/BottomBtn/index.vue

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

src/store/modules/common/user.js

@@ -22,12 +22,8 @@ export default {
     areaTree: [],
     userDeptTree: [],
     userList: [],
-    bankInfo: [], // 账户信息
   },
   mutations: {
-    SET_BANKINFO: (state, bankInfo) => {
-      state.bankInfo = bankInfo.length > 0 ? bankInfo : []
-  },
     SET_AUTHORIZATION(state, authorization) {
       state.authorization = authorization
     },
@@ -211,7 +207,6 @@ export default {
             setLocalStorage('userInfo', JSON.stringify(res.data))
             let res1 = res.data
             commit('SET_USERINFO', res.data)
-            commit('SET_BANKINFO', res.data.bankInfoList || [])
             getAreaTree().then(res => {
               let tree = res.data || []
               handleAreaLoop(tree)
@@ -242,6 +237,7 @@ export default {
             reject(res.response.code)
           })
           // 
+
           // huoqu
         }).catch(e => {
           console.log(e)

src/store/modules/getters.js

@@ -9,8 +9,6 @@ const getters = {
   userList: state => state.common.user.userList,
   dict_datas: state => state.dict.dictDatas,
   requestPageSize: state => state.common.global.requestPageSize,
-  // 银行信息
-  bankInfo: state => state.common.user.bankInfo,
 }
 
 export default getters

src/views/company/claim/index.vue

@@ -86,16 +86,6 @@
               placeholder="请输入"
               @click="showPicker = true"
             />
-            <van-field
-              v-model="form.bankAccount"
-              :disabled="disabled"
-              required
-              label="收款账号"
-              clear-trigger="always"
-              input-align="right"
-              placeholder="请输入"
-              @click="showPicker2 = true"
-            />
             <van-field
               v-model="form.reason"
               :disabled="disabled"
@@ -827,8 +817,6 @@
         }
       "
     />
-
-    <!-- 资金来源底部框 -->
     <van-popup v-model="showPicker" position="bottom">
       <van-picker
         show-toolbar
@@ -838,17 +826,6 @@
         @cancel="showPicker = false"
       />
     </van-popup>
-
-    <!-- 银行账号底部框 -->
-    <van-popup v-model="showPicker2" position="bottom">
-      <van-picker
-        show-toolbar
-        title="选择银行账号"
-        :columns="bankAccountList1"
-        @confirm="selectBankAccount"
-        @cancel="showPicker2 = false"
-      />
-    </van-popup>
   </div>
 </template>
 
@@ -889,15 +866,10 @@ export default {
     this.getTree()
   },
   // 生命周期：挂载完成时（可以访问DOM元素）
-  mounted() {
-    console.log(this.$store.getters.bankInfo, 'this.$store.getters.bankInfo')
-  },
+  mounted() {},
   data() {
     return {
-      showPicker2: false,
       showPicker: false,
-      // 银行账号列表
-      bankAccountList: this.$store.getters.bankInfo,
       areaTree: [],
       indexOne: 1,
       indexTwo: 1,
@@ -994,9 +966,6 @@ export default {
   // 计算属性
   // bs_fee_type
   computed: {
-    bankAccountList1() {
-      return this.bankAccountList.map((e) => e.bankNumber)
-    },
     fundingSourceList() {
       const list = this.getDictDatas('funding_source')?.map((e) => {
         return {
@@ -1044,11 +1013,6 @@ export default {
   watch: {},
   // 方法集合
   methods: {
-    selectBankAccount(val) {
-      console.log(val, 'valvalval')
-      this.form.bankAccount = val
-      this.showPicker2 = false
-    },
     selectFundingSource(val) {
       this.form.fundingSource = val.value
       this.fundingSourceLabel = val.text