|
|
@ -441,7 +441,7 @@ |
|
|
fixed="left" |
|
|
fixed="left" |
|
|
header-align="center" |
|
|
header-align="center" |
|
|
align="center" |
|
|
align="center" |
|
|
width="170" |
|
|
|
|
|
|
|
|
width="200" |
|
|
label="操作"> |
|
|
label="操作"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<!-- <a class="customer-a" @click="deleteSfdcMaterialHist(scope.row)">删除</a>--> |
|
|
<!-- <a class="customer-a" @click="deleteSfdcMaterialHist(scope.row)">删除</a>--> |
|
|
@ -457,6 +457,9 @@ |
|
|
&& scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'" |
|
|
&& scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'" |
|
|
@click="warnFinishMaterialWithNoRemainderConfirm(scope.row)" |
|
|
@click="warnFinishMaterialWithNoRemainderConfirm(scope.row)" |
|
|
>结束生产</a> |
|
|
>结束生产</a> |
|
|
|
|
|
<a class="customer-a" v-if="scope.row.finishedFlag == 'Y'" |
|
|
|
|
|
@click="openMaterialRoll(scope.row)" |
|
|
|
|
|
>打开</a> |
|
|
<el-dropdown trigger="click" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N' && scope.row.sAPBOMItemNo >= 0 |
|
|
<el-dropdown trigger="click" v-if="operatorData.operatorName != '' && scope.row.finishedFlag == 'N' && scope.row.sAPBOMItemNo >= 0 |
|
|
&& scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'"> |
|
|
&& scope.row.histType == '发料' && scope.row.keyRMFlag == 'N'"> |
|
|
<a class="customer-a" style="cursor: pointer;">更多</a> |
|
|
<a class="customer-a" style="cursor: pointer;">更多</a> |
|
|
@ -856,7 +859,8 @@ import { |
|
|
rollSplit, |
|
|
rollSplit, |
|
|
getOrderFirstItemNo, |
|
|
getOrderFirstItemNo, |
|
|
checkProcessInspectionPendingCount, |
|
|
checkProcessInspectionPendingCount, |
|
|
getOrderNotesByOrderNo // 新增 |
|
|
|
|
|
|
|
|
getOrderNotesByOrderNo, // 新增 |
|
|
|
|
|
openMaterialRoll // 打开材料卷 |
|
|
} from "@/api/yieldReport/produce_report_normal.js"; |
|
|
} from "@/api/yieldReport/produce_report_normal.js"; |
|
|
import { |
|
|
import { |
|
|
getUserSpecialSecurity, |
|
|
getUserSpecialSecurity, |
|
|
@ -4155,6 +4159,36 @@ export default { |
|
|
this.sfdcMaterialList = data.rows; |
|
|
this.sfdcMaterialList = data.rows; |
|
|
}); |
|
|
}); |
|
|
}, |
|
|
}, |
|
|
|
|
|
// 打开材料卷(重新激活已完成的材料) |
|
|
|
|
|
openMaterialRoll(row) { |
|
|
|
|
|
this.$confirm('确定要打开该材料卷吗?', '提示', { |
|
|
|
|
|
confirmButtonText: '确定', |
|
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
|
type: 'warning' |
|
|
|
|
|
}).then(() => { |
|
|
|
|
|
let requestData = { |
|
|
|
|
|
site: this.searchData.site, |
|
|
|
|
|
seqNo: this.searchData.seqNo, |
|
|
|
|
|
rollNo: row.rollNo, |
|
|
|
|
|
histSeqNo: row.histSeqNo, |
|
|
|
|
|
type: 'open', |
|
|
|
|
|
userId: this.$store.state.user.name |
|
|
|
|
|
} |
|
|
|
|
|
openMaterialRoll(requestData).then(({data}) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
this.$message.success(data.message || '操作成功') |
|
|
|
|
|
// 刷新材料列表 |
|
|
|
|
|
this.getSfdcMaterialList() |
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message.error(data.message || data.msg || '操作失败') |
|
|
|
|
|
} |
|
|
|
|
|
}).catch((error) => { |
|
|
|
|
|
this.$message.error('操作失败,请稍后重试') |
|
|
|
|
|
}) |
|
|
|
|
|
}).catch(() => { |
|
|
|
|
|
// 用户取消操作 |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
//刷新派工单 的下机卷的记录 |
|
|
//刷新派工单 的下机卷的记录 |
|
|
getSfdcRollOpsList() { |
|
|
getSfdcRollOpsList() { |
|
|
getSfdcRollOpsByCon(this.searchData).then(({data}) => { |
|
|
getSfdcRollOpsByCon(this.searchData).then(({data}) => { |
|
|
|