Browse Source

周转日映射

develop
wangxy 2 years ago
parent
commit
e05dc9e448
8 changed files with 19 additions and 13 deletions
  1. +7
    -4
      src/views/plan/workbench/homePage/beta/predict/index.vue
  2. +5
    -2
      src/views/plan/workbench/homePage/beta/predict/predictEdit.vue
  3. +1
    -1
      src/views/plan/workbench/homePage/formal/analysis/commonLineChart.vue
  4. +1
    -1
      src/views/plan/workbench/homePage/formal/analysis/lineBarChart.vue
  5. +1
    -1
      src/views/plan/workbench/homePage/formal/versions/index.vue
  6. +1
    -1
      src/views/plan/workbench/materialAnalysis/chart/commonLineChart.vue
  7. +1
    -1
      src/views/plan/workbench/materialAnalysis/chart/lineBarChart.vue
  8. +2
    -2
      src/views/plan/workbench/materialAnalysis/version/index.vue

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

@ -29,7 +29,7 @@
:key="item" :key="item"
:width="getRowWidth(item)" :width="getRowWidth(item)"
:label="getColumnName(item)" :label="getColumnName(item)"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template #default="scope"> <template #default="scope">
@ -42,13 +42,16 @@
<span v-else-if="item === 'AP_CustDemandVerHead-GlobalPublish'">{{ <span v-else-if="item === 'AP_CustDemandVerHead-GlobalPublish'">{{
scope.row["AP_CustDemandVerHead-GlobalPublish"] == 1 ? "是" : "否" scope.row["AP_CustDemandVerHead-GlobalPublish"] == 1 ? "是" : "否"
}}</span> }}</span>
<span v-else-if="item === 'AP_CustDemandVerHead-VersionId'">{{
transLabelObj[scope.row["AP_CustDemandVerHead-VersionId"]]
}}</span>
<span v-else-if="item === 'AP_CustDemandVerHead-Valid'">{{ <span v-else-if="item === 'AP_CustDemandVerHead-Valid'">{{
scope.row["AP_CustDemandVerHead-Valid"] == true ? "当前使用" : "" scope.row["AP_CustDemandVerHead-Valid"] == true ? "当前使用" : ""
}}</span> }}</span>
<span v-else>{{ scope.row[item] }}</span> <span v-else>{{ scope.row[item] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="350" fixed="right">
<el-table-column align="center" label="操作" width="270" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button <el-button
class="edit-button-style" class="edit-button-style"
@ -73,13 +76,13 @@
size="small" size="small"
>修改</el-button >修改</el-button
> >
<el-button
<!-- <el-button
class="edit-button-style" class="edit-button-style"
@click="handleCopy(scope.row)" @click="handleCopy(scope.row)"
icon="el-icon-document-copy" icon="el-icon-document-copy"
size="small" size="small"
>复制</el-button >复制</el-button
>
> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>


+ 5
- 2
src/views/plan/workbench/homePage/beta/predict/predictEdit.vue View File

@ -10,7 +10,7 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="getColumnName('AP_CustDemandVerHead-VersionId')" prop="AP_CustDemandVerHead-VersionId"> <el-form-item :label="getColumnName('AP_CustDemandVerHead-VersionId')" prop="AP_CustDemandVerHead-VersionId">
<el-input v-model="formData['AP_CustDemandVerHead-VersionId']" :disabled="item.title === '修改'" placeholder="请输入" />
<el-input v-model="formData['AP_CustDemandVerHead-VersionIdName']" :disabled="item.title === '修改'" placeholder="请输入" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="item.title !== '修改' && item.title !== '复制'"> <el-col :span="6" v-if="item.title !== '修改' && item.title !== '复制'">
@ -292,7 +292,10 @@ export default {
.then(res => { .then(res => {
if (res.code === 200) { if (res.code === 200) {
let formNewData = res.data let formNewData = res.data
this.formData = formNewData
this.formData = {
...formNewData,
"AP_CustDemandVerHead-VersionIdName": this.transLabelObj[res.data['AP_CustDemandVerHead-VersionId']]
}
this.CustDemandVerDetail = res.data['CustDemandVerDetail'] this.CustDemandVerDetail = res.data['CustDemandVerDetail']
if (formNewData['AP_CustDemandVerHead-CustomerItem'].length > 0) { if (formNewData['AP_CustDemandVerHead-CustomerItem'].length > 0) {
this.headers = (formNewData['AP_CustDemandVerHead-CustomerItem'][0].SortKeys) this.headers = (formNewData['AP_CustDemandVerHead-CustomerItem'][0].SortKeys)


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

@ -59,7 +59,7 @@ export default {
}) })
this.seriesArray.push({ this.seriesArray.push({
type: 'line', type: 'line',
name:el.VersionId,
name: this.transLabelObj[el.VersionId] || el.VersionId,
data: receivableArray, data: receivableArray,
markLine: { markLine: {
data: [ data: [


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

@ -55,7 +55,7 @@ export default {
}) })
this.seriesArray.push({ this.seriesArray.push({
type: 'bar', type: 'bar',
name:el.VersionId,
name: this.transLabelObj[el.VersionId] || el.VersionId,
data: receivableArray, data: receivableArray,
animationDuration animationDuration
}) })


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

@ -26,7 +26,7 @@
</el-table-column> </el-table-column>
<el-table-column label="版本" min-width="150" key="VersionId" :width="getRowWidth('VersionId')" > <el-table-column label="版本" min-width="150" key="VersionId" :width="getRowWidth('VersionId')" >
<template #default="scope"> <template #default="scope">
{{scope.row['VersionId']}}
{{transLabelObj[scope.row['VersionId']]}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for="(item, index) in headers" <el-table-column v-for="(item, index) in headers"


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

@ -58,7 +58,7 @@ export default {
}) })
this.seriesArray.push({ this.seriesArray.push({
type: 'line', type: 'line',
name: el.VersionId,
name: this.transLabelObj[el.VersionId] || el.VersionId,
data: receivableArray, data: receivableArray,
animationDuration animationDuration
}) })


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

@ -58,7 +58,7 @@ export default {
}) })
this.seriesArray.push({ this.seriesArray.push({
type: 'bar', type: 'bar',
name: el.VersionId,
name: this.transLabelObj[el.VersionId] || el.VersionId,
data: receivableArray, data: receivableArray,
animationDuration animationDuration
}) })


+ 2
- 2
src/views/plan/workbench/materialAnalysis/version/index.vue View File

@ -25,7 +25,7 @@
border> border>
<el-table-column label="版本号" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-VersionId"> <el-table-column label="版本号" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-VersionId">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row['AP_CustDemandVerHead-VersionId'] }}</span>
<span>{{ transLabelObj[scope.row['AP_CustDemandVerHead-VersionId']] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="客户" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-CustomerId"> <el-table-column label="客户" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-CustomerId">
@ -67,7 +67,7 @@
border> border>
<el-table-column label="版本号" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-VersionId"> <el-table-column label="版本号" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-VersionId">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row['AP_CustDemandVerHead-VersionId'] }}</span>
<span>{{ transLabelObj[scope.row['AP_CustDemandVerHead-VersionId']] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="客户" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-CustomerId"> <el-table-column label="客户" :show-overflow-tooltip="true" prop="AP_CustDemandVerHead-CustomerId">


Loading…
Cancel
Save