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

过程检验弹出框

master
han\hanst 4 months ago
parent
bc07850788
commit
9254d6cac7
2 changed files with 1639 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1458
      src/views/modules/yieldReport/com_process_inspection.vue
  2. 237
      src/views/modules/yieldReport/com_produce_report_normal.vue

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

237
src/views/modules/yieldReport/com_produce_report_normal.vue
View File

@ -5,7 +5,7 @@
<el-dialog v-drag <el-dialog v-drag
width="900px" class="customer-dialog" width="900px" class="customer-dialog"
:title="titleCon" v-bind="$attrs" v-on="$listeners"> :title="titleCon" v-bind="$attrs" v-on="$listeners">
<el-form :inline="true" label-position="top" style="height: 507px;"
<el-form :inline="true" label-position="top" style="height: 650px;"
label-width="80px"> label-width="80px">
<!-- 第一行信息 --> <!-- 第一行信息 -->
<el-form style="margin-top: -10px;"> <el-form style="margin-top: -10px;">
@ -102,13 +102,49 @@
</fieldset> </fieldset>
<!-- 列表展示区域 --> <!-- 列表展示区域 -->
<fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 660px; height: 310px;">
<fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 660px; height: 450px;">
<legend class="customer-legend">{{ labels.listDesc }}</legend> <legend class="customer-legend">{{ labels.listDesc }}</legend>
<el-tabs v-model="activeTable" style="margin-top: -3px; width: 655px; height: 285px;"
<el-tabs v-model="activeTable" style="margin-top: -3px; width: 655px; height: 425px;"
type="border-card" @tab-click="tabClick" class="customer-tab"> type="border-card" @tab-click="tabClick" class="customer-tab">
<el-tab-pane :label=labels.orderInfo name="order_info">
<div style="height: 400px; padding: 10px;">
<!-- 技术注意事项 -->
<div style="margin-bottom: 10px;">
<label style="font-weight: bold; margin-bottom: 5px; display: block;">技术注意事项</label>
<el-input
type="textarea"
:rows="3"
v-model="orderInfo.technicalNotes"
style="width: 100%;">
</el-input>
</div>
<!-- 客户特殊要求 -->
<div style="margin-bottom: 10px;">
<label style="font-weight: bold; margin-bottom: 5px; display: block;">客户特殊要求</label>
<el-input
type="textarea"
:rows="3"
v-model="orderInfo.customerRequirements"
style="width: 100%;">
</el-input>
</div>
<!-- 订单备注信息 -->
<div>
<label style="font-weight: bold; margin-bottom: 5px; display: block;">订单备注信息</label>
<el-input
type="textarea"
:rows="3"
v-model="orderInfo.orderNotes"
style="width: 100%;">
</el-input>
</div>
</div>
</el-tab-pane>
<el-tab-pane :label=labels.timeList name="sfdc_time"> <el-tab-pane :label=labels.timeList name="sfdc_time">
<el-table <el-table
height="260"
height="400"
:data="sfdcTimeList" :data="sfdcTimeList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -145,7 +181,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.toolList name="sfdc_tool"> <el-tab-pane :label=labels.toolList name="sfdc_tool">
<el-table <el-table
height="120"
height="170"
:data="orderToolList" :data="orderToolList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -168,7 +204,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <el-table
height="140"
height="230"
:data="sfdcToolList" :data="sfdcToolList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -210,7 +246,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.materialList name="sfdc_material"> <el-tab-pane :label=labels.materialList name="sfdc_material">
<el-table <el-table
height="120"
height="170"
:data="orderBomList" :data="orderBomList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -233,7 +269,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table <el-table
height="140"
height="230"
:data="sfdcMaterialList" :data="sfdcMaterialList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -282,7 +318,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.rollopsList name="sfdc_rollOps"> <el-tab-pane :label=labels.rollopsList name="sfdc_rollOps">
<el-table <el-table
height="260"
height="400"
:data="sfdcRollOpsList" :data="sfdcRollOpsList"
border border
v-loading="dataListLoading" v-loading="dataListLoading"
@ -308,7 +344,7 @@
<!-- 不良记录 --> <!-- 不良记录 -->
<el-tab-pane :label=labels.defectList name="sfdc_defect"> <el-tab-pane :label=labels.defectList name="sfdc_defect">
<el-table <el-table
height="260"
height="400"
:data="sfdcDefectList" :data="sfdcDefectList"
border border
show-summary show-summary
@ -347,7 +383,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label=labels.rollList name="sfdc_roll"> <el-tab-pane :label=labels.rollList name="sfdc_roll">
<el-table <el-table
height="260"
height="400"
:data="sfdcRollList" :data="sfdcRollList"
border border
show-summary show-summary
@ -394,62 +430,47 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</fieldset> </fieldset>
<!-- 刷新按钮 -->
<div style="margin-left: 680px; margin-top: -640px; width: 200px;">
<el-button class="customer-bun-mid controller-bun" type="primary" @click="refreshPageData"
style="margin-left: 20px; margin-bottom: 10px; width: 60px;">
{{ buttons.refreshButton }}
</el-button>
<el-button class="customer-bun-mid controller-bun" type="primary" @click="switchOperatorModal"
style="margin-left: 28px; margin-bottom: 10px; width: 60px;">
{{ buttons.switchOperator }}
</el-button>
</div>
<!-- 生产调机菜单 --> <!-- 生产调机菜单 -->
<fieldset class="customer-fieldset" <fieldset class="customer-fieldset"
style="margin-left: 680px; margin-top: -510px; width: 200px; height: 130px;">
style="margin-left: 680px; width: 200px; height: 100px;">
<legend class="customer-legend">{{ labels.produceButtons }}</legend> <legend class="customer-legend">{{ labels.produceButtons }}</legend>
<el-form> <el-form>
<el-form-item>
<el-button class="customer-bun-mid" type="primary" @click="refreshPageData"
style="margin-left: 15px; margin-top: 10px; margin-bottom: 25px;">
{{ buttons.refreshButton }}
</el-button>
</el-form-item>
<el-form-item>
<el-button class="customer-bun-mid" type="primary" @click="switchOperatorModal"
style="margin-left: 20px; margin-top: 10px;">
{{ buttons.switchOperator }}
</el-button>
</el-form-item>
<el-form-item style="margin-top: 20px;">
<el-form-item style="margin-top: 10px;">
<el-button class="customer-bun-mid controller-bun" type="primary" @click="startTuningModal" <el-button class="customer-bun-mid controller-bun" type="primary" @click="startTuningModal"
:disabled="buttonTags.tuningFlag" :disabled="buttonTags.tuningFlag"
style="margin-left: 15px; margin-bottom: 5px;"> style="margin-left: 15px; margin-bottom: 5px;">
{{ buttons.startTuning }} {{ buttons.startTuning }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item style="margin-top: 20px;">
<el-form-item>
<el-button class="customer-bun-mid controller-bun" type="primary" @click="startProduceModal" <el-button class="customer-bun-mid controller-bun" type="primary" @click="startProduceModal"
:disabled="buttonTags.produceFlag" :disabled="buttonTags.produceFlag"
style="margin-left: 20px; margin-bottom: 5px;">
style="margin-left: 20px; margin-bottom: 5px;margin-top: 10px">
{{ buttons.startProduce }} {{ buttons.startProduce }}
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item style="margin-top: 12px;">
<el-form-item>
<el-button class="customer-bun-mid" type="primary" @click="sopPreviewModal" <el-button class="customer-bun-mid" type="primary" @click="sopPreviewModal"
style="margin-left: 15px; margin-bottom: 5px;">
style="margin-left: 15px; margin-bottom: 5px;margin-top: 10px">
{{ buttons.sopView }} {{ buttons.sopView }}
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</fieldset> </fieldset>
<!-- 不良 -->
<fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
<legend class="customer-legend">{{ labels.defectButtons }}</legend>
<el-form style="text-align: center;">
<el-form-item style="margin-top: 5px;">
<el-button class="customer-bun-mid controller-bun" @click="defectRollModal" type="primary"
:disabled="buttonTags.defectFlag"
style="margin-left: 0px; margin-top: 10px;">
{{ buttons.reportDefect }}
</el-button>
</el-form-item>
<!-- <el-form-item style="margin-top: 5px;">-->
<!-- <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>-->
<!-- </el-form-item>-->
</el-form>
</fieldset>
<!-- 扫描 --> <!-- 扫描 -->
<fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;"> <fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
@ -470,10 +491,26 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</fieldset> </fieldset>
<!-- 不良 -->
<fieldset class="customer-fieldset" style="margin-left: 680px; width: 200px; height: 80px;">
<legend class="customer-legend">{{ labels.defectButtons }}</legend>
<el-form style="text-align: center;">
<el-form-item style="margin-top: 5px;">
<el-button class="customer-bun-mid controller-bun" @click="defectRollModal" type="primary"
:disabled="buttonTags.defectFlag"
style="margin-left: 0px; margin-top: 10px;">
{{ buttons.reportDefect }}
</el-button>
</el-form-item>
<!-- <el-form-item style="margin-top: 5px;">-->
<!-- <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">多语言设置</el-button>-->
<!-- </el-form-item>-->
</el-form>
</fieldset>
<!-- 停机 --> <!-- 停机 -->
<fieldset class="customer-fieldset" <fieldset class="customer-fieldset"
style="margin-left: 680px; width: 200px; height: 105px;">
style="margin-left: 680px; width: 200px; height: 80px;">
<legend class="customer-legend">{{ labels.downTimeButtons }}</legend> <legend class="customer-legend">{{ labels.downTimeButtons }}</legend>
<el-form style="text-align: center;"> <el-form style="text-align: center;">
<el-form-item> <el-form-item>
@ -486,7 +523,7 @@
</fieldset> </fieldset>
<!--其他操作--> <!--其他操作-->
<fieldset class="customer-fieldset" <fieldset class="customer-fieldset"
style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;">
style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;">
<legend class="customer-legend">{{ buttons.otherOperation }}</legend> <legend class="customer-legend">{{ buttons.otherOperation }}</legend>
<el-form style="text-align: center;"> <el-form style="text-align: center;">
@ -549,6 +586,42 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</fieldset> </fieldset>
<!-- 质量检验 -->
<fieldset class="customer-fieldset"
style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;">
<legend class="customer-legend">{{ labels.qualityInspection }}</legend>
<el-form style="text-align: center;">
<el-form-item style="margin-top: 10px;">
<el-button class="customer-bun-mid" type="primary" @click="qualityInspectionModal"
style="margin-left: 15px; margin-bottom: 5px;">
{{ buttons.qualityInspection }}
</el-button>
</el-form-item>
<el-form-item>
<el-button class="controller-bun" type="primary" @click="qualityInspectionModal"
style="margin-left: 15px; margin-bottom: 5px;margin-top: 10px;">
{{ buttons.mrb }}
</el-button>
</el-form-item>
</el-form>
</fieldset>
<!-- TID绑定 -->
<fieldset class="customer-fieldset"
style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 80px;">
<legend class="customer-legend">{{ labels.tidBanding }}</legend>
<el-form style="text-align: center;">
<el-form-item style="margin-top: 10px;">
<el-button class="customer-bun-mid" type="primary"
style="margin-left: 15px; margin-bottom: 5px;">
{{ buttons.tidBand }}
</el-button>
</el-form-item>
</el-form>
</fieldset>
</el-form> </el-form>
</el-dialog> </el-dialog>
@ -662,6 +735,10 @@
<ComMalformedMaterial ref="comMalformedMaterial" :visible.sync="showMalformedMaterialFlag" <ComMalformedMaterial ref="comMalformedMaterial" :visible.sync="showMalformedMaterialFlag"
@refreshPageData="refreshPageData"></ComMalformedMaterial> @refreshPageData="refreshPageData"></ComMalformedMaterial>
<!-- 过程检验组件 -->
<ComProcessInspection :visible.sync="showProcessInspectionFlag">
</ComProcessInspection>
<!-- SOP预览弹出框 --> <!-- SOP预览弹出框 -->
<el-dialog title="SOP预览" :visible.sync="showSopPreviewFlag" width="50%" top="5vh" :before-close="closeSopPreview"> <el-dialog title="SOP预览" :visible.sync="showSopPreviewFlag" width="50%" top="5vh" :before-close="closeSopPreview">
<div class="sop-preview-content"> <div class="sop-preview-content">
@ -813,6 +890,7 @@ import comProduceDown from "./com_produce_down";/*停机组件*/
import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/ import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/
import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机组件*/ import notOverFinishRoll from "./not_over_finish_roll";/*生产过程的停机组件*/
import ComMalformedMaterial from "./com_malformed_material";/*生产过程的停机组件*/ import ComMalformedMaterial from "./com_malformed_material";/*生产过程的停机组件*/
import ComProcessInspection from "./com_process_inspection";/*过程检验组件*/
var functionId = 'C10000002'; var functionId = 'C10000002';
export default { export default {
data() { data() {
@ -823,6 +901,7 @@ export default {
selectSfdcRollData: '',// 2022-11-17 selectSfdcRollData: '',// 2022-11-17
showMalformedMaterialFlag: false,// 2022-11-17 showMalformedMaterialFlag: false,// 2022-11-17
malformedMaterialButtonFlag: true,// 2022-11-17 malformedMaterialButtonFlag: true,// 2022-11-17
showProcessInspectionFlag: false,// 过程检验弹窗显示状态
showDefault: false, showDefault: false,
popoverFlag: false, popoverFlag: false,
showNotOverFlag: false, showNotOverFlag: false,
@ -849,7 +928,13 @@ export default {
sopPageIndex: 1, // SOP预览分页当前页 sopPageIndex: 1, // SOP预览分页当前页
sopPageSize: 20, // SOP预览分页大小 sopPageSize: 20, // SOP预览分页大小
sopTotalPage: 0, // SOP预览总页数 sopTotalPage: 0, // SOP预览总页数
activeTable: 'sfdc_time',
activeTable: 'order_info',
orderInfo: {
technicalNotes: '',
customerRequirements: '',
orderNotes: ''
},
orderInfoList: [],
sfdcTimeList: [], sfdcTimeList: [],
orderToolList: [], orderToolList: [],
sfdcToolList: [], sfdcToolList: [],
@ -3094,14 +3179,19 @@ export default {
startProduce: '开始生产', startProduce: '开始生产',
sopView:'SOP预览', sopView:'SOP预览',
reportDefect: '报告不良', reportDefect: '报告不良',
toolButton: '刀模板',
materialButton: '材料',
downTime: '报告其他停机',
toolButton: '刀模上机',
materialButton: '材料上机',
downTime: '异常停机',
otherOperation: '其他操作', otherOperation: '其他操作',
preReport: '产量报告', preReport: '产量报告',
deleteRoll: '删除卷', deleteRoll: '删除卷',
notProduce: '未生产下机拆卷', notProduce: '未生产下机拆卷',
scannerRoll: '扫描卷', scannerRoll: '扫描卷',
qualityInspection: '过程检验',
updateSample: '更换样片',
mrb: 'MRB异常单',
updateResult: '更换结果',
tidBand: 'TID文件',
}, },
buttonList: [ buttonList: [
{ {
@ -3230,6 +3320,7 @@ export default {
onlyCurrentRoll: '仅显示当前卷信息', onlyCurrentRoll: '仅显示当前卷信息',
rollButtons: '卷操作', rollButtons: '卷操作',
listDesc: '列表信息', listDesc: '列表信息',
orderInfo: '订单信息',
timeList: '时间', timeList: '时间',
toolList: '刀模板记录', toolList: '刀模板记录',
materialList: '材料', materialList: '材料',
@ -3237,10 +3328,12 @@ export default {
defectList: '不良记录', defectList: '不良记录',
rollList: '机器下机卷', rollList: '机器下机卷',
produceButtons: '生产调机', produceButtons: '生产调机',
defectButtons: '不良',
scanButtons: '扫描',
downTimeButtons: '停机',
defectButtons: '过程不良',
scanButtons: '过程控制',
downTimeButtons: '过程异常',
otherButtons: '其他操作', otherButtons: '其他操作',
qualityInspection: '质量检验',
tidBanding: 'TID绑定',
toolListReplace: '刀模替换', toolListReplace: '刀模替换',
toolListFinish: '结束使用', toolListFinish: '结束使用',
materialListReplace: '换料', materialListReplace: '换料',
@ -3621,6 +3714,7 @@ export default {
comFinishSchedule,/*结束派工单的组件*/ comFinishSchedule,/*结束派工单的组件*/
notOverFinishRoll,/*异常下级报工*/ notOverFinishRoll,/*异常下级报工*/
ComMalformedMaterial, // 材料一场,扫描 ComMalformedMaterial, // 材料一场,扫描
ComProcessInspection,/*过程检验组件*/
}, },
methods: { methods: {
// 删除不良 // 删除不良
@ -3860,6 +3954,15 @@ export default {
//刷新列表数据 //刷新列表数据
this.refreshCurrentTabTable(); this.refreshCurrentTabTable();
}, },
//获取订单信息列表
getOrderInfoList() {
// 获取订单相关的备注信息
this.orderInfo = {
technicalNotes: this.scheduleData.technicalNotes || '',
customerRequirements: this.scheduleData.customerRequirements || '',
orderNotes: this.scheduleData.orderNotes || ''
};
},
//刷新派工单的时间的记录 //刷新派工单的时间的记录
async getSfdcTimeList() { async getSfdcTimeList() {
await getSfdcTimeByCon(this.searchData).then(({data}) => { await getSfdcTimeByCon(this.searchData).then(({data}) => {
@ -3923,7 +4026,9 @@ export default {
} }
//区分不同的页签刷新不同的列表数据 //区分不同的页签刷新不同的列表数据
if (this.activeTable == 'sfdc_time') {
if (this.activeTable == 'order_info') {
this.getOrderInfoList();
} else if (this.activeTable == 'sfdc_time') {
await this.getSfdcTimeList(); await this.getSfdcTimeList();
} else if (this.activeTable == 'sfdc_tool') { } else if (this.activeTable == 'sfdc_tool') {
this.getOrderToolList(); this.getOrderToolList();
@ -3954,7 +4059,7 @@ export default {
this.sfdcDefectList = []; this.sfdcDefectList = [];
this.sfdcRollList = []; this.sfdcRollList = [];
//设置table页签 //设置table页签
this.activeTable = 'sfdc_time';
this.activeTable = 'order_info';
//刷新当前派工单的信息 //刷新当前派工单的信息
this.refreshPageData(); this.refreshPageData();
// 操作权限 // 操作权限
@ -4517,6 +4622,26 @@ export default {
}); });
}, },
// 质量检验相关方法
qualityInspectionModal() {
this.showProcessInspectionFlag = true;
},
updateSampleModal() {
this.$message.info('更换样片功能');
// TODO: 实现更换样片功能
},
mrbModal() {
this.$message.info('MRB异常单功能');
// TODO: 实现MRB异常单功能
},
updateResultModal() {
this.$message.info('更换结果功能');
// TODO: 实现更换结果功能
},
// 保存 默认配置 列 // 保存 默认配置 列
async saveMultiLanguage() { async saveMultiLanguage() {
// 保存页面 button label title 属性 // 保存页面 button label title 属性

Write Preview
Loading…
Cancel
Save