diff --git a/src/api/baseManagement/basematerialBOM.js b/src/api/baseManagement/basematerialBOM.js index 33e53a8..9534a68 100644 --- a/src/api/baseManagement/basematerialBOM.js +++ b/src/api/baseManagement/basematerialBOM.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function listBaseMaterialBom(query) { return request({ - url: 'mes/baseManagement/BaseMaterialBOM/list', + url: 'MasterDataManagement/Material/MaterialBom/list', method: 'get', params: query, }) @@ -18,7 +18,7 @@ export function listBaseMaterialBom(query) { */ export function GetMonterInvList(query) { return request({ - url: 'mes/baseManagement/BaseMaterialBOM/get_monter_inv', + url: 'MasterDataManagement/Material/MaterialBom/get_monter_inv', method: 'post', data: query, }) @@ -30,7 +30,7 @@ export function GetMonterInvList(query) { */ export function GetSonInvList(query) { return request({ - url: 'mes/baseManagement/BaseMaterialBOM/get_son_inv', + url: 'MasterDataManagement/Material/MaterialBom/get_son_inv', method: 'post', data: query, }) @@ -42,7 +42,7 @@ export function GetSonInvList(query) { */ export function addBaseMaterialBom(data) { return request({ - url: 'mes/baseManagement/BaseMaterialBOM', + url: 'MasterDataManagement/Material/MaterialBom', method: 'post', data: data, }) @@ -53,7 +53,7 @@ export function addBaseMaterialBom(data) { */ export function updateBaseMaterialBom(data) { return request({ - url: 'mes/baseManagement/BaseMaterialBOM', + url: 'MasterDataManagement/Material/MaterialBom', method: 'PUT', data: data, }) @@ -64,7 +64,7 @@ export function updateBaseMaterialBom(data) { */ export function getBaseMaterialBom(id) { return request({ - url: 'mes/baseManagement/BaseMaterialBOM/' + id, + url: 'MasterDataManagement/Material/MaterialBom/' + id, method: 'get' }) } @@ -75,7 +75,7 @@ export function getBaseMaterialBom(id) { */ export function delBaseMaterialBom(pid) { return request({ - url: 'mes/baseManagement/BaseMaterialBOM/' + pid, + url: 'MasterDataManagement/Material/MaterialBom/' + pid, method: 'delete' }) } \ No newline at end of file diff --git a/src/api/humanComputerInteraction/index.js b/src/api/humanComputerInteraction/index.js index 8e0826b..dbee5cb 100644 --- a/src/api/humanComputerInteraction/index.js +++ b/src/api/humanComputerInteraction/index.js @@ -2,7 +2,7 @@ import request from '@/utils/request' //左侧树 export function getData(data) { return request({ - url: '/mes/PfRefProductRecipe/list', + url: '/MasterDataManagement/Recipe//PfRefProductRecipe/list', method: 'get', params: data }) @@ -10,7 +10,7 @@ export function getData(data) { //查询卡片 export function getCardData(data) { return request({ - url: '/mes/PfRecipeVersion/list', + url: '/MasterDataManagement/Recipe//PfRecipeVersion/list', method: 'get', params: data }) @@ -19,7 +19,7 @@ export function getCardData(data) { //修改 export function updateData(data) { return request({ - url: '/mes/PfRecipeVersion', + url: '/MasterDataManagement/Recipe//PfRecipeVersion', method: 'put', data: data }) @@ -28,7 +28,7 @@ export function updateData(data) { export function listPfRecipeParameters(query) { return request({ - url: 'mes/PfRecipeParameters/list', + url: 'MasterDataManagement/Recipe//PfRecipeParameters/list', method: 'get', params: query, }) @@ -40,7 +40,7 @@ export function listPfRecipeParameters(query) { */ export function addPfRecipeParameters(data) { return request({ - url: 'mes/PfRecipeParameters', + url: 'MasterDataManagement/Recipe//PfRecipeParameters', method: 'post', data: data, }) @@ -51,7 +51,7 @@ export function addPfRecipeParameters(data) { */ export function updatePfRecipeParameters(data) { return request({ - url: 'mes/PfRecipeParameters', + url: 'MasterDataManagement/Recipe//PfRecipeParameters', method: 'PUT', data: data, }) @@ -62,7 +62,7 @@ export function updatePfRecipeParameters(data) { */ export function getPfRecipeParameters(id) { return request({ - url: 'mes/PfRecipeParameters/' + id, + url: 'MasterDataManagement/Recipe//PfRecipeParameters/' + id, method: 'get' }) } @@ -73,7 +73,7 @@ export function getPfRecipeParameters(id) { */ export function delPfRecipeParameters(pid) { return request({ - url: 'mes/PfRecipeParameters/delete/' + pid, + url: 'MasterDataManagement/Recipe//PfRecipeParameters/delete/' + pid, method: 'POST' }) } @@ -82,7 +82,7 @@ export function delPfRecipeParameters(pid) { //新增 export function addData(data) { return request({ - url: '/mes/PfRecipeVersion/latestVersion', + url: '/MasterDataManagement/Recipe//PfRecipeVersion/latestVersion', method: 'get', params: data }) @@ -91,7 +91,7 @@ export function addData(data) { //外层新增 export function addOutData(data) { return request({ - url: '/mes/PfRecipeVersion/createPfRecipeVersionAndParameters', + url: '/MasterDataManagement/Recipe//PfRecipeVersion/createPfRecipeVersionAndParameters', method: 'post', data: data }) @@ -100,7 +100,7 @@ export function addOutData(data) { //配方码下拉 export function getRecipeCode(data) { return request({ - url: '/mes/PfRefProductRecipe/getRecipeCodePullDown', + url: '/MasterDataManagement/Recipe//PfRefProductRecipe/getRecipeCodePullDown', method: 'get', params: data }) @@ -109,7 +109,7 @@ export function getRecipeCode(data) { //内层新增 export function addInData(data) { return request({ - url: '/mes/PfRecipeParameters', + url: '/MasterDataManagement/Recipe//PfRecipeParameters', method: 'post', data: data }) @@ -118,7 +118,7 @@ export function addInData(data) { //内层修改 export function updateInData(data) { return request({ - url: '/mes/PfRecipeParameters', + url: '/MasterDataManagement/Recipe//PfRecipeParameters', method: 'put', data: data }) @@ -127,7 +127,7 @@ export function updateInData(data) { //下达 export function releaseData(data) { return request({ - url: '/mes/PfRecipeIssueLog/issueRecipe', + url: '/MasterDataManagement/Recipe//PfRecipeIssueLog/issueRecipe', method: 'post', data: data }) @@ -136,7 +136,7 @@ export function releaseData(data) { //内层删除 export function delInData(id) { return request({ - url: '/mes/PfRecipeParameters/delete/' + id, + url: '/MasterDataManagement/Recipe//PfRecipeParameters/delete/' + id, method: 'post', }) } \ No newline at end of file diff --git a/src/api/humanComputerInteraction/productFormula/index.js b/src/api/humanComputerInteraction/productFormula/index.js index fe1ee60..a4d5f35 100644 --- a/src/api/humanComputerInteraction/productFormula/index.js +++ b/src/api/humanComputerInteraction/productFormula/index.js @@ -2,7 +2,7 @@ import request from '@/utils/request' //查询 export function getData(data) { return request({ - url: '/mes/PfRefProductRecipe/list', + url: '/MasterDataManagement/Recipe//PfRefProductRecipe/list', method: 'get', params: data }) @@ -10,7 +10,7 @@ export function getData(data) { //新增 export function addData(data) { return request({ - url: '/mes/PfRefProductRecipe', + url: '/MasterDataManagement/Recipe//PfRefProductRecipe', method: 'post', data }) @@ -19,7 +19,7 @@ export function addData(data) { //修改 export function updateData(data) { return request({ - url: '/mes/PfRefProductRecipe', + url: '/MasterDataManagement/Recipe//PfRefProductRecipe', method: 'put', data }) @@ -27,7 +27,7 @@ export function updateData(data) { //删除 export function deleteData(id) { return request({ - url: '/mes/PfRefProductRecipe/delete/' + id, + url: '/MasterDataManagement/Recipe//PfRefProductRecipe/delete/' + id, method: 'post', }) diff --git a/src/api/humanComputerInteraction/recipeIssued/index.js b/src/api/humanComputerInteraction/recipeIssued/index.js index 8d91df8..d33fd8b 100644 --- a/src/api/humanComputerInteraction/recipeIssued/index.js +++ b/src/api/humanComputerInteraction/recipeIssued/index.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function listPfRecipeIssueLog(query) { return request({ - url: 'mes/PfRecipeIssueLog/list', + url: 'MasterDataManagement/Recipe//PfRecipeIssueLog/list', method: 'get', params: query, }) @@ -18,7 +18,7 @@ export function listPfRecipeIssueLog(query) { */ export function addPfRecipeIssueLog(data) { return request({ - url: 'mes/PfRecipeIssueLog', + url: 'MasterDataManagement/Recipe//PfRecipeIssueLog', method: 'post', data: data, }) @@ -29,7 +29,7 @@ export function addPfRecipeIssueLog(data) { */ export function updatePfRecipeIssueLog(data) { return request({ - url: 'mes/PfRecipeIssueLog', + url: 'MasterDataManagement/Recipe//PfRecipeIssueLog', method: 'PUT', data: data, }) @@ -40,7 +40,7 @@ export function updatePfRecipeIssueLog(data) { */ export function getPfRecipeIssueLog(id) { return request({ - url: 'mes/PfRecipeIssueLog/' + id, + url: 'MasterDataManagement/Recipe//PfRecipeIssueLog/' + id, method: 'get' }) } @@ -51,7 +51,7 @@ export function getPfRecipeIssueLog(id) { */ export function delPfRecipeIssueLog(pid) { return request({ - url: 'mes/PfRecipeIssueLog/delete/' + pid, + url: 'MasterDataManagement/Recipe//PfRecipeIssueLog/delete/' + pid, method: 'POST' }) } diff --git a/src/router/index.js b/src/router/index.js index 58e03ba..cb0a4bd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -64,19 +64,19 @@ export const constantRoutes = [ component: () => import('@/views/error/Error'), hidden: true }, - // { - // path: '', - // component: Layout, - // redirect: '/index', - // children: [ - // { - // path: '/index', - // component: () => import('@/views/index'), - // name: 'Index', - // meta: { title: '首页', icon: 'index', affix: true, titleKey: 'menu.home' } - // } - // ] - // }, + { + path: '', + component: Layout, + redirect: '/index', + children: [ + { + path: '/index', + component: () => import('@/views/masterDataManagement/Plant/PlantFactorySite'), + name: 'Index', + meta: { title: '首页', icon: 'index', affix: true, titleKey: 'menu.home' } + } + ] + }, { path: '/user', component: Layout, diff --git a/src/views/humanComputerInteraction/index.vue b/src/views/humanComputerInteraction/index.vue index 6f831af..94583a5 100644 --- a/src/views/humanComputerInteraction/index.vue +++ b/src/views/humanComputerInteraction/index.vue @@ -439,10 +439,11 @@ const formRules = ref({ version: [{ required: true, message: '请输入版本号', trigger: 'blur' }], }) const handleVersionChange = (val) => { - console.log(val, '输入的版本号'); - // dataList.value.forEach(row => { - // row.version = val - // }) + console.log(val, '输入的版本号'); + // 将所有表格行的版本号都更新为新输入的版本号 + dataList.value.forEach(row => { + row.version = val + }) } const handleXiaDaSubmit = () => { let data = { @@ -502,8 +503,11 @@ const handleQuery = () => { }) }) selectShow.value = true - dataList.value = res.data - + // dataList.value = res.data + dataList.value = res.data.map(item => ({ + ...item, + version: formAdd.value.version // 将用户输入的新版本号赋给每行数据 + })) originalDataList.value = JSON.parse(JSON.stringify(res.data || [])) } }) diff --git a/src/views/humanComputerInteraction/productFormula/index.vue b/src/views/humanComputerInteraction/productFormula/index.vue index 09ebad9..8ab701b 100644 --- a/src/views/humanComputerInteraction/productFormula/index.vue +++ b/src/views/humanComputerInteraction/productFormula/index.vue @@ -102,6 +102,9 @@