admin-web/src/views/departmentitem/itemdis/distribution/index.vue

@@ -30,9 +30,9 @@
                      </div>
                      <div class="one-hed">
                        <div class="box"><span class="span-two">部门：</span>{{ item.inWarehouseName }}</div>
                        <div class="box"><span class="span-two">领取人：</span>{{ item.inOperatorName }}</div>
                        <div class="box"><span class="span-two">分发人：</span>{{ item.inOperatorName }}</div>
                        <div class="box">
                          <span class="span-two">领取时间：</span>{{ item.createTime | formatTime }}
                          <span class="span-two">分发时间：</span>{{ item.createTime | formatTime }}
                        </div>
                      </div>
                      <div class="card-end">
@@ -158,11 +158,15 @@
          defaultValue: '',
        },
      ],
      filterFrom: {},
      // 树数据
      treeDataList: []
    };
  },
  created() {
    this.filterFrom = {
      outAgencyId: this.userInfo.tenantId,
    };
    this.fetchData()
  },
  methods: {

 consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java

@@ -220,8 +220,9 @@

    @GetMapping("/query/goodsTemplate")
    public ResponseValue queryGoodsTemplateByCategoryId(Long agencyId, Long categoryId) {
        // TODO 不限制机构
        List<BaseGoodsTemplate> list =
            this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, categoryId, null, null);
            this.baseGoodsTemplateService.queryGoodsTemplateByCategoryId(null, categoryId, null, null);
        if (list == null) {
            return ResponseValue.error("查询失败！");
        }
@@ -250,7 +251,9 @@

        String sql =
            "SELECT DISTINCT bgt.id,bgt.GOODS_NAME, CLASSIFICATION type FROM l_wh_goods g LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.id "
                + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID = :warehouseId " + "AND CATEGORY_ID = :categoryId "
                + "WHERE WAREHOUSE_TYPE = 0 " + "AND WAREHOUSE_ID = :warehouseId "
                // TODO 临时解决
                /*+ "AND CATEGORY_ID = :categoryId "*/
                // 1:集采,2:自采
                + "AND BUY_TYPE =1";