| north-glass-erp/.idea/workspace.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| north-glass-erp/northglass-erp/src/layout/MainErpView.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| north-glass-erp/northglass-erp/src/views/pp/report/Report.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
north-glass-erp/.idea/workspace.xml
@@ -45,37 +45,37 @@ <option name="hideEmptyMiddlePackages" value="true" /> <option name="showLibraryContents" value="true" /> </component> <component name="PropertiesComponent"><![CDATA[{ "keyToString": { "RequestMappingsPanelOrder0": "0", "RequestMappingsPanelOrder1": "1", "RequestMappingsPanelWidth0": "75", "RequestMappingsPanelWidth1": "75", "RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true", "SHARE_PROJECT_CONFIGURATION_FILES": "true", "WebServerToolWindowFactoryState": "false", "git-widget-placeholder": "master", "last_opened_file_path": "D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/components/pp/processCard", "node.js.detected.package.eslint": "true", "node.js.detected.package.tslint": "true", "node.js.selected.package.eslint": "(autodetect)", "node.js.selected.package.tslint": "(autodetect)", "nodejs_package_manager_path": "npm", "project.structure.last.edited": "模块", "project.structure.proportion": "0.0", "project.structure.side.proportion": "0.0", "settings.editor.selected.configurable": "preferences.pluginManager", "spring.configuration.checksum": "def6d90e829e50c63f98c387daecd138", "ts.external.directory.path": "D:\\软件\\IntelliJ IDEA 2023.2\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external", "vue.rearranger.settings.migration": "true" <component name="PropertiesComponent">{ "keyToString": { "RequestMappingsPanelOrder0": "0", "RequestMappingsPanelOrder1": "1", "RequestMappingsPanelWidth0": "75", "RequestMappingsPanelWidth1": "75", "RunOnceActivity.OpenProjectViewOnStart": "true", "RunOnceActivity.ShowReadmeOnStart": "true", "SHARE_PROJECT_CONFIGURATION_FILES": "true", "WebServerToolWindowFactoryState": "false", "git-widget-placeholder": "master", "last_opened_file_path": "D:/GitRepository/ERP_override/north-glass-erp/northglass-erp/src/components/pp/processCard", "node.js.detected.package.eslint": "true", "node.js.detected.package.tslint": "true", "node.js.selected.package.eslint": "(autodetect)", "node.js.selected.package.tslint": "(autodetect)", "nodejs_package_manager_path": "npm", "project.structure.last.edited": "模块", "project.structure.proportion": "0.0", "project.structure.side.proportion": "0.0", "settings.editor.selected.configurable": "preferences.pluginManager", "spring.configuration.checksum": "def6d90e829e50c63f98c387daecd138", "ts.external.directory.path": "D:\\软件\\IntelliJ IDEA 2023.2\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external", "vue.rearranger.settings.migration": "true" }, "keyToStringList": { "vue.recent.templates": [ "Vue Composition API Component" "keyToStringList": { "vue.recent.templates": [ "Vue Composition API Component" ] } }]]></component> }</component> <component name="RecentsManager"> <key name="CreateClassDialog.RecentsKey"> <recent name="com.example.erp.tools" /> @@ -104,7 +104,7 @@ <command value="length" /> </option> </component> <component name="RunManager" selected="JUnit.erp中的所有"> <component name="RunManager" selected="npm.dev"> <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> <option name="arquillianRunConfiguration"> <value> @@ -212,6 +212,7 @@ <workItem from="1702631535326" duration="205000" /> <workItem from="1702858329054" duration="9016000" /> <workItem from="1703031064839" duration="55055000" /> <workItem from="1703463546867" duration="1756000" /> </task> <task id="LOCAL-00001" summary="第一次推送"> <option name="closed" value="true" /> north-glass-erp/northglass-erp/src/layout/MainErpView.vue
@@ -6,6 +6,7 @@ import {onMounted, reactive, ref, watch} from "vue" import deepClone from "@/utils/deepClone" import userInfo from '@/stores/userInfo' import {Close, Grid, Histogram, MessageBox, SwitchButton} from "@element-plus/icons-vue"; const store=userInfo() const router = useRouter() @@ -61,37 +62,55 @@ }) let openFlag = $ref(null) //原始菜单打开 const openMenu = (menuID) => { if(menuID===openFlag){ openFlag = null }else { openFlag = menuID } } </script> <template> <div> <el-container> <el-header> <el-header > <div style="height: 100%;width: 100%;display: flex"> <img src="../assets/northGlass.ico" alt="" style="max-width: 100%;max-height: 100%"> <h3 style="margin: 1rem ;font-weight: bold;width: 20vw;"> 欢迎{{ user }}使用北玻ERP系统！</h3> <span style="height: 70%;width: 78vw;margin-top: 1rem;" > <el-button class="sys-quit" @click="quit" type="info" round>退出</el-button> <el-button class="sys-quit" @click="quit" type="info" round> <el-icon size="large"><SwitchButton size=""/></el-icon> </el-button> </span> </div> </el-header> <el-container > <el-aside width="160px" style="margin-top: 1.5rem;height: 90% " > <el-menu <el-aside width="160px" style="height: 97%; " > <!-- <el-menu style=" border-radius:0.5rem;border: 0.01rem solid #409EFF;margin-bottom: 0.5rem" @open="handleOpen" ref="menu" active-color="#ffd04b" background-color="#545c64" class="el-menu-vertical-demo" background-color="#409EFF" default-active="2" text-color="#fff"> <el-sub-menu v-for="items in menuList" :index="items.id" :key="items.id"> <template #title> <span>{{items.menuName}}</span> <el-icon v-if="items.id==1"><Grid/></el-icon> <el-icon v-if="items.id==2"><Histogram/></el-icon> <el-icon v-if="items.id==3"><MessageBox/></el-icon> <span style="font-weight: bold;">{{items.menuName}}</span> </template> <router-link v-show="items.id==menuItem.menuID" @@ -103,7 +122,25 @@ </router-link> </el-sub-menu> </el-menu> </el-menu>--> <div class="menu" > <div v-for="items in menuList"> <div class='menu_title' @click="openMenu(items.id)" >{{items.menuName}}<span class='indicator' >▼</span></div> <ul class='enter-x-left' v-show="openFlag==items.id"> <li v-for="menuItem in menuItemList" v-show="items.id==menuItem.menuID" style="margin-bottom: 2px" > <router-link :to="{path:menuItem.url}"> {{ menuItem.itemName}} </router-link> </li> </ul> </div> </div> </el-aside> <el-main> @@ -146,4 +183,176 @@ float: right; height: 99%; } /*------------*/ .menu div div{ width: 138px; height: 35px; line-height: 35px; background: #C6E2FF; color: #000000; font-size: 16px; padding-left: 15px; transition: all 0.3s ease; cursor: pointer; position: relative; font-weight: bold; overflow: hidden; border-bottom: 12px ; margin-bottom:4px; text-align: left; cursor: pointer; border-radius:8px; /* outline: none; */ background-color:#5CADFE; box-shadow: 0 8px 16px 0 rgba(0,0,0,0), 0 6px 5px 0 rgba(0,0,0,0.19); } .menu { width: 138px; height: 33px; line-height: 25px; color: #000000; font-size: 16px; padding-left: 15px; padding-right: 2px; } ul { height: auto; margin: 1px auto; text-align: center; } ul li { height: 28px; line-height: 30px; background: rgb(128, 128, 128); color: #000000; padding-left: 36px; cursor: pointer; overflow: hidden; text-align: left; border-radius:8px; /* outline: none; */ background: #5CADFE; box-shadow: 0 8px 16px 0 rgba(0,0,0,0), 0 6px 5px 0 rgba(0,0,0,0.19); } ul li:hover { background:#5CADFE ; color: #ffffff; } ul li a { text-decoration: none; color: #000000; font-size: 14px; } ul li a:hover { color: #ffffff; } .item_divider { width: 118px; height: 0px; /* background-color: white; opacity: 0.8; */ margin-bottom:2px; } .item a{ width: 138px; height: 35px; display: block; text-decoration: none; color: white; font-size: 14px; text-decoration: none; } .menu_title { width: 138px; height: 35px; line-height: 35px; background: #fafafa; color: rgb(128, 128, 128); font-size: 16px; padding-left: 15px; transition: all 0.3s ease; cursor: pointer; position: relative; font-weight: bold; overflow: hidden; } .menu_title:hover { /* background: #dedede; */ color: #ffffff; } .indicator { display: block; width: 50px; height: 35px; font-weight: bold; position: absolute; right: 0px; top: 0px; transition: all 0.3s ease; text-align: center; } /* 动画效果 */ .enter-x-left { z-index: 9; opacity: 0; animation: enter-x-left 0.4s ease-in-out 0.3s; animation-fill-mode: forwards; transform: translateX(-50px); transition: all 0.3s ease; } .enter-x-left:nth-child(1){ animation-delay: 0.1s; } .enter-x-left:nth-child(2){ animation-delay: 0.2s; } .enter-x-left:nth-child(3) { animation-delay: 0.3s; } .enter-x-left:nth-child(4){ animation-delay: 0.4s; } @keyframes enter-x-left { to { opacity: 1; transform: translateX(0); } } </style> north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -202,12 +202,35 @@ }) const form = reactive({ name: '', region: '', date1: '', date2: '', delivery: false, type: [], resource: '', desc: '', }) </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <el-date-picker v-model="form.date1" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间" :default-time="defaultTime" /> <el-button type="primary">查询</el-button> </el-row> </div> <vxe-grid max-height="100%" @filter-change="filterChanged" @@ -252,4 +275,8 @@ width: 99%; height: 100%; } #selectForm { width: 40%; text-align: center; } </style> north-glass-erp/northglass-erp/src/views/pp/report/Report.vue
@@ -44,8 +44,9 @@ mode="horizontal" :default-active="$route.path" router background-color="#545c64" text-color="white" background-color="#5CADFE" text-color="#000000" active-text-color="#ffffff" > @@ -95,6 +96,7 @@ #div-title{ height: 5%; width: 100%; //color: #ffd04b; }
@@ -193,11 +193,34 @@ }) const form = reactive({ name: '', region: '', date1: '', date2: '', delivery: false, type: [], resource: '', desc: '', }) </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <el-date-picker v-model="form.date1" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间" :default-time="defaultTime" /> <el-button type="primary">查询</el-button> </el-row> </div> <vxe-grid max-height="100%" @filter-change="filterChanged" @@ -242,4 +265,8 @@ width: 99%; height: 100%; } #selectForm { width: 40%; text-align: center; } </style> north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -193,12 +193,35 @@ }) const form = reactive({ name: '', region: '', date1: '', date2: '', delivery: false, type: [], resource: '', desc: '', }) </script> <template> <div class="main-div-customer"> <div id="selectForm"> <el-row :gutter="0"> <el-date-picker v-model="form.date1" type="daterange" start-placeholder="开始时间" end-placeholder="结束时间" :default-time="defaultTime" /> <el-button type="primary">查询</el-button> </el-row> </div> <vxe-grid max-height="100%" @filter-change="filterChanged" @@ -242,4 +265,8 @@ width: 99%; height: 100%; } #selectForm { width: 40%; text-align: center; } </style>
