vue2-client 1.15.29 → 1.15.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.29",
+  "version": "1.15.31",
   "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

@@ -68,7 +68,7 @@ export default {
   },
   mounted () {
     this.activeKey = this.defaultActiveKey
-    this.tabPaneChange('workFlowTab')
+    this.tabPaneChange('initTabLoading')
   },
   methods: {
     // 自定义函数中调用的方法  这个不能删
@@ -82,9 +82,9 @@ export default {
     getConfigByNameAsync,
     tabPaneChange (newKey) {
       let result = {}
-      // if (this.activeKey === newKey) {
-      //   return
-      // }
+      if (this.activeKey === newKey) {
+        return
+      }
       const oldKey = this.activeKey
       if (this.config.changeFunc) {
         let oldRef

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -1059,6 +1059,10 @@ export default {
           const stepDefine = this.targetStepDefine[i]
           const key = this.getRealKey(stepDefine.model, isKeyHandle)
           if (Object.prototype.hasOwnProperty.call(dataObj, key)) {
+            // 历史表单内容根据流程中配置的表单项顺序进行渲染，需要兼容表单项展示函数
+            if (stepDefine.showFormItemFunc && !(await this.showFormItemFunc(stepDefine.showFormItemFunc, dataObj))) {
+              continue
+            }
             let value = dataObj[key]
             // 字典值处理
             if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
@@ -1361,6 +1365,26 @@ export default {
         this.$message.error('执行操作失败')
       }
     },
+    // 表单项展示函数--用来渲染历史节点数据时和填写表单显示内容同步
+    async showFormItemFunc (func, form) {
+      try {
+        if (func) {
+          // 一般展示项函数中不应该存在setForm函数 先屏蔽this.setForm和this.attr的传递还有在this上下文指向不同可能存在异常 流程表单的展示项函数尽量功能单一。有异常默认进行展示(先兼容到这后续有问题进行调整)
+          const obj = executeStrFunctionByContext(this, func, [form, null, null, util, '新增/修改'])
+          // 判断是 bool 还是  obj  兼容
+          if (typeof obj === 'boolean') {
+            return obj
+          } else if (obj && typeof obj === 'object') {
+            // obj 是一个对象，并且不是数组
+            return obj?.show
+          }
+        } else {
+          return true
+        }
+      } catch (e) {
+        return true
+      }
+    },
     // 检查按钮是否显示
     checkButtonVisible (button) {
       try {

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">