yinq
/
aucma-mes-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
夜笙歌 9 months ago
parent 1edb858572 6165dec495
commit 2fb5989891
7 changed files with 125 additions and 101 deletions
Show Stats Download Patch File Download Diff File

BIN
src/assets/model/live/v1.mp4
View File

Binary file not shown.

8
src/views/base/qualityProcess/index.vue
Unescape Escape View File

@ -93,14 +93,14 @@
<el-table v-loading="loading" :data="processStationList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="processStationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/> <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="质检工序编号" align="center" prop="processCode" v-if="columns[1].visible"/> <el-table-column label="所属产线" align="center" prop="productLineCode" v-if="columns[4].visible"/>
<el-table-column label="质检工序名称" align="center" prop="processName" v-if="columns[2].visible"/> <el-table-column label="工序类别" align="center" prop="processType" v-if="columns[3].visible">
<el-table-column label="类别" align="center" prop="processType" v-if="columns[3].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.process_type" :value="scope.row.processType"/> <dict-tag :options="dict.type.process_type" :value="scope.row.processType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属产线" align="center" prop="productLineCode" v-if="columns[4].visible"/> <el-table-column label="质检工序编号" align="center" prop="processCode" v-if="columns[1].visible"/>
<el-table-column label="质检工序名称" align="center" prop="processName" v-if="columns[2].visible"/>
<el-table-column label="质检工位编号" align="center" prop="parentId" v-if="columns[13].visible"/> <el-table-column label="质检工位编号" align="center" prop="parentId" v-if="columns[13].visible"/>
<el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[14].visible"/> <el-table-column label="质检工位名称" align="center" prop="stationName" v-if="columns[14].visible"/>
<el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[5].visible"/> <el-table-column label="单位生产时间" align="center" prop="productionTime" v-if="columns[5].visible"/>

58
src/views/index_v1.vue
Unescape Escape View File

@ -12,12 +12,12 @@
<el-table-column <el-table-column
prop="no" prop="no"
label="序号" label="序号"
width="180"> width="50">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="plant" prop="plant"
label="工厂" label="工厂"
width="180"> width="80">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productionLine" prop="productionLine"
@ -25,19 +25,19 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workOrderNumber" prop="workOrderNumber"
label="工单号"> label="SAP计划编号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productName" prop="SalesOrderNumber"
label="产品名称"> label="销售单号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productCode" prop="productCode"
label="产品编码"> label="产品编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SalesOrderNumber" prop="productName"
label="销售单号"> label="产品名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="scheduledProduction" prop="scheduledProduction"
@ -122,16 +122,40 @@ export default {
tableData: [ tableData: [
{ {
no: '1', no: '1',
plant: '1', plant: '1301',
productionLine: '1', productionLine: '新产线',
workOrderNumber: '1', workOrderNumber: '11236564',
productName: '1', productName: 'SC-187,C,特需',
productCode: '1', productCode: '9002005735',
SalesOrderNumber: '1', SalesOrderNumber: '0000055258',
scheduledProduction: '1', scheduledProduction: '100',
FinishedOutput: '1', FinishedOutput: '0',
percentageComplete: '1' percentageComplete: '0%'
} },
{
no: '2',
plant: '1301',
productionLine: '新产线',
workOrderNumber: '11236570',
productName: 'SC-281C,C,特需',
productCode: '9002007012',
SalesOrderNumber: '0000055621',
scheduledProduction: '150',
FinishedOutput: '149',
percentageComplete: '99.33%'
},
{
no: '3',
plant: '1301',
productionLine: '新产线',
workOrderNumber: '11234730',
productName: 'SC-500Y,YZ怡宝24YP,C',
productCode: '9002006928',
SalesOrderNumber: '0000055537',
scheduledProduction: '400',
FinishedOutput: '399',
percentageComplete: '99.75%'
},
] ]
} }
}, },

38
src/views/report/fewerMistakesReport/index.vue
Unescape Escape View File

@ -11,30 +11,30 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="产品编码" prop="MATERIAL_CODE"> <el-form-item label="型号" prop="MATERIAL_CODE">
<el-input <el-input
v-model="queryParams.MATERIAL_CODE" v-model="queryParams.MATERIAL_CODE"
placeholder="请输入产品编码" placeholder="请输入型号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="MATERIAL_NAME">
<el-input
v-model="queryParams.MATERIAL_NAME"
placeholder="请输入产品名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="SAP订单编号" prop="ORDER_CODE">
<el-input
v-model="queryParams.ORDER_CODE"
placeholder="请输入SAP计划编号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="产品名称" prop="MATERIAL_NAME">-->
<!-- <el-input-->
<!-- v-model="queryParams.MATERIAL_NAME"-->
<!-- placeholder="请输入产品名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="SAP订单编号" prop="ORDER_CODE">-->
<!-- <el-input-->
<!-- v-model="queryParams.ORDER_CODE"-->
<!-- placeholder="请输入SAP计划编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="工位"> <el-form-item label="工位">
<el-select v-model="queryParams.stationCode" placeholder="请选择工位"> <el-select v-model="queryParams.stationCode" placeholder="请选择工位">
<el-option <el-option
@ -203,7 +203,7 @@ export default {
this.queryParams.endBeginTime = null this.queryParams.endBeginTime = null
} }
qualityDefectsStatisticalAnalysisList(this.queryParams).then(response => { qualityDefectsStatisticalAnalysisList(this.queryParams).then(response => {
this.reportList = response.data // this.reportList = response.data
// this.total = response.total; // this.total = response.total;
this.loading = false this.loading = false
}) })

2
src/views/report/productTraceabilityReport/index.vue
Unescape Escape View File

@ -203,7 +203,7 @@ export default {
this.queryParams.endBeginTime = null this.queryParams.endBeginTime = null
} }
productionExecutionReportList(this.queryParams).then(response => { productionExecutionReportList(this.queryParams).then(response => {
this.reportList = response.data // this.reportList = response.data
// this.total = response.total; // this.total = response.total;
this.loading = false this.loading = false
}) })

50
src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue
Unescape Escape View File

@ -11,30 +11,30 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="产品编码" prop="MATERIAL_CODE"> <!-- <el-form-item label="产品编码" prop="MATERIAL_CODE">-->
<el-input <!-- <el-input-->
v-model="queryParams.MATERIAL_CODE" <!-- v-model="queryParams.MATERIAL_CODE"-->
placeholder="请输入产品编码" <!-- placeholder="请输入产品编码"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="产品名称" prop="MATERIAL_NAME"> <!-- <el-form-item label="产品名称" prop="MATERIAL_NAME">-->
<el-input <!-- <el-input-->
v-model="queryParams.MATERIAL_NAME" <!-- v-model="queryParams.MATERIAL_NAME"-->
placeholder="请输入产品名称" <!-- placeholder="请输入产品名称"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="SAP订单编号" prop="ORDER_CODE"> <!-- <el-form-item label="SAP订单编号" prop="ORDER_CODE">-->
<el-input <!-- <el-input-->
v-model="queryParams.ORDER_CODE" <!-- v-model="queryParams.ORDER_CODE"-->
placeholder="请输入SAP计划编号" <!-- placeholder="请输入SAP计划编号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="工位"> <el-form-item label="工位">
<el-select v-model="queryParams.stationCode" placeholder="请选择工位"> <el-select v-model="queryParams.stationCode" placeholder="请选择工位">
<el-option <el-option
@ -201,7 +201,7 @@ export default {
this.queryParams.endBeginTime = null this.queryParams.endBeginTime = null
} }
qualityDefectsStatisticalAnalysisList(this.queryParams).then(response => { qualityDefectsStatisticalAnalysisList(this.queryParams).then(response => {
this.reportList = response.data // this.reportList = response.data
// this.total = response.total; // this.total = response.total;
this.loading = false this.loading = false
}) })

70
src/views/report/qualityIssuesReport/index.vue
Unescape Escape View File

@ -11,40 +11,40 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="产品编码" prop="MATERIAL_CODE"> <!-- <el-form-item label="产品编码" prop="MATERIAL_CODE">-->
<el-input <!-- <el-input-->
v-model="queryParams.MATERIAL_CODE" <!-- v-model="queryParams.MATERIAL_CODE"-->
placeholder="请输入产品编码" <!-- placeholder="请输入产品编码"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="产品名称" prop="MATERIAL_NAME"> <!-- <el-form-item label="产品名称" prop="MATERIAL_NAME">-->
<el-input <!-- <el-input-->
v-model="queryParams.MATERIAL_NAME" <!-- v-model="queryParams.MATERIAL_NAME"-->
placeholder="请输入产品名称" <!-- placeholder="请输入产品名称"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="SAP订单编号" prop="ORDER_CODE"> <!-- <el-form-item label="SAP订单编号" prop="ORDER_CODE">-->
<el-input <!-- <el-input-->
v-model="queryParams.ORDER_CODE" <!-- v-model="queryParams.ORDER_CODE"-->
placeholder="请输入SAP计划编号" <!-- placeholder="请输入SAP计划编号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="工位"> <!-- <el-form-item label="工位">-->
<el-select v-model="queryParams.stationCode" placeholder="请选择工位"> <!-- <el-select v-model="queryParams.stationCode" placeholder="请选择工位">-->
<el-option <!-- <el-option-->
v-for="item in findStationList" <!-- v-for="item in findStationList"-->
:key="item.productLineCode" <!-- :key="item.productLineCode"-->
:label="item.productLineName" <!-- :label="item.productLineName"-->
:value="item.productLineCode" <!-- :value="item.productLineCode"-->
></el-option> <!-- ></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="起止时间"> <el-form-item label="起止时间">
<el-date-picker <el-date-picker
v-model="daterangeBeginTime" v-model="daterangeBeginTime"
@ -201,7 +201,7 @@ export default {
this.queryParams.endBeginTime = null this.queryParams.endBeginTime = null
} }
productionExecutionReportList(this.queryParams).then(response => { productionExecutionReportList(this.queryParams).then(response => {
this.reportList = response.data // this.reportList = response.data
// this.total = response.total; // this.total = response.total;
this.loading = false this.loading = false
}) })

Write Preview
Loading…
Cancel
Save