Browse Source

Merge pull request '文件目录调整' (#19) from lingxiao into develop

Reviewed-on: #19
Reviewed-by: wangxy <xinyao.wang@le-it.com.cn>
pull/21/head
wangxy 3 years ago
parent
commit
d8b1c85d9c
17 changed files with 158 additions and 15 deletions
  1. +128
    -0
      src/icons/svg/主生产计划管理.svg
  2. +0
    -12
      src/router/plan.js
  3. +22
    -0
      src/router/productionPlanning.js
  4. +5
    -3
      src/router/routers.js
  5. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleChar/index.vue
  6. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
  7. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
  8. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/index.vue
  9. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/char.vue
  10. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue
  11. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue
  12. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue
  13. +0
    -0
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue
  14. +0
    -0
      src/views/productionPlanning/customerInquiry/add.vue
  15. +0
    -0
      src/views/productionPlanning/customerInquiry/index.vue
  16. +0
    -0
      src/views/productionPlanning/customerInquiry/upload.vue
  17. +3
    -0
      src/views/productionPlanning/index.vue

+ 128
- 0
src/icons/svg/主生产计划管理.svg View File

@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>导航icon/主生产计划管理 </title>
<defs>
<linearGradient x1="22.2375148%" y1="44.8333102%" x2="73.3677472%" y2="57.4177961%" id="linearGradient-1">
<stop stop-color="#FDF0C6" offset="0%"></stop>
<stop stop-color="#FFCFA5" offset="55.0262238%"></stop>
<stop stop-color="#FFDAA9" offset="100%"></stop>
</linearGradient>
<linearGradient x1="1.82386489%" y1="38.0706749%" x2="100%" y2="38.0706749%" id="linearGradient-2">
<stop stop-color="#B99570" offset="0%"></stop>
<stop stop-color="#D4A377" offset="16.5401005%"></stop>
<stop stop-color="#DBAB7F" offset="44.7825612%"></stop>
<stop stop-color="#CD8B61" offset="69.3099869%"></stop>
<stop stop-color="#B47C52" offset="100%"></stop>
</linearGradient>
<linearGradient x1="10.534815%" y1="45.0052782%" x2="97.5035173%" y2="54.9947218%" id="linearGradient-3">
<stop stop-color="#FFF5DF" offset="0%"></stop>
<stop stop-color="#FFF9CF" offset="19.9901661%"></stop>
<stop stop-color="#FFD7AF" offset="100%"></stop>
</linearGradient>
<linearGradient x1="9.85093183%" y1="45.7834909%" x2="96.3222714%" y2="57.7488648%" id="linearGradient-4">
<stop stop-color="#FDEFC6" offset="0%"></stop>
<stop stop-color="#FFD2A7" offset="48.2217002%"></stop>
<stop stop-color="#FFDAA9" offset="100%"></stop>
</linearGradient>
<linearGradient x1="4.5067412%" y1="41.2940733%" x2="97.1282695%" y2="41.2940733%" id="linearGradient-5">
<stop stop-color="#B6936F" offset="0%"></stop>
<stop stop-color="#D0A277" offset="38.6964598%"></stop>
<stop stop-color="#E8B688" offset="54.3078016%"></stop>
<stop stop-color="#D18960" offset="72.6808348%"></stop>
<stop stop-color="#B79262" offset="100%"></stop>
</linearGradient>
<polygon id="path-6" points="11.9634217 13.8636873 22.6611802 13.8636873 22.6611802 22.293449 12.1611014 22.293449"></polygon>
<filter x="-0.9%" y="-1.2%" width="101.9%" height="102.4%" filterUnits="objectBoundingBox" id="filter-7">
<feOffset dx="0" dy="-0.2" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
<feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
</filter>
<linearGradient x1="0%" y1="50%" x2="93.7448373%" y2="50%" id="linearGradient-8">
<stop stop-color="#D7AF86" offset="0%"></stop>
<stop stop-color="#D3A175" offset="23.7544711%"></stop>
<stop stop-color="#CDA96E" offset="50.907662%"></stop>
<stop stop-color="#CDAC70" offset="55.5604968%"></stop>
<stop stop-color="#E38B5C" offset="76.9653299%"></stop>
<stop stop-color="#B07F55" offset="100%"></stop>
</linearGradient>
<polygon id="path-9" points="6.49875321 4.35843319 17.4982322 4.35843319 17.4982322 12.4876352 6.49875321 12.4876352"></polygon>
<filter x="-14.5%" y="-17.2%" width="129.1%" height="139.4%" filterUnits="objectBoundingBox" id="filter-10">
<feOffset dx="0" dy="0.2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
</filter>
<filter x="-15.9%" y="-19.1%" width="131.8%" height="143.1%" filterUnits="objectBoundingBox" id="filter-11">
<feGaussianBlur stdDeviation="0.5" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
<feOffset dx="0" dy="-0.5" in="shadowBlurInner1" result="shadowOffsetInner1"></feOffset>
<feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
</filter>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-12">
<stop stop-color="#928F6D" offset="0%"></stop>
<stop stop-color="#603D13" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-13">
<stop stop-color="#9B937C" offset="0%"></stop>
<stop stop-color="#52350C" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="0%" x2="50%" y2="85.0333463%" id="linearGradient-14">
<stop stop-color="#F4F4F4" offset="0%"></stop>
<stop stop-color="#DAD9DA" offset="100%"></stop>
</linearGradient>
<path d="M0.5,0 L6.88869837,0 L6.88869837,0 L10,3.06488183 L10,12.5 C10,12.7761424 9.77614237,13 9.5,13 L0.5,13 C0.223857625,13 3.38176876e-17,12.7761424 0,12.5 L0,0.5 C-3.38176876e-17,0.223857625 0.223857625,5.07265313e-17 0.5,0 Z" id="path-15"></path>
<filter x="-2.5%" y="-1.9%" width="105.0%" height="107.7%" filterUnits="objectBoundingBox" id="filter-16">
<feOffset dx="0" dy="0.5" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
<feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
</filter>
<linearGradient x1="50%" y1="43.5645834%" x2="5.26883231%" y2="93.2692162%" id="linearGradient-17">
<stop stop-color="#4A4C5B" offset="0%"></stop>
<stop stop-color="#636970" offset="21.1951864%"></stop>
<stop stop-color="#6D7B7B" offset="65.1066611%"></stop>
<stop stop-color="#839290" offset="100%"></stop>
</linearGradient>
<linearGradient x1="2.84217094e-12%" y1="73.8434328%" x2="86.8174444%" y2="73.8434328%" id="linearGradient-18">
<stop stop-color="#155DB8" offset="0%"></stop>
<stop stop-color="#44B9D3" offset="77.267264%"></stop>
<stop stop-color="#33D7F0" offset="100%"></stop>
</linearGradient>
</defs>
<g id="导航icon/主生产计划管理--" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="编组-2">
<g id="货品">
<polygon id="路径-36" fill="url(#linearGradient-1)" points="2.85972689 11 11.7583897 11 11.9311796 14.0369025 11.7583897 14.8907486 0.918723261 14.8907486"></polygon>
<polygon id="路径-49" fill="url(#linearGradient-2)" points="1.10651338 14.9013118 1.10651338 23.518474 11.9890157 23.518474 11.9890157 14.9013118"></polygon>
<polygon id="路径-35" fill="url(#linearGradient-3)" points="7.26567389 0.920237133 15.9805949 0.920237133 17.2073318 3.65679028 17.2073318 4.37119345 6.43814422 4.37119345 6.28868514 3.30581083"></polygon>
<polygon id="路径-48" fill="url(#linearGradient-4)" points="11.8330716 10.218956 11.8465943 13.9478538 22.5498766 13.9478538 20.8405355 9.97388939 11.8330716 9.97388939"></polygon>
<g id="路径-50">
<use fill="url(#linearGradient-5)" fill-rule="evenodd" xlink:href="#path-6"></use>
<use fill="black" fill-opacity="1" filter="url(#filter-7)" xlink:href="#path-6"></use>
</g>
<g id="矩形">
<use fill="black" fill-opacity="1" filter="url(#filter-10)" xlink:href="#path-9"></use>
<use fill="url(#linearGradient-8)" fill-rule="evenodd" xlink:href="#path-9"></use>
<use fill="black" fill-opacity="1" filter="url(#filter-11)" xlink:href="#path-9"></use>
</g>
<polyline id="路径-33" stroke="url(#linearGradient-12)" stroke-width="0.5" points="7.06729033 0.778657253 16.0110852 0.778657253 17.3603364 3.52657914 17.3603364 9.91160757 20.7869206 9.91160757 22.6586243 13.4665113 22.6586243 22.4876352 11.9612521 22.4876352 11.9612521 13.918382"></polyline>
<polyline id="路径-34" stroke="url(#linearGradient-13)" stroke-width="0.5" points="7.29572044 0.613455617 6.26290236 3.32719408 6.26290236 10.9163608 2.95213768 10.9163608 1 14.2707708 1 23.600296 12.1611014 23.600296 12.1611014 22.7331752"></polyline>
</g>
<g id="编组" transform="translate(16.968099, 15.839755) rotate(-345.000000) translate(-16.968099, -15.839755) translate(11.968099, 9.339755)">
<g id="矩形">
<use fill="black" fill-opacity="1" filter="url(#filter-16)" xlink:href="#path-15"></use>
<use fill="url(#linearGradient-14)" fill-rule="evenodd" xlink:href="#path-15"></use>
</g>
<rect id="矩形" fill="#4091BA" x="1" y="2" width="2" height="2"></rect>
<rect id="矩形" fill="#4091BA" x="4" y="2" width="2" height="2"></rect>
<rect id="矩形" fill="#4091BA" x="6" y="2" width="2" height="2"></rect>
<rect id="矩形" stroke="#ADBBCA" stroke-width="0.5" fill="#D8D8D8" x="1.25" y="4.25" width="7.5" height="7.5" rx="0.5"></rect>
<rect id="矩形" stroke="#9DB0C4" stroke-width="0.5" fill="#DFE7ED" x="1.25" y="4.25" width="2.5" height="7.5"></rect>
<rect id="矩形" stroke="#9DB0C4" stroke-width="0.5" fill="#DFE7ED" x="3.25" y="4.25" width="2.5" height="7.5"></rect>
<rect id="矩形" fill="#9DB0C4" x="1" y="6.8452381" width="8" height="1"></rect>
<rect id="矩形备份-2" fill="#9DB0C4" x="1" y="7.8452381" width="8" height="1"></rect>
<rect id="矩形备份-3" fill="#9DB0C4" x="1" y="9.8452381" width="8" height="1"></rect>
<rect id="矩形备份" stroke="#9DB0C4" stroke-width="0.5" x="6.25" y="4.25" width="2.5" height="7.5"></rect>
<path d="M7,0 L10,3 L8,3 C7.44771525,3 7,2.55228475 7,2 L7,0 L7,0 Z" id="矩形" fill="url(#linearGradient-17)"></path>
</g>
<path d="M16.5310889,6.78242468 L17.6657689,7.74164365 C19.0676252,6.05518544 20.4937636,5.73544579 21.9441839,6.78242468 C21.9526691,6.7748814 21.7738489,7.09462105 21.4077234,7.74164365 L23.5310889,8.34807621 L23.5310889,4.82324978 L22.69837,5.69294959 C21.5456523,4.2634307 20.1050711,3.97353076 18.3766265,4.82324978 C17.4428117,5.25878135 16.8276326,5.91183965 16.5310889,6.78242468 Z" id="路径-25" fill="url(#linearGradient-18)" transform="translate(20.031089, 6.348076) rotate(-330.000000) translate(-20.031089, -6.348076) "></path>
</g>
</g>
</svg>

+ 0
- 12
src/router/plan.js View File

@ -36,18 +36,6 @@ const plant = {
title: "工作台",
component: () => import("@/views/plan/workbench"),
children: [
{
icon: "el-icon-document",
path: "/plan/workbench/customerInquiry",
title: "客户询单",
component: () => import("@/views/plan/workbench/customerInquiry"),
},
{
icon: "el-icon-document",
path: "/plan/workbench/customerForecastDemandReview",
title: "客户预测需求评审",
component: () => import("@/views/plan/workbench/customerForecastDemandReview"),
},
{
icon: "el-icon-document",
path: "/plan/workbench/homePage",


+ 22
- 0
src/router/productionPlanning.js View File

@ -0,0 +1,22 @@
const plant = {
icon: "el-icon-coin",
path: "/productionPlanning",
title: "主计划生产管理",
component: () => import("@/views/productionPlanning"),
children: [
{
icon: "el-icon-document",
path: "/productionPlanning/customerInquiry",
title: "客户询单",
component: () => import("@/views/productionPlanning/customerInquiry"),
},
{
icon: "el-icon-document",
path: "/productionPlanning/customerForecastDemandReview",
title: "客户预测需求评审",
component: () => import("@/views/productionPlanning/customerForecastDemandReview"),
},
],
}
export default plant;

+ 5
- 3
src/router/routers.js View File

@ -2,13 +2,15 @@ import System from "./system";
import FactoryModel from "./factoryModel";
import Plan from "./plan";
import PersonalCenter from "./personalCenter";
import predictEdit from "./predictEdit"
import PredictEdit from "./predictEdit";
import ProductionPlanning from './productionPlanning';
const routes = [
{...System},
{...FactoryModel},
{ ...PersonalCenter},
{ ...predictEdit },
{ ...Plan}
{ ...PredictEdit },
{ ...Plan},
{ ...ProductionPlanning}
];
export default routes;

src/views/plan/workbench/customerForecastDemandReview/demandPlanning/articleChar/index.vue → src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleChar/index.vue View File


src/views/plan/workbench/customerForecastDemandReview/demandPlanning/articleDemand/index.vue → src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue View File


src/views/plan/workbench/customerForecastDemandReview/demandPlanning/index.vue → src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue View File


src/views/plan/workbench/customerForecastDemandReview/index.vue → src/views/productionPlanning/customerForecastDemandReview/index.vue View File


src/views/plan/workbench/customerForecastDemandReview/resourceContent/evaluation/char.vue → src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/char.vue View File


src/views/plan/workbench/customerForecastDemandReview/resourceContent/evaluation/index.vue → src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue View File


src/views/plan/workbench/customerForecastDemandReview/resourceContent/index.vue → src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue View File


src/views/plan/workbench/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue → src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue View File


src/views/plan/workbench/customerForecastDemandReview/resourceContent/resourceLoad/index.vue → src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue View File


src/views/plan/workbench/customerInquiry/add.vue → src/views/productionPlanning/customerInquiry/add.vue View File


src/views/plan/workbench/customerInquiry/index.vue → src/views/productionPlanning/customerInquiry/index.vue View File


src/views/plan/workbench/customerInquiry/upload.vue → src/views/productionPlanning/customerInquiry/upload.vue View File


+ 3
- 0
src/views/productionPlanning/index.vue View File

@ -0,0 +1,3 @@
<template>
<router-view />
</template>

Loading…
Cancel
Save