@@ -1,7 +1,7 @@
<!--
* @ Author : zhp
* @ Date : 2023 - 12 - 12 13 : 45 : 25
* @ LastEditTime : 2023 - 12 - 13 16 : 55 : 27
* @ LastEditTime : 2023 - 12 - 14 14 : 56 : 40
* @ LastEditors : zhp
* @ Description :
-- >
@@ -24,100 +24,132 @@
color : ' # 606266 '
} " >
< el-table-column : label = "'许昌安彩月成品生产汇总' + timeTips" align = "center" >
< el-table-column prop = "glassType" label = "品种" >
< el-table-column prop = "glassType" label = "品种" align = "center" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.glassType" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.glassType }} < / span >
< / template >
< / el -table -column >
< el-table-column label = "规格" >
< el-table-column prop = "inputNow" label = "本周 " >
< template slot -scope = " scope ">
< el-input v-if = "scope.row.det === true" v-model="scope.row.inputNow" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.inputNow }} < /span >
< / template >
< el-table-column label = "规格" align = "center" >
< el-table-column label = "成品" align = "center " >
< el-table-column :show-header = "false ">
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.productionL" :disabled="disabled" > < /el -input >
< span v-else > {{ scope.row.productionL }} < / span >
< / template >
< / el -table -column >
< el-table-column :show-header = "false" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.productionW" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.productionW }} < / span >
< / template >
< / el -table -column >
< el-table-column :show-header = "false" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.productionH" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.productionH }} < / span >
< / template >
< / el -table -column >
< / el-table-column >
< el-table-column prop = "inputHis" label= "上周 " >
< template slot -scope = " scope ">
< el-input v-if = "scope.row.det === true" v-model="scope.row.inputHis" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.inputHis }} < / span >
< /template >
< / el -table -column >
< el-table-column prop = "inputTrend" label = "增减" >
<template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.inputTrend" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.inputTrend }} < / span >
< / template >
< / el -table -column >
< / el-table-column >
< el-table-column label = "完成良品产量" >
< el-table-column prop = "goodProductNow" label = "本周" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.goodProductNow" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.goodProductNow }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "goodProductHis" label = "上周" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.goodProductHis" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.goodProductHis }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "goodProductTrend" label = "增减" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.goodProductTrend" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.goodProductTrend }} < / span >
< / template >
< / el -table -column >
< / el-table-column >
< el-table-column label = "原片漏检率" >
< el-table-column prop = "missCheckNow" label = "本周" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.missCheckNow" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.missCheckNow }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "missCheckHis" label = "上周" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.missCheckHis" :disabled="disabled" > < / el -input >
< span v-else > {{ scope.row.missCheckHis }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "missCheckTrend" label = "增减" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.missCheckTrend" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.missCheckTrend }} < / span >
< / template >
< / el -table -column >
< / el-table-column >
< el-table-column label = "综合良品率" >
< el-table-column prop = "goodProductPassNow" label = "本周" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.goodProductPassNow" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.goodProductPassNow }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "goodProductPassHis" label = "上周" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.goodProductPassHis" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.goodProductPassHis }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "goodProductPassTrend" label = "增减" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.goodProductPassTrend" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.goodProductPassTrend }} < / span >
< / template >
< el-table-column label = "原片 " >
< el-table-column prop = "originalGlassSize ">
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.originalGlassSize" :disabled="disabled" >
< /el -input >
< span v-else > {{ scope.row.originalGlassSize }} < / span >
< / template >
</ el -table -column >
< / el-table-column >
< / el-table-column >
< / el-table-column >
<!-- < el-table-column label = "完成良品产量" > -- >
< el-table-column prop = "customerId" label = "用户" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.customerId" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.customerId }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "packageType" label = "包装形式" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.packageType" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.packageType }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "orderNum" label = "订单数量" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.orderNum" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.orderNum }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "orderFinish" label = "订单完成" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.orderFinish" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.orderFinish }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "orderRemaining" label = "未完成订单" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.orderRemaining" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.orderRemaining }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "stockLastMonth" label = "上月库存" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.stockLastMonth" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.stockLastMonth }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "productNumThisMonth" label = "本月生产成品" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.productNumThisMonth" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.productNumThisMonth }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "deliveNum" label = "发货量" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.deliveNum" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.deliveNum }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "undeliveNum" label = "未发货量" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.undeliveNum" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.undeliveNum }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "undeliveArea" label = "未发货面积" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.undeliveArea" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.undeliveArea }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "deliveArea" label = "发货面积" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.deliveArea" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.deliveArea }} < / span >
< / template >
< / el -table -column >
< el-table-column prop = "productAreaThisMonth" label = "本月生产面积" >
< template slot -scope = " scope " >
< el-input v-if = "scope.row.det === true" v-model="scope.row.productAreaThisMonth" :disabled="disabled" >
< / el -input >
< span v-else > {{ scope.row.productAreaThisMonth }} < / span >
< / template >
< / el -table -column >
<!-- < / el-table-column > -- >
< div style = "height: 50px;" class = "remark" slot = "append" >
< h3 style = "float: left;text-align: center;margin-left: 20px;" > 备注 : < / h3 >
< el-input :disabled = "disabled" style = "float:right;width: 96%;margin-top: 8px;" v-model = "remark" > < / el -input >
@@ -143,8 +175,8 @@
< script >
import {
getAutoDeliveDataList ,
updateProduction DataList ,
updateSumProduction DataList
updateSumAutoDelive DataList ,
updateAutoDelive DataList
} from '@/api/report/production' ;
// import Editor from '@/components/Editor';
import moment from 'moment' ;
@@ -482,10 +514,10 @@ export default {
// console.log(JSON.stringify(updateArr[1]))
const result = await Promise . all ( [
await updateSumProductionDataList ( obj ) ,
await updateProduction DataList ( updateArr ) ,
await updateAutoDelive DataList ( updateArr ) ,
] ) ;
if ( result [ 0 ] == true && result [ 1 ] == true ) {
console. log ( res )
// console.log(res)
this . disabled = true
this . isSave = false
this . getDataList ( )
@@ -519,12 +551,12 @@ export default {
// sum = res.data.list.splice(index, 1)
// }
// })
// res.data.forEach((ele,index) => {
// if (ele.det === false) {
// res.data.list[index].lineId = '合计'
// this. remark = res.data.list[index]. remark
// }
// });
res . data . forEach ( ( ele , index ) => {
if ( ele . det === false ) {
res. data [ index ] . glassType = '合计'
this. remark = res . data [ index ] . remark
}
} ) ;
this . list = res . data
} ,
} ,