Merge pull request '修复主生产计划发布弹出窗口bug' (#163) from xuxiaoming into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/163

src/server/api.js

@@ -56,21 +56,21 @@ export const getStanderOne = (params) =>
   });
 
 export const uploadExcel = (param, customerId, versionId) =>
-  service.request({
+  upService.request({
 		url: "/admin/ap/custdemandverhead/importfile?customerId=" + customerId + "&versionId=" + versionId,
     method: "post",
     headers: { "Content-Type": "multipart/form-data" },
     data: param,
   });
 export const readexcel = (param, script) =>
-  service.request({
+  upService.request({
 		url: "/admin/base/script/readexcel?script=" + script,
     method: "post",
     headers: { "Content-Type": "multipart/form-data" },
     data: param,
   });
 export const bulkimportfile = (data) =>
-	service.request({
+  upService.request({
 		url: "/admin/ap/custdemandverhead/bulkimportfile",
 		method: "post",
 		headers: { "Content-Type": "multipart/form-data" },

src/server/request.js

@@ -2,6 +2,7 @@ import axios from "axios";
 import { ElMessage } from "element-plus";
 let switchValue = true;
 const baseURL = process.env.VUE_APP_BASE_URL || "http://101.201.121.115:9003/";
+// const baseURL = process.env.VUE_APP_BASE_URL || "http://192.168.0.98:9003/";
 const service = axios.create({
   baseURL,
   timeout: 1000 * 60 * 2, // request timeout

src/views/factoryModel/materialResourceMaintenance/alternativeResources/index.vue

@@ -174,7 +174,6 @@ export default {
     // 物料列表
     getArticleList(){
       getArticleList().then(({data=[]})=>{
-        console.log('%cindex.vue line:151 data', 'color: #007acc;', data);
         this.articleList=data;
       })
     },

src/views/factoryModel/materialResourceMaintenance/artStockResource/addOrEdit.vue

@@ -506,8 +506,7 @@
               this.edit();
             }
           } else {
-            console.log("error submit!!");
-            console.log('%caddOrEdit.vue line:587 valid', 'color: #007acc;', valid);
+            console.log("error submit!!");;
             return false;
           }
         });

src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue

@@ -226,7 +226,6 @@ export default {
     },
     // 删除
     handleDelete(item) {
-      console.log('%cindex.vue line:186 item', 'color: #007acc;', item);
       this.delHanle(deleteHanle(item["AP_ArticleStockLevel-ArtId"]));
     },
 

src/views/factoryModel/materialResourceMaintenance/inventoryLevels/index.vue

@@ -189,7 +189,6 @@ export default {
     },
     // 删除
     handleDelete(item) {
-      console.log('%cindex.vue line:186 item', 'color: #007acc;', item);
       this.delHanle(deleteHanle(item["AP_ArticleStockLevel-ArtId"]));
     },
 

src/views/factoryModel/materialResourceMaintenance/mainResources/index.vue

@@ -172,7 +172,6 @@ export default {
     // 物料列表
     getArticleList(){
       getArticleList({arttypeid:"FINISHED"}).then(({data=[]})=>{
-        console.log('%cindex.vue line:151 data', 'color: #007acc;', data);
         this.articleList=data;
       })
     },

src/views/plan/workbench/homePage/formal/index.vue

@@ -49,7 +49,6 @@ export default {
 			})
 		},
 		calculateTableHeight(data) {
-			console.log('%cindex.vue line:53 calculateTableHeight formal', 'color: #007acc;', data);
 			this.$emit("calculateTableHeight",data)
 		}
 	},

src/views/plan/workbench/homePage/index.vue

@@ -46,7 +46,6 @@ export default {
 			this.tableHeight = height
 		},
 		calculateFormalTableHeight(height){
-			console.log('%cindex.vue line:49 calculateFormalTableHeight', 'color: #007acc;', height);
 			this.formalTableHeight = height
 		}
 	},

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

@@ -309,7 +309,7 @@
         publishedVersion().then(({ data = "" }) => {
           this.promptMessage = data
         }).catch(() => {
-          this.$message({ type: "error", message: "获取消息失败" });
+          this.$message({ type: "error", message: "获取发布版本失败" });
         });
       },
       handleQuery() {
@@ -453,7 +453,6 @@
           delete item.key;
           delete item.Label;
         });
-        console.log('%cindex.vue line:435 editMapList', 'color: #007acc;', editMapList);
         return JSON.stringify(editMapList);
       },
       // 保存数据

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue

@@ -61,6 +61,7 @@
       v-if="showPublicDetail"
       :showPublicDetail="showPublicDetail"
       :versionNr="versionNr"
+      @closeDialog="closePublicDetailDialog"
     />
   </el-dialog>
 </template>
@@ -120,21 +121,16 @@
         });
       },
       lookDetailHandler(versionNr) {
+        console.log('%cpublic.vue line:123 this.showPublicDetail 1', 'color: #007acc;', this.showPublicDetail);
         this.showPublicDetail = true
+        console.log('%cpublic.vue line:123 this.showPublicDetail 2', 'color: #007acc;', this.showPublicDetail);
         this.versionNr = versionNr
-        // planOrderQuery({
-        //   versionnr: versionNr,
-        //   pageNumber: 1,
-        //   pageSize: 50
-        // }).then(({ data = [] }) => {
-        //   this.loading = false
-        //   this.detailData = data
-        //   this.showPublicDetail = true
-
-        // }).catch((e) => {
-        //   this.$message({ type: "error", message: "重新发布信息失败" });
-        //   this.loading = false
-        // });
+        
+      },
+      closePublicDetailDialog(){
+        console.log('%cpublic.vue line:123 closePublicDetailDialog this.showPublicDetail 1', 'color: #007acc;', this.showPublicDetail);
+        this.showPublicDetail = false
+        console.log('%cpublic.vue line:123 closePublicDetailDialog this.showPublicDetail 2', 'color: #007acc;', this.showPublicDetail);
       },
       publishIdentify() {
         this.loading = true

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/publicDetail.vue

@@ -2,7 +2,8 @@
   <el-dialog title="详情"
       v-model="showPublicDetail"
       width="800px"
-      height="400px">
+      :before-close="closeDialog"
+    >
     <el-table
         style="width: 100%"
         :data="tableData"
@@ -30,6 +31,7 @@
 import { planOrderQuery as queryTableData } from '@/server/productionPlanning/customerForecastDemandReview'
 export default {
   mixins: [ListMixin],
+  emits:["closeDialog"],
   props: {
     
 
@@ -61,7 +63,11 @@ export default {
       
   },
   methods: {
-
+    closeDialog(done){
+      
+      done()
+      this.$emit("closeDialog")
+    }
   }
   
  

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

@@ -151,7 +151,6 @@
           this.SET_articleDemandData(data);
           this.SET_articleDemandLoading(false);
           this.$refs.articleDemandTable.pagination.total = data.count
-          console.log('%cindex.vue line:154 this.$refs.articleDemandTable.pagination', 'color: #007acc;', this.$refs.articleDemandTable.pagination);
         }).catch(() => {
           this.SET_articleDemandLoading(false);
         });

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

@@ -51,7 +51,6 @@
       };
     },
 
-
     computed: {
       ...mapState("customerForecastDemandReview", [
         'evaluationLoadPercent',
@@ -73,7 +72,6 @@
           }
           load++
           this.loadPercent = parseInt(load / temp * 100)
-          console.log('%cindex.vue line:161 this.loadPercent', 'color: #007acc;', this.loadPercent);
         }, 100)
       },
       endLoading(){