测试问题修改
This commit is contained in:
		
							parent
							
								
									36aef6744f
								
							
						
					
					
						commit
						b8328b8047
					
				| 
						 | 
					@ -90,7 +90,7 @@
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="差异数" align="center" prop="" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="差异数" align="center" prop="" :show-overflow-tooltip="true">
 | 
				
			||||||
                        <template slot-scope="scope">
 | 
					                        <template slot-scope="scope">
 | 
				
			||||||
                            <span>{{ scope.row.actualNum-scope.row.bookNum }}</span>
 | 
					                            <span>{{ (scope.row.actualNum-scope.row.bookNum).toFixed(2) }}</span>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                     <!-- <el-table-column label="差异总额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
 | 
					                     <!-- <el-table-column label="差异总额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,14 +65,14 @@
 | 
				
			||||||
        <el-table-column label="盘点单号" align="center" prop="checkCode" :show-overflow-tooltip="true" /> 
 | 
					        <el-table-column label="盘点单号" align="center" prop="checkCode" :show-overflow-tooltip="true" /> 
 | 
				
			||||||
        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
 | 
					        <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true"/>
 | 
				
			||||||
        <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" /> 
 | 
					        <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" /> 
 | 
				
			||||||
        <el-table-column label="盘点员" align="center" prop="firstCheckUser" :show-overflow-tooltip="true" />
 | 
					        <el-table-column label="盘点员" align="center" prop="firstCheckUserName" :show-overflow-tooltip="true" />
 | 
				
			||||||
        <el-table-column label="盘点开始时间" align="center" prop="firstCheckDate" :show-overflow-tooltip="true" width="150"/>  
 | 
					        <el-table-column label="盘点开始时间" align="center" prop="firstCheckDate" :show-overflow-tooltip="true" width="150"/>  
 | 
				
			||||||
        <el-table-column label="盘点结束时间" align="center" prop="secondCheckDate" :show-overflow-tooltip="true" width="150"/>  
 | 
					        <el-table-column label="盘点结束时间" align="center" prop="secondCheckDate" :show-overflow-tooltip="true" width="150"/>  
 | 
				
			||||||
        <el-table-column label="差异总数" align="center" prop="" :show-overflow-tooltip="true" width="120"/>   
 | 
					        <el-table-column label="差异总数" align="center" prop="differNum" :show-overflow-tooltip="true" width="120"/>   
 | 
				
			||||||
        <el-table-column label="差异总额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120">
 | 
					        <el-table-column label="差异总额(元)" align="center" prop="totalProfitLoss" :show-overflow-tooltip="true" width="120">
 | 
				
			||||||
            <!-- <template slot-scope="scope">
 | 
					            <template slot-scope="scope">
 | 
				
			||||||
               <span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
 | 
					               <span>{{ (scope.row.totalProfitLoss/100).toFixed(2) }}</span>
 | 
				
			||||||
            </template>   -->
 | 
					            </template>  
 | 
				
			||||||
        </el-table-column>
 | 
					        </el-table-column>
 | 
				
			||||||
        <!-- <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
 | 
					        <!-- <el-table-column label="操作人" align="center" prop="createBy" :show-overflow-tooltip="true" width="120"/>
 | 
				
			||||||
        <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/>   -->
 | 
					        <el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" width="150"/>   -->
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -265,6 +265,7 @@ export default {
 | 
				
			||||||
            contractType:undefined,
 | 
					            contractType:undefined,
 | 
				
			||||||
            areaId:undefined,
 | 
					            areaId:undefined,
 | 
				
			||||||
            canteenId:undefined,  
 | 
					            canteenId:undefined,  
 | 
				
			||||||
 | 
					            intoDate:new Date()
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        // 表单校验
 | 
					        // 表单校验
 | 
				
			||||||
        baseRules: {
 | 
					        baseRules: {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -69,11 +69,11 @@
 | 
				
			||||||
                    <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
 | 
					                    <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
 | 
				
			||||||
                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"> 
 | 
					                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"> 
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="金额(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
 | 
					                    <!-- <el-table-column label="金额(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
 | 
				
			||||||
                           <template slot-scope="scope"> 
 | 
					                        <template slot-scope="scope"> 
 | 
				
			||||||
                            <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
 | 
					                            <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column>   
 | 
					                    </el-table-column>    -->
 | 
				
			||||||
                    <el-table-column label="入库时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> 
 | 
					                    <el-table-column label="入库时间" align="center" prop="createTime" :show-overflow-tooltip="true"/> 
 | 
				
			||||||
                    <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
 | 
					                    <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
 | 
				
			||||||
                    <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
 | 
					                    <el-table-column label="出库数量" align="center" prop="fetchNum" :show-overflow-tooltip="true">
 | 
				
			||||||
| 
						 | 
					@ -81,7 +81,7 @@
 | 
				
			||||||
                            <el-input v-if="!baseInfo.fetchMaterialId" v-model="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
 | 
					                            <el-input v-if="!baseInfo.fetchMaterialId" v-model="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
 | 
				
			||||||
                            <span v-else>{{ scope.row.fetchNum }}</span>
 | 
					                            <span v-else>{{ scope.row.fetchNum }}</span>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column>  
 | 
					                    </el-table-column>
 | 
				
			||||||
                </el-table>
 | 
					                </el-table>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
| 
						 | 
					@ -135,11 +135,11 @@
 | 
				
			||||||
                            <span v-if="scope.row.salesMode==2">称重</span>
 | 
					                            <span v-if="scope.row.salesMode==2">称重</span>
 | 
				
			||||||
                        </template> -->
 | 
					                        </template> -->
 | 
				
			||||||
                    </el-table-column> 
 | 
					                    </el-table-column> 
 | 
				
			||||||
                    <el-table-column label="单价" align="center" prop="unitPrice" :show-overflow-tooltip="true" >
 | 
					                    <!-- <el-table-column label="单价" align="center" prop="unitPrice" :show-overflow-tooltip="true" >
 | 
				
			||||||
                        <template slot-scope="scope"> 
 | 
					                        <template slot-scope="scope"> 
 | 
				
			||||||
                            <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
 | 
					                            <span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
 | 
				
			||||||
                        </template>
 | 
					                        </template>
 | 
				
			||||||
                    </el-table-column>  
 | 
					                    </el-table-column>   -->
 | 
				
			||||||
                    <el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />  
 | 
					                    <el-table-column label="货品库存" align="center" prop="materialNum" :show-overflow-tooltip="true" />  
 | 
				
			||||||
                    
 | 
					                    
 | 
				
			||||||
                </el-table>
 | 
					                </el-table>
 | 
				
			||||||
| 
						 | 
					@ -265,7 +265,7 @@ export default {
 | 
				
			||||||
            disabledDate(v) {
 | 
					            disabledDate(v) {
 | 
				
			||||||
                return v.getTime() > (new Date().getTime() + 86400000);//  - 86400000是否包括当天
 | 
					                return v.getTime() > (new Date().getTime() + 86400000);//  - 86400000是否包括当天
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }, 
 | 
					        },
 | 
				
			||||||
        materialList:[],//货品信息-表格数据
 | 
					        materialList:[],//货品信息-表格数据
 | 
				
			||||||
        batchIds:[],//货品信息-表格数据-多选
 | 
					        batchIds:[],//货品信息-表格数据-多选
 | 
				
			||||||
        openDialog:false,
 | 
					        openDialog:false,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue