处理冲突

qushaowei

2024-01-31 142f2e839bf76eff614ca7c07c30b5da2745681a

 src/views/mdc/base/EquipmentList.vue

@@ -22,8 +22,8 @@

          <a-col :md="6" :sm="8">
            <a-form-item label="车间名称">
              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
              <a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>
              <!--<a-input placeholder="请输入车间名称" v-model="queryParam.productionName"></a-input>-->
              <a-tree-select v-model="queryParam.productionName" :treeData="workshopTreeData" placeholder="请选择车间"  tree-default-expand-all></a-tree-select>
            </a-form-item>
          </a-col>

@@ -38,6 +38,7 @@
    <!-- 操作按钮区域 -->
    <div class="table-operator" style="border-top: 5px">
      <a-button @click="handleAdd" type="primary" icon="plus" >添加设备</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('设备信息')">导出</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay" @click="handleMenuClick">
          <a-menu-item key="1">
@@ -147,6 +148,7 @@
  import UserRecycleBinModal from './modules/EquipmentList/UserRecycleBinModal'
  import JSuperQuery from '@/components/jeecg/JSuperQuery'
  import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
  import { queryProductionTreeList } from '@/api/api'
  import {mapActions} from 'vuex'

  export default {
@@ -256,10 +258,11 @@
          list: "/mdc/mdcEquipment/list",
          delete: "/mdc/mdcEquipment/delete",
          deleteBatch: "/mdc/mdcEquipment/deleteBatch",
          // exportXlsUrl: "/sys/user/exportXls",
          exportXlsUrl: "/mdc/mdcEquipment/exportXls",
          // importExcelUrl: "sys/user/importExcel",
        },
        isDepartType:''
        isDepartType:'',
        workshopTreeData:[]
      }
    },
    computed: {
@@ -269,6 +272,7 @@
    },
    created() {
      this.queryTreeData()
      this.getWorkshopListByApi()
    },
    methods: {
      ...mapActions(['QueryDepartTree']),
@@ -554,6 +558,12 @@
          this.loadData()
        }
      },

      getWorkshopListByApi(){
        queryProductionTreeList().then(res=>{
          if(res.success) this.workshopTreeData=res.result
        })
      }
    }

  }