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

测试问题修改优化

This commit is contained in:
zzyuan 2025-11-06 10:20:09 +08:00
parent cac93fef29
commit 5116fcf7c1
15 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/foodManage/purchaseManage.js
View File

@ -166,6 +166,17 @@ export function getGoodsInquiryInfoApi(data) {
} }
}) })
} }
//获取采购询价详情
export function getGoodsInquiryInfoBySupplierIdApi(data) {
return request({
url: '/smart-canteen/ims_inquiry/getInfo',
method: 'post',
headers: {
//"merchant-id":"378915229716713472",
},
data: data
})
}
//获取报价供应商详情列表-查看报价 //获取报价供应商详情列表-查看报价
export function getGoodsInquirySupplierInfoApi(data) { export function getGoodsInquirySupplierInfoApi(data) {
return request({ return request({

11
src/views/foodManage/pickManage/materialPicking/edit.vue
View File

@ -49,7 +49,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="领料仓库" prop="warehouseId"> <el-form-item label="领料仓库" prop="warehouseId">
<el-select v-model="baseInfo.warehouseId" clearable :disabled="materialList.length>0" placeholder="请选择领料仓库" style="width: 100%;"> <el-select v-model="baseInfo.warehouseId" :disabled="materialList.length>0" placeholder="请选择领料仓库" style="width: 100%;">
<el-option v-for="item in wareHouseOptions" <el-option v-for="item in wareHouseOptions"
:key="item.warehouseId" :key="item.warehouseId"
:label="item.warehouseName" :label="item.warehouseName"
@ -480,14 +480,15 @@ export default {
}, },
//添加货品 //添加货品
addMaterial(){ addMaterial(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){ console.log(this.baseInfo.warehouseId)
if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
this.openDialog=true this.openDialog=true
this.resetQuery() this.resetQuery()
setTimeout(()=>{ setTimeout(()=>{
this.$refs.multipleTable1.clearSelection() this.$refs.multipleTable1.clearSelection()
},300) },300)
}else{ }else{
this.$modal.msgError("请先选择区域，仓库"); this.$modal.msgError("请先选择区域、仓库");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -647,14 +648,14 @@ export default {
}, },
//导入 //导入
importPurchasePlan(){ importPurchasePlan(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.canteenId!=undefined||this.baseInfo.stallId!=undefined){ if(this.baseInfo.areaId!=undefined&&this.baseInfo.canteenId!=undefined&&this.baseInfo.stallId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
this.openImportDialog=true this.openImportDialog=true
this.resetQuery2() this.resetQuery2()
// setTimeout(()=>{ // setTimeout(()=>{
// this.$refs.multipleTable2.clearSelection() // this.$refs.multipleTable2.clearSelection()
// },300) // },300)
}else{ }else{
this.$modal.msgError("请先选择区域，食堂，档口"); this.$modal.msgError("请先选择区域、食堂、档口、仓库");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */

7
src/views/foodManage/purchaseManage/contractList/edit.vue
View File

@ -737,14 +737,14 @@ export default {
}, },
//导入 //导入
importPurchaseOrder(){ importPurchaseOrder(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.deliveryWarehouseId!=undefined||this.baseInfo.supplierId!=undefined){ if(this.baseInfo.areaId!=undefined&&this.baseInfo.supplierId&&this.baseInfo.supplierId!=undefined){
this.openImportDialog=true this.openImportDialog=true
this.resetQuery2() this.resetQuery2()
// setTimeout(()=>{ // setTimeout(()=>{
// this.$refs.multipleTable2.clearSelection() // this.$refs.multipleTable2.clearSelection()
// },300) // },300)
}else{ }else{
this.$modal.msgError("请先选择区域，供应商"); this.$modal.msgError("请先选择区域、供应商");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -770,8 +770,7 @@ export default {
"orderGoodsCode": this.queryParams2.orderGoodsCode, "orderGoodsCode": this.queryParams2.orderGoodsCode,
"orderStatus":2, "orderStatus":2,
"isContract":1, "isContract":1,
"areaId": this.baseInfo.areaId, "areaId": this.baseInfo.areaId,
// "warehouseId": this.baseInfo.deliveryWarehouseId,
"supplierId": this.baseInfo.supplierId, "supplierId": this.baseInfo.supplierId,
} }
purchaseOrderPageApi(param).then(response => { purchaseOrderPageApi(param).then(response => {

3
src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue
View File

@ -231,7 +231,8 @@ export default {
console.log(row) console.log(row)
let param = { let param = {
"inquiryId": this.baseInfo.inquiryId, "inquiryId": this.baseInfo.inquiryId,
"supplierId":row.supplierId "supplierId":row.supplierId,
"quoteAmount":row.quoteAmount
} }
editInquirySupplierApi(param).then((response) => { editInquirySupplierApi(param).then((response) => {
console.log('response',response); console.log('response',response);

10
src/views/foodManage/purchaseManage/goodsInquiry/index.vue
View File

@ -103,11 +103,11 @@
<span v-if="scope.row.status!=2">未中选</span> <span v-if="scope.row.status!=2">未中选</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="中选供应商" align="center" prop="" :show-overflow-tooltip="true" /> <el-table-column label="中选供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
<el-table-column label="中选金额(元)" align="center" prop="" :show-overflow-tooltip="true" width="120"> <el-table-column label="中选金额(元)" align="center" prop="bidTotalPrice" :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.bidTotalPrice/100).toFixed(2) }}</span>
</template> --> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">

4
src/views/foodManage/purchaseManage/purchaseInspection/edit.vue
View File

@ -25,7 +25,7 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="送货仓库" prop="deliveryWarehouseId"> <el-form-item label="送货仓库" prop="deliveryWarehouseId">
<el-select v-model="baseInfo.deliveryWarehouseId" clearable placeholder="请选择送货仓库" :disabled="materialList.length>0" style="width: 100%;"> <el-select v-model="baseInfo.deliveryWarehouseId" placeholder="请选择送货仓库" :disabled="materialList.length>0" style="width: 100%;">
<el-option v-for="item in wareHouseOptions" <el-option v-for="item in wareHouseOptions"
:key="item.warehouseId" :key="item.warehouseId"
:label="item.warehouseName" :label="item.warehouseName"
@ -731,7 +731,7 @@ export default {
}, },
//导入 //导入
importPurchaseOrder(){ importPurchaseOrder(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.deliveryWarehouseId!=undefined||this.baseInfo.deliverySupplierId!=undefined){ if(this.baseInfo.areaId!=undefined&&this.baseInfo.deliveryWarehouseId!=undefined&&this.baseInfo.deliverySupplierId!=undefined){
this.openImportDialog=true this.openImportDialog=true
this.resetQuery2() this.resetQuery2()
// setTimeout(()=>{ // setTimeout(()=>{

4
src/views/foodManage/purchaseManage/purchaseOrder/edit.vue
View File

@ -799,14 +799,14 @@ export default {
//导入 //导入
importPurchasePlan(){ importPurchasePlan(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.canteenId!=undefined||this.baseInfo.stallId!=undefined){ if(this.baseInfo.areaId!=undefined&&this.baseInfo.canteenId&&this.baseInfo.canteenId!=undefined){
this.openImportDialog=true this.openImportDialog=true
this.resetQuery2() this.resetQuery2()
// setTimeout(()=>{ // setTimeout(()=>{
// this.$refs.multipleTable2.clearSelection() // this.$refs.multipleTable2.clearSelection()
// },300) // },300)
}else{ }else{
this.$modal.msgError("请先选择区域，食堂，档口"); this.$modal.msgError("请先选择区域、食堂");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */

2
src/views/foodManage/purchaseManage/purchaseOrder/index.vue
View File

@ -177,7 +177,7 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" v-if="scope.row.orderStatus==2||(scope.row.orderStatus==3&&scope.row.totalQualifiedNum<scope.row.totalNum)" icon="el-icon-edit" v-if="scope.row.orderStatus==2||(scope.row.orderStatus==3&&scope.row.totalQualifiedNum<scope.row.totalNum&&scope.row.ifAllInspect==2)"
@click="handlePurchaseInspection(scope.row)" @click="handlePurchaseInspection(scope.row)"
>生成采购验货</el-button> >生成采购验货</el-button>
<el-button <el-button

8
src/views/foodManage/stockManage/warehouseIn/edit.vue
View File

@ -17,7 +17,7 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="货品仓库" prop="warehouseId"> <el-form-item label="货品仓库" prop="warehouseId">
<el-select v-model="baseInfo.warehouseId" clearable :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;"> <el-select v-model="baseInfo.warehouseId" :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;">
<el-option v-for="item in wareHouseOptions" <el-option v-for="item in wareHouseOptions"
:key="item.warehouseId" :key="item.warehouseId"
:label="item.warehouseName" :label="item.warehouseName"
@ -312,7 +312,7 @@ export default {
pickerOptions2: { pickerOptions2: {
disabledDate(v) { disabledDate(v) {
return v.getTime() < (new Date().getTime() - 86400000) ||v.getTime() > (new Date().getTime() + 3600 * 1000 * 24 * 60);// - 86400000是否包括当天 return v.getTime() < (new Date().getTime() - 86400000) ||v.getTime() > (new Date().getTime() + 3600 * 1000 * 24 * 180);// - 86400000是否包括当天
} }
}, },
pickerOptions3: { pickerOptions3: {
@ -462,7 +462,7 @@ export default {
this.$refs.multipleTable1.clearSelection() this.$refs.multipleTable1.clearSelection()
},300) },300)
}else{ }else{
this.$modal.msgError("请先选择区域，仓库"); this.$modal.msgError("请先选择区域、仓库");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -668,7 +668,7 @@ export default {
// this.$refs.multipleTable2.clearSelection() // this.$refs.multipleTable2.clearSelection()
// },300) // },300)
}else{ }else{
this.$modal.msgError("请先选择区域，仓库"); this.$modal.msgError("请先选择区域、仓库");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */

10
src/views/foodManage/stockManage/warehouseOut/edit.vue
View File

@ -17,7 +17,7 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="货品仓库" prop="warehouseId"> <el-form-item label="货品仓库" prop="warehouseId">
<el-select v-model="baseInfo.warehouseId" clearable :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;"> <el-select v-model="baseInfo.warehouseId" :disabled="materialList.length>0" placeholder="请选择货品仓库" style="width: 100%;">
<el-option v-for="item in wareHouseOptions" <el-option v-for="item in wareHouseOptions"
:key="item.warehouseId" :key="item.warehouseId"
:label="item.warehouseName" :label="item.warehouseName"
@ -388,14 +388,14 @@ export default {
}, },
//添加货品 //添加货品
addMaterial(){ addMaterial(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){ if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
this.openDialog=true this.openDialog=true
this.resetQuery() this.resetQuery()
setTimeout(()=>{ setTimeout(()=>{
this.$refs.multipleTable1.clearSelection() this.$refs.multipleTable1.clearSelection()
},300) },300)
}else{ }else{
this.$modal.msgError("请先选择区域，仓库"); this.$modal.msgError("请先选择区域、仓库");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
@ -579,14 +579,14 @@ export default {
importMaterial(){ importMaterial(){
if(this.baseInfo.areaId!=undefined||this.baseInfo.warehouseId!=undefined){ if(this.baseInfo.areaId!=undefined&&this.baseInfo.warehouseId&&this.baseInfo.warehouseId!=undefined){
this.openImportDialog=true this.openImportDialog=true
this.resetQuery2() this.resetQuery2()
setTimeout(()=>{ setTimeout(()=>{
this.$refs.multipleTable2.clearSelection() this.$refs.multipleTable2.clearSelection()
},300) },300)
}else{ }else{
this.$modal.msgError("请先选择区域，仓库"); this.$modal.msgError("请先选择区域、仓库");
} }
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */

2
src/views/foodManage/stockManage/warehouseOut/index.vue
View File

@ -49,6 +49,7 @@
<el-option label="报损出库" :value="2"></el-option> <el-option label="报损出库" :value="2"></el-option>
<el-option label="退货出库" :value="3"></el-option> <el-option label="退货出库" :value="3"></el-option>
<el-option label="调拨出库" :value="4"></el-option> <el-option label="调拨出库" :value="4"></el-option>
<el-option label="即入即出" :value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -92,6 +93,7 @@
<span v-if="scope.row.outType==2">报损出库</span> <span v-if="scope.row.outType==2">报损出库</span>
<span v-if="scope.row.outType==3">退货出库</span> <span v-if="scope.row.outType==3">退货出库</span>
<span v-if="scope.row.outType==4">调拨出库</span> <span v-if="scope.row.outType==4">调拨出库</span>
<span v-if="scope.row.outType==5">即入即出</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="质检报告" align="center" prop="status" :show-overflow-tooltip="true" width="100"> <!-- <el-table-column label="质检报告" align="center" prop="status" :show-overflow-tooltip="true" width="100">

1
src/views/foodManage/stockReport/inoutDetails/index.vue
View File

@ -58,6 +58,7 @@
<span v-if="scope.row.recordType==2&&scope.row.outType==2">报损出库</span> <span v-if="scope.row.recordType==2&&scope.row.outType==2">报损出库</span>
<span v-if="scope.row.recordType==2&&scope.row.outType==3">退货出库</span> <span v-if="scope.row.recordType==2&&scope.row.outType==3">退货出库</span>
<span v-if="scope.row.recordType==2&&scope.row.outType==4">调拨出库</span> <span v-if="scope.row.recordType==2&&scope.row.outType==4">调拨出库</span>
<span v-if="scope.row.recordType==2&&scope.row.outType==5">即入即出</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="业务单据" align="center" prop="recordId" :show-overflow-tooltip="true" width="180"/> <el-table-column label="业务单据" align="center" prop="recordId" :show-overflow-tooltip="true" width="180"/>

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

@ -178,7 +178,7 @@
import { imgUpLoadTwo } from '@/api/system/upload' import { imgUpLoadTwo } from '@/api/system/upload'
import { systemAreaTreeApi } from "@/api/base/stall"; import { systemAreaTreeApi } from "@/api/base/stall";
import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/stockManage"; import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/stockManage";
import { getGoodsInquiryInfoApi,addGoodsInquiryApi,editGoodsQuotationApi,getGoodsInquiryDetailInfoApi } from "@/api/foodManage/purchaseManage"; import { getGoodsInquiryInfoBySupplierIdApi,addGoodsInquiryApi,editGoodsQuotationApi,getGoodsInquiryDetailInfoApi } from "@/api/foodManage/purchaseManage";
export default { export default {
name: "SupplierQuotationEdit", name: "SupplierQuotationEdit",
dicts: [], dicts: [],
@ -281,10 +281,11 @@ export default {
}, },
getContractInfo(){ getContractInfo(){
let param = { let param = {
inquiryId:this.supplierQuotationData.inquiryId inquiryId:this.supplierQuotationData.inquiryId,
supplierId:this.supplierQuotationData.supplierId
} }
//查询 //查询
getGoodsInquiryInfoApi(param).then((response) => { getGoodsInquiryInfoBySupplierIdApi(param).then((response) => {
this.baseInfo = response.data; this.baseInfo = response.data;
this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime]) this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])
this.materialList = this.baseInfo.detailList; this.materialList = this.baseInfo.detailList;
@ -320,7 +321,7 @@ export default {
handleSupplierChange(e){ handleSupplierChange(e){
let param = { let param = {
inquiryId:this.supplierQuotationData.inquiryId, inquiryId:this.supplierQuotationData.inquiryId,
supplierId:this.baseInfo.supplierId supplierId:this.supplierQuotationData.supplierId
} }
console.log("detailparam",param) console.log("detailparam",param)
//查询 //查询

1
src/views/foodManage/supplierFunction/supplierQuotation/index.vue
View File

@ -43,6 +43,7 @@
<span v-if="scope.row.bidStatus==4">未中标</span> <span v-if="scope.row.bidStatus==4">未中标</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报价供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
<el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" /> <el-table-column label="报价开始时间" align="center" prop="startTime" :show-overflow-tooltip="true" />
<el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" /> <el-table-column label="报价结束时间" align="center" prop="endTime" :show-overflow-tooltip="true" />
<!-- <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/> --> <!-- <el-table-column label="决标时间" align="center" prop="bidTime" :show-overflow-tooltip="true"/> -->

2
vue.config.js
View File

@ -36,7 +36,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://192.168.2.75:48380`,//旭 // target: `http://192.168.2.75:48380`,//旭
target: `http://192.168.0.34:48380`,//测试 target: `http://192.168.20.241:48380`,//测试
// target: `http://192.168.2.108:48380`,//测试 // target: `http://192.168.2.108:48380`,//测试
// target: `http://192.168.0.34:48380`,//测试 // target: `http://192.168.0.34:48380`,//测试
// target: `http://192.168.0.176:48380`,// // target: `http://192.168.0.176:48380`,//