diff --git a/src/components/queryComponent/index.vue b/src/components/queryComponent/index.vue index 963fe4e..c127439 100644 --- a/src/components/queryComponent/index.vue +++ b/src/components/queryComponent/index.vue @@ -84,6 +84,7 @@ import { put, post } from "@/server/api.js"; // isShowAddButton: 是否显示新增按钮图标，也用来区分预测版本列表组件需要显示的功能 import uploadTemplate from "./upload.vue"; +import { ElMessage } from 'element-plus' import lookError from "./lookError.vue"; import {mapMutations} from 'vuex' export default { @@ -121,7 +122,13 @@ export default { return post('/admin/ap/custdemandverhead/issueallversion', this.batchImport) }) .then(() => { - this.msgSuccess("批量发布成功"); + // this.msgSuccess("批量发布成功"); + ElMessage({ + showClose: true, + message: '批量发布成功', + type: 'success', + duration: 0 + }) this.$emit('batchReleaseEmit', true) }) .catch(() => { }); @@ -139,12 +146,24 @@ export default { return put('/admin/ap/custdemandverhead/issueglobalallversion') }) .then(() => { - this.msgSuccess("全局发布成功"); + // this.msgSuccess("全局发布成功"); + ElMessage({ + showClose: true, + message: '全局发布成功', + type: 'success', + duration: 0 + }) this.$emit('batchReleaseEmit', true) this.getReleaseAllLoading(false) }) - .catch(() => { + .catch(({msg}) => { this.getReleaseAllLoading(false) + ElMessage({ + showClose: true, + message: msg, + type: 'error', + duration: 0 + }) }); }, // 全局反发布 @@ -158,7 +177,13 @@ export default { return put('/admin/ap/custdemandverhead/removeissueglobalallversion') }) .then(() => { - this.msgSuccess("全局反发布成功"); + // this.msgSuccess("全局反发布成功"); + ElMessage({ + showClose: true, + message: '全局反发布成功', + type: 'success', + duration: 0 + }) this.$emit('batchReleaseEmit', true) }) .catch(() => { }); diff --git a/src/router/productionPlanning.js b/src/router/productionPlanning.js index 2bf66ee..d2b791e 100644 --- a/src/router/productionPlanning.js +++ b/src/router/productionPlanning.js @@ -1,10 +1,10 @@ const plant = { - icon: "el-icon-coin", - path: "/productionPlanning", - title: "主计划生产管理", - component: () => import("@/views/productionPlanning"), - children: [ - { + icon: "el-icon-coin", + path: "/productionPlanning", + title: "主计划生产管理", + component: () => import("@/views/productionPlanning"), + children: [ + { icon: "el-icon-document", path: "/productionPlanning/customerInquiry", title: "客户询单", @@ -28,7 +28,19 @@ const plant = { title: "日生成计划", component: () => import("@/views/productionPlanning/dailyProductionPlan"), }, - ], + { + icon: "el-icon-document", + path: "/productionPlanning/emergencyOrder", + title: "紧急插单", + component: () => import("@/views/productionPlanning/emergencyOrder"), + }, + { + icon: "el-icon-document", + path: "/productionPlanning/versionHistory", + title: "历史版本", + component: () => import("@/views/productionPlanning/versionHistory"), + }, + ], } export default plant; \ No newline at end of file diff --git a/src/server/productionPlanning/customerForecastDemandReview.js b/src/server/productionPlanning/customerForecastDemandReview.js index 6d51ca8..4f62c85 100644 --- a/src/server/productionPlanning/customerForecastDemandReview.js +++ b/src/server/productionPlanning/customerForecastDemandReview.js @@ -80,3 +80,4 @@ export const planOrderQuery = (param)=> get("/admin/ap/planorder/query",param) export const republish = (data) => post("/admin/ap/planorderversion/relpublish",data) +export const publishIdentifyAll = () => get("admin/ap/planorderversion/publishidentifyall") \ No newline at end of file diff --git a/src/server/productionPlanning/emergencyOrder.js b/src/server/productionPlanning/emergencyOrder.js new file mode 100644 index 0000000..fbd48b1 --- /dev/null +++ b/src/server/productionPlanning/emergencyOrder.js @@ -0,0 +1,20 @@ +import { + get, + postForm, + deleteData +} from "../api"; +// 工厂列表 +export const insertData = (params) => postForm('/admin/ap/balance/articledemandemergencycreate', params); +// 产品列表 +export const saveData = (params) => postForm('/admin/ap/balance/articledemandemergencysave', params); +// 查询列表 +export const getData = (params) => postForm("/admin/ap/balance/articledemandemergencyget", params); +// 导入文件 +export const publishData = (params) => postForm("/admin/ap/balance/articledemandemergencypublish", params); + + +export const getArtIdList = () => get("/admin/base/article/selectdata?ArtTypeId=FINISHED") + +export const deleteall = () => deleteData("/admin/ap/articledemandemergency/deleteall") + +export const syncPurchase = () => get("admin/common/task/caigou") \ No newline at end of file diff --git a/src/server/request.js b/src/server/request.js index 08070f1..dd87341 100644 --- a/src/server/request.js +++ b/src/server/request.js @@ -82,4 +82,4 @@ upService.interceptors.response.use( return Promise.reject(error.response); } ); -export {service, upService, baseURL}; +export { service, upService, baseURL }; diff --git a/src/views/plan/workbench/homePage/beta/predict/index.vue b/src/views/plan/workbench/homePage/beta/predict/index.vue index b25d1d7..e7daa96 100644 --- a/src/views/plan/workbench/homePage/beta/predict/index.vue +++ b/src/views/plan/workbench/homePage/beta/predict/index.vue @@ -116,6 +116,7 @@ export default { "AP_CustDemandVerHead-CreateUser", "AP_CustDemandVerHead-LastModify", "AP_CustDemandVerHead-LastUser", + "AP_CustDemandVerHead-UserName", "AP_CustDemandVerHead-CreateTime", ], loading: false, diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue index 7d152e1..f11a14c 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue @@ -41,10 +41,29 @@
-
+ +
+ 版本 +
+
+ + + +
+
+ 日志 +
+
+ 历史数据 +
+
MPS策略
-
+
+ 同步库存 +
+
-
+
-
+
-
+
- -
+
- +
{{ scope.row[item] }}
- {{ scope.row[item] }}
+ {{ scope.row[item] }}
{{ scope.row[item] }} @@ -162,6 +190,7 @@ import Public from "./public"; import Char from "./char"; import { mapActions, mapMutations, mapState } from "vuex"; + import { baseURL } from "@/server/request" import { getArtIdList, publishedVersion, @@ -169,8 +198,10 @@ reloadData, saveDemand, searchResource, - exportData + exportData, + publishIdentifyAll } from "@/server/productionPlanning/customerForecastDemandReview"; + import { syncData } from "@/server/productionPlanning/productInventory"; import { getColumnName } from "@/utils/allField.js"; export default { @@ -203,6 +234,9 @@ }, data() { return { + publishedVersionNr:"", + historyList:[], + syncDataDisable:false, queryParams: {}, mode: "", showPublicDialog: false, @@ -216,7 +250,7 @@ editKeyList: [], pagination:{ pageNumber: 1, - pageSize: 20, + pageSize: 24, // 因为每11条为一组 这里的数字应该是 11 的整数倍 .../index.vue 170行 的整数倍 total: 0, } }; @@ -224,6 +258,7 @@ created() { this.getMpsModeList(); this.getArticleList(); + this.getPublishIdentifyAll() }, mounted() { this.$nextTick(() => { @@ -306,6 +341,40 @@ "SET_evaluationSecondResourceLoading", "SET_articleDemandLoading", ]), + getPublishIdentifyAll(){ + publishIdentifyAll().then( ( {data = []}) => { + + this.historyList = data.publishedVersionLi + }) + }, + lookErrorHandler(versionNr){ + window.open(baseURL + "admin/common/log/read/plan/"+versionNr) + }, + lookErrorLogHandler(versionNr){ + window.open(baseURL + "admin/common/log/read/planlog/"+versionNr) + }, + // 同步数据 + syncData() { + this.syncDataDisable = true + syncData().then(({ code }) => { + if (code == 200) { + this.$message({ + type: "success", + message: "同步库存成功" + }) + } else { + this.$message({ + type: "error", + message: "同步库存失败" + }) + } + this.syncDataDisable = false + + }).catch(() => { + this.syncDataDisable = false + + }) + }, getPublishedVersion() { publishedVersion().then(({ data = "" }) => { @@ -337,10 +406,14 @@ // }); } }, - cancelPublicDialog(opt) { + cancelPublicDialog(data) { this.showPublicDialog = false - if (opt == "submit") { + if (data !== false) { this.handleQuery() + this.historyList.push({ + publishedVersionNr:data["version"] + }) + window.open(baseURL + "admin/common/log/read/planlog/"+data["version"]) } }, toggleChar() { @@ -628,7 +701,7 @@ justify-content: space-between; .search { - width: 800px; + width: 1200px; display: flex; .mps-button { @@ -669,6 +742,7 @@ background: #ccc; border-radius: 1px; border: 1px solid #ccc; + } .image_button:hover { diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue index f77b0ca..d76a902 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue @@ -156,7 +156,7 @@ publicData(this.formData).then(({ data = [] }) => { this.loading = false this.$message({ type: "success", message: "发布成功" }); - this.$emit("cancelHandle", "submit") + this.$emit("cancelHandle", this.formData) }).catch(() => { this.loading = false }); diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue index 268f5ec..8b4829b 100644 --- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue +++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue @@ -58,7 +58,9 @@ "AP_ArticleDemand-TargetInventory": "目标库存", "AP_ArticleDemand-MinInventory": "最低库存", "AP_ArticleDemand-NetDemandQty": "净生产量", - "AP_ArticleDemand-EndingInventory": "期末库存" + "AP_ArticleDemand-EndingInventory": "期末库存", + "AP_ArticleDemand-ZaituQty":"采购量", + "AP_ArticleDemand-WeiwaiQty":"委外量" } }; }, @@ -165,8 +167,8 @@ data["SortKeys"].splice(this.keyStartIndex, 0, "Label"); data["Item"].forEach((item, index) => { item.key = item["AP_ArticleDemand-ArtId"]; - item.Label = this.labelList[item["AP_ArticleDemand-Label"]]; - if (index % 10 == 0) { + item.Label = this.labelList[item["AP_ArticleDemand-Label"]]??item["AP_ArticleDemand-Label"]; + if (index % 12 == 0) { // 每多少条为一组 item.show = true; } else { item.show = false; diff --git a/src/views/productionPlanning/emergencyOrder/index.vue b/src/views/productionPlanning/emergencyOrder/index.vue new file mode 100644 index 0000000..8c6a387 --- /dev/null +++ b/src/views/productionPlanning/emergencyOrder/index.vue @@ -0,0 +1,540 @@ + + + \ No newline at end of file diff --git a/src/views/productionPlanning/productInventory/index.vue b/src/views/productionPlanning/productInventory/index.vue index e0ab580..d6e845b 100644 --- a/src/views/productionPlanning/productInventory/index.vue +++ b/src/views/productionPlanning/productInventory/index.vue @@ -21,7 +21,7 @@ @click="resetQuery">重置 同步库存 @@ -78,6 +78,7 @@ "ArticleStock-FGQty", "ArticleStock-WIPQty", "ArticleStock-PUCQty", + "ArticleStock-OSCQty", ], articleList: [], syncDataDisable: false, diff --git a/src/views/productionPlanning/versionHistory/index.vue b/src/views/productionPlanning/versionHistory/index.vue new file mode 100644 index 0000000..33d8016 --- /dev/null +++ b/src/views/productionPlanning/versionHistory/index.vue @@ -0,0 +1,551 @@ + + + \ No newline at end of file