Browse Source

客户需求计划管理-周转日映射关系

develop
wangxy 2 years ago
parent
commit
70fe37ed81
13 changed files with 89 additions and 31 deletions
  1. +2
    -1
      src/views/plan/workbench/homePage/beta/index.vue
  2. +1
    -1
      src/views/plan/workbench/homePage/beta/predict/index.vue
  3. +8
    -1
      src/views/plan/workbench/homePage/beta/predict/predictEdit.vue
  4. +12
    -4
      src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue
  5. +3
    -3
      src/views/plan/workbench/homePage/formal/analysis/index.vue
  6. +12
    -4
      src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue
  7. +3
    -2
      src/views/plan/workbench/homePage/formal/index.vue
  8. +2
    -2
      src/views/plan/workbench/homePage/formal/versions/index.vue
  9. +12
    -3
      src/views/plan/workbench/homePage/index.vue
  10. +11
    -3
      src/views/plan/workbench/materialAnalysis/chart/commonLineChart.vue
  11. +3
    -3
      src/views/plan/workbench/materialAnalysis/chart/index.vue
  12. +11
    -3
      src/views/plan/workbench/materialAnalysis/chart/lineBarChart.vue
  13. +9
    -1
      src/views/plan/workbench/materialAnalysis/index.vue

+ 2
- 1
src/views/plan/workbench/homePage/beta/index.vue View File

@ -7,6 +7,7 @@
:CreateModel="CreateModel"
:isShowComponent="isShowComponent"
:tableHeight="tableHeight"
:transLabelObj="transLabelObj"
@calculateTableHeight="calculateTableHeight" />
</el-tab-pane>
<!-- <el-tab-pane label="正式订单" name="second">
@ -28,7 +29,7 @@ export default {
Order,
Product
},
props: ["customerId", "CreateModel","tableHeight"],
props: ["customerId", "CreateModel","tableHeight","transLabelObj"],
data() {
return {
activeName: 'first',


+ 1
- 1
src/views/plan/workbench/homePage/beta/predict/index.vue View File

@ -99,7 +99,7 @@ export default {
components: {
queryComponent,
},
props: ["customerId", "CreateModel", "isShowComponent", "tableHeight"],
props: ["customerId", "CreateModel", "isShowComponent", "tableHeight", "transLabelObj"],
data() {
return {
tableData: [],


+ 8
- 1
src/views/plan/workbench/homePage/beta/predict/predictEdit.vue View File

@ -114,7 +114,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column v-for="(item1, index) in headers" :key="index" :label="item1" width="130">
<el-table-column v-for="(item1, index) in headers" :key="index" :label="transLabelObj[item1]" width="130">
<template #default="scope">
<el-input
v-model="scope.row.Item[item1]"
@ -201,9 +201,11 @@ export default {
startWeekArray: [],
orgListArray: [],
CustDemandVerDetail: {},
transLabelObj: {},
}
},
mounted() {
this.getTransLabel()
this.getCreateModeData()
this.getOrgListData()
if (this.item.title === '修改') {
@ -216,6 +218,11 @@ export default {
}
},
methods: {
getTransLabel() {
get('/user/week_to_date').then(({data})=>{
this.transLabelObj = data || {}
})
},
/** 新增属性 */
handleAddValst() {
this.formData['AP_CustDemandVerHead-CustomerItem'].push({


+ 12
- 4
src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue View File

@ -17,7 +17,11 @@ export default {
customerId: {
type: String,
default: ''
}
},
transLabelObj: {
type: Object,
default: {}
}
},
data() {
return {
@ -26,6 +30,7 @@ export default {
seriesArray: [],
maxValue: '',
minValue: '',
copyXDataArray: [],
}
},
watch: {
@ -40,13 +45,16 @@ export default {
this.xDataArray = []
this.seriesArray = []
if (newValue.length > 0) {
this.xDataArray = newValue[0].SortKeys || []
this.copyXDataArray = JSON.parse(JSON.stringify(newValue[0].SortKeys))
this.xDataArray = newValue[0].SortKeys.map(el => {
return this.transLabelObj[el]
})
this.maxValue = newValue[0].PeriodOnPeriodUpperLimit
this.minValue = newValue[0].PeriodOverPeriodLowerLimit
}
newValue.forEach(el => {
receivableArray = []
this.xDataArray.forEach(elChild => {
this.copyXDataArray.forEach(elChild => {
receivableArray.push(el.Item[elChild])
})
this.seriesArray.push({
@ -140,7 +148,7 @@ export default {
data: this.xDataArray,
axisLabel: { //
interval: 0,
rotate:'80',//
rotate:'10',//
},
},
yAxis: {


+ 3
- 3
src/views/plan/workbench/homePage/formal/analysis/index.vue View File

@ -61,10 +61,10 @@
</el-col>
<el-col :span="allTheSingle === '2' ? 16 : 20" style="height: 100%;">
<div class="analysis-chart-wrapper">
<CommonLineChart :dataList="dataList.PerCustomerDeviationDetailItem|| []" />
<CommonLineChart :dataList="dataList.PerCustomerDeviationDetailItem|| []" :transLabelObj="transLabelObj" />
</div>
<div class="analysis-chart-wrapper" style="margin-top: 30px;">
<LineBarChart :dataList="dataList.CustomerDeviationDetailItem || []" />
<LineBarChart :dataList="dataList.CustomerDeviationDetailItem || []" :transLabelObj="transLabelObj" />
</div>
</el-col>
<!-- <el-col :span="allTheSingle === '2' ? 9 : 11">
@ -87,7 +87,7 @@ import LineBarChart from './lineBarChart'
import { mapState } from "vuex"
export default {
name: "analysis",
props: ["customerId", "tableHeight"],
props: ["customerId", "tableHeight", "transLabelObj"],
components: {
CommonLineChart,
LineBarChart


+ 12
- 4
src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue View File

@ -17,13 +17,18 @@ export default {
customerId: {
type: String,
default: ''
}
},
transLabelObj: {
type: Object,
default: {}
}
},
data() {
return {
// chart: null,
xDataArray: [],
seriesArray: [],
copyXDataArray: [],
}
},
watch: {
@ -38,11 +43,14 @@ export default {
this.xDataArray = []
this.seriesArray = []
if (newValue.length > 0) {
this.xDataArray = newValue[0].SortKeys
this.copyXDataArray = JSON.parse(JSON.stringify(newValue[0].SortKeys))
this.xDataArray = newValue[0].SortKeys.map(el => {
return this.transLabelObj[el]
})
}
newValue.forEach(el => {
receivableArray = []
this.xDataArray.forEach(elChild => {
this.copyXDataArray.forEach(elChild => {
receivableArray.push(el.Item[elChild])
})
this.seriesArray.push({
@ -122,7 +130,7 @@ export default {
data: this.xDataArray,
axisLabel: { //
interval: 0,
rotate:'80',//
rotate:'10',//
},
},
yAxis: {


+ 3
- 2
src/views/plan/workbench/homePage/formal/index.vue View File

@ -6,10 +6,11 @@
:customerId="customerId"
:isShowComponent="isShowComponent"
:tableHeight="tableHeight"
:transLabelObj="transLabelObj"
@calculateTableHeight="calculateTableHeight"/>
</el-tab-pane>
<el-tab-pane label="偏差分析" name="second">
<Analysis :customerId="customerId" :tableHeight="tableHeight"/>
<Analysis :customerId="customerId" :transLabelObj="transLabelObj" :tableHeight="tableHeight"/>
</el-tab-pane>
<el-tab-pane label="客户零件清单" name="third">
<Parts
@ -31,7 +32,7 @@ export default {
Analysis,
Parts
},
props: ["customerId","tableHeight"],
props: ["customerId","tableHeight","transLabelObj"],
data() {
return {
activeName: 'first',


+ 2
- 2
src/views/plan/workbench/homePage/formal/versions/index.vue View File

@ -31,7 +31,7 @@
</el-table-column>
<el-table-column v-for="(item, index) in headers"
:key="item"
:width="getRowWidth(item)" :label="item" min-width="150">
:width="getRowWidth(item)" :label="transLabelObj[item]" min-width="150">
<template v-slot="{ row }">{{ (row.Item?.[index]?.[item]) }}</template>
</el-table-column>
</el-table>
@ -42,7 +42,7 @@
import { get } from "@/server/api.js";
import queryComponent from '@/components/queryComponent'
export default {
props: ["customerId", "isShowComponent","tableHeight"],
props: ["customerId", "isShowComponent","tableHeight","transLabelObj"],
components: {
queryComponent
},


+ 12
- 3
src/views/plan/workbench/homePage/index.vue View File

@ -8,13 +8,13 @@
</div>
<!-- 右侧预测版本列表正式订单产品需求 -->
<div class="homepage-top-right-wrap">
<Beta :customerId="customerId" :CreateModel="CreateModel" @calculateTableHeight="calculateTableHeight" :tableHeight="tableHeight" />
<Beta :customerId="customerId" :CreateModel="CreateModel" @calculateTableHeight="calculateTableHeight" :tableHeight="tableHeight" :transLabelObj="transLabelObj" />
</div>
</div>
<DragBar />
<!-- 下面模块多版本比较偏差分析客户零件清单 -->
<div class="homepage-bottom-wrap" id="bottom">
<Formal :customerId="customerId" @calculateTableHeight="calculateFormalTableHeight" :tableHeight="formalTableHeight" />
<Formal :customerId="customerId" :transLabelObj="transLabelObj" @calculateTableHeight="calculateFormalTableHeight" :tableHeight="formalTableHeight" />
</div>
</ContentContainer>
</template>
@ -22,6 +22,7 @@
import Customer from './customer'
import Beta from './beta'
import Formal from './formal'
import { get } from "@/server/api.js";
export default {
components:{
Customer,
@ -35,6 +36,7 @@ export default {
customerId: "",
CreateModel: "",
currentCustomId: '',
transLabelObj: {},
}
},
methods: {
@ -47,10 +49,17 @@ export default {
},
calculateFormalTableHeight(height){
this.formalTableHeight = height
}
},
getTransLabel() {
get('/user/week_to_date').then(({data})=>{
this.transLabelObj = data || {}
})
},
},
created() {
this.getTransLabel()
this.currentCustomId = this.$route.query.CustomerId
},
mounted () {
this.dragChangeSize((topHeight,bottomHeight) => {


+ 11
- 3
src/views/plan/workbench/materialAnalysis/chart/commonLineChart.vue View File

@ -15,6 +15,10 @@ export default {
type: String,
default: ''
},
transLabelObj: {
type: Object,
default: {}
}
},
data() {
return {
@ -23,6 +27,7 @@ export default {
seriesArray: [],
maxValue: '',
minValue: '',
copyXDataArray: [],
}
},
watch: {
@ -41,11 +46,14 @@ export default {
this.xDataArray = []
this.seriesArray = []
if (currentValue && currentValue.SortKeys) {
this.xDataArray = currentValue.SortKeys
this.copyXDataArray = JSON.parse(JSON.stringify(currentValue.SortKeys))
this.xDataArray = currentValue.SortKeys.map(el => {
return this.transLabelObj[el]
})
}
(newValue.PerCustomerDeviationDetailItem || []).forEach(el => {
receivableArray = []
this.xDataArray.forEach(elChild => {
this.copyXDataArray.forEach(elChild => {
receivableArray.push(el.Item[elChild])
})
this.seriesArray.push({
@ -116,7 +124,7 @@ export default {
data: this.xDataArray,
axisLabel: { //
interval: 0,
rotate:'80',//
rotate:'10',//
},
},
legend: {


+ 3
- 3
src/views/plan/workbench/materialAnalysis/chart/index.vue View File

@ -15,10 +15,10 @@
</div>
<div class="chart-bottom-wrap">
<div class="chart-bottom-top">
<CommonLineChart :dataList="dataList" />
<CommonLineChart :dataList="dataList" :transLabelObj="transLabelObj" />
</div>
<div class="chart-bottom-bottom">
<LineBarChart :dataList="dataList" />
<LineBarChart :dataList="dataList" :transLabelObj="transLabelObj" />
</div>
</div>
</div>
@ -30,7 +30,7 @@ import CommonLineChart from './commonLineChart'
import LineBarChart from './lineBarChart'
export default {
name: "analysis",
props: ["queryParams", 'versionId'],
props: ["queryParams", 'versionId', 'transLabelObj'],
components: {
QueryComponent,
CommonLineChart,


+ 11
- 3
src/views/plan/workbench/materialAnalysis/chart/lineBarChart.vue View File

@ -15,6 +15,10 @@ export default {
type: String,
default: ''
},
transLabelObj: {
type: Object,
default: {}
}
},
data() {
return {
@ -23,6 +27,7 @@ export default {
seriesArray: [],
maxValue: '',
minValue: '',
copyXDataArray: [],
}
},
watch: {
@ -41,11 +46,14 @@ export default {
this.xDataArray = []
this.seriesArray = []
if (currentValue && currentValue.SortKeys) {
this.xDataArray = currentValue.SortKeys
this.copyXDataArray = JSON.parse(JSON.stringify(currentValue.SortKeys))
this.xDataArray = currentValue.SortKeys.map(el => {
return this.transLabelObj[el]
})
}
newValue.CustomerDeviationDetailItem.forEach(el => {
receivableArray = []
this.xDataArray.forEach(elChild => {
this.copyXDataArray.forEach(elChild => {
receivableArray.push(el.Item[elChild])
})
this.seriesArray.push({
@ -125,7 +133,7 @@ export default {
data: this.xDataArray,
axisLabel: { //
interval: 0,
rotate:'80',//
rotate:'10',//
},
},
yAxis: {


+ 9
- 1
src/views/plan/workbench/materialAnalysis/index.vue View File

@ -13,7 +13,7 @@
</div>
<DragBar />
<div class="material-bottom-wrap" id="bottom">
<Chart :queryParams="queryParams" :versionId="versionId" />
<Chart :queryParams="queryParams" :versionId="versionId" :transLabelObj="transLabelObj" />
</div>
</ContentContainer>
</template>
@ -21,6 +21,7 @@
import Filter from './filter'
import Version from './version'
import Chart from './chart'
import { get } from "@/server/api.js";
export default {
components:{
Filter,
@ -32,9 +33,11 @@ export default {
withTheRingRadio: 'ring',
versionId: '',
queryParams: {},
transLabelObj: {},
}
},
mounted () {
this.getTransLabel()
this.dragChangeSize();
},
methods: {
@ -45,6 +48,11 @@ export default {
versionEmit(version) {
this.versionId = version
},
getTransLabel() {
get('/user/week_to_date').then(({data})=>{
this.transLabelObj = data || {}
})
},
},
}
</script>


Loading…
Cancel
Save