Merge branch 'master' of http://139.186.142.91:10010/r/productDev/zbomyoujia

liukangdong

2024-07-29 26fb0b3e76f52212a2cef49a0bc0b94e7425880c

 admin/src/views/business/shopTree.vue

@@ -3,8 +3,9 @@
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:shop:create', 'business:shop:sync','business:shop:sort']">
        <li><el-button type="primary" @click="$refs.OperaShopImportWindow.open('初始化导入')"  icon="el-icon-plus" v-permissions="['business:shop:create']">初始化导入</el-button></li>
        <li><el-button type="primary" @click="$refs.OperaFcodeImportWindow.open('Fcode信息导入')"  icon="el-icon-plus" v-permissions="['business:shop:create']">Fcode信息导入</el-button></li>
        <li><el-button @click="resetRelations" type="primary" :loading="sorting" icon="el-icon-edit" v-permissions="['business:shop:update']">重置上下级关系</el-button></li>
        <li><el-button type="primary" @click="$refs.OperaFcodeImportWindow.open('Fcode信息导入')"  icon="el-icon-plus" v-permissions="['business:shop:create']">Fcode信息导入</el-button></li>
        <li><el-button type="primary" @click="$refs.OperaCategoryImportWindow.open('品类初始化导入')"  icon="el-icon-plus" v-permissions="['business:shop:create']">品类初始化导入</el-button></li>
        <li><el-button @click="sort('top')" :loading="sorting" icon="el-icon-sort-up" v-permissions="['business:shop:sort']">上移</el-button></li>
        <li><el-button @click="sort('bottom')" :loading="sorting" icon="el-icon-sort-down" v-permissions="['business:shop:sort']">下移</el-button></li>
      </ul>
@@ -24,7 +25,8 @@
          @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" label="组织名称" min-width="300px"></el-table-column>
        <el-table-column prop="name" label="组织名称" fixed min-width="300px"></el-table-column>
        <el-table-column prop="code" label="组织编码" min-width="120px"></el-table-column>
        <el-table-column prop="type" label="一级类型" min-width="100px">
          <template scope="{row}">
            <span v-if="row.type == 1">HR</span>
@@ -54,12 +56,12 @@
          <template scope="{row}">
            <span v-if="row.status == 0" style="color: red">停用</span>
            <span v-if="row.status == 1" style="color: green">正常</span>
            <span v-if="row.status == 2" style="color: grey">已删除</span>
            <span v-if="row.status == -1" style="color: grey">已删除</span>
          </template>
        </el-table-column>
<!--

        <el-table-column prop="namePath" label="组织路径" min-width="200px"></el-table-column>
-->

<!--
        <el-table-column prop="syncDate" label="最后同步时间" min-width="120px"></el-table-column>
-->
@@ -81,6 +83,7 @@
    <OperaShopWindow ref="OperaShopWindow" :list="list" @success="handlePageChange"/>
    <OperaShopImportWindow ref="OperaShopImportWindow"  @success="handlePageChange"/>
    <OperaFcodeImportWindow ref="OperaFcodeImportWindow"  @success="handlePageChange"/>
    <OperaCategoryImportWindow ref="OperaCategoryImportWindow"  @success="handlePageChange"/>
  </TableLayout>
</template>

@@ -90,11 +93,12 @@
import { companySync, sort, resetRelations } from '@/api/business/shop'
import OperaShopImportWindow from '@/components/business/OperaShopImportWindow'
import OperaFcodeImportWindow from '@/components/business/OperaFcodeImportWindow'
import OperaCategoryImportWindow from '@/components/business/OperaCategoryImportWindow'
import OperaShopWindow from '@/components/business/OperaShopWindow'
export default {
  name: 'shopTree',
  extends: BaseTable,
  components: { TableLayout, OperaShopImportWindow, OperaShopWindow, OperaFcodeImportWindow },
  components: { TableLayout, OperaShopImportWindow, OperaShopWindow, OperaFcodeImportWindow,OperaCategoryImportWindow },
  data () {
    return {
      // 搜索