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

Merge remote-tracking branch 'origin/master'

master
[li_she] 4 years ago
parent
af2943fe42 1c36af4aae
commit
4f8f010066
6 changed files with 140 additions and 281 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. 2
      src/api/yieldReport/com_separate_roll_with_split.js
  2. 7
      src/api/yieldReport/com_split_order_report.js
  3. 2
      src/views/modules/schedule/order_schedule_fqc.vue
  4. 1
      src/views/modules/yieldReport/com_separate_roll.vue
  5. 146
      src/views/modules/yieldReport/com_separate_roll_with_split.vue
  6. 263
      src/views/modules/yieldReport/com_split_order_report.vue

2
src/api/yieldReport/com_separate_roll_with_split.js
View File

@ -4,7 +4,7 @@ import { createAPI } from '@/utils/httpRequest.js'
export const refreshCurrentPageData = data => createAPI('scheduling/getSplitScheduleCreateRollPageData', 'POST', data) export const refreshCurrentPageData = data => createAPI('scheduling/getSplitScheduleCreateRollPageData', 'POST', data)
//刷新当前的页面table //刷新当前的页面table
export const refreshCurrentPageTable = data => createAPI('schedule/endTuningAndStartProduce', 'POST', data)
export const refreshCurrentPageTable = data => createAPI('scheduling/getSplitScheduleSeparateRolls', 'POST', data)
//检查是否可以创建分卷 //检查是否可以创建分卷
export const checkCreateSeparateRoll = data => createAPI('scheduling/checkCreateSplitScheduleSeparateRoll', 'POST', data) export const checkCreateSeparateRoll = data => createAPI('scheduling/checkCreateSplitScheduleSeparateRoll', 'POST', data)

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

@ -27,9 +27,6 @@ export const getSfdcRollOpsByCon = data => createAPI('schedule/getSfdcRollOpsByC
// 获取当前派工单的不良卷记录 // 获取当前派工单的不良卷记录
export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon', '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('scheduling/refreshWorkPlatformButtonsWithSplit', 'POST', data) export const refreshWorkPlatformButtons = data => createAPI('scheduling/refreshWorkPlatformButtonsWithSplit', 'POST', data)
@ -81,6 +78,10 @@ export const switchrollReverse = data => createAPI('schedule/switchrollReverse',
//查询班次数据 //查询班次数据
export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data) export const getScheduleShiftData = data => createAPI('schedule/getScheduleShiftData', 'POST', data)
//刷新分切页面的table
export const refreshSplitScheduleTable = data => createAPI('scheduling/getSplitScheduleSeparateRolls', 'POST', data)

2
src/views/modules/schedule/order_schedule_fqc.vue
View File

@ -2081,7 +2081,7 @@ hr {
margin-bottom: 2px; margin-bottom: 2px;
} }
/*设置间距*/
/*设置间距*//* 我是来测试的*/
.el-dropdown-menu /deep/ li.customer-li{ .el-dropdown-menu /deep/ li.customer-li{
font-size: 12px; font-size: 12px;
line-height: 16px; line-height: 16px;

1
src/views/modules/yieldReport/com_separate_roll.vue
View File

@ -174,7 +174,6 @@ export default {
//获取当前是的数量 //获取当前是的数量
let rollQty = parseFloat(this.pageData.rollQty); let rollQty = parseFloat(this.pageData.rollQty);
debugger;
//判断是否可以修改 //判断是否可以修改
if (rollQty <= 0 || !Number.isInteger(rollQty)){ if (rollQty <= 0 || !Number.isInteger(rollQty)){
this.$message.error('良品数量必须大于零且是整数!'); this.$message.error('良品数量必须大于零且是整数!');

146
src/views/modules/yieldReport/com_separate_roll_with_split.vue
View File

@ -123,6 +123,7 @@ export default {
seqNo: '', seqNo: '',
orderNo: '', orderNo: '',
itemNo: 0, itemNo: 0,
rollNo: '',
partNo: '', partNo: '',
partDesc: '', partDesc: '',
operatorId: '', operatorId: '',
@ -135,6 +136,7 @@ export default {
supplierName: '', supplierName: '',
rollQty: 0, rollQty: 0,
rollNums: 1, rollNums: 1,
splitType: 'S'
}, },
operatorData: { operatorData: {
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -150,14 +152,14 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303, functionId: 5303,
serialNumber: '5303MaterialReportDate',
serialNumber: '5303MaterialRollNo',
tableId: "5303Material", tableId: "5303Material",
tableName: "派工单材料",
columnProp: "reportDate",
tableName: "材料",
columnProp: "rollNo",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "报告时间",
columnWidth: 125,
columnLabel: "卷号",
columnWidth: 100,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -168,13 +170,13 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5305, functionId: 5305,
serialNumber: '5305MaterialReportedBy',
serialNumber: '5305MaterialRollQty',
tableId: "5305Material", tableId: "5305Material",
tableName: "派工单材料",
columnProp: "reportedBy",
tableName: "材料",
columnProp: "rollQty",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "报告人",
columnLabel: "卷数量",
columnWidth: 60, columnWidth: 60,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -186,13 +188,13 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5305, functionId: 5305,
serialNumber: '5305MaterialRmRollNo',
serialNumber: '5305MaterialSuppDeliveryNote',
tableId: "5305Material", tableId: "5305Material",
tableName: "派工单材料",
columnProp: "rmRollNo",
tableName: "材料",
columnProp: "suppDeliveryNote",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "材料卷号",
columnLabel: "供应商送货单号",
columnWidth: 100, columnWidth: 100,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -204,13 +206,13 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5305, functionId: 5305,
serialNumber: '5305MaterialPartNo',
serialNumber: '5305MaterialRollDate',
tableId: "5305Material", tableId: "5305Material",
tableName: "派工单材料",
columnProp: "partNo",
tableName: "材料",
columnProp: "rollDate",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "零部件编码",
columnLabel: "入库日期",
columnWidth: 100, columnWidth: 100,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -222,13 +224,13 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5305, functionId: 5305,
serialNumber: '5305MaterialStartDate',
serialNumber: '5305MaterialCreatedDate',
tableId: "5305Material", tableId: "5305Material",
tableName: "派工单材料",
columnProp: "startDate",
tableName: "材料",
columnProp: "createdDate",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "开始使用时间",
columnLabel: "分卷日期",
columnWidth: 125, columnWidth: 125,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -240,13 +242,13 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5305, functionId: 5305,
serialNumber: '5305MaterialTransQty',
serialNumber: '5305MaterialCreatedBy',
tableId: "5305Material", tableId: "5305Material",
tableName: "派工单材料",
columnProp: "transQty",
tableName: "材料",
columnProp: "createdBy",
headerAlign: "center", headerAlign: "center",
align: "right", align: "right",
columnLabel: "数量",
columnLabel: "分卷人",
columnWidth: 80, columnWidth: 80,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -258,31 +260,13 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5305, functionId: 5305,
serialNumber: '5305MaterialNetIssueQty',
serialNumber: '5305MaterialSuppRollNoFlag',
tableId: "5305Material", tableId: "5305Material",
tableName: "派工单材料",
columnProp: "netIssueQty",
tableName: "材料",
columnProp: "suppRollNoFlag",
headerAlign: "center", headerAlign: "center",
align: "right", align: "right",
columnLabel: "本卷调机数量",
columnWidth: 100,
columnHidden: true,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialKeyRMFlag',
tableId: "5305Material",
tableName: "派工单材料",
columnProp: "keyRMFlag",
headerAlign: "center",
align: "center",
columnLabel: "是否主材",
columnLabel: "已录入供应商批号",
columnWidth: 80, columnWidth: 80,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -294,14 +278,14 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5305, functionId: 5305,
serialNumber: '5305MaterialSAPBOMItemNo',
serialNumber: '5305MaterialSuppRollNo',
tableId: "5305Material", tableId: "5305Material",
tableName: "派工单材料",
columnProp: "sAPBOMItemNo",
tableName: "材料",
columnProp: "suppRollNo",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "SAP BOM序号",
columnWidth: 100,
columnLabel: "供应商批号",
columnWidth: 80,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -352,7 +336,7 @@ export default {
//获取页面显示的参数 //获取页面显示的参数
this.getCurrentPageData(); this.getCurrentPageData();
//刷新页面的table数据 //刷新页面的table数据
//this.getCurrentPageTable();
this.getCurrentPageTable();
}, },
//获取当前页面的参数 //获取当前页面的参数
@ -365,7 +349,7 @@ export default {
this.pageData.fgPartDesc = data.pageMap.fgPartDesc; this.pageData.fgPartDesc = data.pageMap.fgPartDesc;
this.pageData.referName = data.pageMap.referName; this.pageData.referName = data.pageMap.referName;
this.pageData.supplierId = data.pageMap.supplierId; this.pageData.supplierId = data.pageMap.supplierId;
this.pageData.supplierName = data.pageMap.supplierName;
this.pageData.supplierName = data.pageMap.supplierDesc;
}); });
}, },
@ -386,6 +370,8 @@ export default {
this.pageData.fgPartNo = val.PartNo; this.pageData.fgPartNo = val.PartNo;
this.pageData.fgPartDesc = val.PartDescSpec; this.pageData.fgPartDesc = val.PartDescSpec;
} }
//触发页面参数初始化
this.getCurrentPageData();
}, },
// 获取基础数据列表 // 获取基础数据列表
@ -417,33 +403,51 @@ export default {
}, },
/*处理材料下料的记录*/ /*处理材料下料的记录*/
createSeparateRollBun(){
createSeparateRollBun: function () {
//数量是否符合要求 //数量是否符合要求
let rollQty = this.pageData.rollQty;
debugger;
let rollQty = this.pageData.rollQty
//判断是否可以修改 //判断是否可以修改
if (rollQty <= 0){
this.$message.error('请输入有效的每卷数量!');
return false;
if (rollQty <= 0) {
this.$message.error('请输入有效的每卷数量!')
return false
} }
//判断卷数 //判断卷数
let rollNums = this.pageData.rollNums;
if (rollNums <= 0){
this.$message.error('请输入有效的卷数!');
return false;
let rollNums = this.pageData.rollNums
if (rollNums <= 0) {
this.$message.error('请输入有效的卷数!')
return false
}
//判断客户编码
let customerId = this.pageData.customerId.trim()
let fgPartNo = this.pageData.fgPartNo.trim()
let supplierId = this.pageData.supplierId.trim()
//判断是否存在客户编码
if (customerId === '' || customerId === '无') {
this.$message.error('请选择有效的客户编码!')
return false
}
//判断是否存在产品编码
if (fgPartNo === '' || fgPartNo === '无') {
this.$message.error('请选择有效的产品编码!')
return false
}
//判断是否存在供应商
if (supplierId === '' || supplierId === '*') {
this.$message.error('供应商编码有误!')
return false
} }
//调用方法执行上材料 //调用方法执行上材料
createSeparateRoll(this.pageData).then(({data}) => { createSeparateRoll(this.pageData).then(({data}) => {
if(data.code === 500){
this.$message.error(data.msg);
}else{
this.$message.success(data.msg);
if (data.code === 500) {
this.$message.error(data.msg)
} else {
this.$message.success(data.msg)
//刷新报工的页面 //刷新报工的页面
this.$emit('refreshPageData');
this.$emit('refreshPageData')
//关闭当前的页面 //关闭当前的页面
this.closeDialog();
this.closeDialog()
} }
});
})
}, },

263
src/views/modules/yieldReport/com_split_order_report.vue
View File

@ -320,7 +320,7 @@
<el-tab-pane label="机器下机卷" name="sfdc_roll"> <el-tab-pane label="机器下机卷" name="sfdc_roll">
<el-table <el-table
height="260" height="260"
:data="sfdcRollList"
:data="materialRollList"
border border
show-summary show-summary
v-loading="dataListLoading" v-loading="dataListLoading"
@ -349,9 +349,6 @@
width="115" width="115"
:label="'操作'"> :label="'操作'">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="customer-a" v-if="operatorData.operatorName != '' && scope.row.finishedFlag != 'N'"
@click="warnReopenSfdcRollsConfirm(scope.row)"
>重打开</a>
<a class="customer-a" v-if="operatorData.operatorName != ''" <a class="customer-a" v-if="operatorData.operatorName != ''"
@click="warnDeleteSfdcRollsConfirm(scope.row)" @click="warnDeleteSfdcRollsConfirm(scope.row)"
>删除卷</a> >删除卷</a>
@ -596,7 +593,6 @@ import {
getSfdcMaterialByCon, getSfdcMaterialByCon,
getSfdcRollOpsByCon, getSfdcRollOpsByCon,
getSfdcDefectByCon, getSfdcDefectByCon,
getSfdcRollByCon,
refreshWorkPlatformButtons, refreshWorkPlatformButtons,
checkScheduleButton, checkScheduleButton,
checkCreateNewSfdcRoll, checkCreateNewSfdcRoll,
@ -606,6 +602,7 @@ import {
processFinishTool,/*执行工具的结束使用的方法*/ processFinishTool,/*执行工具的结束使用的方法*/
finishMaterialWithNoRemainder,/*执行材料结束使用 且无剩余 */ finishMaterialWithNoRemainder,/*执行材料结束使用 且无剩余 */
switchrollReverse, switchrollReverse,
refreshSplitScheduleTable,
} from "@/api/yieldReport/com_split_order_report.js"; } from "@/api/yieldReport/com_split_order_report.js";
/*引入组件*/ /*引入组件*/
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/ import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
@ -656,7 +653,7 @@ export default {
sfdcMaterialList: [], sfdcMaterialList: [],
sfdcRollOpsList: [], sfdcRollOpsList: [],
sfdcDefectList: [], sfdcDefectList: [],
sfdcRollList: [],
materialRollList: [],
columnTimeArray: [ columnTimeArray: [
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
@ -2511,9 +2508,9 @@ export default {
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303, functionId: 5303,
serialNumber: '5303RollRollNo',
tableId: "5303Roll",
tableName: "下机卷",
serialNumber: '5303MaterialRollNo',
tableId: "5303Material",
tableName: "材料",
columnProp: "rollNo", columnProp: "rollNo",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
@ -2528,122 +2525,14 @@ export default {
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollCreatedDate',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "createdDate",
headerAlign: "center",
align: "center",
columnLabel: "创建时间",
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollCreatedBy',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "createdBy",
headerAlign: "center",
align: "center",
columnLabel: "创建人",
columnWidth: 55,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollCurrentOpsItemNo',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "currentOpsItemNo",
headerAlign: "center",
align: "center",
columnLabel: "当前生产工序号",
columnWidth: 95,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollLastFinishedOpsItemNo',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "lastFinishedOpsItemNo",
headerAlign: "center",
align: "center",
columnLabel: "最近完工工序号",
columnWidth: 95,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollFinishedDate',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "finishedDate",
headerAlign: "center",
align: "center",
columnLabel: "完工时间",
columnWidth: 125,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollFinishedFlag',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "finishedFlag",
headerAlign: "center",
align: "center",
columnLabel: "是否完成",
columnWidth: 60,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollOnLineFlag',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "onLineFlag",
functionId: 5305,
serialNumber: '5305MaterialRollQty',
tableId: "5305Material",
tableName: "材料",
columnProp: "rollQty",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "是否在线",
columnLabel: "卷数量",
columnWidth: 60, columnWidth: 60,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -2654,32 +2543,14 @@ export default {
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollPauseFlag',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "pauseFlag",
headerAlign: "center",
align: "center",
columnLabel: "暂停",
columnWidth: 35,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollOriRollNo',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "oriRollNo",
functionId: 5305,
serialNumber: '5305MaterialSuppDeliveryNote',
tableId: "5305Material",
tableName: "材料",
columnProp: "suppDeliveryNote",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "原卷号",
columnLabel: "供应商送货单号",
columnWidth: 100, columnWidth: 100,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -2690,33 +2561,15 @@ export default {
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollStartOpsItemNo',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "startOpsItemNo",
functionId: 5305,
serialNumber: '5305MaterialRollDate',
tableId: "5305Material",
tableName: "材料",
columnProp: "rollDate",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "开始生产工序号",
columnWidth: 95,
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollRollType',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "rollType",
headerAlign: "center",
align: "center",
columnLabel: "卷类型",
columnWidth: 75,
columnLabel: "入库日期",
columnWidth: 100,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -2726,15 +2579,15 @@ export default {
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollCreatedOpsItemNo',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "createdOpsItemNo",
functionId: 5305,
serialNumber: '5305MaterialCreatedDate',
tableId: "5305Material",
tableName: "材料",
columnProp: "createdDate",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "创建卷的工序号",
columnWidth: 95,
columnLabel: "分卷日期",
columnWidth: 125,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -2744,15 +2597,15 @@ export default {
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollRollQty',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "rollQty",
functionId: 5305,
serialNumber: '5305MaterialCreatedBy',
tableId: "5305Material",
tableName: "材料",
columnProp: "createdBy",
headerAlign: "center", headerAlign: "center",
align: "center",
columnLabel: "卷数量",
columnWidth: 55,
align: "right",
columnLabel: "分卷人",
columnWidth: 80,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -2762,15 +2615,15 @@ export default {
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollFirstLevelRollNo',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "firstLevelRollNo",
functionId: 5305,
serialNumber: '5305MaterialSuppRollNoFlag',
tableId: "5305Material",
tableName: "材料",
columnProp: "suppRollNoFlag",
headerAlign: "center", headerAlign: "center",
align: "center",
columnLabel: "最原始卷号",
columnWidth: 100,
align: "right",
columnLabel: "已录入供应商批号",
columnWidth: 80,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
@ -2780,14 +2633,14 @@ export default {
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303RollVirtualRollFlag',
tableId: "5303Roll",
tableName: "下机卷",
columnProp: "virtualRollFlag",
functionId: 5305,
serialNumber: '5305MaterialSuppRollNo',
tableId: "5305Material",
tableName: "材料",
columnProp: "suppRollNo",
headerAlign: "center", headerAlign: "center",
align: "center", align: "center",
columnLabel: "虚拟卷",
columnLabel: "供应商批号",
columnWidth: 80, columnWidth: 80,
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
@ -3084,8 +2937,8 @@ export default {
//刷新派工单的下机卷的记录 //刷新派工单的下机卷的记录
getSfdcRollList() { getSfdcRollList() {
getSfdcRollByCon(this.searchData).then(({data}) => {
this.sfdcRollList = data.rows;
refreshSplitScheduleTable(this.searchData).then(({data}) => {
this.materialRollList = data.rows;
}); });
}, },
@ -3265,7 +3118,6 @@ export default {
/*不初始化操作员的方法*/ /*不初始化操作员的方法*/
notInitOperatorData() { notInitOperatorData() {
debugger;
//关闭切换用户的组件 //关闭切换用户的组件
this.showOperatorFlag = false; this.showOperatorFlag = false;
$(".controller-bun").addClass("disabled-bun"); $(".controller-bun").addClass("disabled-bun");
@ -3547,6 +3399,9 @@ export default {
/*提醒是否删除的提示*/ /*提醒是否删除的提示*/
warnDeleteSfdcRollsConfirm(sfdcRollRow) { warnDeleteSfdcRollsConfirm(sfdcRollRow) {
//等待开发
this.$message.error('待开发!')
return false;
this.$confirm('确实要删除该卷吗?', '提示', { this.$confirm('确实要删除该卷吗?', '提示', {
confirmButtonText: '确认', confirmButtonText: '确认',
celButtonText: '取消', celButtonText: '取消',

Write Preview
Loading…
Cancel
Save