From 1fcf8cb8d028415912c322590d4890b0f2c8318a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 30 Apr 2024 22:30:31 +0800
Subject: [PATCH] =?UTF-8?q?2024-04-30=20=E6=9B=B4=E6=96=B02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/changeManagement/changeManagement.js | 14 ++++++++++++++
.../modules/changeManagement/changeRecord.vue | 6 ++++--
.../customer/customerInformationManagement.vue | 2 +-
src/views/modules/part/partInformation.vue | 6 +++---
.../projectInfo/com_projectInfo-add-or-update.vue | 4 ++--
.../com_technical-add-or-update.vue | 2 +-
6 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/api/changeManagement/changeManagement.js b/src/api/changeManagement/changeManagement.js
index e7d815a..71007c4 100644
--- a/src/api/changeManagement/changeManagement.js
+++ b/src/api/changeManagement/changeManagement.js
@@ -200,6 +200,20 @@ export const submitChange = data => createAPI(`/plm/changeManagement/submitChang
*/
export const getNodeAuthority = data => createAPI(`/plm/changeManagement/getNodeAuthority`,'post',data)
+/**
+ * 下达
+ * @param data
+ * @returns {*}
+ */
+export const issueChange2 = data => createAPI(`/plm/changeManagement/issueChange2`,'post',data)
+
+/**
+ * 提交
+ * @param data
+ * @returns {*}
+ */
+export const submitChange2 = data => createAPI(`/plm/changeManagement/submitChange2`,'post',data)
+
diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index 4639a47..9026bf7 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -852,6 +852,8 @@
issueChange, // 下达
submitChange, // 提交
getNodeAuthority, // 获取节点权限
+ issueChange2, // 临时下达方法
+ submitChange2, // 临时提交方法
} from '@/api/changeManagement/changeManagement.js'
import ChooseList from '@/views/modules/common/Chooselist'
import changeUploadFile from "../base/upload_file.vue";
@@ -2157,7 +2159,7 @@
changeNo: row.changeNo,
menuId: this.$route.meta.menuId
}
- issueChange(tempData).then(({data}) => {
+ issueChange2(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({message: '操作成功', type: 'success'})
@@ -2193,7 +2195,7 @@
menuId: this.$route.meta.menuId,
nodeConclusion: this.modalData.nodeConclusion
}
- submitChange(tempData).then(({data}) => {
+ submitChange2(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({message: '操作成功', type: 'success'})
diff --git a/src/views/modules/customer/customerInformationManagement.vue b/src/views/modules/customer/customerInformationManagement.vue
index abb0ebb..c4cfa3a 100644
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@@ -342,7 +342,7 @@
-
+
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index 5d96be7..a731a3d 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -568,8 +568,8 @@
- 投产
- 保存
+ 同步
+ 保存
关闭
@@ -3844,7 +3844,7 @@
toBecomeOfficialPartModal (row) {
this.modalData = {
flag: '3',
- title: '物料转正',
+ title: '同步物料信息',
site: row.site,
partNo: row.partNo,
partDesc: row.partDesc,
diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index 29c25de..40007c6 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -37,7 +37,7 @@
- 所属客户
+ 直接客户
@@ -675,7 +675,7 @@
// return false;
// }
if(!this.dataForm.customerId){
- this.$alert('请选择所属客户！', '错误', {
+ this.$alert('请选择直接客户！', '错误', {
confirmButtonText: '确定'
})
return false;
diff --git a/src/views/modules/sampleManagement/com_technical-add-or-update.vue b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
index fa1b195..fcffff1 100644
--- a/src/views/modules/sampleManagement/com_technical-add-or-update.vue
+++ b/src/views/modules/sampleManagement/com_technical-add-or-update.vue
@@ -14,7 +14,7 @@
保存后跳转至详情
- 项目料号
+ 测试料号