页面逻辑优化
This commit is contained in:
parent
2126b86e45
commit
0713089304
|
|
@ -88,16 +88,15 @@
|
||||||
<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="purNum" :show-overflow-tooltip="true" />
|
<el-table-column label="单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
|
||||||
<el-table-column label="报价数量" align="center" prop="quoteNum" :show-overflow-tooltip="true" />
|
|
||||||
<el-table-column label="中选单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
|
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
|
<span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="中选总价(元)" align="center" prop="totalPrice" :show-overflow-tooltip="true">
|
<el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="小计" align="center" prop="totalPrice" :show-overflow-tooltip="true">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ (scope.row.totalPrice/100).toFixed(2) }}</span>
|
<span>{{ ((scope.row.singlePrice/100)*scope.row.purNum).toFixed(2) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="display: flex;align-items: center;">
|
<div style="display: flex;align-items: center;">
|
||||||
<el-button type="primary" plain @click="addMaterial">添加货品</el-button>
|
<el-button type="primary" plain @click="addMaterial">添加货品</el-button>
|
||||||
<!-- <el-button type="primary" plain @click="importMaterial">导入领料单</el-button> -->
|
<el-button type="primary" plain @click="importMaterial">导入领料单</el-button>
|
||||||
<el-button type="danger" plain @click="delMaterial">删除</el-button>
|
<el-button type="danger" plain @click="delMaterial">删除</el-button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -147,8 +147,8 @@
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
<!-- 选择货品 -->
|
<!-- 选择领料单 -->
|
||||||
<el-dialog title="导入采购订单" :visible.sync="openImportDialog" width="70%" append-to-body >
|
<el-dialog title="导入领料单" :visible.sync="openImportDialog" width="70%" append-to-body >
|
||||||
<div style="width: 100%;height:620px;">
|
<div style="width: 100%;height:620px;">
|
||||||
<el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" label-width="90px">
|
<el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" label-width="90px">
|
||||||
<el-form-item label="领料单标题" prop="title">
|
<el-form-item label="领料单标题" prop="title">
|
||||||
|
|
@ -159,8 +159,7 @@
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-table v-loading="loading2" :data="tableListData2" ref="multipleTable2" height="520" :row-key="(row)=>{return row.fetchMaterialId}" @selection-change="handleSelectionChange3">
|
<el-table v-loading="loading2" :data="tableListData2" ref="multipleTable2" height="220" highlight-current-row @current-change="handleCurrentChange">
|
||||||
<el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
|
|
||||||
<el-table-column label="序号" align="center" width="80" type="index">
|
<el-table-column label="序号" align="center" width="80" type="index">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{(queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index + 1}}</span>
|
<span>{{(queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index + 1}}</span>
|
||||||
|
|
@ -184,6 +183,16 @@
|
||||||
:limit.sync="queryParams2.pageSize"
|
:limit.sync="queryParams2.pageSize"
|
||||||
@pagination="getList2"
|
@pagination="getList2"
|
||||||
/>
|
/>
|
||||||
|
<div>
|
||||||
|
<div>领料单明细</div>
|
||||||
|
<el-table :data="materialDetailsData" height="250">
|
||||||
|
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
|
||||||
|
<el-table-column label="计划采购数量" align="center" prop="purchaseNum" :show-overflow-tooltip="true" />
|
||||||
|
</el-table>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button type="primary" @click="">确 定</el-button>
|
<el-button type="primary" @click="">确 定</el-button>
|
||||||
|
|
@ -198,8 +207,8 @@ import { imgUpLoadTwo } from '@/api/system/upload'
|
||||||
import { systemAreaTreeApi } from "@/api/base/stall";
|
import { systemAreaTreeApi } from "@/api/base/stall";
|
||||||
import { systemMaterialTreeApi,getStockMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage";
|
import { systemMaterialTreeApi,getStockMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage";
|
||||||
import { getWarehouseOutInfoApi,addWarehouseOutApi,editWarehouseOutApi } from "@/api/foodManage/stockManage";
|
import { getWarehouseOutInfoApi,addWarehouseOutApi,editWarehouseOutApi } from "@/api/foodManage/stockManage";
|
||||||
|
import { fetchMaterialPageApi,getFetchMaterialInfoApi } from "@/api/foodManage/pickManage";
|
||||||
//warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi
|
//warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi
|
||||||
import { fetchMaterialPageApi } from "@/api/foodManage/pickManage";
|
|
||||||
export default {
|
export default {
|
||||||
name: "WarehouseOutEdit",
|
name: "WarehouseOutEdit",
|
||||||
dicts: [],
|
dicts: [],
|
||||||
|
|
@ -267,6 +276,7 @@ export default {
|
||||||
loading2:false,
|
loading2:false,
|
||||||
total2: 0, // 总条数
|
total2: 0, // 总条数
|
||||||
tableListData2: [],//导入弹窗-表格数据
|
tableListData2: [],//导入弹窗-表格数据
|
||||||
|
materialDetailsData:[]
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
@ -571,8 +581,16 @@ export default {
|
||||||
this.loading2 = false;
|
this.loading2 = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSelectionChange3(selection) {
|
//选中
|
||||||
|
handleCurrentChange(row){
|
||||||
|
console.log(row)
|
||||||
|
this.importRow = row;
|
||||||
|
let param = {
|
||||||
|
fetchMaterialId:this.importRow.fetchMaterialId
|
||||||
|
}
|
||||||
|
getFetchMaterialInfoApi(param).then((response) => {
|
||||||
|
this.materialDetailsData = response.rows||[];
|
||||||
|
});
|
||||||
},
|
},
|
||||||
patternValue(row){
|
patternValue(row){
|
||||||
row.fetchNum = row.fetchNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1')
|
row.fetchNum = row.fetchNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1')
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue