修改bug

This commit is contained in:
‘937886381’
2024-03-07 16:28:23 +08:00
parent 2c06d68d72
commit 39493549b9
11 changed files with 221 additions and 128 deletions

View File

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