diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 16eeca05..8a6617ee 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -143,24 +143,24 @@ {{ scope.row.零件类型名称 }} - - - - 外协 - - - - - - 带料 - - - - - - 着急 - - + + + + + + + + + + + + + + + + + + @@ -176,7 +176,7 @@ 打回档案 + @click="handleDele(scope.$index, scope.row, 'form1')">打回 @@ -190,16 +190,10 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - 是否白图 - 是否高难度 + + 投产 - - - - - - @@ -236,14 +230,14 @@ label="批次数量"> {{ scope.row.批次数量 }} - - {{ scope.row.是否外协 }} - - - {{ scope.row.是否带料 }} - + + + + + + + + {{ scope.row.机加工开始时间 }} diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index eaac00f1..22451047 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -73,12 +73,12 @@ type="selection" align="center" width="35"/> - + {{ scope.row.零件图号 }} - + {{ scope.row.零件名称 }} @@ -103,42 +103,42 @@ {{ scope.row.工序数量 }} - - - {{ scope.row.是否超负荷 }} - - - - - 外协 - - - - - - - - - - {{ scope.row.板焊 }} - - - - - 板焊 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43,30 +44,31 @@ {{ scope.row.工艺名称简称 }} + + + 工时 + 重量 + 面积 + + + - - {{ scope.row.外协价格1 }} - + {{ scope.row.外协价格1 }} - - {{ scope.row.重量价格1 }} - + {{ scope.row.重量价格1 }} - - {{ scope.row.面积价格1 }} - + {{ scope.row.面积价格1 }} - { this.total = parseInt(response.data.total) if (response.data.rows.length !== 0) { - for (let i = 0; i < response.data.rows.length; i++) { - if (response.data.rows[i].外协价格计算标准流水号 === '1') { - this.colorCode1.push('mianji') - this.colorCode2.push('') - this.colorCode3.push('') - } else if (response.data.rows[i].外协价格计算标准流水号 === '2') { - this.colorCode1.push('') - this.colorCode2.push('mianji') - this.colorCode3.push('') - } else { - this.colorCode1.push('') - this.colorCode2.push('') - this.colorCode3.push('mianji') - } - } this.tableData3 = response.data.rows } }) diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index 331a9933..7c85ec31 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -56,12 +56,18 @@ - + + + + 已付款 + 未付款 + + {{ scope.row.表单号 }} @@ -425,14 +431,6 @@ export default { this.dialogFormVisible2 = false this.$refs[formName].resetFields() }, - // 表格颜色 - tableRowClassName({ row }) { - if (row.实际付款时间 !== '') { - return 'fukuan' - } else { - return '' - } - }, // 获取表格2数据 getParts(row) { this.loading2 = true diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 620fa278..91ad0e0b 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -19,7 +19,13 @@ - + + + + 成交 + 未成交 + + {{ scope.row.表单号 }} @@ -1542,14 +1548,6 @@ export default { return '' } }, - // 表格颜色 - tableRowClassName2({ row }) { - if (row.单据状态 === '成交') { - return 'chengjiao' - } else { - return '' - } - }, // 分页 handleSizeChange(val) { this.pageList = 1 diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index eb16c1cf..782c0d46 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -16,11 +16,9 @@ align="center" width="50"/> - {{ scope.row.零件图号 }} - @@ -57,19 +55,23 @@ - + - 选择 - + + + 外协 + 自制 + + {{ scope.row.工艺名称 }} @@ -252,14 +254,6 @@ export default { handleCurrentChange1(val) { this.pageCurrent1 = val this.searchTable() - }, - // 表格颜色 - tableRowClassName({ row }) { - if (row.工序间是否外协 === 2) { - return 'waixie' - } else { - return '' - } } } }