下达
新增打样
转正式料号
@@ -4476,19 +4476,27 @@ import {EventBus} from "../../../main";
})
},
getConfirmProgressPusherList() {
- let inData = {
- site: this.proofingCurrentRow.site,
- orderRef1: this.proofingCurrentRow.projectId,
- orderRef2: this.proofingCurrentRow.projectPartId,
- page: 1,
- limit: 1000
- }
- searchConfirmProgressPusherList(inData).then(({data}) => {
- if (data && data.code === 0){
- this.confirmProgressPusherList = data.page.list;
- }
- })
- },
+ return new Promise((resolve, reject) => {
+ let inData = {
+ site: this.proofingCurrentRow.site,
+ orderRef1: this.proofingCurrentRow.projectId,
+ orderRef2: this.proofingCurrentRow.projectPartId,
+ page: 1,
+ limit: 1000
+ };
+
+ searchConfirmProgressPusherList(inData).then(({ data }) => {
+ if (data && data.code === 0) {
+ this.confirmProgressPusherList = data.page.list;
+ resolve(); // 成功时调用 resolve
+ } else {
+ reject(new Error(data.msg)); // 处理错误
+ }
+ }).catch(error => {
+ reject(error); // 处理请求错误
+ });
+ });
+ } ,
confirmDocument(row) {
// 将this.$store.state.user.id转为字符串
let userId = this.$store.state.user.id.toString()
@@ -4598,7 +4606,37 @@ import {EventBus} from "../../../main";
if (data.code === 0) {
this.confirmVisible = false;
this.getConfirmProgressDocumentList();
- this.getConfirmProgressPusherList();
+ this.getConfirmProgressPusherList().then(() => {
+ // 判断 confirmProgressPusherList 中的 confirmFlag 是否全部为 Y
+ let flag = true;
+ for (let i = 0; i < this.confirmProgressPusherList.length; i++) {
+ if (this.confirmProgressPusherList[i].confirmFlag !== 'Y') {
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag) {
+ this.proofingCurrentRow.status = '正式量产';
+ eamProjectPartInfoEdit(this.proofingCurrentRow).then(({ data }) => {
+ this.dataList.forEach((item) => {
+ if (item.projectPartId === this.proofingCurrentRow.projectPartId) {
+ this.dataListIndex = this.dataList.indexOf(item)
+ }
+ })
+ this.getDataList();
+ if (data.code !== 0) {
+ this.$alert(data.msg, '错误', {
+ confirmButtonText: '确定'
+ });
+ }
+ });
+ }
+ }).catch(error => {
+ this.$alert('获取确认进度推送列表失败', '错误', {
+ confirmButtonText: '确定'
+ });
+ });
EventBus.$emit('updateAgencyMatterForConfirm')
}else {
this.$alert(data.msg, '错误', {
From b185b5f24bab879e4258263bc5984bb4a3ea0654 Mon Sep 17 00:00:00 2001
From: yuejiayang <146344614+YangLei105@users.noreply.github.com>
Date: Thu, 7 Nov 2024 10:36:13 +0800
Subject: [PATCH 2/4] =?UTF-8?q?2024.11.7=20=E6=96=87=E6=A1=A3=E6=94=B6?=
=?UTF-8?q?=E9=9B=86=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/eam/eamProjectInfoForConfirm.vue | 3 +++
src/views/modules/eam/eamProjectInfoForProof.vue | 3 +++
src/views/modules/eam/eamProjectInfoForUploads.vue | 3 +++
src/views/modules/eam/eamProjectPartInfo.vue | 8 ++++++++
4 files changed, 17 insertions(+)
diff --git a/src/views/modules/eam/eamProjectInfoForConfirm.vue b/src/views/modules/eam/eamProjectInfoForConfirm.vue
index cd979e0..7fefec1 100644
--- a/src/views/modules/eam/eamProjectInfoForConfirm.vue
+++ b/src/views/modules/eam/eamProjectInfoForConfirm.vue
@@ -1108,6 +1108,9 @@ export default {
},
{
status: '已量产',
+ },
+ {
+ status: '正式量产',
}
],
allPersonnelInfoList: [],
diff --git a/src/views/modules/eam/eamProjectInfoForProof.vue b/src/views/modules/eam/eamProjectInfoForProof.vue
index 6b18be7..1de9357 100644
--- a/src/views/modules/eam/eamProjectInfoForProof.vue
+++ b/src/views/modules/eam/eamProjectInfoForProof.vue
@@ -886,6 +886,9 @@ export default {
},
{
status: '已量产',
+ },
+ {
+ status: '正式量产',
}
],
};
diff --git a/src/views/modules/eam/eamProjectInfoForUploads.vue b/src/views/modules/eam/eamProjectInfoForUploads.vue
index f855ae2..89e8080 100644
--- a/src/views/modules/eam/eamProjectInfoForUploads.vue
+++ b/src/views/modules/eam/eamProjectInfoForUploads.vue
@@ -1140,6 +1140,9 @@ export default {
},
{
status: '已量产',
+ },
+ {
+ status: '正式量产',
}
],
};
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index e69f3d6..812ee54 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -190,6 +190,11 @@
{{ scope.row[item.columnProp] }}