Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -79,6 +79,7 @@
                 :key="j"
                 :prop="column.name"
                 :width="column.field_options.custom_class || null"
+                show-overflow-tooltip
               >
                 <template slot="header">
                   {{

src/views/component/formTemplate/index.vue

@@ -348,7 +348,8 @@ export default {
         shen_pi_liu_cheng: '',
         bian_zhi_bu_men_: '',
         bu_men_fen_zu_: '',
-        bei_zhu_: ''
+        bei_zhu_: '',
+        liu_cheng_shu_ju_: []
       },
       typeOption: [
         {
@@ -560,6 +561,7 @@ export default {
         for (const key in this.form) {
           this.form[key] = this.params[key]
         }
+        console.log('this.form===>', this.form)
         // JSON 解析
         const liu_cheng_shu_ju_ = JSON.parse(this.form.liu_cheng_shu_ju_)
         // console.log(liu_cheng_shu_ju_.nodeList)

src/views/component/templateFill/selector.vue

@@ -125,12 +125,15 @@ export default {
       this.setApproverOptions(approverData, peiZhi)
     },
     setApproverOptions(approverData, peiZhi) {
+      console.log('approverData===>', approverData)
       approverData.nodeList.forEach((item) => {
         const x = `approver${item.sn}`
         if (item.executeType === 'employee') {
-          this.options[x] = this.userList.filter((i) =>
-            item.executor.includes(i.userId)
-          )
+          this.options[x] = this.userList.filter((i) => {
+            console.log('it==>', item.executor)
+            const roles = item.executor.split(',')
+            return roles.some((r) => i.userId.includes(r))
+          })
         } else if (item.executeType === 'role') {
           const roles = item.executor.split(',')
           this.options[x] = this.userList.filter((i) =>