bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/bonus-jyy-smart-canteen' into bonus-jyy-smart-canteen

This commit is contained in:
lizhenhua 2025-09-15 16:09:49 +08:00
parent 35d7787215 cfdb17bec7
commit 7d8e93e965
4 changed files with 97 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/foodManage/supplierFunction/supplierQuotation/detail.vue
View File

@ -186,6 +186,8 @@ export default {
//查询
getGoodsInquiryDetailInfoApi(param).then((response) => {
this.baseInfo = this.supplierQuotationData;
this.baseInfo.arrivalTime=response.data[0].arrivalTime;
console.log("this.baseInfo",this.baseInfo)
// this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])
this.materialList = response.data;
// supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {

9
src/views/foodManage/supplierFunction/supplierQuotation/edit.vue
View File

@ -86,7 +86,9 @@
<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="size" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="6" clearable @change="sumAmount" @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
@ -289,6 +291,7 @@ export default {
supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
this.supplierOptions = response.rows||[];
});
this.handleSupplierChange();
});
},
//区域树
@ -322,11 +325,13 @@ export default {
console.log("detailparam",param)
//查询
getGoodsInquiryDetailInfoApi(param).then((response) => {
console.log('response',response);
console.log('responseCCCC',response);
this.materialList = response.data;
console.log("this.materialList",this.materialList);
if(this.materialList==null||this.materialList.length==0||this.materialList==undefined){
this.$modal.msgError("该供应商不在询价供应商之类！");
}else{
console.log("获取供应商报价信息");
}
this.baseInfo.arrivalTime=this.materialList[0].arrivalTime
});

18
src/views/foodManage/supplierManage/supplyStatistics/index.vue
View File

@ -1,19 +1,7 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="日期">
<el-date-picker
v-model="dateRange"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
format="yyyy-MM-dd" style="width: 220px"
:picker-options="pickerOptions" >
</el-date-picker>
</el-form-item>
<!-- SS -->
<el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="queryParams.areaId"
:options="treeOptions" :filterable="true" style="width: 240px;" :show-all-levels="false"
@ -65,8 +53,8 @@
</template>
</el-table-column>
<el-table-column label="采购订单数量" align="center" prop="orderNum" :show-overflow-tooltip="true" />
<el-table-column label="最近一次采购中标日期" align="center" prop="" :show-overflow-tooltip="true"/>
<el-table-column label="最近一次采购中标金额" align="center" prop="" :show-overflow-tooltip="true"/>
<el-table-column label="最近一次采购中标日期" align="center" prop="lastBidDate" :show-overflow-tooltip="true"/>
<el-table-column label="最近一次采购中标金额" align="center" prop="lastBidAmount" :show-overflow-tooltip="true"/>
</el-table>
<pagination

2
src/views/system/user/index.vue
View File

@ -216,6 +216,7 @@
align="center"
key="userName"
prop="userName"
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
@ -223,7 +224,6 @@
align="center"
key="userCode"
prop="userCode"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
<el-table-column