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

测试问题修改

This commit is contained in:
zzyuan 2025-09-05 09:26:11 +08:00
parent beeb4efbc3
commit b4b0fbbe21
11 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/foodManage/baseInfo/baseSetting.vue
View File

@ -29,7 +29,7 @@
</div> </div>
</div> </div>
<div class="item"> <!-- <div class="item">
<div> <div>
<div> <div>
<span class="item-label">货品临期天数设置:</span> <span class="item-label">货品临期天数设置:</span>
@ -41,7 +41,7 @@
</div> </div>
<div style="color: #999;font-size: 14px;margin-top: 10px;">设置临期天数后，系统将根据货品的有效日期自动进行货品临期提醒</div> <div style="color: #999;font-size: 14px;margin-top: 10px;">设置临期天数后，系统将根据货品的有效日期自动进行货品临期提醒</div>
</div> </div>
</div> </div> -->
<div class="item"> <div class="item">
<div> <div>
<div> <div>
@ -84,7 +84,7 @@ export default {
return { return {
material_conversion_rounding_method:null, material_conversion_rounding_method:null,
purchase_plan_reference_price:null, purchase_plan_reference_price:null,
goods_expireing_day_reminder:null, // goods_expireing_day_reminder:null,
qualification_certificates_expiring_day_reminder:null, qualification_certificates_expiring_day_reminder:null,
goods_lacking_number_reminder:null, goods_lacking_number_reminder:null,
@ -107,9 +107,9 @@ export default {
if(item.itemName=='purchase_plan_reference_price'){ if(item.itemName=='purchase_plan_reference_price'){
this.purchase_plan_reference_price = item.itemValue this.purchase_plan_reference_price = item.itemValue
} }
if(item.itemName=='goods_expireing_day_reminder'){ // if(item.itemName=='goods_expireing_day_reminder'){
this.goods_expireing_day_reminder = item.itemValue // this.goods_expireing_day_reminder = item.itemValue
} // }
if(item.itemName=='qualification_certificates_expiring_day_reminder'){ if(item.itemName=='qualification_certificates_expiring_day_reminder'){
this.qualification_certificates_expiring_day_reminder = item.itemValue this.qualification_certificates_expiring_day_reminder = item.itemValue
} }
@ -123,7 +123,7 @@ export default {
let param = [ let param = [
{"itemName": "material_conversion_rounding_method","itemValue":this.material_conversion_rounding_method}, {"itemName": "material_conversion_rounding_method","itemValue":this.material_conversion_rounding_method},
{"itemName": "purchase_plan_reference_price","itemValue":this.purchase_plan_reference_price}, {"itemName": "purchase_plan_reference_price","itemValue":this.purchase_plan_reference_price},
{"itemName": "goods_expireing_day_reminder","itemValue":this.goods_expireing_day_reminder}, // {"itemName": "goods_expireing_day_reminder","itemValue":this.goods_expireing_day_reminder},
{"itemName": "qualification_certificates_expiring_day_reminder","itemValue":this.qualification_certificates_expiring_day_reminder}, {"itemName": "qualification_certificates_expiring_day_reminder","itemValue":this.qualification_certificates_expiring_day_reminder},
{"itemName": "goods_lacking_number_reminder","itemValue":this.goods_lacking_number_reminder}, {"itemName": "goods_lacking_number_reminder","itemValue":this.goods_lacking_number_reminder},
] ]

2
src/views/foodManage/purchaseManage/goodsInquiry/detail.vue
View File

@ -144,7 +144,7 @@ export default {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天
} }
}, },
materialLis:[], materialList:[],
openDialog:false, openDialog:false,
materialTreeOptions:[], materialTreeOptions:[],
// 查询参数 // 查询参数

6
src/views/foodManage/purchaseManage/purchaseOrder/detail.vue
View File

@ -85,7 +85,7 @@
</div> </div>
</div> </div>
<div style="width: 100%;height: 400px;overflow-y: auto;"> <div style="width: 100%;height: 400px;overflow-y: auto;">
<el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> --> <!-- <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" />
<!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> -->
@ -171,7 +171,7 @@ export default {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天
} }
}, },
materialLis:[], materialList:[],
openDialog:false, openDialog:false,
materialTreeOptions:[], materialTreeOptions:[],
// 查询参数 // 查询参数
@ -219,7 +219,7 @@ export default {
//查询查询食堂下拉结构 //查询查询食堂下拉结构
getPurchaseOrderInfoApi(param).then((response) => { getPurchaseOrderInfoApi(param).then((response) => {
this.baseInfo = response.data; this.baseInfo = response.data;
this.materialLis = this.baseInfo.orderGoodsDetailList; this.materialList = this.baseInfo.orderGoodsDetailList;
}); });
}, },
// 多选框选中数据 // 多选框选中数据

6
src/views/foodManage/stockManage/inventoryCount/detail.vue
View File

@ -36,7 +36,7 @@
</div> </div>
</div> </div>
<div style="width: 100%;height: 400px;overflow-y: auto;"> <div style="width: 100%;height: 400px;overflow-y: auto;">
<el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> --> <!-- <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" />
<!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> -->
@ -60,7 +60,7 @@
</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">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.actualNum*(scope.row.price/100) }}</span> <span>{{ (scope.row.actualNum*(scope.row.price/100)).toFixed(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="" :show-overflow-tooltip="true">
@ -142,7 +142,7 @@ export default {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天
} }
}, },
materialLis:[], materialList:[],
openDialog:false, openDialog:false,
materialTreeOptions:[], materialTreeOptions:[],
// 查询参数 // 查询参数

2
src/views/foodManage/stockManage/inventoryCount/edit.vue
View File

@ -85,7 +85,7 @@
</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">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.actualNum*(scope.row.price/100) }}</span> <span>{{ (scope.row.actualNum*(scope.row.price/100)).toFixed(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="" :show-overflow-tooltip="true">

6
src/views/foodManage/stockManage/warehouseIn/detail.vue
View File

@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div style="width: 100%;height: 400px;overflow-y: auto;"> <div style="width: 100%;height: 400px;overflow-y: auto;">
<el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> --> <!-- <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" />
<!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> -->
@ -130,7 +130,7 @@ export default {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天
} }
}, },
materialLis:[], materialList:[],
openDialog:false, openDialog:false,
materialTreeOptions:[], materialTreeOptions:[],
// 查询参数 // 查询参数
@ -178,7 +178,7 @@ export default {
//查询查询食堂下拉结构 //查询查询食堂下拉结构
getWarehouseInInfoApi(param).then((response) => { getWarehouseInInfoApi(param).then((response) => {
this.baseInfo = response.data; this.baseInfo = response.data;
this.materialLis = this.baseInfo.imsIntoInventoryDetailVOList; this.materialList = this.baseInfo.imsIntoInventoryDetailVOList;
}); });
}, },
// 多选框选中数据 // 多选框选中数据

6
src/views/foodManage/stockManage/warehouseOut/detail.vue
View File

@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div style="width: 100%;height: 400px;overflow-y: auto;"> <div style="width: 100%;height: 400px;overflow-y: auto;">
<el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> --> <!-- <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" />
<!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> -->
@ -140,7 +140,7 @@ export default {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天
} }
}, },
materialLis:[], materialList:[],
openDialog:false, openDialog:false,
materialTreeOptions:[], materialTreeOptions:[],
// 查询参数 // 查询参数
@ -188,7 +188,7 @@ export default {
//查询查询食堂下拉结构 //查询查询食堂下拉结构
getWarehouseOutInfoApi(param).then((response) => { getWarehouseOutInfoApi(param).then((response) => {
this.baseInfo = response.data; this.baseInfo = response.data;
this.materialLis = this.baseInfo.imsOutInventoryDetailVOList; this.materialList = this.baseInfo.imsOutInventoryDetailVOList;
}); });
}, },
// 多选框选中数据 // 多选框选中数据

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

@ -69,8 +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="" :show-overflow-tooltip="true"> <el-table-column label="金额(元)" align="center" prop="unitPrice" :show-overflow-tooltip="true">
</el-table-column> <template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
</template>
</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">
@ -125,13 +128,18 @@
<el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" /> <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="materialName" :show-overflow-tooltip="true" />
<el-table-column label="货品类别" align="center" prop="materialTypeName" :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="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">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<span v-if="scope.row.salesMode==1">按份</span> <span v-if="scope.row.salesMode==1">按份</span>
<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" >
<template slot-scope="scope">
<span>{{ (scope.row.unitPrice/100).toFixed(2) }}</span>
</template>
</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>

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

@ -52,7 +52,7 @@
</div> </div>
</div> </div>
<div style="width: 100%;height: 400px;overflow-y: auto;"> <div style="width: 100%;height: 400px;overflow-y: auto;">
<el-table v-loading="loading" :data="materialLis" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="materialList" ref="multipleTable" height="380" :row-key="(row)=>{return row.materialId}" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="50" align="center" :reserve-selection="true" /> --> <!-- <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" />
<!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> --> <!-- <el-table-column label="图片" align="center" prop="" :show-overflow-tooltip="true" /> -->
@ -136,7 +136,7 @@ export default {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天
} }
}, },
materialLis:[], materialList:[],
openDialog:false, openDialog:false,
materialTreeOptions:[], materialTreeOptions:[],
// 查询参数 // 查询参数

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

@ -460,7 +460,7 @@ export default {
this.loadingBtn=true; this.loadingBtn=true;
console.log("param",param) console.log("param",param)
editGoodsQuotationApi(param).then((response) => { editGoodsQuotationApi(param).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("报价成功");
this.loadingBtn=false this.loadingBtn=false
this.jumpList() this.jumpList()
}).catch(() => { }).catch(() => {

4
src/views/foodManage/supplierManage/supplierList/index.vue
View File

@ -337,13 +337,13 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="去年度营业收入" prop="lastYearOperatingIncome"> <el-form-item label="去年度营业收入" prop="lastYearOperatingIncome">
<el-input v-model="form.lastYearOperatingIncome" placeholder="请输入去年度营业收入" maxlength="10" clearable <el-input v-model="form.lastYearOperatingIncome" placeholder="请输入去年度营业收入" maxlength="8" clearable
@input="(v)=>(form.lastYearOperatingIncome=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/> @input="(v)=>(form.lastYearOperatingIncome=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="前年度营业收入" prop="beforeYearOperatingIncome"> <el-form-item label="前年度营业收入" prop="beforeYearOperatingIncome">
<el-input v-model="form.beforeYearOperatingIncome" placeholder="请输入前年度营业收入" maxlength="10" clearable <el-input v-model="form.beforeYearOperatingIncome" placeholder="请输入前年度营业收入" maxlength="8" clearable
@input="(v)=>(form.beforeYearOperatingIncome=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/> @input="(v)=>(form.beforeYearOperatingIncome=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
</el-form-item> </el-form-item>
</el-col> </el-col>