Browse Source

Merge remote-tracking branch 'origin/master'

master
ruanqi 4 years ago
parent
commit
c2baf0cc01
  1. 7
      src/api/report/customer_report_show.js
  2. 3
      src/api/yieldReport/com_separate_roll_with_split.js
  3. 2
      src/api/yieldReport/com_switch_roll.js
  4. 1
      src/router/index.js
  5. 15
      src/views/modules/report/com_show_customer_report_search_column.vue
  6. 283
      src/views/modules/report/customer_report_show.vue
  7. 16
      src/views/modules/report/user_customer_report.vue
  8. 298
      src/views/modules/yieldReport/com_separate_roll_with_split.vue
  9. 4
      src/views/modules/yieldReport/com_split_order_switch_roll.vue

7
src/api/report/customer_report_show.js

@ -0,0 +1,7 @@
import { createAPI } from '@/utils/httpRequest.js'
// 获取派工单的最新信息
export const getCustomerReportData = data => createAPI('report/getCustomerReportData', 'POST', data)
// 获取派工单的最新信息
export const runCustomerReport = data => createAPI('report/runCustomerReport', 'POST', data)

3
src/api/yieldReport/com_separate_roll_with_split.js

@ -1,5 +1,8 @@
import { createAPI } from '@/utils/httpRequest.js'
// 获取分切工单的物料信息
export const getSplitOrderParts = data => createAPI('schedule/getSplitOrderParts', 'POST', data)
// 获取当前的卷的上机材料的主料
export const refreshCurrentPageData = data => createAPI('scheduling/getSplitScheduleCreateRollPageData', 'POST', data)

2
src/api/yieldReport/com_switch_roll.js

@ -22,3 +22,5 @@ export const switchrollRepackAction = data => createAPI('schedule/switchrollRepa
// 换分切工单切换卷校验
export const checkSplitScheduleSwitchRoll = data => createAPI('schedule/checkSplitScheduleSwitchRoll', 'POST', data)
//分切工单切换卷操作
export const splitScheduleSwitchRoll = data => createAPI('schedule/splitScheduleSwitchRoll', 'POST', data)

1
src/router/index.js

@ -38,6 +38,7 @@ const mainRoutes = {
{ path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
{ path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
// { path: '/demo-ueditor', component: _import('demo/ueditor'), name: 'demo-ueditor', meta: { title: 'demo-ueditor', isTab: true } }
{ path: '/customer_report_show', component: _import('modules/report/customer_report_show'), name: 'report', meta: { title: '自定义报表展示', isTab: true } },//2022-04-20 自定义报表路径
],
beforeEnter (to, from, next) {
let token =Vue.cookie.get('token')

15
src/views/modules/report/com_show_customer_report_search_column.vue

@ -67,6 +67,7 @@ export default {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
reportId: '',
closedFlag: false,
},
searchColumnList: [],
searchColumnlArray: [
@ -158,9 +159,10 @@ export default {
methods: {
/*初始化页面参数*/
init(reportId) {
init(reportId, closedFlag) {
//
this.pageData.reportId = reportId;
this.pageData.closedFlag = closedFlag;
//
this.refreshPageData();
},
@ -202,10 +204,21 @@ export default {
/*保存已经修改好的参数数据*/
runCustomerReportModal(){
//
if(this.pageData.closedFlag){
//
this.closeDialog()
//
this.$emit('initSearchColumns', this.searchColumnList);
}else{
//dialog
this.$nextTick(() => {
this.showRunCustomerReportFlag = true;
this.$refs.runCustomerReport.init(this.pageData.reportId, this.searchColumnList);
//dialog
this.closeDialog();
});
}
},
},

283
src/views/modules/report/customer_report_show.vue

@ -0,0 +1,283 @@
<template>
<div class="customer-css" >
<!-- 查询时间和产品 -->
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;" >
<el-row>
<el-form-item :label="'报表名称:'">
<el-input v-model="pageData.reportName" readonly="readonly" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'报表分类:'">
<el-input v-model="pageData.reportType" readonly="readonly" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'报表ID:'">
<el-input v-model="pageData.reportId" readonly="readonly" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="''" style="margin-left: 50px; margin-top: 20px;">
<el-button class="customer-bun-min" type="primary" @click="showCustomerReportSearchColumnModal" style="margin-left: 10px; margin-bottom: 5px;">查询</el-button>
<download-excel style="width: 50px; padding: 5px; margin-bottom: 10px;"
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:footer="exportFooter"
:defaultValue="exportDefaultValue"
:fetch="createExportData"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
导出
</download-excel>
</el-form-item>
</el-row>
</el-form>
<!-- 工单主表信息 -->
<el-main style="margin-top: 5px; padding: 0px; width: 100%;">
<el-table :height="height"
:data="customerReportList"
border
v-loading="dataListLoading"
style="width: 100%; margin-top: 0px;">
<el-table-column
v-for="(item,index) in customerColumnlArray" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<el-input type="number" class="table-number-input" v-if="item.columnAttr === 'number'"
v-model="scope.row[item.columnProp]"></el-input>
<el-input type="text" class="table-text-input" v-if="item.columnAttr === 'text'"
v-model="scope.row[item.columnProp]"></el-input>
<span v-else>{{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-main>
<!-- 查询列展示 -->
<showCustomerReportSearchColumn ref="showCustomerReportSearchColumn" :close-on-click-modal="false"
:visible.sync="showCustomerReportSearchColumnFlag"
@initSearchColumns = "initSearchColumns">
</showCustomerReportSearchColumn>
</div>
</template>
<script>
/*组件*/
import showCustomerReportSearchColumn from '@/views/modules/report/com_show_customer_report_search_column';/*新增自定义报表的功能*/
import {
getCustomerReportData,
runCustomerReport,
} from '@/api/report/customer_report_show.js'
export default {
data() {
return {
height: 200,
pageData: {
site: this.$store.state.user.site,
username: this.$store.state.user.name,
reportId: '',
reportName: '',
reportType: '',
seqNo: 0,
status: 1,
},
showCustomerReportSearchColumnFlag: false,
customerReportList: [],
customerColumnlArray: [],
currentReportRow: {},
customerReport: [],
searchColumns: [],
// start
exportData: [],
exportName: "定制报表导出",
exportFooter: [],
exportDefaultValue: "这一行这一列没有数据",
// end
reportList: [],
dataListLoading: false,
}
},
/*组件*/
components: {
showCustomerReportSearchColumn,/*显示查询列参数*/
},
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 195;
})
},
methods: {
/*刷新报工的类型*/
refreshCustomerReportData(){
//Id
let reportId = this.$route.query.reportId;
let requestData = {'site': this.pageData.site, 'reportId': reportId};
//
getCustomerReportData(requestData).then(({data}) => {
//
if(data.code === 200){
this.customerColumnlArray = data.resultMap.columnRows;
this.customerReport = data.resultMap.customerReport;
//
this.pageData.reportId = this.customerReport.reportId;
this.pageData.reportName = this.customerReport.reportName;
this.pageData.reportType = this.customerReport.reportType;
//modal
this.showCustomerReportSearchColumnModal(this.customerReport);
}else{
this.$message.error(data.msg);
}
})
},
/*刷新页面table*/
refreshCurrentPage(){
this.refreshPageTables();
},
/*展示查询列*/
showCustomerReportSearchColumnModal(){
this.$nextTick(() => {
this.showCustomerReportSearchColumnFlag = true;
let closedFlag = true;
this.$refs.showCustomerReportSearchColumn.init(this.pageData.reportId, closedFlag);
});
},
/*页面参数的条件查询*/
initSearchColumns(searchColumns){
//
this.searchColumns = searchColumns;
//
let requestData = {searchColumnList: JSON.stringify(this.searchColumns), pageData: JSON.stringify(this.pageData)};
runCustomerReport(requestData).then(({data}) => {
//
if(data.code === 200){
this.customerReportList = data.resultMap.resultRows;
this.customerColumnlArray = data.resultMap.columnRows;
}else{
this.$message.error(data.msg);
}
});
},
/*设置工艺的行*/
setCurrentReportRow(row, column, event) {
this.currentReportRow = row;
},
// excel
fields() {
//
this.exportName = this.customerReport.reportName +"-"+ this.dayjs().format('YYYYMMDDHHmmss');
//
let json = "{"
this.customerColumnlArray.forEach((item, index) => {
if (index == this.customerColumnlArray.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
}
})
json += "}"
let s = eval("(" + json + ")")
return s
},
createExportData() {
// ,,
return this.customerReportList;
},
},
created() {
//
this.refreshCustomerReportData();
},
}
</script>
<!--当前页面的标签样式-->
<style scoped lang="scss">
/*针对el-card*/
.customer-card .el-form-item__content{
margin-top: -15px;
}
.customer-card .el-form-item{
height: 22px;
}
.customer-border .el-form-item__content{
margin-top: -30px;
}
/*全局年与日类型 宽度*/
div.el-time-width{
width: 110px !important;
}
/* 全局时间右边框*/
.customer-css input.el-input__inner{
height: 22px !important;
padding-right: 0px !important;
}
/* 控制el-card标签的数据*/
div.customer-el-card {
margin-left: 110px;
margin-top: -15px;
height: 20px;
width: 60px;
}
/* 颜色控制 */
div.customer-el-card-pink {
background: #FF00FF;
}
div.customer-el-card-orange {
background: #FFD700;
}
div.customer-el-card-blue {
background: #0000CD;
}
/*清掉样式*/
.el-radio+.el-radio {
margin-left: 0px;
}
/*当前按钮的通用样式*/
.customer-css .customer-bun-mid{
width: 60px;
text-align: center;
}
.customer-css .customer-bun-min{
width: 50px;
text-align: center;
}
.customer-css .customer-bun-max{
width: 80px;
text-align: center;
}
/*当前按钮的通用样式*/
.customer-css .el-button--medium {
padding: 5px 5px;
}
</style>

16
src/views/modules/report/user_customer_report.vue

@ -1,5 +1,6 @@
<template>
<div class="customer-css" >
<a class="customer-report" href="" ref="customerReport" target="_blank" style="display: none;"></a>
<!-- 查询时间和产品 -->
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;" >
<el-row>
@ -39,7 +40,8 @@
width="220"
:label="'操作'">
<template slot-scope="scope">
<a class="customer-a" @click="showCustomerReportSearchColumnModal(scope.row)">查询</a>
<!--<a class="customer-a" @click="showCustomerReportSearchColumnModal(scope.row)">查询</a>-->
<a class="customer-a" @click="openCustomerReportPage(scope.row)">查询</a>
</template>
</el-table-column>
<el-table-column
@ -221,6 +223,18 @@ export default {
});
},
/*打开新的查询页面*/
openCustomerReportPage(currentRow){
//
let customerReport= this.$refs.customerReport;
debugger;
//
customerReport.setAttribute('href', window.location.origin+'/#/customer_report_show'+"?reportId="+currentRow.reportId);
//
customerReport.click();
},
/*设置工艺的行*/
setCurrentReportRow(row, column, event) {
this.currentReportRow = row;

298
src/views/modules/yieldReport/com_separate_roll_with_split.vue

@ -1,11 +1,38 @@
<template>
<div class="customer-css">
<el-dialog :title="titleCon" v-drag v-bind="$attrs" v-on="$listeners"
width="755px" style="height: 530px;" class="customer-dialog">
width="755px" style="height: 560px;" class="customer-dialog">
<el-form :inline="true" label-position="top" style="height: 400px;"
label-width="80px">
<fieldset class="customer-fieldset" style="width: 730px;">
<el-table height="100"
:data="orderPartList"
border ref="orderPartTable" highlight-current-row
v-loading="dataListLoading"
@current-change="changePartRow"
style="width: 730px; margin-left: 0px; margin-top: 0px;">
<el-table-column
v-for="(item,index) in columnPartArray" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed"
:width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<!--<el-input type="number" class="table-input" align="right" @blur="checkValidQty(scope.row)"-->
<el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
v-model="scope.row[item.columnProp]"></el-input>
<span v-else>{{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-row style="margin-left: 5px; margin-top: -5px;">
<el-col :span="4" >
<el-form-item :label="''">
@ -65,7 +92,7 @@
</el-col>
</el-row>
</fieldset>
<el-table height="300"
<el-table height="200"
:data="sfdcMaterialList"
border
v-loading="dataListLoading"
@ -94,7 +121,7 @@
</el-table>
</el-form>
<span slot="footer" class="dialog-footer" >
<el-button type="primary" @click="closeDialog">关闭</el-button>
<el-button type="primary" @click="closeDialog" style="margin-bottom: 5px;">关闭</el-button>
</span>
</el-dialog>
<!--列表的组件-->
@ -107,6 +134,7 @@
import Chooselist from '@/views/modules/common/Chooselist';/*列表组件*/
/*js请求*/
import {
getSplitOrderParts,/*获取分切工单的物料信息*/
refreshCurrentPageData,
refreshCurrentPageTable,
checkCreateSeparateRoll,/*检查是否可以创建分卷*/
@ -136,6 +164,7 @@ export default {
supplierName: '',
rollQty: 0,
rollNums: 1,
bomItemNo: 0,
splitType: 'S'
},
operatorData: {
@ -147,14 +176,89 @@ export default {
seqNo: '',
showFlag: false
},
orderPartList: [],
columnPartArray: [
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5309PartBomItemNo',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "bomItemNo",
headerAlign: "center",
align: "center",
columnLabel: "行号",
columnWidth: '',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5309PartPartNo',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "partNo",
headerAlign: "center",
align: "center",
columnLabel: "物料编码",
columnWidth: '',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5309PartPartDesc',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "partDesc",
headerAlign: "center",
align: "center",
columnLabel: "物料描述",
columnWidth: '',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5309PartOrderQty',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "orderQty",
headerAlign: "center",
align: "center",
columnLabel: "数量",
columnWidth: '',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
],
sfdcMaterialList: [],
columnMaterialArray: [
{
userId: this.$store.state.user.name,
functionId: 5303,
serialNumber: '5303MaterialRollNo',
tableId: "5303Material",
tableName: "材料",
serialNumber: '5309PartRollNo',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "rollNo",
headerAlign: "center",
align: "center",
@ -170,9 +274,9 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialRollQty',
tableId: "5305Material",
tableName: "材料",
serialNumber: '5309PartRollQty',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "rollQty",
headerAlign: "center",
align: "center",
@ -188,9 +292,9 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialSuppDeliveryNote',
tableId: "5305Material",
tableName: "材料",
serialNumber: '5309PartSuppDeliveryNote',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "suppDeliveryNote",
headerAlign: "center",
align: "center",
@ -206,9 +310,9 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialRollDate',
tableId: "5305Material",
tableName: "材料",
serialNumber: '5309PartRollDate',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "rollDate",
headerAlign: "center",
align: "center",
@ -224,9 +328,9 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialCreatedDate',
tableId: "5305Material",
tableName: "材料",
serialNumber: '5309PartCreatedDate',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "createdDate",
headerAlign: "center",
align: "center",
@ -242,9 +346,9 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialCreatedBy',
tableId: "5305Material",
tableName: "材料",
serialNumber: '5309PartCreatedBy',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "createdBy",
headerAlign: "center",
align: "right",
@ -260,9 +364,9 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialSuppRollNoFlag',
tableId: "5305Material",
tableName: "材料",
serialNumber: '5309PartSuppRollNoFlag',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "suppRollNoFlag",
headerAlign: "center",
align: "right",
@ -278,9 +382,9 @@ export default {
{
userId: this.$store.state.user.name,
functionId: 5305,
serialNumber: '5305MaterialSuppRollNo',
tableId: "5305Material",
tableName: "材料",
serialNumber: '5309PartSuppRollNo',
tableId: "5309Part",
tableName: "分切工单",
columnProp: "suppRollNo",
headerAlign: "center",
align: "center",
@ -303,105 +407,116 @@ export default {
},
methods: {
/*初始化页面参数*/
init(scheduleData, operatorData) {
init (scheduleData, operatorData) {
//
this.pageData.partNo = scheduleData.partNo;
this.pageData.partDesc = scheduleData.partDesc;
this.pageData.orderNo = scheduleData.orderNo;
this.pageData.itemNo = scheduleData.itemNo;
this.pageData.seqNo = scheduleData.seqNo;
this.pageData.rollNo = scheduleData.rollNo;
this.pageData.operatorId = operatorData.operatorId;
this.pageData.customerId = '无';
this.pageData.customerName = '';
this.pageData.fgPartNo = '无';
this.pageData.fgPartDesc = '';
this.pageData.supplierId = '*';
this.pageData.supplierName = '';
this.pageData.partNo = ''
this.pageData.partDesc = ''
this.pageData.orderNo = scheduleData.orderNo
this.pageData.itemNo = scheduleData.itemNo
this.pageData.seqNo = scheduleData.seqNo
this.pageData.rollNo = scheduleData.rollNo
this.pageData.operatorId = operatorData.operatorId
this.pageData.customerId = '无'
this.pageData.customerName = ''
this.pageData.fgPartNo = '无'
this.pageData.fgPartDesc = ''
this.pageData.supplierId = '*'
this.pageData.supplierName = ''
//
this.sfdcMaterialList = [];
this.sfdcMaterialList = []
//
this.operatorData = JSON.parse(JSON.stringify(operatorData));
this.operatorData = JSON.parse(JSON.stringify(operatorData))
//
this.titleCon = '创建分卷';
this.titleCon = '创建分卷'
//
this.refreshSplitOrderParts();
//
this.refreshPageData();
this.refreshPageData()
},
/*关闭modal*/
closeDialog(){
this.$emit('update:visible', false);
closeDialog () {
this.$emit('update:visible', false)
},
/*刷新分期工单的*/
refreshSplitOrderParts () {
getSplitOrderParts(this.pageData).then(({data}) => {
this.orderPartList = data.rows;
setTimeout(() => {
this.$refs.orderPartTable.setCurrentRow(this.orderPartList[0]);
}, 300)
});
},
/*刷新当前的页面参数*/
refreshPageData(){
refreshPageData () {
//
this.getCurrentPageData();
this.getCurrentPageData()
//table
this.getCurrentPageTable();
this.getCurrentPageTable()
},
//
getCurrentPageData(){
getCurrentPageData () {
refreshCurrentPageData(this.pageData).then(({data}) => {
//
this.pageData.customerId = data.pageMap.customerId;
this.pageData.customerName = data.pageMap.customerName;
this.pageData.fgPartNo = data.pageMap.fgPartNo;
this.pageData.fgPartDesc = data.pageMap.fgPartDesc;
this.pageData.referName = data.pageMap.referName;
this.pageData.supplierId = data.pageMap.supplierId;
this.pageData.supplierName = data.pageMap.supplierDesc;
});
this.pageData.customerId = data.pageMap.customerId
this.pageData.customerName = data.pageMap.customerName
this.pageData.fgPartNo = data.pageMap.fgPartNo
this.pageData.fgPartDesc = data.pageMap.fgPartDesc
this.pageData.referName = data.pageMap.referName
this.pageData.supplierId = data.pageMap.supplierId
this.pageData.supplierName = data.pageMap.supplierDesc
})
},
//
getCurrentPageTable(){
getCurrentPageTable () {
refreshCurrentPageTable(this.pageData).then(({data}) => {
this.sfdcMaterialList = data.rows;
});
this.sfdcMaterialList = data.rows
})
},
/*列表方法的回调*/
getBaseData(val){
if (this.tagNo === 92){
this.pageData.customerId = val.ConfigurationTemplateID;
this.pageData.customerName = val.CustDesc;
}else if(this.tagNo == 5){
this.pageData.fgPartNo = val.PartNo;
this.pageData.fgPartDesc = val.PartDescSpec;
getBaseData (val) {
if (this.tagNo === 92) {
this.pageData.customerId = val.ConfigurationTemplateID
this.pageData.customerName = val.CustDesc
} else if (this.tagNo == 5) {
this.pageData.fgPartNo = val.PartNo
this.pageData.fgPartDesc = val.PartDescSpec
}
//
this.getCurrentPageData();
this.getCurrentPageData()
},
//
getBaseList(val){
getBaseList (val) {
this.tagNo = val
this.$nextTick(() => {
let strVal = "";
if (val === 92){
strVal = this.pageData.customerId;
}else if(val === 5){
strVal = this.pageData.fgPartNo;
let strVal = ''
if (val === 92) {
strVal = this.pageData.customerId
} else if (val === 5) {
strVal = this.pageData.fgPartNo
}
this.$refs.baseList.init(val, strVal)
})
},
//
checkCreateSeparateRoll(){
checkCreateSeparateRoll () {
//
checkCreateSeparateRoll(this.pageData).then(({data}) => {
//
if(data.code == 500){
this.$message.error(data.msg);
}else{
if (data.code == 500) {
this.$message.error(data.msg)
} else {
//
this.createSeparateRollBun();
this.createSeparateRollBun()
}
});
})
},
/*处理材料下料的记录*/
@ -452,12 +567,23 @@ export default {
})
},
/*触发修改的时间*/
changePartRow(row, oldRow){
//
if(row){
this.pageData.partNo = row.partNo;
this.pageData.partDesc = row.partDesc;
//
this.refreshPageData();
}
},
},
created() {
//
}
//
//this.refreshSplitOrderParts();
},
}
</script>

4
src/views/modules/yieldReport/com_split_order_switch_roll.vue

@ -29,7 +29,7 @@ import comExceptionReason from "./com_exception_reason";//异常远远
/*添加js的方法和请求*/
import {
checkSplitScheduleSwitchRoll,/*校验是否可以切换卷*/
switchSfdcRoll,/*执行切换卷的操作*/
splitScheduleSwitchRoll,/*执行切换卷的操作*/
} from '@/api/yieldReport/com_switch_roll.js'
export default {
name: "com_merge_roll",
@ -149,7 +149,7 @@ export default {
/*执行切换卷的操作*/
switchRollOperation() {
//
switchSfdcRoll(this.pageData).then(({data}) => {
splitScheduleSwitchRoll(this.pageData).then(({data}) => {
//
if (data.code === 200) {
//

Loading…
Cancel
Save