Merge remote-tracking branch 'origin/master'

src/views/cw/invoice/InvoiceFormTask.vue

@@ -375,7 +375,7 @@
                 label: 'name',         // 显示名称
                 children: 'children'    // 子级字段名
               }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
+              :url="`/system-server/sys/user/treeUserDataFinanceOffice?type=2`"
               :value="inputForm.billingPeopleReal"
               :clearable="true"
               :accordion="true"
@@ -396,7 +396,7 @@
                 label: 'name',         // 显示名称
                 children: 'children'    // 子级字段名
               }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
+              :url="`/system-server/sys/user/treeUserDataFinanceOffice?type=2`"
               :value="inputForm.reconciliationPeople"
               :clearable="true"
               :accordion="true"

src/views/finance/invoice/InvoiceFormTask.vue

@@ -334,7 +334,7 @@
                 label: 'name',         // 显示名称
                 children: 'children'    // 子级字段名
               }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
+              :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"
               :value="inputForm.billingPeopleReal"
               :clearable="true"
               :accordion="true"

src/views/program/registered/ContactForm.vue

@@ -26,6 +26,7 @@
           :print-config="{}"
           :sort-config="{remote:true}"
           :data="dataList"
+		  :key="clientTableKey"
           :checkbox-config="{}">
           <vxe-column type="seq" width="40"></vxe-column>
           <vxe-column type="checkbox" width="50px"></vxe-column>
@@ -62,6 +63,7 @@
           pageSize: 10,
           orders: []
         },
+		  clientTableKey: '',
         dataList: [],
         searchForm: {
           ids: [],
@@ -120,6 +122,7 @@
             data.workClientLinkman.forEach(i => {
               this.dataList.push(i)
             })
+			  this.clientTableKey = Math.random()
           })
         })
       },