From 4cbdc84dc84c305ad0a1fb103a00c345f29504dc Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Thu, 31 Jul 2025 14:14:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=8A=B6=E6=80=81=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/part/partInformation.js | 5 +++
src/views/modules/base/partInformation.vue | 37 ++++++++++++++++---
.../com_poReceiving_add_or_update.vue | 2 +-
src/views/modules/production/order.vue | 10 ++---
4 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/src/api/part/partInformation.js b/src/api/part/partInformation.js
index d348bf5..fc35c8d 100644
--- a/src/api/part/partInformation.js
+++ b/src/api/part/partInformation.js
@@ -286,3 +286,8 @@ export const partInformationToOfficial = data => createAPI(`/partInformation/par
export const deletePart = data => createAPI(`/partInformation/deletePart`,'post',data)
+
+/**
+ * 确认物料审核状态
+ */
+export const confirmPartCheckStatus = data => createAPI('/partInformation/confirmPartCheckStatus', 'post', data)
diff --git a/src/views/modules/base/partInformation.vue b/src/views/modules/base/partInformation.vue
index 897aaa5..330cda3 100644
--- a/src/views/modules/base/partInformation.vue
+++ b/src/views/modules/base/partInformation.vue
@@ -87,20 +87,20 @@
label="操作">
编辑
-
+ 确认
删除
-
+
-
-
+<!– BOM–>
+<!– Routing–>
+<!– 转正式物料–>
-
+ -->
@@ -1358,6 +1358,7 @@
getBomAndRoutingList, // 查询物料的bom和routing集合
partInformationToOfficial, // 转正式物料
getProjectPartNo, // 获取物料编码
+ confirmPartCheckStatus, //LR 2025 新增的方法
} from '@/api/part/partInformation.js'
import {
getChooselistData
@@ -3165,6 +3166,8 @@
updateItemValue () {
this.loading = true
let tempData = {
+ site: this.$store.state.user.site,
+ partNo: this.partCurrentRow.partNo,
itemList: JSON.parse(JSON.stringify(this.copyAttributeList))
}
commitItemValue(tempData).then(({data}) => {
@@ -3304,6 +3307,8 @@
// 确认修改物料属性
commitItemValue () {
let tempData = {
+ site: this.partCurrentRow.site,
+ partNo: this.partCurrentRow.partNo,
itemList: JSON.parse(JSON.stringify(this.updatePartItemList))
}
commitItemValue(tempData).then(({data}) => {
@@ -4762,6 +4767,26 @@
}
},
+ //检查是否确认的状态
+ checkConfirmStatus(row){
+ this.$confirm('确认当前物料正常使用?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ //执行删除的操作
+ confirmPartCheckStatus(row).then(({data}) => {
+ //如果成功刷新表格
+ if(data.code == 0) {
+ this.$message.success(data.msg);
+ this.getDataList();
+ }else {
+ this.$message.error(data.msg);
+ }
+ });
+ })
+ },
+
// 区域代码输入校验
regionOfOriginBlur () {
if (this.modalData.regionOfOrigin != null && this.modalData.regionOfOrigin !== '') {
diff --git a/src/views/modules/material/com_poReceiving_add_or_update.vue b/src/views/modules/material/com_poReceiving_add_or_update.vue
index e3f9778..ffa94f1 100644
--- a/src/views/modules/material/com_poReceiving_add_or_update.vue
+++ b/src/views/modules/material/com_poReceiving_add_or_update.vue
@@ -674,7 +674,7 @@
wdrNo:this.dataForm.wdrNo,
locationID:this.dataForm.locationId,
manufactureDate: this.dayjs(this.dataForm.manufactureDate).format('YYYY-MM-DD'),
- expiredDate:this.dayjs(this.dataForm.expiredDate).format('YYYY-MM-DD'),
+ expiredDate: this.dayjs(this.dataForm.expiredDate).format('YYYY-MM-DD'),
rollNumber:this.rollData.rollNumber,
}
diff --git a/src/views/modules/production/order.vue b/src/views/modules/production/order.vue
index 6bc8036..8fd671a 100644
--- a/src/views/modules/production/order.vue
+++ b/src/views/modules/production/order.vue
@@ -425,7 +425,7 @@ export default {
-
+
@@ -435,7 +435,7 @@ export default {
@@ -520,12 +520,12 @@ export default {
产品编码
-
+
-
+
@@ -533,7 +533,7 @@ export default {