wilson
/
rongxing-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

分切报工

master
rui_li 4 years ago
parent
197f7a39f3
commit
b479c7ceb2
3 changed files with 3842 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 92
      src/api/yieldReport/com_split_order_report.js
  2. 3698
      src/views/modules/yieldReport/com_split_order_report.vue
  3. 58
      src/views/modules/yieldReport/produce_order.vue

92
src/api/yieldReport/com_split_order_report.js
View File

@ -0,0 +1,92 @@
import { createAPI } from '@/utils/httpRequest.js'
// 获取派工单信息
export const getScheduleDataBySeqNo = data => createAPI('schedule/getScheduleDataBySeqNo', 'POST', data)
// 获取当前上机卷信息
export const getCurrentRollOpsBySeqNo = data => createAPI('schedule/getCurrentRollOpsBySeqNo', 'POST', data)
// 获取当前派工单的时间记录
export const getSfdcTimeByCon = data => createAPI('schedule/getSfdcTimeByCon', 'POST', data)
// 获取当前派工单的刀模记录
export const getOrderToolByCon = data => createAPI('schedule/getOrderToolByCon', 'POST', data)
// 获取当前派工单的刀模记录
export const getSfdcToolByCon = data => createAPI('schedule/getSfdcToolByCon', 'POST', data)
// 获取当前工单的Bom记录
export const getOrderBomByCon = data => createAPI('schedule/getOrderBomByCon', 'POST', data)
// 获取当前派工单的材料记录
export const getSfdcMaterialByCon = data => createAPI('schedule/getSfdcMaterialByCon', 'POST', data)
// 获取当前派工单的上机卷记录
export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByCon', 'POST', data)
// 获取当前派工单的不良卷记录
export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', 'POST', data)
// 获取当前上机卷信息
export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data)
// 获取当前页面的按钮
export const refreshWorkPlatformButtons = data => createAPI('schedule/refreshWorkPlatformButtons', 'POST', data)
// 获取当前页面的按钮
export const checkScheduleButton = data => createAPI('schedule/checkScheduleButton', 'POST', data)
//测试是否可以创建sfdcRoll卷
export const checkCreateNewSfdcRoll = data => createAPI('schedule/checkCreateNewSfdcRoll', 'POST', data)
//创建新卷号
export const createNewRoll = data => createAPI('schedule/createNewRoll', 'POST', data)
//重新打开sfdcRolls
export const reopenSfdcRolls = data => createAPI('schedule/reopenSfdcRolls', 'POST', data)
//删除sfdcRolls
export const deleteSfdcRolls = data => createAPI('schedule/deleteSfdcRolls', 'POST', data)
//执行工具的结束使用的方法
export const processFinishTool = data => createAPI('schedule/processFinishTool', 'POST', data)
//执行材料结束使用 且未剩余的方法
export const finishMaterialWithNoRemainder = data => createAPI('schedule/processFinishMaterialWithNoRemainder', 'POST', data)
/*-------------------------------------------------------sxm 其它报工业务--------------------------------------------------------*/
//保存当前卷不良记录
export const saveSfdcDefect = data => createAPI('schedule/saveSfdcDefect', 'POST', data)
// 校验卷记录
export const checkSfdcDefect = data => createAPI('schedule/checkSfdcDefect', 'POST', data)
// 批量保存不良信息
export const saveSfdcDefectList = data => createAPI('schedule/saveSfdcDefectList','POST',data)
// 获取所有不良信息列表
export const inspectiondefectcode = data => createAPI('inspectiondefectcode/searchDefectList','POST',data)
// 批量送检卷列表
export const searchFqcSfdcRolls = data => createAPI('schedule/searchFqcSfdcRolls','POST',data)
// getScheduleDateShif
export const getScheduleDateShift = data => createAPI('schedule/getScheduleDateShift','POST',data)
// 批量送检
export const workbenchPostinspection = data => createAPI('schedule/workbenchPostinspection','POST',data)
// 返工重检 下机卷列表
export const getReworkSfdcRollByCon = data => createAPI('schedule/getReworkSfdcRollByCon', 'POST', data)
//switchrollReverse
export const switchrollReverse = data => createAPI('schedule/switchrollReverse', 'POST', data)
//查询班次数据
export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data)

3698
src/views/modules/yieldReport/com_split_order_report.vue
File diff suppressed because it is too large
View File

58
src/views/modules/yieldReport/produce_order.vue
View File

@ -4,11 +4,6 @@
<fieldset class="customer-field" style="width: 675px; padding: 0.35em 0.75em 0.425em;">
<legend>菜单</legend>
<el-form :inline="true" label-position="top" label-width="100px" style="">
<el-form-item :label="''">
<el-button type="primary" class="customer-bun-mid"
style="margin-left: 10px; width: 60px; margin-bottom: 5px;">列表
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="refreshPageTables()" class="customer-bun-mid"
style="margin-left: 10px; margin-bottom: 5px;">查询
@ -39,6 +34,11 @@
style="margin-left: 10px; margin-bottom: 5px;">FQC分卷
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" class="customer-bun-mid" @click="switchOperatorModal(8)"
style="margin-left: 10px; width: 60px; margin-bottom: 5px;">分切报工
</el-button>
</el-form-item>
</el-form>
</fieldset>
<!-- 查询时间和产品 -->
@ -163,6 +163,12 @@
:visible.sync="showReportFlag" ref="comProduceReportNormal">
</comProduceReportNormal>
<!-- 分切报工的组件 -->
<comSplitOrderReport :close-on-click-modal="false"
:visible.sync="showSplitReportFlag" ref="comSplitOrderReport">
</comSplitOrderReport>
<!-- 正常的结束派工单组件 -->
<comFinishSchedule :close-on-click-modal="false"
@ -213,6 +219,8 @@ import reworkInspectReport from "./otherReport/rework_inspect_report";/*结束
import fqcSplitRollReport from "./otherReport/fqc_split_roll_report";/*结束派工的组件*/
import changePackaging from "./otherReport/change_packaging";/*结束派工的组件*/
import createRecheck from './com_create_recheck'
import Com_split_schedule from "../schedule/com_split_schedule";
import comSplitOrderReport from './com_split_order_report';/*分切报工*/
export default {
data() {
@ -221,6 +229,7 @@ export default {
menuShow: false,
showOperatorFlag: false,
showReportFlag: false,
showSplitReportFlag: false,
fqcShowReportFlag: false,
reworkShowReportFlag: false,
fqcRollShowReportFlag: false,
@ -1046,8 +1055,10 @@ export default {
}
},
components: {
Com_split_schedule,
comSwitchOperator,/*切换用户的组件*/
comProduceReportNormal,/*报工页面的组件*/
comSplitOrderReport,/*分切报工*/
comFinishSchedule,/*结束派工单的组件*/
fqcProduceReportNormal, /*FQC报工*/
reworkInspectReport, /*返工重建*/
@ -1642,6 +1653,12 @@ export default {
// 换包装
this.changePackaging();
}
/*分切报工*/
if (operatorData.reportType == 8) {
// 分切报工
this.showSplitOrderReportModal();
}
},
notInitOperatorData(val) {
@ -1671,7 +1688,12 @@ export default {
if (val == 4) {
//切换到换包装
this.changePackaging();
}
//分切报工
if (val == 5) {
//分切报工
this.showSplitOrderReportModal();
}
},
//切换员工modal
@ -1715,6 +1737,16 @@ export default {
})
}
})
}else if(val == 8){//处理 分切工单
//判断当前工单是否是分切工单
let orderType = this.currentRow.orderType;
if(orderType === 'D'){
this.showOperatorFlag = true;
this.$refs.comSwitchOperator.init(val);
}else{
this.$message.error('当前工单非分切工单!');
return false;
}
}else{
if (val == 4){
getShopOrder(this.currentRow).then(({data}) =>{
@ -1740,8 +1772,8 @@ export default {
}
}
},
//切换报工modal
switchProduceReportModal() {
//首先判断是否选择好派工单
@ -1756,6 +1788,20 @@ export default {
});
},
//打开分切报工的
showSplitOrderReportModal() {
//首先判断是否选择好派工单
if (JSON.stringify(this.currentRow) == '{}') {
this.$message.error('请先选择派工单!');
return false;
}
this.$nextTick(() => {
//打开分切报工功能
this.showSplitReportFlag = true;
this.$refs.comSplitOrderReport.init(this.currentRow.seqNo, this.operatorData);
});
},
//打开结束派工单的modal
showFinishScheduleModal() {
//首先判断是否选择好派工单

Write Preview
Loading…
Cancel
Save