vue2-client 1.14.89 → 1.14.91

package/package.json

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

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -23,7 +23,13 @@
       :destroyOnClose="true">
       <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
     </a-modal>
-    <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @x-form-item-emit-func="handleFormItemEvent"
+      @address-selected="handleAddressSelected"
+    >
+    </WorkflowDetail>
   </a-card>
 </template>
 
@@ -84,6 +90,15 @@ export default {
       this.$refs.workFlow.init({
         workflowId: record.twf_id
       })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.workFlow.openAddressSelect()
+      }
+    },
+    handleAddressSelected (record) {
+      this.$refs.workFlow.setAddress({ address: record.f_address })
     }
   }
 }

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -48,6 +48,8 @@
                   @refresh="stepChanged"
                   @success="success"
                   @nextClick="nextClick"
+                  @x-form-item-emit-func="handleFormItemEvent"
+                  @address-selected="handleAddressSelected"
                   class="handle-content"
                 />
               </template>
@@ -152,6 +154,7 @@ export default {
       visible: false
     }
   },
+  expose: ['setAddress', 'openAddressSelect'],
   computed: {
     ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['isMobile'])
@@ -242,6 +245,20 @@ export default {
     // 提交完成后事件
     nextClick (res) {
       this.$emit('nextClick', res)
+    },
+    handleFormItemEvent (func, data, value) {
+      this.$emit('x-form-item-emit-func', func, data, value)
+    },
+    handleAddressSelected (record) {
+      this.$emit('address-selected', record)
+    },
+    // 选择地址弹出框方法
+    openAddressSelect () {
+      this.$refs.workflowHandle.$refs.addressSelect.setFormShow()
+    },
+    // 给地址选择表单项赋值
+    setAddress (record) {
+      this.$refs.workflowHandle.$refs.xAddForm.setForm(record)
     }
   }
 }

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

@@ -1040,13 +1040,11 @@ export default {
         return false
       }
     },
-    formItemEmitFunc (func) {
-      if (func === 'selectAddress') {
-        this.$refs.addressSelect.setFormShow()
-      }
+    formItemEmitFunc (func, data, value) {
+      this.$emit('x-form-item-emit-func', func, data, value)
     },
     setFormValue (record) {
-      this.$refs.xAddForm.setForm({ address: record.f_address })
+      this.$emit('address-selected', record)
     }
   },
   watch: {}

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>

package/src/pages/addressSelect/index.vue

@@ -12,6 +12,9 @@ export default {
       this.onAddressTypeChange(newVal, oldVal)
     }
   },
+  mounted () {
+    this.getAreaList('')
+  },
   data () {
     return {
       selectAddressVisible: false,
@@ -133,7 +136,7 @@ export default {
         if (res) {
           this.$message.success(`${this.addAddressMsg}成功`)
           this.addAddressFlag = false
-          this.refresh()
+          this.$refs.selAddressXFormTable.refreshTable(true)
         }
       })
     },