Compare commits

..

No commits in common. "274b8125a04ebaabd4c3533b95db7339016470a4" and "83dbf6791197383d31ad64aa8eb4289a5a10b1b4" have entirely different histories.

1 changed files with 284 additions and 207 deletions

View File

@ -1,64 +1,115 @@
<template> <template>
<el-container> <el-container>
<el-aside style="width: 50%; background: #ffffff"> <el-aside style="width: 50%; background: #ffffff">
<div style="height: 50%;">
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<span style="font-size: 14px">库存统计</span> <span style="font-size: 14px">库存统计</span>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-select v-model="params.type" clearable style="width: 120px;" <el-select
@change="materialTypeChange"> v-model="params.type"
<el-option v-for="item in materialTypeOptions" :key="item.id" :label="item.name" clearable
:value="item.id"> style="width: 120px;"
@change="materialTypeChange"
>
<el-option
v-for="item in materialTypeOptions"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option> </el-option>
</el-select> </el-select>
<xtSelect :apiObj="apiObj" v-model="query.material" v-model:obj="selectObj" <xtSelect
:labelField="'name'" style="width: 250px;" :params="mquery" :apiObj="apiObj"
@change="selectMaterialChange"> v-model="query.material"
v-model:obj="selectObj"
:labelField="'name'"
style="width: 150px;"
:params="mquery"
@change="selectMaterialChange"
>
<el-table-column label="名称" prop="name"></el-table-column> <el-table-column label="名称" prop="name"></el-table-column>
<el-table-column label="型号" prop="model"></el-table-column> <el-table-column label="型号" prop="model"></el-table-column>
<el-table-column label="规格" prop="spcification"></el-table-column> <el-table-column label="规格" prop="spcification"></el-table-column>
</xtSelect> </xtSelect>
<el-button type="primary" icon="el-icon-search" @click="materialTypeChange"></el-button> <el-button
<el-button @click="handleExport('1')" type="primary">导出</el-button> type="primary"
icon="el-icon-search"
@click="materialTypeChange"
></el-button>
<el-button @click="handleExport('1')" type="primary"
>导出</el-button
>
</div> </div>
</el-header> </el-header>
<el-main> <el-main>
<scTable v-if="params.type == 10 || params.type == 20" ref="tables1" :data="tableData1" <scTable
id="exportDiv1" stripe hideDo hidePagination :summary-method="getSummaries" show-summary row-key="id"> v-if="params.type == 10 || params.type == 20"
ref="tables1"
:data="tableData1"
id="exportDiv1"
stripe
hideDo
hidePagination
:summary-method="getSummaries" show-summary
>
<el-table-column type="index" width="50"/> <el-table-column type="index" width="50"/>
<el-table-column label="物料名" prop="material_name" :filters="nameFilters1" <el-table-column label="物料名" prop="material_name"
:filter-method="filterName1" filter-placement="bottom-end" /> :filters="nameFilters1"
<el-table-column label="型号" prop="material_model" :filters="modelFilters1" :filter-method="filterName1"
:filter-method="filterModel1" filter-placement="bottom-end" /> filter-placement="bottom-end"/>
<el-table-column label="规格" prop="material_specification" :filters="specsFilters1" <el-table-column label="型号" prop="material_model"
:filter-method="filterSpecs1" filter-placement="bottom-end" /> :filters="modelFilters1"
<el-table-column prop="dept_name" label="完成车间" :filters="deptFilters1" :filter-method="filterModel1"
:filter-method="filterDept1" filter-placement="bottom-end" /> filter-placement="bottom-end"/>
<el-table-column label="库存合格品数" prop="count" /> <el-table-column label="规格" prop="material_specification"
:filters="specsFilters1"
:filter-method="filterSpecs1"
filter-placement="bottom-end"/>
<el-table-column prop="dept_name" label="完成车间"
:filters="deptFilters1"
:filter-method="filterDept1"
filter-placement="bottom-end"/>
<el-table-column label="库存总数" prop="count" />
</scTable> </scTable>
<scTable v-else ref="tables11" :data="tableData11" id="exportDiv1" stripe hideDo hidePagination <scTable
:summary-method="getSummaries2" show-summary row-key="id"> v-else
ref="tables11"
:data="tableData11"
id="exportDiv1"
stripe
hideDo
hidePagination
:summary-method="getSummaries2"
show-summary
>
<el-table-column type="index" width="50" /> <el-table-column type="index" width="50" />
<el-table-column label="物料名" prop="name" :filters="nameFilters11" <el-table-column label="物料名" prop="name"
:filter-method="filterName11" filter-placement="bottom-end" /> :filters="nameFilters11"
<el-table-column label="型号" prop="model" :filters="modelFilters11" :filter-method="filterName11"
:filter-method="filterModel11" filter-placement="bottom-end" /> filter-placement="bottom-end"/>
<el-table-column label="规格" prop="specification" :filters="specsFilters11" <el-table-column label="型号" prop="model"
:filter-method="filterSpecs11" filter-placement="bottom-end" /> :filters="modelFilters11"
:filter-method="filterModel11"
filter-placement="bottom-end"/>
<el-table-column label="规格" prop="specification"
:filters="specsFilters11"
:filter-method="filterSpecs11"
filter-placement="bottom-end"/>
<el-table-column label="仓库合格品数" prop="count_mb"/> <el-table-column label="仓库合格品数" prop="count_mb"/>
<el-table-column label="周预估值" v-if="params.type == 30"> <el-table-column label="周预估值" v-if="params.type == 30">
<template #default="scope"> <template #default="scope">
<el-input v-model="scope.row.week_esitimate_consume" <el-input
@blur="weekcountChange(scope.row)"></el-input> v-model="scope.row.week_esitimate_consume"
@blur="weekcountChange(scope.row)"
></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="可用天数" v-if="params.type == 30"> <el-table-column label="可用天数" v-if="params.type == 30">
<template #default="scope"> <template #default="scope">
<span <span v-if="scope.row.week_esitimate_consume &&scope.row.week_esitimate_consume !==null">
v-if="scope.row.week_esitimate_consume && scope.row.week_esitimate_consume !== null">
{{Math.floor(scope.row.count_mb /scope.row.week_esitimate_consume) * 7}} {{Math.floor(scope.row.count_mb /scope.row.week_esitimate_consume) * 7}}
</span> </span>
</template> </template>
@ -66,72 +117,115 @@
</scTable> </scTable>
</el-main> </el-main>
</el-container> </el-container>
</div> </el-aside>
<div style="height: 50%;"> <el-main class="nopadding">
<el-container> <el-container>
<el-header> <el-header>
<div class="left-panel"> <div class="left-panel">
<span style="font-size: 14px">库存出入库统计</span> <span style="font-size: 14px">库存出入库统计</span>
</div> </div>
<div class="right-panel"> <div class="right-panel">
<el-select v-model="query.mio_type" clearable @change="mioTypeChange" style="width: 100px"> <el-select
<el-option v-for="e in mioTypeEnum.values" :key="e.key" :value="e.key" v-model="query.mio_type"
:label="e.text"></el-option> clearable
@change="mioTypeChange"
style="width: 100px"
>
<el-option
v-for="e in mioTypeEnum.values"
:key="e.key"
:value="e.key"
:label="e.text"
></el-option>
</el-select> </el-select>
<el-select v-model="queryType" style="width: 100px" @change="queryTypeChnge"> <el-select
<el-option v-for="item in typeOptions" :key="item" :label="item" v-model="queryType"
:value="item"></el-option> style="width: 100px"
@change="queryTypeChnge"
>
<el-option
v-for="item in typeOptions"
:key="item"
:label="item"
:value="item"
></el-option>
</el-select> </el-select>
<el-date-picker v-if="queryType == ''" v-model="queryDate" type="month" placeholder="查询月" <el-date-picker
value-format="YYYY-MM" style="width: 100px"> v-if="queryType == '月'"
v-model="queryDate"
type="month"
placeholder="查询月"
value-format="YYYY-MM"
style="width: 100px"
>
</el-date-picker> </el-date-picker>
<el-date-picker v-if="queryType == ''" v-model="queryDate" type="year" placeholder="查询年" <el-date-picker
value-format="YYYY" style="width: 100px"> v-if="queryType == '年'"
v-model="queryDate"
type="year"
placeholder="查询年"
value-format="YYYY"
style="width: 100px"
>
</el-date-picker> </el-date-picker>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button> <el-button
type="primary"
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button @click="handleExport('2')" type="primary">导出</el-button> <el-button @click="handleExport('2')" type="primary">导出</el-button>
</div> </div>
</el-header> </el-header>
<el-main> <el-main>
<scTable ref="tables2" :data="tableData" id="exportDiv2" stripe hideDo hidePagination <scTable
:summary-method="getSummaries" show-summary row-key="id"> ref="tables2"
<el-table-column label="物料名" prop="物料名" :filters="nameFilters2" :filter-method="filterName2" :data="tableData"
id="exportDiv2"
stripe
hideDo
hidePagination
:summary-method="getSummaries"
show-summary
>
<el-table-column label="物料名" prop="物料名"
:filters="nameFilters2"
:filter-method="filterName2"
filter-placement="bottom-end"> filter-placement="bottom-end">
</el-table-column> </el-table-column>
<el-table-column label="型号" prop="型号" :filters="modelFilters2" :filter-method="filterModel2" <el-table-column label="型号" prop="型号"
filter-placement="bottom-end"></el-table-column> :filters="modelFilters2"
<el-table-column label="规格" prop="规格" :filters="specsFilters2" :filter-method="filterSpecs2" :filter-method="filterModel2"
filter-placement="bottom-end"></el-table-column> filter-placement="bottom-end"
></el-table-column>
<el-table-column label="规格" prop="规格"
:filters="specsFilters2"
:filter-method="filterSpecs2"
filter-placement="bottom-end"
></el-table-column>
<el-table-column label="出入库类型"> <el-table-column label="出入库类型">
<span>{{ mio_type_name }}</span> <span>{{ mio_type_name }}</span>
</el-table-column> </el-table-column>
<el-table-column label="执行车间" prop="执行车间" :filters="deptFilters2" <el-table-column label="执行车间" prop="执行车间"
:filter-method="filterDept2" filter-placement="bottom-end"> :filters="deptFilters2"
:filter-method="filterDept2"
filter-placement="bottom-end">
</el-table-column> </el-table-column>
<template <template v-if="queryType == '月' &&(query.mio_type == 'pur_in' ||query.mio_type == 'do_in' ||query.mio_type == 'other_in')">
v-if="queryType == '月' && (query.mio_type == 'pur_in' || query.mio_type == 'do_in' || query.mio_type == 'other_in')">
<el-table-column label="月入库总数" prop="数量"></el-table-column> <el-table-column label="月入库总数" prop="数量"></el-table-column>
</template> </template>
<template <template v-if="queryType == '月' &&(query.mio_type == 'do_out' ||query.mio_type == 'sale_out' ||query.mio_type == 'other_out')">
v-if="queryType == '月' && (query.mio_type == 'do_out' || query.mio_type == 'sale_out' || query.mio_type == 'other_out')">
<el-table-column label="月出库数量" prop="数量"> <el-table-column label="月出库数量" prop="数量">
</el-table-column> </el-table-column>
</template> </template>
<template <template v-if="queryType == '年' &&(query.mio_type == 'pur_in' ||query.mio_type == 'do_in' ||query.mio_type == 'other_in')">
v-if="queryType == '年' && (query.mio_type == 'pur_in' || query.mio_type == 'do_in' || query.mio_type == 'other_in')">
<el-table-column label="年入库总数" prop="数量"></el-table-column> <el-table-column label="年入库总数" prop="数量"></el-table-column>
</template> </template>
<template <template v-if="queryType == '年' &&(query.mio_type == 'do_out'||query.mio_type == 'sale_out'||query.mio_type == 'other_out')">
v-if="queryType == '年' && (query.mio_type == 'do_out' || query.mio_type == 'sale_out' || query.mio_type == 'other_out')">
<el-table-column label="年出库总数" prop="数量"></el-table-column> <el-table-column label="年出库总数" prop="数量"></el-table-column>
</template> </template>
</scTable> </scTable>
</el-main> </el-main>
</el-container> </el-container>
</div>
</el-aside>
<el-main class="nopadding">
<scEcharts :option="echartsOptions" height="80%"></scEcharts>
</el-main> </el-main>
</el-container> </el-container>
</template> </template>
@ -144,7 +238,6 @@ export default {
name: "chart", name: "chart",
data() { data() {
return { return {
echartsOptions: null,
mioTypeEnum, mioTypeEnum,
apiObj: this.$API.mtm.material.list, apiObj: this.$API.mtm.material.list,
materialType: "", materialType: "",
@ -158,7 +251,6 @@ export default {
type__in: "10", type__in: "10",
is_hidden: false, is_hidden: false,
is_assemb: false, is_assemb: false,
query: "{id,name,model,specification}"
}, },
selectObj: {}, selectObj: {},
mio_type_name: mioTypeEnum.values[0].text, mio_type_name: mioTypeEnum.values[0].text,
@ -210,7 +302,6 @@ export default {
that.end_date = that.currentYear + "-12-31"; that.end_date = that.currentYear + "-12-31";
that.getTableData(); that.getTableData();
that.getTableData1(); that.getTableData1();
that.initChartOptions();
}, },
methods: { methods: {
queryTypeChnge() { queryTypeChnge() {
@ -318,20 +409,6 @@ export default {
that.getTableData11(); that.getTableData11();
} }
that.getTableData(); that.getTableData();
that.initChartOptions();
},
initChartOptions() {
this.$API.bi.dataset.exec.req("materialCount", {query: {
"select_dept": "",
"groupby_dept": "",
"material_types": this.params.type,
"select_material": "",
"groupby_material": ""
}}).then((res) => {
if (res.echart_options) {
this.echartsOptions = JSON.parse(res.echart_options);
}
})
}, },
// //
weekcountChange(row) { weekcountChange(row) {