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

Merge pull request 'projects/mesxc-zhp' (#314) from projects/mesxc-zhp into projects/mesxc-test

Browse Source 
Reviewed-on: #314
This commit is contained in:
朱菊兰 2024-04-08 14:09:52 +08:00
commit 58457487d1
18 changed files with 188 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/base/packagingPrintLog/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-02-28 10:38:34 * @LastEditTime: 2024-04-08 11:49:33
* @Description: * @Description:
--> -->
<template> <template>
@ -128,7 +128,7 @@ export default {
param: 'createTime', param: 'createTime',
}, },
{ {
type: 'button', type: this.$auth.hasPermi('base:packaging-print-log:query') ? 'button' : '',
btnName: '搜索', btnName: '搜索',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

2
src/views/extend/processEquMaterialBom/index.vue
View File

@ -112,7 +112,7 @@ export default {
param: 'code', param: 'code',
}, },
{ {
type: 'button', type: this.$auth.hasPermi('extend:process-equ-material-bom:query') ? 'button' : '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

2
src/views/extend/processEquValueBom/index.vue
View File

@ -113,7 +113,7 @@ export default {
param: 'code', param: 'code',
}, },
{ {
type: 'button', type: this.$auth.hasPermi('extend:process-equ-value-bom:query') ? 'button' : '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

4
src/views/quality/base/qualityHotMaterial/index.vue
View File

@ -135,7 +135,7 @@ export default {
width: 250 width: 250
}, },
{ {
type: 'button', type: this.$auth.hasPermi('base:quality-hot-material:query') ? 'button' : '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',
@ -144,7 +144,7 @@ export default {
type: 'separate', type: 'separate',
}, },
{ {
type: this.$auth.hasPermi('base:quality-scrap-det:create') ? 'button' : '', type: this.$auth.hasPermi('base:quality-hot-material:create') ? 'button' : '',
btnName: '新增', btnName: '新增',
name: 'add', name: 'add',
color: 'success', color: 'success',

2
src/views/quality/base/qualityScrapLog/index.vue
View File

@ -119,7 +119,7 @@ export default {
// filterable: true // filterable: true
// }, // },
{ {
type: 'button', type: this.$auth.hasPermi('base:quality-scrap-det:query') ? 'button' : '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

6
src/views/quality/monitoring/deviceParameters/index.vue
View File

@ -218,7 +218,11 @@ export default {
width: 350, width: 350,
}, },
{ {
type: 'button', type: this.$auth.hasPermi(
'monitoring:device-parameters:query'
)
? 'button'
: '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

13
src/views/quality/monitoring/equipmentTraceability/index.vue
View File

@ -260,17 +260,24 @@ export default {
// ], // ],
// }, // },
{ {
type: 'button', type: this.$auth.hasPermi(
'monitoring:equipment-traceability:query'
)
? 'button'
: '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',
}, },
{ {
type: 'button', type: this.$auth.hasPermi(
'monitoring:equipment-traceability:export'
)
? 'button'
: '',
btnName: '导出', btnName: '导出',
name: 'export', name: 'export',
color: 'warning', color: 'warning',
}, },
// { // {
// type: 'separate', // type: 'separate',

32
src/views/quality/monitoring/materielDateFrom/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-29 14:08:18 * @LastEditTime: 2024-04-07 16:19:18
* @Description: * @Description:
--> -->
<template> <template>
@ -84,21 +84,21 @@ export default {
// }, // },
tableProps, tableProps,
// tableH: this.tableHeight(260), // tableH: this.tableHeight(260),
tableBtn: [ // tableBtn: [
this.$auth.hasPermi(`base:packaging-print-log:update`) // this.$auth.hasPermi(`base:packaging-print-log:update`)
? { // ? {
type: 'edit', // type: 'edit',
btnName: '编辑', // btnName: '编辑',
} // }
: undefined, // : undefined,
this.$auth.hasPermi(`base:packaging-print-log:delete`) // this.$auth.hasPermi(`base:packaging-print-log:delete`)
? { // ? {
type: 'delete', // type: 'delete',
btnName: '删除', // btnName: '删除',
} // }
: undefined, // : undefined,
].filter((v) => v), // ].filter((v) => v),
list: [], list: [],
listQuery: { listQuery: {
pageSize: 10, pageSize: 10,
@ -131,7 +131,7 @@ export default {
width: 250 width: 250
}, },
{ {
type: 'button', type: this.$auth.hasPermi('monitoring:materiel-date-from:query') ? 'button' : '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

5
src/views/quality/monitoring/originalGlassRetrace/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-29 14:08:30 * @LastEditTime: 2024-04-07 16:25:19
* @Description: * @Description:
--> -->
<template> <template>
@ -147,7 +147,8 @@ export default {
// width: 250 // width: 250
// }, // },
{ {
type: 'button',
type: this.$auth.hasPermi('monitoring:rawMaterial-traceability:query') ? 'button' : '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

9
src/views/quality/monitoring/processTraceability/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-08-01 14:55:51 * @Date: 2023-08-01 14:55:51
* @LastEditors: zhp * @LastEditors: zhp
* @LastEditTime: 2024-03-29 15:32:33 * @LastEditTime: 2024-04-07 16:26:56
* @Description: * @Description:
--> -->
<template> <template>
@ -135,7 +135,12 @@ export default {
width: 250 width: 250
}, },
{ {
type: 'button',
type: this.$auth.hasPermi(
'monitoring:process-traceability:query'
)
? 'button'
: '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

6
src/views/quality/monitoring/qualityInspectionRecord/index.vue
View File

@ -159,7 +159,11 @@ export default {
// width: 350, // width: 350,
}, },
{ {
type: 'button', type: this.$auth.hasPermi(
'base:quality-inspection-record:query'
)
? 'button'
: '',
btnName: '查询', btnName: '查询',
name: 'search', name: 'search',
color: 'primary', color: 'primary',

6
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-27 09:27:23 * @LastEditTime: 2024-04-08 11:47:39
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -18,8 +18,8 @@
<el-form-item> <el-form-item>
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small" <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
@click="getDataList">查询</el-button> @click="getDataList">查询</el-button>
<el-button v-if="this.$auth.hasPermi('report:glass-day:export')" type="primary" size="small" plain <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
@click="handleExport">导出</el-button> plain @click="handleExport">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@ -9,8 +9,8 @@
<el-form-item> <el-form-item>
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small" <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
@click="getDataList">查询</el-button> @click="getDataList">查询</el-button>
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
@click="handleExport">导出</el-button> plain @click="handleExport">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@ -16,8 +16,8 @@
<el-form-item> <el-form-item>
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small" <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
@click="getDataList">查询</el-button> @click="getDataList">查询</el-button>
<el-button v-if="this.$auth.hasPermi('report:glass-weekly:export')" type="primary" size="small" plain <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
@click="handleExport">导出</el-button> plain @click="handleExport">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

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

@ -11,8 +11,8 @@
<el-form-item> <el-form-item>
<el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small" <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:query')" type="primary" size="small"
@click="getDataList">查询</el-button> @click="getDataList">查询</el-button>
<el-button v-if="this.$auth.hasPermi('report:glass-year:export')" type="primary" size="small" plain <el-button v-if="this.$auth.hasPermi('base:report-auto-original-glass:export')" type="primary" size="small"
@click="handleExport">导出</el-button> plain @click="handleExport">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>

77
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-29 09:48:32 * @LastEditTime: 2024-04-08 11:45:52
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -12,8 +12,9 @@
<el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月"> <el-date-picker v-model="reportTime" type="month" size="small" @change="changeTime" placeholder="选择月">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button type="primary" @click="getDataList()">查询</el-button> <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain </el-button>
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
</el-form> </el-form>
<el-row style="float: right; margin-bottom: 5px"> <el-row style="float: right; margin-bottom: 5px">
@ -28,122 +29,122 @@
<el-table-column :label="'许昌安彩月成品生产汇总' + '(' + timeTips + ')'" align="center"> <el-table-column :label="'许昌安彩月成品生产汇总' + '(' + timeTips + ')'" align="center">
<el-table-column prop="lineId" label="生产线" align="center"> <el-table-column prop="lineId" label="生产线" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineName }} </span> <span v-else>{{ scope.row.lineName }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投入数㎡" align="center"> <el-table-column label="投入数㎡" align="center">
<el-table-column prop="inputNow" label="本月" align="center"> <el-table-column prop="inputNow" label="本月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputNow }} </span> <span v-else>{{ scope.row.inputNow }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="inputHis" label="上月" align="center"> <el-table-column prop="inputHis" label="上月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputHis }} </span> <span v-else>{{ scope.row.inputHis }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="inputTrend" label="增减" align="center"> <el-table-column prop="inputTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ? <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 : parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == 0 ? 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="完成良品产量" align="center"> <el-table-column label="完成良品产量" align="center">
<el-table-column prop="goodProductNow" label="本月" align="center"> <el-table-column prop="goodProductNow" label="本月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductNow }} </span> <span v-else>{{ scope.row.goodProductNow }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductHis" label="上月" align="center"> <el-table-column prop="goodProductHis" label="上月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductHis }} </span> <span v-else>{{ scope.row.goodProductHis }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductTrend" label="增减" align="center"> <el-table-column prop="goodProductTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ? <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 : parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == 0 ? 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="原片漏检率" align="center"> <el-table-column label="原片漏检率" align="center">
<el-table-column prop="missCheckNow" label="本月" align="center"> <el-table-column prop="missCheckNow" label="本月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow * <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="missCheckHis" label="上月" align="center"> <el-table-column prop="missCheckHis" label="上月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis * <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="missCheckTrend" label="增减" align="center"> <el-table-column prop="missCheckTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ? <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ? parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="综合良品率" align="center"> <el-table-column label="综合良品率" align="center">
<el-table-column prop="goodProductPassNow" label="本月" align="center"> <el-table-column prop="goodProductPassNow" label="本月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow * <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductPassHis" label="上月" align="center"> <el-table-column prop="goodProductPassHis" label="上月" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis * <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductPassTrend" label="增减" align="center"> <el-table-column prop="goodProductPassTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ? <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend == parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>

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

@ -14,9 +14,9 @@
style="width: 350px" placeholder="选择周"> style="width: 350px" placeholder="选择周">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button type="primary" @click="getDataList()">查询</el-button> <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
<!-- <el-button type="primary" @click="getDataList()">查询</el-button> --> </el-button>
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain <el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
</el-form> </el-form>
<el-row style="float: right; margin-bottom: 5px"> <el-row style="float: right; margin-bottom: 5px">
@ -31,126 +31,126 @@
<el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center"> <el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center">
<el-table-column prop="lineId" label="生产线" align="center"> <el-table-column prop="lineId" label="生产线" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineName }} </span> <span v-else>{{ scope.row.lineName }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投入数㎡" align="center"> <el-table-column label="投入数㎡" align="center">
<el-table-column prop="inputNow" label="本周" align="center"> <el-table-column prop="inputNow" label="本周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputNow }} </span> <span v-else>{{ scope.row.inputNow }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="inputHis" label="上周" align="center"> <el-table-column prop="inputHis" label="上周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputHis }} </span> <span v-else>{{ scope.row.inputHis }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="inputTrend" label="增减" align="center"> <el-table-column prop="inputTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ? <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="完成良品产量" align="center"> <el-table-column label="完成良品产量" align="center">
<el-table-column prop="goodProductNow" label="本周" align="center"> <el-table-column prop="goodProductNow" label="本周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductNow }} </span> <span v-else>{{ scope.row.goodProductNow }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductHis" label="上周" align="center"> <el-table-column prop="goodProductHis" label="上周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductHis }} </span> <span v-else>{{ scope.row.goodProductHis }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductTrend" label="增减" align="center"> <el-table-column prop="goodProductTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ? <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="原片漏检率" align="center"> <el-table-column label="原片漏检率" align="center">
<el-table-column prop="missCheckNow" label="本周" align="center"> <el-table-column prop="missCheckNow" label="本周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow * <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="missCheckHis" label="上周" align="center"> <el-table-column prop="missCheckHis" label="上周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis * <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="missCheckTrend" label="增减" align="center"> <el-table-column prop="missCheckTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ? <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="综合良品率" align="center"> <el-table-column label="综合良品率" align="center">
<el-table-column prop="goodProductPassNow" label="本周" align="center"> <el-table-column prop="goodProductPassNow" label="本周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow * <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductPassHis" label="上周" align="center"> <el-table-column prop="goodProductPassHis" label="上周" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis * <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductPassTrend" label="增减" align="center"> <el-table-column prop="goodProductPassTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ? <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend == parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>

87
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-29 09:48:49 * @LastEditTime: 2024-04-08 11:46:49
* @LastEditors: zhp * @LastEditors: zhp
* @Description: * @Description:
--> -->
@ -14,8 +14,9 @@
style="width: 350px" placeholder="选择年"> style="width: 350px" placeholder="选择年">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-button type="primary" @click="getDataList()">查询</el-button> <el-button v-if="this.$auth.hasPermi('report:auto-production:query')" type="primary" @click="getDataList()">查询
<el-button v-if="this.$auth.hasPermi('report:glass-month:export')" type="primary" size="small" plain </el-button>
<el-button v-if="this.$auth.hasPermi('report:auto-production:export')" type="primary" size="small" plain
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
<!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button> <!-- <el-button type="primary" icon="el-icon-edit-outline" @click="editDataList()">编辑</el-button>
<el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> --> <el-button v-if="isSave" type="success" @click="saveDataList()">保存</el-button> -->
@ -33,126 +34,126 @@
<el-table-column :label="'许昌安彩年成品生产汇总' + '(' + timeTips + ')'" align="center"> <el-table-column :label="'许昌安彩年成品生产汇总' + '(' + timeTips + ')'" align="center">
<el-table-column prop="lineId" label="生产线" align="center"> <el-table-column prop="lineId" label="生产线" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.lineName" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.lineName }} </span> <span v-else>{{ scope.row.lineName }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="投入数㎡" align="center"> <el-table-column label="投入数㎡" align="center">
<el-table-column prop="inputNow" label="今年" align="center"> <el-table-column prop="inputNow" label="今年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputNow }} </span> <span v-else>{{ scope.row.inputNow }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="inputHis" label="去年" align="center"> <el-table-column prop="inputHis" label="去年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.inputHis }} </span> <span v-else>{{ scope.row.inputHis }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="inputTrend" label="增减" align="center"> <el-table-column prop="inputTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.inputTrend" :disabled="!disabled"></el-input>
<span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ? <span v-else>{{ scope.row.inputTrend && scope.row.inputTrend != 0 ?
parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend == parseFloat((scope.row.inputTrend * 100).toFixed(2)) + '%' : scope.row.inputTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="完成良品产量" align="center"> <el-table-column label="完成良品产量" align="center">
<el-table-column prop="goodProductNow" label="今年" align="center"> <el-table-column prop="goodProductNow" label="今年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductNow" :disabled="disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductNow }} </span> <span v-else>{{ scope.row.goodProductNow }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductHis" label="去年" align="center"> <el-table-column prop="goodProductHis" label="去年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductHis" :disabled="disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductHis }} </span> <span v-else>{{ scope.row.goodProductHis }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductTrend" label="增减" align="center"> <el-table-column prop="goodProductTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ? <span v-else>{{ scope.row.goodProductTrend && scope.row.goodProductTrend != 0 ?
parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend == parseFloat((scope.row.goodProductTrend * 100).toFixed(2)) + '%' : scope.row.goodProductTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="原片漏检率" align="center"> <el-table-column label="原片漏检率" align="center">
<el-table-column prop="missCheckNow" label="今年" align="center"> <el-table-column prop="missCheckNow" label="今年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow * <span v-else>{{ scope.row.missCheckNow ? parseFloat((scope.row.missCheckNow *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="missCheckHis" label="去年" align="center"> <el-table-column prop="missCheckHis" label="去年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input>
<span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis * <span v-else>{{ scope.row.missCheckHis ? parseFloat((scope.row.missCheckHis *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="missCheckTrend" label="增减" align="center"> <el-table-column prop="missCheckTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.missCheckTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ? <span v-else>{{ scope.row.missCheckTrend && scope.row.missCheckTrend != 0 ?
parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend == parseFloat((scope.row.missCheckTrend * 100).toFixed(2)) + '%' : scope.row.missCheckTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="综合良品率" align="center"> <el-table-column label="综合良品率" align="center">
<el-table-column prop="goodProductPassNow" label="今年" align="center"> <el-table-column prop="goodProductPassNow" label="今年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassNow" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow * <span v-else>{{ scope.row.goodProductPassNow ? parseFloat((scope.row.goodProductPassNow *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductPassHis" label="去年" align="center"> <el-table-column prop="goodProductPassHis" label="去年" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassHis" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis * <span v-else>{{ scope.row.goodProductPassHis ? parseFloat((scope.row.goodProductPassHis *
100).toFixed(2)) + 100).toFixed(2)) +
'%' : null }} '%' : null }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="goodProductPassTrend" label="增减" align="center"> <el-table-column prop="goodProductPassTrend" label="增减" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled"> <el-input v-if="!disabled" type="number" v-model="scope.row.goodProductPassTrend" :disabled="!disabled">
</el-input> </el-input>
<span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ? <span v-else>{{ scope.row.goodProductPassTrend && scope.row.goodProductPassTrend != 0 ?
parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend == parseFloat((scope.row.goodProductPassTrend * 100).toFixed(2)) + '%' : scope.row.goodProductPassTrend ==
0 ? 0 ?
0 : 0 :
null null
}} </span> }} </span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>