下达
新增打样
转正式料号
@@ -2761,6 +2766,9 @@ import {EventBus} from "../../../main";
},
{
status: '已量产',
+ },
+ {
+ status: '正式量产',
}
],
userBuList: [],
@@ -4476,19 +4484,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 +4614,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, '错误', {
diff --git a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
index f48186a..c03e307 100644
--- a/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
+++ b/src/views/modules/orderIssure/soIssueNotify/searchIssureNotifyForCK.vue
@@ -1,5 +1,10 @@
+
+
+
+
+
@@ -245,6 +250,11 @@
}from "@/api/orderIssure/soIssueNotify.js"
import Chooselist from '@/views/modules/common/Chooselist'
import {getEamWorkShop} from "@/api/factory/site.js";
+ import {
+ getTableDefaultListLanguage,
+ getTableUserListLanguage,
+ } from "@/api/table.js"
+ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
export default {
components: {
Chooselist
@@ -280,6 +290,7 @@
dataListLoading: false,
currentRow:'',
headerData:'',
+ favorite: false,
columnList1:[
{
userId: this.$store.state.user.name,
@@ -1213,6 +1224,127 @@
return ''
},
+
+ // 动态列开始 获取 用户保存的 格式列
+ async getTableUserColumn(tableId, columnId) {
+ let queryTableUser = {
+ userId: this.$store.state.user.name,
+ functionId: this.$route.meta.menuId,
+ tableId: tableId,
+ status: true,
+ languageCode: this.$i18n.locale
+ }
+ await getTableUserListLanguage(queryTableUser).then(({data}) => {
+ if (data.rows.length > 0) {
+ //this.columnList1 = []
+ switch (columnId) {
+ case 1:
+ this.columnList1 = data.rows
+ break;
+ case 2:
+ this.columnList2 = data.rows
+ break;
+ case 3:
+ this.columnList3 = data.rows
+ break;
+ case 4:
+ this.columnList4 = data.rows
+ break;
+ // case 5:
+ // this.columnList5 = data.rows
+ // break;
+ }
+ } else {
+ this.getColumnList(tableId, columnId)
+ }
+ })
+ },
+
+ // 获取 tableDefault 列
+ async getColumnList (tableId, columnId) {
+ let queryTable= {
+ functionId: this.$route.meta.menuId,
+ tableId: tableId,
+ languageCode: this.$i18n.locale
+ }
+ await getTableDefaultListLanguage(queryTable).then(({data}) => {
+ if (!data.rows.length == 0) {
+ switch (columnId) {
+ case 1:
+ this.columnList1 = data.rows
+ break;
+ case 2:
+ this.columnList2 = data.rows
+ break;
+ case 3:
+ this.columnList3 = data.rows
+ break;
+ case 4:
+ this.columnList4 = data.rows
+ break;
+ // case 5:
+ // this.columnList5 = data.rows
+ // break;
+ }
+ } else {
+ // this.showDefault = true.
+ }
+ })
+
+ },
+ // 校验用户是否收藏
+ favoriteIsOk () {
+ let userFavorite = {
+ userId: this.$store.state.user.id,
+ languageCode: this.$i18n.locale
+ }
+ userFavoriteList(userFavorite).then(({data}) => {
+ for (let i = 0; i < data.list.length; i++) {
+ if (this.$route.meta.menuId === data.list[i].menuId) {
+ this.favorite = true
+ }
+ }
+ })
+ },
+
+ // 收藏 OR 取消收藏
+ favoriteFunction () {
+ let userFavorite = {
+ userId: this.$store.state.user.id,
+ functionId: this.$route.meta.menuId,
+ }
+ if (this.favorite) {
+ removeUserFavorite(userFavorite).then(({data}) => {
+ this.$message.success(data.msg)
+ this.favorite = false
+ })
+ } else {
+ // 收藏
+ saveUserFavorite(userFavorite).then(({data}) => {
+ this.$message.success(data.msg)
+ this.favorite = true
+ })
+ }
+ },
+
+ },
+ created () {
+ // 按钮控制
+ // this.getButtonAuthData()
+ // 获取用户的 site 和 bu
+ // this.getSiteAndBuByUserName()
+ // 校验用户是否收藏
+ this.favoriteIsOk()
+
+ // 动态列
+ this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+ this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
+ this.getTableUserColumn(this.$route.meta.menuId+'table3',3)
+ this.getTableUserColumn(this.$route.meta.menuId+'table4',4)
+ // if (!this.authSearch) {
+ // // 获取数据列表
+ // this.getDataList()
+ // }
},
}
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 86654b6..51edf2d 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -36,7 +36,7 @@
-
+