vue2-client 1.15.30 → 1.15.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.30",
+  "version": "1.15.32",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -3,7 +3,7 @@
     <a-tabs
       :tabBarGutter="tabBarGutter"
       :activeKey="activeKey"
-      @change="tabPaneChange"
+      @change="(activeKey) => tabPaneChange(activeKey, false)"
       :hideAdd="true"
       :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }"
     >
@@ -68,7 +68,7 @@ export default {
   },
   mounted () {
     this.activeKey = this.defaultActiveKey
-    this.tabPaneChange('initTabLoading')
+    this.tabPaneChange('initTabLoading', true)
   },
   methods: {
     // 自定义函数中调用的方法  这个不能删
@@ -80,7 +80,7 @@ export default {
     getRealKeyData,
     getConfigByName,
     getConfigByNameAsync,
-    tabPaneChange (newKey) {
+    tabPaneChange (newKey, initStatus = false) {
       let result = {}
       if (this.activeKey === newKey) {
         return
@@ -161,6 +161,9 @@ export default {
       } else {
         this.activeKey = newKey
       }
+      if (initStatus) {
+        this.activeKey = this.defaultActiveKey
+      }
     },
     initConfig () {
       if (this.configName) {

package/src/pages/addressSelect/index.vue

@@ -19,6 +19,7 @@ export default {
     return {
       selectAddressVisible: false,
       addAddressFlag: false,
+      confirmLoading: false,
       form: {
         f_address_type: '',
         f_residential_area_id: '',
@@ -120,25 +121,36 @@ export default {
         this.$message.warning('请选择小区')
         return
       }
-      this.deleteAddressData()
-      runLogic('addAddress', Object.assign({}, this.form, {
-        f_address: this.generateAddressString()
-      }, {
-        orgid: this.currUser.orgid,
-        f_orgid: this.currUser.orgid,
-        f_orgname: this.currUser.orgs,
-        f_depid: this.currUser.depids,
-        f_depname: this.currUser.deps,
-        f_operatorid: this.currUser.id,
-        f_operator: this.currUser.name,
-        f_filialeid: this.currUser.orgid
-      }), 'af-revenue').then(res => {
-        if (res) {
-          this.$message.success(`${this.addAddressMsg}成功`)
+      this.confirmLoading = true
+      try {
+        this.deleteAddressData()
+        runLogic('addAddress', Object.assign({}, this.form, {
+          f_address: this.generateAddressString()
+        }, {
+          orgid: this.currUser.orgid,
+          f_orgid: this.currUser.orgid,
+          f_orgname: this.currUser.orgs,
+          f_depid: this.currUser.depids,
+          f_depname: this.currUser.deps,
+          f_operatorid: this.currUser.id,
+          f_operator: this.currUser.name,
+          f_filialeid: this.currUser.orgid
+        }), 'af-revenue').then(res => {
+          if (res) {
+            this.$message.success(`${this.addAddressMsg}成功`)
+          }
+        }).catch(() => {
+          this.$message.error('添加地址失败')
+        }).finally(() => {
+          this.confirmLoading = false
           this.addAddressFlag = false
           this.$refs.selAddressXFormTable.refreshTable(true)
-        }
-      })
+        })
+      } catch (error) {
+        this.$message.error('添加地址失败')
+        this.confirmLoading = false
+        this.addAddressFlag = false
+      }
     },
     // 删除 addressData 中存在 addressModel 不存在的字段
     deleteAddressData () {
@@ -215,6 +227,8 @@ export default {
       :dialog-style="{ top: '30px' }"
       :z-index="1005"
       @ok="addressSubmit"
+      :ok-button-props="{ loading: confirmLoading }"
+      :confirm-loading="confirmLoading"
       @cancel="addAddressFlag = false"
       title="新增地址信息"
       :destroyOnClose="true">