Merge remote-tracking branch 'origin/master'

jiangping

2024-02-29 8b00bff78ba86989df613fcc7b09e7f64e135a52

 admin/src/views/business/internalCompany.vue

@@ -18,7 +18,7 @@
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
                <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('新建企业')">新建</el-button></li>
                <li><el-button type="primary" v-permissions="['business:company:sync']" @click="synchronous()">同步</el-button></li>
                <li><el-button type="primary"  v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">同步</el-button></li>
            </ul>
            <el-table
                v-loading="isWorking.search"
@@ -26,6 +26,7 @@
                stripe
                :tree-props="{children: 'childList'}"
                row-key="id"
                :expand-row-keys="[list && list.length > 0 ? list[0].id.toString() : '']"
                @selection-change="handleSelectionChange"
            >
<!--                <el-table-column type="selection" width="55"></el-table-column>-->
@@ -62,6 +63,7 @@
  data () {
    return {
      // 搜索
      loading:false,
      searchForm: {
        type: 1
      },
@@ -98,7 +100,7 @@
    async synchronous () {
      this.$dialog.actionConfirm('操作确认提醒', '您确认同步全部信息吗？')
        .then(() => {
          this.isWorking.delete = true
          this.loading = true
          companySync({})
            .then(res => {
              this.$tip.apiSuccess(res || '同步成功')
@@ -108,7 +110,7 @@
              this.$tip.apiFailed(e)
            })
            .finally(() => {
              this.isWorking.delete = false
              this.loading = false
            })
        })
        .catch(() => {})