Browse Source

修复客户询单bug

pull/21/head
xuxiaoming 3 years ago
parent
commit
a179f94868
4 changed files with 13 additions and 3 deletions
  1. +7
    -1
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue
  2. +1
    -0
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue
  3. +4
    -1
      src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue
  4. +1
    -1
      src/views/productionPlanning/customerInquiry/index.vue

+ 7
- 1
src/views/productionPlanning/customerForecastDemandReview/resourceContent/index.vue View File

@ -14,6 +14,7 @@
ref="resourceLoadComponents" ref="resourceLoadComponents"
:resourceId="resourceId" :resourceId="resourceId"
:resourceType="resourceType" :resourceType="resourceType"
:Height="tableHeight+'px'"
@calculateTableHeight="calculateTableHeight" @calculateTableHeight="calculateTableHeight"
@handleCancelResource="handleCancelResource" /> @handleCancelResource="handleCancelResource" />
</el-tab-pane> </el-tab-pane>
@ -45,13 +46,18 @@ export default {
}, },
data() { data() {
return { return {
tableHeight:0,
evaluationLoading:false, evaluationLoading:false,
evaluationDataNew: [], evaluationDataNew: [],
evaluationDataOld: [], evaluationDataOld: [],
activeName: 'evaluation'
activeName: 'resourceLoad'
} }
}, },
methods: { methods: {
calculateTableHeight(height) {
console.log('%cindex.vue line:58 height', 'color: #007acc;', height);
this.tableHeight = (height -10)+"";
},
// //
handlePublic(param){ handlePublic(param){
param.data = JSON.stringify(param.data); param.data = JSON.stringify(param.data);


+ 1
- 0
src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/detail.vue View File

@ -8,6 +8,7 @@
<div class="cl" ref="topTableRef"> <div class="cl" ref="topTableRef">
<el-table <el-table
:data="dataList" :data="dataList"
height="500px"
border size="mini" > border size="mini" >
<el-table-column <el-table-column
v-for="item in headers" v-for="item in headers"


+ 4
- 1
src/views/productionPlanning/customerForecastDemandReview/resourceContent/resourceLoad/index.vue View File

@ -59,7 +59,7 @@
v-loading="articleDemandLoading" v-loading="articleDemandLoading"
class="articleDemand-table" class="articleDemand-table"
:data="tableData" :data="tableData"
:height="tableHeight"
:height="Height"
:cell-class-name="cellStyle" :cell-class-name="cellStyle"
border size="mini" > border size="mini" >
<el-table-column <el-table-column
@ -120,6 +120,9 @@ export default {
type: String, type: String,
default:"" default:""
}, },
Height:{
type:String
}
}, },
data(){ data(){
return { return {


+ 1
- 1
src/views/productionPlanning/customerInquiry/index.vue View File

@ -114,7 +114,7 @@
import Add from "./add.vue"; import Add from "./add.vue";
import Upload from "./upload.vue"; import Upload from "./upload.vue";
import { ListMixin } from "@/mixins/newListMixin"; import { ListMixin } from "@/mixins/newListMixin";
import { getCustomerList ,customerorderreviewlist,exportExcel } from "@/server/plan/workbench/customerInquiry";
import { getCustomerList ,customerorderreviewlist,exportExcel } from "@/server/productionPlanning/customerInquiry";
export default { export default {
components: { components: {
Add, Add,


Loading…
Cancel
Save