Merge remote-tracking branch 'origin/master'

futian.liu

2023-12-09 2af69a47b08aa4988cc9733a361a733a671a5f81

 admin-web/src/views/statisticalreport/itemReport/index.vue

@@ -4,49 +4,43 @@
      <div class="filter-container" style="margin-bottom: 10px">
        <my-search ref="searchBar" :items="items" @search="filterForm"></my-search>
      </div>
      <div class="title"  align="center">物品统计表</div>
      <div class="title">物品统计表</div>
      <el-table
        v-loading="loading"
        :data="tableData"
        border
        style="width: 100%">
        <el-table-column
          fixed="left"
          align="center"
          prop="orgName"
          label="机构"
          width="150">
          min-width="150">
        </el-table-column>
        <el-table-column
          fixed="left"
          align="center"
          prop="warehouseName"
          label="仓库/部门"
          width="150">
          min-width="150">
        </el-table-column>
        <el-table-column
          fixed="left"
          align="center"
          prop="goodsCode"
          label="物品编码"
          width="150">
        </el-table-column>
        <el-table-column
          fixed="left"
          align="center"
          prop="goodsTemplateName"
          label="物品名称"
          width="150">
          min-width="150">
        </el-table-column>
        <el-table-column
          fixed="left"
          align="center"
          prop="baseGoodsModelsName"
          label="规格型号"
          width="150">
          min-width="150">
        </el-table-column>
        <el-table-column
          fixed="left"
          align="center"
          prop="zaiKuNum"
          label="在库/在用数量"
@@ -54,21 +48,18 @@
        </el-table-column>

        <el-table-column
          fixed="left"
          align="center"
          prop="baoFeiNum"
          label="报废数"
          width="150">
        </el-table-column>
<!--        <el-table-column-->
<!--          align="center"-->
<!--          prop="diaoBoNum"-->
<!--          label="调拨数"-->
<!--          width="150">-->
<!--        </el-table-column>-->
        <el-table-column
          fixed="left"
          align="center"
          prop="diaoBoNum"
          label="调拨数"
          width="150">
        </el-table-column>
        <el-table-column
          fixed="left"
          align="center"
          prop="totalNum"
          label="总数量"
@@ -80,12 +71,11 @@
</template>

<script>
  import {getGoodsStatistics} from '@/api/dashboard/goodsStatis.js'
  import {formatDate,LongToDate} from "@/utils/DateFormatter";
  import {downLoad} from "@/utils/base";
  import SettingIplatform from '@/utils/settingIplatform';
import {getGoodsStatistics} from '@/api/dashboard/goodsStatis.js'
import {formatDate} from "@/utils/DateFormatter";
import SettingIplatform from '@/utils/settingIplatform';

  export default {
export default {
    data() {
      return {
        items: [
@@ -96,7 +86,7 @@
            placeholder: '请选择',
            defaultValue: '',
            options: [],
            cascader: [{key:'warehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
            cascader: [{key:'baseWarehouseId',queryKey: 'agencyId'},{key:'goodsTemplateId',queryKey: 'agencyId'}],
            optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
          },
          {