微服务拆分

master
zhaoxiaolin 1 year ago
parent 15ca3ad1f1
commit 13c98b2922

@ -45,6 +45,7 @@
"js-beautify": "1.13.0", "js-beautify": "1.13.0",
"js-cookie": "3.0.1", "js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1", "jsencrypt": "3.0.0-rc.1",
"moment": "^2.29.4",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"quill": "1.3.7", "quill": "1.3.7",
"screenfull": "5.0.2", "screenfull": "5.0.2",

@ -84,3 +84,10 @@ export function delOrder(id) {
method: 'delete' method: 'delete'
}); });
} }
// 同步SAP订单
export function syncSAP() {
return request({
url: '/mes/order/syncSAP',
method: 'post'
});
}

@ -7,7 +7,8 @@
<template v-for="(item, index) in topMenus"> <template v-for="(item, index) in topMenus">
<el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
><svg-icon :icon-class="item.meta.icon" /> ><svg-icon :icon-class="item.meta.icon" />
{{ item.meta.title }}</el-menu-item {{ item.meta.title }}
</el-menu-item
> >
</template> </template>
@ -120,6 +121,7 @@ export default {
}, },
// //
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
this.currentIndex = key; this.currentIndex = key;
const route = this.routers.find(item => item.path === key); const route = this.routers.find(item => item.path === key);
if (this.ishttp(key)) { if (this.ishttp(key)) {

@ -18,7 +18,7 @@
<template v-if="device !== 'mobile'"> <template v-if="device !== 'mobile'">
<el-select <el-select
v-model="poolName" v-model="poolName"
placeholder="请选择园区" placeholder="请选择工厂数据源"
@change="handleChange" @change="handleChange"
:disabled="poolNameList.length <= 1" :disabled="poolNameList.length <= 1"
class="right-menu-item hover-effect" class="right-menu-item hover-effect"

@ -13,6 +13,10 @@ module.exports = {
* 是否显示顶部导航 * 是否显示顶部导航
*/ */
topNav: true, topNav: true,
/**
* 是否显示数据源选择下拉框
*/
poolNav:true,
/** /**
* 是否显示 tagsView * 是否显示 tagsView

@ -1,6 +1,6 @@
import defaultSettings from '@/settings' import defaultSettings from '@/settings'
const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings const { sideTheme, showSettings,poolNav, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || '' const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
const state = { const state = {
@ -9,6 +9,7 @@ const state = {
sideTheme: storageSetting.sideTheme || sideTheme, sideTheme: storageSetting.sideTheme || sideTheme,
showSettings: showSettings, showSettings: showSettings,
topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav, topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
poolNav: poolNav,
tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView, tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader, fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo, sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,

@ -75,7 +75,7 @@
plain plain
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleSyncSAP"
v-hasPermi="['mes:pro:order:add']" v-hasPermi="['mes:pro:order:add']"
>SAP同步 >SAP同步
</el-button> </el-button>
@ -366,8 +366,9 @@
getOrder, getOrder,
delOrder, delOrder,
addOrder, addOrder,
updateOrder updateOrder,
} from "@/api/mes/pro/order"; syncSAP
} from "@/api/plan/order";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@ -967,8 +968,18 @@
if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) { if (this.productData[0].atrr1 == '' || this.productData[0].atrr1 == null) {
this.formFields[this.formFields.length - 1].batchQuantity = ''; this.formFields[this.formFields.length - 1].batchQuantity = '';
} }
} },
/** SAP同步按钮操作 */
handleSyncSAP() {
this.$modal.confirm('是否确认SAP同步操作步骤').then(function() {
return syncSAP(contentIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("同步成功");
}).catch(() => {});
},
} }
}; };
</script> </script>
<style> <style>

@ -318,7 +318,7 @@
</template> </template>
<script> <script>
import { updatePlanDetail,getPlanDetailList,addWetPlan,getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/mes/plan"; import { updatePlanDetail,getPlanDetailList,addWetPlan,getBMSList,getProductList,getBucketList,getWorkOrderList,listPlan, getPlan, delPlan, addPlan, updatePlan } from "@/api/plan/plan";
export default { export default {
name: "Plan", name: "Plan",

@ -268,7 +268,7 @@
</template> </template>
<script> <script>
import { listWorkorder, getWorkorder, delWorkorder,downWorkorder, addWorkorder, updateWorkorder } from "@/api/mes/pro/workorder"; import { listWorkorder, getWorkorder, delWorkorder,downWorkorder, addWorkorder, updateWorkorder } from "@/api/plan/workorder";
import moment from 'moment'; import moment from 'moment';
export default { export default {
name: "Workorder", name: "Workorder",

@ -140,7 +140,7 @@
</template> </template>
<script> <script>
import { listBaseFile, getBaseFile, delBaseFile, addBaseFile, updateBaseFile } from "@/api/mes/pro/baseFile"; import { listBaseFile, getBaseFile, delBaseFile, addBaseFile, updateBaseFile } from "@/api/technology/baseFile";
export default { export default {
name: "BaseFile", name: "BaseFile",

@ -134,7 +134,7 @@
</template> </template>
<script> <script>
import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/processcontent"; import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/processcontent";
import ItemSelect from "@/components/itemSelect/index.vue"; import ItemSelect from "@/components/itemSelect/index.vue";
export default { export default {
name: "Processcontent", name: "Processcontent",

@ -324,7 +324,7 @@
</template> </template>
<script> <script>
import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/mes/pro/process"; import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/process";
import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment"; import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment";
import Processcontent from "./content.vue"; import Processcontent from "./content.vue";

@ -288,7 +288,7 @@
</template> </template>
<script> <script>
import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/mes/pro/proroute"; import { listProroute, getProroute, delProroute, addProroute, updateProroute } from "@/api/technology/proroute";
import Routeprocess from "./routeprocess"; import Routeprocess from "./routeprocess";
import Routeprodproduct from "./routeprodproduct"; import Routeprodproduct from "./routeprodproduct";
export default { export default {

@ -133,7 +133,7 @@
</template> </template>
<script> <script>
import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/mes/pro/routeprocess"; import { listRouteprocess, getRouteprocess, delRouteprocess, addRouteprocess, updateRouteprocess } from "@/api/technology/routeprocess";
import {listAllProcess} from "@/api/mes/pro/process"; import {listAllProcess} from "@/api/mes/pro/process";
export default { export default {
name: "Routeprocess", name: "Routeprocess",

@ -5,7 +5,7 @@
</template> </template>
<script> <script>
import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/mes/pro/routeprodproduct"; import { getListProduct, addProduct , updateProduct, getProduct, delProduct} from "@/api/technology/routeprodproduct";
export default { export default {
name: "Routeprodproduct", name: "Routeprodproduct",

@ -160,7 +160,7 @@
</template> </template>
<script> <script>
import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/mes/pro/recipecontent"; import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/recipecontent";
import ItemSelect from "@/components/itemSelect/index.vue"; import ItemSelect from "@/components/itemSelect/index.vue";
export default { export default {
name: "Processcontent", name: "Processcontent",

@ -207,7 +207,7 @@
</template> </template>
<script> <script>
import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/mes/pro/recipe"; import { listProcess, getProcess, delProcess, addProcess, updateProcess } from "@/api/technology/recipe";
import Processcontent from "./content.vue"; import Processcontent from "./content.vue";
export default { export default {
Loading…
Cancel
Save