Merge branch 'develop' into xuxiaoming

* develop:
  api路径调整

# Conflicts:
#	src/views/productionPlanning/customerInquiry/index.vue

src/server/plan/workbench/customerForecastDemandReview.js → src/server/productionPlanning/customerForecastDemandReview.js

@@ -1,7 +1,7 @@
 import {
 	get,
 	postForm
-} from "../../api";
+} from "../api";
 // 工厂列表
 export const getCustomerList = (params) => get('/admin/base/customer/selectlist', params);
 // 产品列表

src/server/plan/workbench/customerInquiry.js → src/server/productionPlanning/customerInquiry.js

@@ -2,7 +2,7 @@ import {
 	get,
 	post,
 	upload
-} from "../../api";
+} from "../api";
 // 工厂列表
 export const getCustomerList = (params) => get('/admin/base/customer/selectlist', params);
 // 产品列表

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue

@@ -26,7 +26,7 @@
   </ContentContainer>
 </template>
 <script>
-import { getCustomerArticleDemand } from "@/server/plan/workbench/customerForecastDemandReview";
+import { getCustomerArticleDemand } from "@/server/productionPlanning/customerForecastDemandReview";
 // 物料需求表
 import ArticleDemand from "./articleDemand";
 // 物料需求图

src/views/productionPlanning/customerForecastDemandReview/index.vue

@@ -64,7 +64,7 @@ import DemandPlanning from "./demandPlanning";
 // 资源内容
 import ResourceContent from "./resourceContent";
 // api
-import { getMainResourceList,getSecondaryResourceList,custartSearch} from "@/server/plan/workbench/customerForecastDemandReview";
+import { getMainResourceList,getSecondaryResourceList,custartSearch} from "@/server/productionPlanning/customerForecastDemandReview";
 
 export default {
   components: {

src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue

@@ -24,7 +24,7 @@
 
 import Evaluation from './evaluation'
 import ResourceLoad from './resourceLoad'
-import { getMpsPlan, changeMpsPlan,saveMpsPlan} from "@/server/plan/workbench/customerForecastDemandReview";
+import { getMpsPlan, changeMpsPlan,saveMpsPlan} from "@/server/productionPlanning/customerForecastDemandReview";
 
 export default {
 	components:{

src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue

@@ -96,7 +96,7 @@ v-if="showDetail"
 </template>
 <script>
 import Detail from "./detail.vue"
-import { getVersionList,getResourceCapacity,getCustomerDemand } from "@/server/plan/workbench/customerForecastDemandReview";
+import { getVersionList,getResourceCapacity,getCustomerDemand } from "@/server/productionPlanning/customerForecastDemandReview";
 import pending from "@/assets/img/pending.png"
 import published from "@/assets/img/published.png"
 

src/views/productionPlanning/customerInquiry/add.vue

@@ -48,7 +48,7 @@
 </el-dialog>
 </template>
 <script>
-import { getCustartlist } from "@/server/plan/workbench/customerInquiry";
+import { getCustartlist } from "@/server/productionPlanning/customerInquiry";
 export default {
     emits:[
         'setIsAdd',

src/views/productionPlanning/customerInquiry/upload.vue

@@ -15,7 +15,7 @@
 	</el-dialog>
 </template>
 <script>
-import { uploadExcel } from "@/server/plan/workbench/customerInquiry.js";
+import { uploadExcel } from "@/server/productionPlanning/customerInquiry.js";
 export default {
 	name: 'editField',
   props:{