Browse Source

0412 新看板

master
ruanqi 1 year ago
parent
commit
6e45cb5064
  1. 1
      src/api/production/generateReport.js
  2. 2
      src/api/production/query.js
  3. 94
      src/views/modules/Abnormal/AbnormalFeedBack.vue
  4. 22
      src/views/modules/production/generateReport.vue
  5. 73
      src/views/modules/production/searchSfdc.vue
  6. 541
      src/views/modules/query/sfdcTimeHistQuery.vue

1
src/api/production/generateReport.js

@ -64,6 +64,7 @@ export const startRework = data =>createAPI(`/dailyPlan/startRework`,'post',data
export const selectRework = data =>createAPI(`/dailyPlan/selectRework`,'post',data)
export const saveRework = data =>createAPI(`/dailyPlan/saveRework`,'post',data)
export const getRework = data =>createAPI(`/dailyPlan/getRework`,'post',data)
export const getTimeHistListForSfdc = data =>createAPI(`/dailyPlan/getTimeHistListForSfdc`,'post',data)
export const getPackagePrintDataList = data =>createAPI('/board/getPackagePrintDataList','get',data)

2
src/api/production/query.js

@ -7,3 +7,5 @@ export const getHunlianTaskList = data => createAPI(`dailyPlan/getHunlianTaskLis
export const getHunlianTaskIssure = data => createAPI(`dailyPlan/getHunlianTaskIssure`, 'post', data);
export const liuhuaIssureAndReport= data => createAPI(`dailyPlan/liuhuaIssureAndReport`, 'post', data);
export const scheduleAbnormalReport= data => createAPI(`dailyPlan/scheduleAbnormalReport`, 'post', data);
export const getSfdcTimeHistQuery= data => createAPI(`dailyPlan/getSfdcTimeHistQuery`, 'post', data);

94
src/views/modules/Abnormal/AbnormalFeedBack.vue

@ -256,6 +256,70 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 40px;">
<el-form-item label="报废状态1">
<el-select filterable v-model="abnormalFeedBackData.scrapType1" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废状态2">
<el-select filterable v-model="abnormalFeedBackData.scrapType2" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废状态3">
<el-select filterable v-model="abnormalFeedBackData.scrapType3" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废状态4">
<el-select filterable v-model="abnormalFeedBackData.scrapType4" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废状态5">
<el-select filterable v-model="abnormalFeedBackData.scrapType5" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapTypeList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
<el-form-item label="报废原因1">
<el-select filterable v-model="abnormalFeedBackData.scrapReason1" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapReasonList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废原因2">
<el-select filterable v-model="abnormalFeedBackData.scrapReason2" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapReasonList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废原因3">
<el-select filterable v-model="abnormalFeedBackData.scrapReason3" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapReasonList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废原因4">
<el-select filterable v-model="abnormalFeedBackData.scrapReason4" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapReasonList "
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item label="报废原因5">
<el-select filterable v-model="abnormalFeedBackData.scrapReason5" clearable style="width: 95px">
<el-option :label="item.label" :value="item.label" v-for="(item,index) in scrapReasonList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;">
<el-form-item label="紧急处理方式">
<el-input v-model="abnormalFeedBackData.treatmentTemporary" type="textarea" :disabled="disableFlag2" :rows="3" resize='none' style="width: 562px"></el-input>
</el-form-item>
@ -436,6 +500,16 @@
"异常数量": "abnormalQty",
"异常情况影响分析": "abnormalInfluence",
"异常描述": "abnormalRemark",
"报废状态1": "scrapType1",
"报废原因1": "scrapReason1",
"报废状态2": "scrapType2",
"报废原因2": "scrapReason2",
"报废状态3": "scrapType3",
"报废原因3": "scrapReason3",
"报废状态4": "scrapType4",
"报废原因4": "scrapReason4",
"报废状态5": "scrapType5",
"报废原因5": "scrapReason5",
"紧急处理方式": "treatmentTemporary",
"临时性措施结论": "temporaryConclusion",
"温度": "temperatureTemporary",
@ -499,6 +573,26 @@
abnormalFeedBackData:{
},
scrapTypeList:[
{label:'缺料'},
{label:'气泡'},
{label:'断裂'},
{label:'窝气'},
{label:'粘模'},
{label:'熟料'},
{label:'杂质'},
{label:'烧边'},
{label:'错位'},
{label:'脱胶'},
{label:'表面缺陷'},
],
scrapReasonList:[
{label:'材料问题'},
{label:'人员操作'},
{label:'设备问题'},
{label:'模具问题'},
{label:'工艺问题'},
],
columnFileContentArray: [
{
columnProp: 'fileName',

22
src/views/modules/production/generateReport.vue

@ -365,7 +365,10 @@
<el-input v-model="stopData.abnormalQty" type="number" style="width: 85px"></el-input>
</el-form-item>
<el-form-item :label="'异常情况影响分析:'">
<el-input v-model="stopData.abnormalInfluence" style="width: 463px"></el-input>
<el-input v-model="stopData.abnormalInfluence" style="width: 350px"></el-input>
</el-form-item>
<el-form-item :label="'下一步派工单:'">
<el-input v-model="stopData.nextSeqNo" type="number" style="width: 85px"></el-input>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;">
@ -817,6 +820,7 @@
abnormalRemark:'',
abnormalInfluence:'',
abnormalQty:'',
nextSeqNo:'',
},
}
},
@ -1185,13 +1189,14 @@
},
stopScan(){
this.getAllAbnormalItem();
this.stopData.seqNo='',
this.stopData.shiftNo='',
this.stopData.site='',
this.stopData.resourceDesc='',
this.stopData.orderNo='',
this.stopData.abnormalRemark='',
this.stopData.abnormalCode='',
this.stopData.seqNo='';
this.stopData.shiftNo='';
this.stopData.site='';
this.stopData.resourceDesc='';
this.stopData.orderNo='';
this.stopData.abnormalRemark='';
this.stopData.abnormalCode='';
this.stopData.nextSeqNo='';
this.stopModalFlag=true;
this.fileList = [];
this.$nextTick(() => { this.$refs.stop.focus();})
@ -1455,6 +1460,7 @@
formData.append("abnormalRemark", this.stopData.abnormalRemark);
formData.append("abnormalInfluence", this.stopData.abnormalInfluence);
formData.append("abnormalQty", this.stopData.abnormalQty);
formData.append("nextSeqNo", this.stopData.nextSeqNo);
// let inData={
// username:this.$store.state.user.name,
// seqNo:this.scanSeqNo

73
src/views/modules/production/searchSfdc.vue

@ -93,9 +93,10 @@
header-align="center"
fixed="left"
align="center"
width="100"
width="140"
label="操作">
<template slot-scope="scope" class="foo_container">
<a type="text" size="small" v-if="scope.row.reportQty>=0" @click="timeHistModel(scope.row)">暂停记录</a>
<a type="text" size="small" v-if="scope.row.acceptQty>0" @click="printCard(scope.row)">让步接收标签</a>
</template>
</el-table-column>
@ -117,6 +118,67 @@
</el-table-column>
</el-table>
</div>
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="暂停记录" :visible.sync="detailFlag" width="760px">
<el-table
height="300"
:data="detailList"
border
style="width: 100%">
<el-table-column
prop="eventTime"
header-align="center"
align="center"
min-width="130"
label="暂停时间">
</el-table-column>
<el-table-column
prop="tillTime"
header-align="center"
align="center"
min-width="130"
label="继续时间">
</el-table-column>
<el-table-column
prop="completedFlag"
header-align="center"
align="center"
min-width="80"
label="是否继续">
</el-table-column>
<el-table-column
prop="totalTime"
header-align="center"
align="right"
min-width="80"
label="暂停时长">
</el-table-column>
<el-table-column
prop="abnormalDesc"
header-align="center"
align="left"
min-width="90"
label="暂停异常">
</el-table-column>
<el-table-column
prop="abnormalRemark"
header-align="center"
align="left"
min-width="120"
label="异常备注">
</el-table-column>
<el-table-column
prop="nextSeqNo"
header-align="center"
align="center"
min-width="100"
label="下一步派工单">
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<el-button @click="detailFlag = false" type="primary">取消</el-button>
</span>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -125,6 +187,7 @@
import {
getSfdcList,
printDefectCard,
getTimeHistListForSfdc,
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
import {
@ -695,6 +758,8 @@
// end
height: 200,
tableData: [],
detailFlag:false,
detailList: [],
searchData: {
seqNo:'',
orderNo: '',
@ -799,6 +864,12 @@
}
})
},
timeHistModel(row){
getTimeHistListForSfdc(row).then(({data}) => {
this.detailFlag=true
this.detailList=data.rows
})
},
tableRowClassName ({row, rowIndex}) {
if ( row.csysScrapRate<row.scrapRate) {

541
src/views/modules/query/sfdcTimeHistQuery.vue

@ -0,0 +1,541 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form-item :label="'派工单号'">
<el-input v-model="searchData.seqNo" type="number" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'异常情况'">
<el-input v-model="searchData.abnormalDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'规格型号'">
<el-input v-model="searchData.partDesc" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'操作员姓名'">
<el-input v-model="searchData.operatorName" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'暂停日期'">
<el-date-picker
style="width: 120px"
v-model="searchData.startDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至'">
<el-date-picker
style="width: 120px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="searchTable()">查询</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
</el-form-item>
</el-form>
<el-table
:data="dataList"
:height="height"
border
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 1000]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
getSfdcTimeHistQuery,
} from "@/api/production/query.js"
import Chooselist from '@/views/modules/common/Chooselist'
export default {
components: {
Chooselist
},
data() {
return {
dataList: [],
searchData: {
page: 1,
limit: 20,
operatorName: '',
username: this.$store.state.user.name,
seqNo: '',
partNo :'',
partDesc:'',
startDate:'',
endDate:'',
abnormalDesc:'',
remark:'',
},
exportList:[],
pageIndex: 1,
pageSize: 20,
totalPage: 0,
visible:false,
dataListLoading: false,
columnList1:[
{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1SeqNo',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "seqNo",
headerAlign: "center",
align: "center",
columnLabel: "派工单号",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1EventTime',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "eventTime",
headerAlign: "center",
align: "center",
columnLabel: "暂停时间",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1TillTime',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "tillTime",
headerAlign: "center",
align: "center",
columnLabel: "继续时间",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1CompletedFlag',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "completedFlag",
headerAlign: "center",
align: "center",
columnLabel: "是否继续",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1TotalTime',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "totalTime",
headerAlign: "center",
align: "right",
columnLabel: "暂停时长",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1AbnormalDesc',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "abnormalDesc",
headerAlign: "center",
align: "left",
columnLabel: "暂停异常",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 90
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1AbnormalRemark',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "abnormalRemark",
headerAlign: "center",
align: "left",
columnLabel: "异常备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1NextSeqNo',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "nextSeqNo",
headerAlign: "center",
align: "center",
columnLabel: "下一步派工单",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1SScheduledDate',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "sScheduledDate",
headerAlign: "center",
align: "center",
columnLabel: "派工单日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1SWorkCenterNo',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "sWorkCenterNo",
headerAlign: "center",
align: "center",
columnLabel: "加工中心",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1OperatorName',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "operatorName",
headerAlign: "center",
align: "center",
columnLabel: "操作员姓名",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1ItemNo',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "itemNo",
headerAlign: "center",
align: "right",
columnLabel: "工序号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1Site',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "site",
headerAlign: "center",
align: "center",
columnLabel: "工厂",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 40
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1SScheduledDate',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "sScheduledDate",
headerAlign: "center",
align: "center",
columnLabel: "派工日期",
columnHidden: false,
columnImage: false,
columnSortable: true,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1OrderNo',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "orderNo",
headerAlign: "center",
align: "left",
columnLabel: "生产订单",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 130
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1OperationDesc',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "operationDesc",
headerAlign: "center",
align: "left",
columnLabel: "工序号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1PartNo',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "partNo",
headerAlign: "center",
align: "left",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1PartDesc',
tableId: "400003Table1",
tableName: "异常派工单清单",
columnProp: "partDesc",
headerAlign: "center",
align: "left",
columnLabel: "规格型号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 300
}
],
// start
exportData: [],
exportName: '派工单暂停清单'+this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ["派工单暂停清单"],
exportFooter: [],
// end
height:200,
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight- 200
})
},
methods: {
// S
getBaseList (val, type) {
this.tagNo = val
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
if (val === 1013) {
if(type==1) {
strVal = this.dataForm.partType
}
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 1013) {
if(this.tagNo1==1) {
this.dataForm.partType = val.Base_id
this.dataForm.partTypeDesc = val.Base_desc
}
}
},
//
init(inData) {
//
this.searchData = JSON.parse(JSON.stringify(inData));
//
this.searchTable();
},
//
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.searchTable()
},
//
currentChangeHandle (val) {
this.pageIndex = val
this.searchTable()
},
searchTable(){
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
getSfdcTimeHistQuery(this.searchData).then(({data}) => {
if (data.code == 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
this.dataListLoading = false
})
},
//excel
//excel
async createExportData() {
this.searchData.limit = -1
this.searchData.page = 1
await getSfdcTimeHistQuery(this.searchData).then(({data}) => {
this.exportList= data.page.list;
})
return this.exportList;
},
startDownload() {
// this.exportData = this.dataList
},
finishDownload() {
},
fields() {
let json = "{"
this.columnList1.forEach((item, index) => {
if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
}
})
json += "}"
let s = eval("(" + json + ")")
return s
},
},
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save