Browse Source

修复已知bug

pull/117/head
xuxiaoming 3 years ago
parent
commit
75dd839e8b
4 changed files with 15 additions and 12 deletions
  1. +1
    -1
      src/server/request.js
  2. +0
    -3
      src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue
  3. +12
    -8
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
  4. +2
    -0
      src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue

+ 1
- 1
src/server/request.js View File

@ -2,7 +2,7 @@ import axios from "axios";
import { ElMessage } from 'element-plus';
let switchValue = true;
const service = axios.create({
baseURL: process.env.VUE_APP_BASE_URL || "http://101.201.121.115:9003/",
baseURL: process.env.VUE_APP_BASE_URL || "http://192.168.0.36:9003",
timeout: 20000, // request timeout
});
service.interceptors.request.use(


+ 0
- 3
src/views/factoryModel/materialResourceMaintenance/artStockResource/index.vue View File

@ -75,9 +75,6 @@
<span v-if="item === 'AP_ArticleStockLevel-PlantNr'">{{
mappingText(planList, scope.row["AP_ArticleStockLevel-PlantNr"], 'Plant-PlantNr', 'Plant-Name1')
}}</span>
<span v-else-if="item === 'AP_ArticleStockLevel-ArtId'">{{
mappingText(articleList, scope.row["AP_ArticleStockLevel-ArtId"], 'Article-ArtId', 'Article-Descr1')
}}</span>
<span v-else-if="item === 'AP_ArticleStockLevel-MinCoverPeriodType'">{{
mappingText(minCoverPeriodTypeArray, scope.row["AP_ArticleStockLevel-MinCoverPeriodType"], 'Stdef-StdefTyp', 'Stdef-Bez')
}}</span>


+ 12
- 8
src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue View File

@ -62,19 +62,24 @@
</div>
</div>
<div class="button_list">
<img :class="editButtonClass" :src="require('@/assets/icon/outsourcing_demand.png')" title="外购需求" @click="editRow('外购需求')">
<img :src="require('@/assets/icon/reload.png')" class="image_button" title="初始化" @click="reloadData">
<div class="button_split"></div>
<img :class="editButtonClass" :src="require('@/assets/icon/net_production.png')" title="净生产量" @click="editRow('净生产量')">
<img :src="require('@/assets/icon/save.png')" class="image_button" title="保存" @click="saveDemandData">
<div class="button_split"></div>
<img :class="publicButtonClass" :src="require('@/assets/icon/public.png')" title="发布数据" @click="publicData">
<div class="button_split"></div>
<img :src="require('@/assets/icon/refresh.png')" class="image_button" title="刷新数据" @click="refreshData">
<div class="button_split"></div>
<img :src="require('@/assets/icon/save.png')" class="image_button" title="保存" @click="saveDemandData">
<img :src="require('@/assets/img/download.png')" class="image_button" title="导出" @click="exportData">
<div class="button_split"></div>
<img :src="require('@/assets/icon/reload.png')" class="image_button" title="数据重载" @click="reloadData">
<img :class="editButtonClass" :src="require('@/assets/icon/outsourcing_demand.png')" title="外购需求" @click="editRow('外购需求')">
<div class="button_split"></div>
<img :src="require('@/assets/img/download.png')" class="image_button" title="导出" @click="exportData">
<img :class="editButtonClass" :src="require('@/assets/icon/net_production.png')" title="净生产量" @click="editRow('净生产量')">
<!-- <div class="button_split"></div>
<img :src="require('@/assets/icon/refresh.png')" class="image_button" title="刷新数据" @click="refreshData"> -->
</div>
</div>
<el-table
@ -408,7 +413,6 @@ export default {
this.SET_evaluationSecondResourceLoading(false);
this.SET_evaluationMainResourceLoading(false);
this.$message({ type: "success", message: "保存成功" });
this.SET_publicButtonClass("image_button");
}).catch(() => {
this.SET_evaluationSecondResourceLoading(false);
this.SET_evaluationMainResourceLoading(false);


+ 2
- 0
src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue View File

@ -101,6 +101,7 @@ export default {
"INIT_yAxis",
"SET_yAxis",
"SET_articleDemandData",
"SET_publicButtonClass",
"SET_editButtonClass"
]),
resetQuery() {
@ -167,6 +168,7 @@ export default {
this.$message({ type: "error", message: "查询的数据为空" });
return;
}
this.SET_publicButtonClass("image_button");
this.SET_xAxis(data["SortKeys"].slice(this.keyStartIndex));
data["SortKeys"].splice(this.keyStartIndex, 0, "Label");
data["Item"].forEach((item, index) => {


Loading…
Cancel
Save