mt-fe-group/yudao-dev
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

projects/mesxc-zhp #234

Merged
juzi merged 2 commits from projects/mesxc-zhp into projects/mesxc-test 2024-03-07 16:33:39 +08:00
Conversation 0 Commits 2 Files Changed 11 +221 -128
11 changed files with 221 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/OperationalOverview/processingBoard.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-07-19 15:18:30 * @Date: 2021-07-19 15:18:30
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-06 10:57:52 * @LastEditTime: 2024-03-06 12:01:10
* @Description: * @Description:
--> -->
<template> <template>
@ -632,12 +632,12 @@ export default {
]) ])
this.eqConfig.data = eqArr this.eqConfig.data = eqArr
this.$refs['eqScrollBoard'].updateRows(eqArr) this.$refs['eqScrollBoard'].updateRows(eqArr)
this.$refs.productLineChart.initChart(['D61', 'D62', 'D63', 'D64', 'D65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
this.getList() this.getList()
this.initWebSocket() this.initWebSocket()
this.SJGInitWebSocket() this.SJGInitWebSocket()
this.getTimes() this.getTimes()
// this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321]) // this.$refs.EnergyMonitoringChart.initChart(['Y61', 'Y62', 'Y63', 'Y64', 'Y65',], [3134, 2323, 3232, 3233, 2321])
this.$refs.productLineChart.initChart(['D61', 'D62', 'D63', 'D64', 'D65',], [98, 97, 98.7, 98.5, 98.3,], [3134, 2323, 3232, 3233, 2321])
const _this = this; const _this = this;
_this.beilv2 = document.documentElement.clientWidth / 1920 _this.beilv2 = document.documentElement.clientWidth / 1920
window.onresize = () => { window.onresize = () => {

34
src/views/report/glass/day.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2024-01-24 15:15:24 * @Date: 2024-01-24 15:15:24
* @LastEditTime: 2024-03-05 09:36:28 * @LastEditTime: 2024-03-07 16:21:26
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<inputTable :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all" :type="listQuery.reportType" <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all" :type="listQuery.reportType"
@refreshDataList="getDataList" /> @refreshDataList="getDataList" />
<!-- <pagination <!-- <pagination
:limit.sync="listQuery.pageSize" :limit.sync="listQuery.pageSize"
@ -52,7 +52,8 @@ export default {
total: 0, total: 0,
reportType: 2, reportType: 2,
reportTime: [] reportTime: []
}, },
date:'许昌安彩日原片生产汇总',
reportTime: '', reportTime: '',
startTimeStamp: '', startTimeStamp: '',
endTimeStamp: '', endTimeStamp: '',
@ -75,14 +76,34 @@ export default {
const res = await getCorePLList(); const res = await getCorePLList();
this.proLineList = res.data; this.proLineList = res.data;
}, },
// 获取数据列表 // 获取数据列表
multipliedByHundred(str) {
let floatVal = parseFloat(str);
if (isNaN(floatVal)) {
return 0;
}
floatVal = Math.round(str * 10000) / 100;
let strVal = floatVal.toString();
let searchVal = strVal.indexOf('.');
if (searchVal < 0) {
searchVal = strVal.length;
strVal += '.';
}
while (strVal.length <= searchVal + 2) {
strVal += '0';
}
return parseFloat(strVal);
},
async getDataList() { async getDataList() {
this.dataListLoading = true; this.dataListLoading = true;
await this.urlOptions.getDataListURL(this.listQuery).then(response => { await this.urlOptions.getDataListURL(this.listQuery).then(response => {
this.tableData = response.data.filter(item => { this.tableData = response.data.filter(item => {
this.proLineList.forEach(it => { this.proLineList.forEach(it => {
if (item.lineId === it.id) { if (item.lineId === it.id) {
item.lineName = it.name item.lineName = it.name
item.originalGlassStatisticsTrend = item.originalGlassStatisticsTrend ? this.multipliedByHundred(item.originalGlassStatisticsTrend) + '%' : null
item.actualProductTrend = item.actualProductTrend ? this.multipliedByHundred(item.actualProductTrend) + '%' : null
item.originalGlassPassTrend = item.originalGlassPassTrend ? this.multipliedByHundred(item.originalGlassPassTrend) * 100 + '%' : null
} }
}) })
if (item.det === false) { if (item.det === false) {
@ -121,6 +142,7 @@ export default {
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
console.log(this.listQuery.reportTime); console.log(this.listQuery.reportTime);
this.getDataList();
} else { } else {
this.listQuery.reportTime = [] this.listQuery.reportTime = []
} }
@ -159,7 +181,7 @@ export default {
this.exportLoading = true; this.exportLoading = true;
return this.urlOptions.exportURL(params); return this.urlOptions.exportURL(params);
}).then(response => { }).then(response => {
this.$download.excel(response, '原片生产周报.xls'); this.$download.excel(response, '原片生产日报.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => { }); }).catch(() => { });
} }

14
src/views/report/glass/inputTable.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: Do not edit * @Author: Do not edit
* @Date: 2023-12-13 14:10:04 * @Date: 2023-12-13 14:10:04
* @LastEditTime: 2023-12-14 10:18:20 * @LastEditTime: 2024-03-07 16:17:14
* @LastEditors: DY * @LastEditors: zhp
* @Description: * @Description:
--> -->
<template> <template>
@ -92,6 +92,7 @@ const cols = [
{ {
prop: 'originalGlassStatisticsTrend', prop: 'originalGlassStatisticsTrend',
label: '增减', label: '增减',
// filter:(v)=>{v + '%'}
} }
] ]
}, },
@ -111,6 +112,7 @@ const cols = [
{ {
prop: 'actualProductTrend', prop: 'actualProductTrend',
label: '增减', label: '增减',
// filter: (v) => { v + '%' }
} }
] ]
}, },
@ -145,6 +147,10 @@ const cols = [
type: Array, type: Array,
default: () => [], default: () => [],
}, },
date: {
type: String,
default:''
},
sum: { sum: {
type: Object, type: Object,
default: () => {}, default: () => {},
@ -165,9 +171,9 @@ const cols = [
immediate: true, immediate: true,
handler(newv, oldv) { handler(newv, oldv) {
if (newv[0] !== '') { if (newv[0] !== '') {
this.cols[0].label = '许昌安彩周原片生产汇总' + '(' + newv[0] + '-' + newv[1] + ')' this.cols[0].label = this.date + '(' + newv[0] + '-' + newv[1] + ')'
} else { } else {
this.cols[0].label = '许昌安彩周原片生产汇总' this.cols[0].label = this.date
} }
} }
}, },

47
src/views/report/glass/month.vue
View File

@ -1,33 +1,27 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div> <div>
<el-form <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
:model="listQuery" <el-form-item label="月" prop="reportTime">
:inline="true" <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
ref="dataForm" </el-date-picker>
class="blueTip"> </el-form-item>
<el-form-item label="月" prop="reportTime"> <el-form-item>
<el-date-picker <el-button v-if="this.$auth.hasPermi('report:glass-month:query')" type="primary" size="small"
v-model="reportTime" @click="getDataList">查询</el-button>
type="month" <el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain
size="small" @click="handleExport">导出</el-button>
@change="changeTime" </el-form-item>
placeholder="选择月"> </el-form>
</el-date-picker> </div>
</el-form-item> <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
<el-form-item> :type="listQuery.reportType" @refreshDataList="getDataList" />
<el-button v-if="this.$auth.hasPermi('report:glass-month:query')" type="primary" size="small" @click="getDataList">查询</el-button> <!-- <pagination
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain @click="handleExport">导出</el-button>
</el-form-item>
</el-form>
</div>
<inputTable :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all" :type="listQuery.reportType" @refreshDataList="getDataList" />
<!-- <pagination
:limit.sync="listQuery.pageSize" :limit.sync="listQuery.pageSize"
:page.sync="listQuery.pageNo" :page.sync="listQuery.pageNo"
:total="listQuery.total" :total="listQuery.total"
@pagination="getDataList" /> --> @pagination="getDataList" /> -->
</div> </div>
</template> </template>
<script> <script>
@ -50,7 +44,8 @@ export default {
total: 0, total: 0,
reportType: 4, reportType: 4,
reportTime: [] reportTime: []
}, },
date: '许昌安彩月原片生产汇总',
reportTime: '', reportTime: '',
startTimeStamp: '', startTimeStamp: '',
endTimeStamp: '', endTimeStamp: '',

53
src/views/report/glass/weekly.vue
View File

@ -1,35 +1,29 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <search-bar <!-- <search-bar
:formConfigs="formConfig" :formConfigs="formConfig"
ref="searchBarForm" ref="searchBarForm"
@headBtnClick="buttonClick" /> --> @headBtnClick="buttonClick" /> -->
<div> <div>
<el-form <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
:model="listQuery" <el-form-item label="周" prop="reportTime">
:inline="true" <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
ref="dataForm" :picker-options="{firstDayOfWeek: 1}"
class="blueTip"> :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp" style="width: 350px"
<el-form-item label="周" prop="reportTime"> placeholder="选择周">
<el-date-picker </el-date-picker>
v-model="reportTime" </el-form-item>
type="week" <el-form-item>
size="small" <el-button v-if="this.$auth.hasPermi('report:glass-weekly:query')" type="primary" size="small"
@change="changeTime" @click="getDataList">查询</el-button>
:picker-options="{firstDayOfWeek: 1}" <el-button v-if="this.$auth.hasPermi('report:glass-weekly:export')" type="primary" size="small" plain
:format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp" @click="handleExport">导出</el-button>
style="width: 350px" </el-form-item>
placeholder="选择周"> </el-form>
</el-date-picker> </div>
</el-form-item> <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
<el-form-item> :type="listQuery.reportType" @refreshDataList="getDataList" />
<el-button v-if="this.$auth.hasPermi('report:glass-weekly:query')" type="primary" size="small" @click="getDataList">查询</el-button> </div>
<el-button v-if="this.$auth.hasPermi('report:glass-weekly:export')" type="primary" size="small" plain @click="handleExport">导出</el-button>
</el-form-item>
</el-form>
</div>
<inputTable :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all" :type="listQuery.reportType" @refreshDataList="getDataList" />
</div>
</template> </template>
<script> <script>
@ -52,7 +46,8 @@ export default {
total: 0, total: 0,
reportType: 3, reportType: 3,
reportTime: [] reportTime: []
}, },
date: '许昌安彩周原片生产汇总',
reportTime: '', reportTime: '',
startTimeStamp: '', startTimeStamp: '',
endTimeStamp: '', endTimeStamp: '',

50
src/views/report/glass/year.vue
View File

@ -1,31 +1,24 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div> <div>
<el-form <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
:model="listQuery" <el-form-item label="年" prop="reportTime">
:inline="true" <el-date-picker v-model="reportTime" type="year" size="small" @change="changeTime"
ref="dataForm" :picker-options="{firstDayOfWeek: 1}" :format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
class="blueTip"> style="width: 350px" placeholder="选择年">
<el-form-item label="年" prop="reportTime"> </el-date-picker>
<el-date-picker </el-form-item>
v-model="reportTime" <el-form-item>
type="year" <el-button v-if="this.$auth.hasPermi('report:glass-year:query')" type="primary" size="small"
size="small" @click="getDataList">查询</el-button>
@change="changeTime" <el-button v-if="this.$auth.hasPermi('report:glass-year:export')" type="primary" size="small" plain
:picker-options="{firstDayOfWeek: 1}" @click="handleExport">导出</el-button>
:format="'yyyy 年' + '\u3000' + startTimeStamp + '-' + endTimeStamp" </el-form-item>
style="width: 350px" </el-form>
placeholder="选择年"> </div>
</el-date-picker> <inputTable :date="date" :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all"
</el-form-item> :type="listQuery.reportType" @refreshDataList="getDataList" />
<el-form-item> </div>
<el-button v-if="this.$auth.hasPermi('report:glass-year:query')" type="primary" size="small" @click="getDataList">查询</el-button>
<el-button v-if="this.$auth.hasPermi('report:glass-year:export')" type="primary" size="small" plain @click="handleExport">导出</el-button>
</el-form-item>
</el-form>
</div>
<inputTable :data="tableData" :time="[startTimeStamp, endTimeStamp]" :sum="all" :type="listQuery.reportType" @refreshDataList="getDataList" />
</div>
</template> </template>
<script> <script>
@ -48,7 +41,8 @@ export default {
total: 0, total: 0,
reportType: 5, reportType: 5,
reportTime: [] reportTime: []
}, },
date: '许昌安彩年原片生产汇总',
reportTime: '', reportTime: '',
startTimeStamp: '', startTimeStamp: '',
endTimeStamp: '', endTimeStamp: '',

35
src/views/report/productionDayReport/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-05 09:36:18 * @LastEditTime: 2024-03-07 16:10:22
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -24,11 +24,11 @@
background: '#F2F4F9', background: '#F2F4F9',
color: '#606266' color: '#606266'
}"> }">
<el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center"> <el-table-column :label="'许昌安彩日成品生产汇总' + timeTips" align="center">
<el-table-column prop="lineId" label="生产线"> <el-table-column prop="lineName" label="生产线">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineId }} </span> <span v-else>{{ scope.row.lineName }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投入数㎡"> <el-table-column label="投入数㎡">
@ -153,12 +153,12 @@ import {
// import Editor from '@/components/Editor'; // import Editor from '@/components/Editor';
import moment from 'moment'; import moment from 'moment';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
import { getCorePLList } from '@/api/base/coreProductionLine';
// import basicPageMixin from '@/mixins/lb/basicPageMixin'; // import basicPageMixin from '@/mixins/lb/basicPageMixin';
const tableProps = [ const tableProps = [
{ {
// width: 128, // width: 128,
prop: 'lineId', prop: 'lineName',
label: '生产线', label: '生产线',
}, },
{ {
@ -424,6 +424,7 @@ export default {
// } // }
this.getTodayStartTimeAndEndTime() this.getTodayStartTimeAndEndTime()
this.getDataList() this.getDataList()
this.getDict()
}, },
methods: { methods: {
format(shijianchuo) { format(shijianchuo) {
@ -540,7 +541,13 @@ export default {
this.$modal.msgError('更新失败'); this.$modal.msgError('更新失败');
} }
}, },
async getDict() {
// 产线列表
const res = await getCorePLList();
this.proLineList = res.data;
},
async getDataList() { async getDataList() {
this.list = []
// if (this.monthValue.length > 0) { // if (this.monthValue.length > 0) {
// console.log(this.monthValue) // console.log(this.monthValue)
// this.listQuery.reportTime[0] = this.transformTime(this.monthValue[0]) // this.listQuery.reportTime[0] = this.transformTime(this.monthValue[0])
@ -554,6 +561,7 @@ export default {
// } // }
console.log(this.listQuery); console.log(this.listQuery);
const res = await this.$axios({ const res = await this.$axios({
url: '/base/report-auto-production/page', url: '/base/report-auto-production/page',
method: 'get', method: 'get',
@ -568,10 +576,19 @@ export default {
// }) // })
res.data.list.forEach((ele,index) => { res.data.list.forEach((ele,index) => {
if (ele.det === false) { if (ele.det === false) {
res.data.list[index].lineId = '合计' res.data.list[index].lineName = '合计'
this.remark = res.data.list[index].remark this.remark = res.data.list[index].remark
} }
}); })
res.data.list.forEach(item => {
this.proLineList.forEach(it => {
if (item.lineId === it.id) {
console.log(item)
item.lineName = it.name
}
})
})
this.list = res.data.list this.list = res.data.list
}, },
}, },

27
src/views/report/productionMonthReport/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-05 09:06:22 * @LastEditTime: 2024-03-07 16:07:25
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -29,8 +29,8 @@
<el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center"> <el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center">
<el-table-column prop="lineId" label="生产线"> <el-table-column prop="lineId" label="生产线">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineId }} </span> <span v-else>{{ scope.row.lineName }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投入数㎡"> <el-table-column label="投入数㎡">
@ -155,6 +155,7 @@ import {
// import Editor from '@/components/Editor'; // import Editor from '@/components/Editor';
import moment from 'moment'; import moment from 'moment';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
import { getCorePLList } from '@/api/base/coreProductionLine'
// import basicPageMixin from '@/mixins/lb/basicPageMixin'; // import basicPageMixin from '@/mixins/lb/basicPageMixin';
const tableProps = [ const tableProps = [
@ -427,8 +428,14 @@ export default {
// } // }
this.getDataList() this.getDataList()
this.getDict()
}, },
methods: { methods: {
async getDict() {
// 产线列表
const res = await getCorePLList();
this.proLineList = res.data;
},
handleExport() { handleExport() {
// 处理查询参数 // 处理查询参数
let params = { ...this.dataForm }; let params = { ...this.dataForm };
@ -565,11 +572,21 @@ export default {
// }) // })
res.data.list.forEach((ele,index) => { res.data.list.forEach((ele,index) => {
if (ele.det === false) { if (ele.det === false) {
res.data.list[index].lineId = '合计' res.data.list[index].lineName = '合计'
this.remark = res.data.list[index].remark this.remark = res.data.list[index].remark
} }
}); })
res.data.list.forEach(item => {
this.proLineList.forEach(it => {
if (item.lineId === it.id) {
console.log(item)
item.lineName = it.name
}
})
})
this.list = res.data.list this.list = res.data.list
// this.list = res.data.list
}, },
}, },
}; };

21
src/views/report/productionShipmentsReport/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-04 16:51:18 * @LastEditTime: 2024-03-07 16:10:47
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -26,7 +26,7 @@
background: '#F2F4F9', background: '#F2F4F9',
color: '#606266' color: '#606266'
}"> }">
<el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center"> <el-table-column :label="'许昌安彩周成品生产汇总' + timeTips" align="center">
<el-table-column prop="glassType" label="品种" align="center"> <el-table-column prop="glassType" label="品种" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.glassType" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.glassType" :disabled="disabled"></el-input>
@ -187,7 +187,7 @@ import {
// import Editor from '@/components/Editor'; // import Editor from '@/components/Editor';
import moment from 'moment'; import moment from 'moment';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
import { getCorePLList } from '@/api/base/coreProductionLine'
// import basicPageMixin from '@/mixins/lb/basicPageMixin'; // import basicPageMixin from '@/mixins/lb/basicPageMixin';
const tableProps = [ const tableProps = [
{ {
@ -458,8 +458,14 @@ export default {
// this.searchBarFormConfig[0].defaultSelect = []; // this.searchBarFormConfig[0].defaultSelect = [];
// } // }
this.getDataList() this.getDataList()
this.getDict()
}, },
methods: { methods: {
async getDict() {
// 产线列表
const res = await getCorePLList()
this.proLineList = res.data;
},
timeSelect() { timeSelect() {
// switch (this.queryParams.timeDim) { // switch (this.queryParams.timeDim) {
// case '1': // case '1':
@ -563,6 +569,15 @@ export default {
this.remark = res.data[index].remark this.remark = res.data[index].remark
} }
}); });
// res.data.list.forEach(item => {
// this.proLineList.forEach(it => {
// if (item.lineId === it.id) {
// console.log(item)
// item.lineName = it.name
// }
// })
// })
this.list = res.data this.list = res.data
}, },
}, },

28
src/views/report/productionWeekReport/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-04 16:51:38 * @LastEditTime: 2024-03-07 16:10:53
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -29,11 +29,11 @@
background: '#F2F4F9', background: '#F2F4F9',
color: '#606266' color: '#606266'
}"> }">
<el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center"> <el-table-column :label="'许昌安彩周成品生产汇总' + timeTips" align="center">
<el-table-column prop="lineId" label="生产线"> <el-table-column prop="lineId" label="生产线">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineId }} </span> <span v-else>{{ scope.row.lineName }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投入数㎡"> <el-table-column label="投入数㎡">
@ -158,6 +158,7 @@ import {
// import Editor from '@/components/Editor'; // import Editor from '@/components/Editor';
import moment from 'moment'; import moment from 'moment';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
import { getCorePLList } from '@/api/base/coreProductionLine'
// import basicPageMixin from '@/mixins/lb/basicPageMixin'; // import basicPageMixin from '@/mixins/lb/basicPageMixin';
const tableProps = [ const tableProps = [
@ -367,8 +368,14 @@ export default {
// } // }
this.getCurrentWeekStartTimeAndEndTime() this.getCurrentWeekStartTimeAndEndTime()
this.getDataList() this.getDataList()
this.getDict()
}, },
methods: { methods: {
async getDict() {
// 产线列表
const res = await getCorePLList()
this.proLineList = res.data;
},
getCurrentWeekStartTimeAndEndTime() { getCurrentWeekStartTimeAndEndTime() {
const current = new Date(); const current = new Date();
// current是本周的第几天 // current是本周的第几天
@ -484,10 +491,19 @@ export default {
// }) // })
res.data.list.forEach((ele,index) => { res.data.list.forEach((ele,index) => {
if (ele.det === false) { if (ele.det === false) {
res.data.list[index].lineId = '合计' res.data.list[index].lineName = '合计'
this.remark = res.data.list[index].remark this.remark = res.data.list[index].remark
} }
}); })
res.data.list.forEach(item => {
this.proLineList.forEach(it => {
if (item.lineId === it.id) {
console.log(item)
item.lineName = it.name
}
})
})
this.list = res.data.list this.list = res.data.list
}, },
}, },

30
src/views/report/productionYearReport/index.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Author: zhp * @Author: zhp
* @Date: 2023-12-12 13:45:25 * @Date: 2023-12-12 13:45:25
* @LastEditTime: 2024-03-05 09:47:42 * @LastEditTime: 2024-03-07 16:11:03
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -29,11 +29,11 @@
color: '#606266' color: '#606266'
}"> }">
<el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center"> <el-table-column :label="'许昌安彩年成品生产汇总' + timeTips" align="center">
<el-table-column prop="lineId" label="生产线"> <el-table-column prop="lineId" label="生产线">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" v-model="scope.row.lineId" :disabled="disabled"></el-input> <el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineId }} </span> <span v-else>{{ scope.row.lineName }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投入数㎡"> <el-table-column label="投入数㎡">
@ -159,7 +159,8 @@ import {
import moment from 'moment'; import moment from 'moment';
// import DialogForm from './dialogForm.vue'; // import DialogForm from './dialogForm.vue';
import { parseTime } from '../../core/mixins/code-filter'; import { parseTime } from '../../core/mixins/code-filter';
// import basicPageMixin from '@/mixins/lb/basicPageMixin'; import { getCorePLList } from '@/api/base/coreProductionLine'
const tableProps = [ const tableProps = [
{ {
// width: 128, // width: 128,
@ -369,8 +370,14 @@ export default {
// this.searchBarFormConfig[0].defaultSelect = []; // this.searchBarFormConfig[0].defaultSelect = [];
// } // }
this.getDataList() this.getDataList()
this.getDict()
}, },
methods: { methods: {
async getDict() {
// 产线列表
const res = await getCorePLList()
this.proLineList = res.data;
},
getCurrentYearFirst() { getCurrentYearFirst() {
let date = new Date(); let date = new Date();
date.setDate(1); date.setDate(1);
@ -507,10 +514,19 @@ export default {
// }) // })
res.data.list.forEach((ele,index) => { res.data.list.forEach((ele,index) => {
if (ele.det === false) { if (ele.det === false) {
res.data.list[index].lineId = '合计' res.data.list[index].lineName = '合计'
this.remark = res.data.list[index].remark this.remark = res.data.list[index].remark
} }
}); })
res.data.list.forEach(item => {
this.proLineList.forEach(it => {
if (item.lineId === it.id) {
console.log(item)
item.lineName = it.name
}
})
})
this.list = res.data.list this.list = res.data.list
}, },
}, },