关联报表修改
This commit is contained in:
		
							parent
							
								
									8fbf0fed81
								
							
						
					
					
						commit
						015012e409
					
				| 
						 | 
					@ -86,21 +86,15 @@
 | 
				
			||||||
            <el-table-column label="生产计划单号" align="center" prop="productionPlanId" :show-overflow-tooltip="true" />
 | 
					            <el-table-column label="生产计划单号" align="center" prop="productionPlanId" :show-overflow-tooltip="true" />
 | 
				
			||||||
            <el-table-column label="采购计划单号" align="center" prop="planCode" :show-overflow-tooltip="true" />
 | 
					            <el-table-column label="采购计划单号" align="center" prop="planCode" :show-overflow-tooltip="true" />
 | 
				
			||||||
            <el-table-column label="采购计划时间" align="center" prop="purchaseDate" :show-overflow-tooltip="true" />
 | 
					            <el-table-column label="采购计划时间" align="center" prop="purchaseDate" :show-overflow-tooltip="true" />
 | 
				
			||||||
            <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
 | 
					 | 
				
			||||||
            <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>
 | 
					 | 
				
			||||||
            <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="120"/>
 | 
					 | 
				
			||||||
            <el-table-column label="计划采购货品总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" />
 | 
					            <el-table-column label="计划采购货品总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" />
 | 
				
			||||||
            <el-table-column label="采购预算金额(元)" align="center" prop="purchaseBudgetTotal" :show-overflow-tooltip="true">
 | 
					            <el-table-column label="采购预算金额(元)" align="center" prop="purchaseBudgetTotal" :show-overflow-tooltip="true">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                <span>{{ (scope.row.purchaseBudgetTotal/100).toFixed(2) }}</span>
 | 
					                <span>{{ (scope.row.purchaseBudgetTotal/100).toFixed(2) }}</span>
 | 
				
			||||||
                </template>  
 | 
					                </template>  
 | 
				
			||||||
            </el-table-column> 
 | 
					            </el-table-column> 
 | 
				
			||||||
            <el-table-column label="计划状态" align="center" prop="status" :show-overflow-tooltip="true" width="110">
 | 
					            <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="150"/>
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					            <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="150"/>
 | 
				
			||||||
                    <span v-if="scope.row.status==1">待发布</span>
 | 
					            <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="150"/>
 | 
				
			||||||
                    <span v-if="scope.row.status==2">已发布</span> 
 | 
					 | 
				
			||||||
                </template>  
 | 
					 | 
				
			||||||
            </el-table-column>   
 | 
					 | 
				
			||||||
        </el-table> 
 | 
					        </el-table> 
 | 
				
			||||||
        <pagination
 | 
					        <pagination
 | 
				
			||||||
        v-show="total2>0"
 | 
					        v-show="total2>0"
 | 
				
			||||||
| 
						 | 
					@ -134,20 +128,6 @@
 | 
				
			||||||
            </el-table-column>
 | 
					            </el-table-column>
 | 
				
			||||||
            <el-table-column label="采购订单号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" width="180"/>
 | 
					            <el-table-column label="采购订单号" align="center" prop="orderGoodsCode" :show-overflow-tooltip="true" width="180"/>
 | 
				
			||||||
            <el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true" width="180"/>  
 | 
					            <el-table-column label="采购订单标题" align="center" prop="orderTitle" :show-overflow-tooltip="true" width="180"/>  
 | 
				
			||||||
            <!-- <el-table-column label="提交状态" align="center" prop="orderStatus" :show-overflow-tooltip="true" width="100">
 | 
					 | 
				
			||||||
                <template slot-scope="scope">
 | 
					 | 
				
			||||||
                    <span v-if="scope.row.orderStatus==1">待提交</span>
 | 
					 | 
				
			||||||
                    <span v-if="scope.row.orderStatus==2">已提交</span> 
 | 
					 | 
				
			||||||
                </template>  
 | 
					 | 
				
			||||||
            </el-table-column> -->
 | 
					 | 
				
			||||||
            <!-- <el-table-column label="确认状态" align="center" prop="supplierConfirmStatus" :show-overflow-tooltip="true" width="100">
 | 
					 | 
				
			||||||
                <template slot-scope="scope">
 | 
					 | 
				
			||||||
                    <span v-if="scope.row.supplierConfirmStatus==1">待确认</span>
 | 
					 | 
				
			||||||
                    <span v-if="scope.row.supplierConfirmStatus==2">确认通过</span>
 | 
					 | 
				
			||||||
                    <span v-if="scope.row.supplierConfirmStatus==3">已拒绝</span> 
 | 
					 | 
				
			||||||
                </template>  
 | 
					 | 
				
			||||||
            </el-table-column> -->
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
            <el-table-column label="订单总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
 | 
					            <el-table-column label="订单总金额(元)" align="center" prop="orderAmount" :show-overflow-tooltip="true" width="120">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
 | 
					                <span>{{ (scope.row.orderAmount/100).toFixed(2) }}</span>
 | 
				
			||||||
| 
						 | 
					@ -155,14 +135,12 @@
 | 
				
			||||||
            </el-table-column>
 | 
					            </el-table-column>
 | 
				
			||||||
            <el-table-column label="货品总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/> 
 | 
					            <el-table-column label="货品总数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/> 
 | 
				
			||||||
            <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
 | 
					            <el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120"/>
 | 
				
			||||||
            <el-table-column label="交货日期" align="center" prop="requestArrivalTime" :show-overflow-tooltip="true" width="150"/> 
 | 
					            <el-table-column label="交货日期" align="center" prop="requestArrivalTime" :show-overflow-tooltip="true" width="120"/> 
 | 
				
			||||||
            <el-table-column label="所属区域-食堂-档口" align="center" prop="" :show-overflow-tooltip="true" width="250">
 | 
					            <el-table-column label="所属区域-食堂-档口" align="center" prop="" :show-overflow-tooltip="true" width="250">
 | 
				
			||||||
                <template slot-scope="scope">
 | 
					                <template slot-scope="scope">
 | 
				
			||||||
                <span>{{ scope.row.areaName }}-{{ scope.row.canteenName }}-{{ scope.row.stallName }}</span>
 | 
					                <span>{{ scope.row.areaName }}-{{ scope.row.canteenName }}-{{ scope.row.stallName }}</span>
 | 
				
			||||||
                </template>  
 | 
					                </template>  
 | 
				
			||||||
            </el-table-column>
 | 
					            </el-table-column>
 | 
				
			||||||
            <!-- <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="150"/> 
 | 
					 | 
				
			||||||
            <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="150"/>    --> 
 | 
					 | 
				
			||||||
        </el-table>
 | 
					        </el-table>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <pagination
 | 
					        <pagination
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue