修改

jinlin

2023-12-08 02b942d804cfa1ea094256b914a08083288695ed

修改

 modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/controller/ConfigItemChangeController.java

@@ -124,9 +124,8 @@

    @GetMapping("getItemList")
    @ApiOperation("获取入库配置项列表")
    public PageResult<WarehouseConfigItem> getItemList(Long projectId) {
        List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId);
    public PageResult<WarehouseConfigItem> getItemList(Long projectId,String ids) {
        List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId,ids);
        return PageResult.ok(resultList);
    }

}

 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java

@@ -23,5 +23,5 @@

    List<WarehouseConfigItem> itemList(Long projectId);

    List<WarehouseConfigItem> warehouseList(Long projectId);
    List<WarehouseConfigItem> warehouseList(Long projectId,String ids);
}

 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseConfigItemService.java

@@ -51,7 +51,7 @@
        return baseDao.itemList(projectId);
    }

    public List<WarehouseConfigItem> warehouseConfigList(Long projectId) {
        return baseDao.warehouseList(projectId);
    public List<WarehouseConfigItem> warehouseConfigList(Long projectId,String ids) {
        return baseDao.warehouseList(projectId,ids);
    }
}

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml

@@ -48,11 +48,8 @@
        from config_item_warehouse_detail a
        WHERE a.is_delete = 0
          and a.project_id = ${projectId}
        <if test="warehouse_id!=null">
            AND id not in  (select id from config_item_warehouse_detail where is_delete = 0 and warehouse_id = ${warehouseId})
        </if>
        <if test="selectIds!=null">
            AND id not in  (${selectIds})
        <if test="ids!=null">
            AND id not in  (${ids})
        </if>
    </select>


 web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue

@@ -400,7 +400,9 @@
      handleCommand() {
        this.$nextTick(()=>{
          console.log(this.dataForm.projectId,'this.dataForm.projectId')
          this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,this.dataForm.id)
          let ids = '1733024946927554561,1733024946600398850'
          this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,ids)

        })
        // this.dataForm.configItemList.push({})
        // this.$nextTick(() => {

 web/src/views/modules/configItemChange/configItemList.vue

@@ -45,16 +45,16 @@
    return {
      pageCode:'',
      dataForm: {
        id:'',
        ids:null,
        projectId:'',
        configChangeList:[],
      }
    }
  },
  methods: {
    init(projectId,id) {
    init(projectId,ids) {
      this.dataForm.projectId = projectId
      this.dataForm.id = id
       this.dataForm.ids = ids
      console.log(this.dataForm,'this.dataForm.id')
      this.$nextTick(()=>{
        this.$refs.tableObj.query()