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-08-07 11:05:37 +08:00
parent 1f0a7cabfb 1e0755f2fe
commit 8d6c906733
12 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/foodManage/stockManage.js
View File

@ -341,7 +341,8 @@ export function delCheckInventoryApi(data) {
method: 'post', method: 'post',
headers: { headers: {
//"merchant-id":"378915229716713472", //"merchant-id":"378915229716713472",
} },
data: data
}) })
} }
@ -400,7 +401,8 @@ export function delGoodsTransferApi(data) {
method: 'post', method: 'post',
headers: { headers: {
//"merchant-id":"378915229716713472", //"merchant-id":"378915229716713472",
} },
data: data
}) })
} }

2
src/views/foodManage/pickManage/materialPicking/detail.vue
View File

@ -60,7 +60,7 @@
<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> <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="库存数量" align="center" prop="inventoryNum" :show-overflow-tooltip="true"/> <el-table-column label="库存数量" align="center" prop="materialNum" :show-overflow-tooltip="true"/>
<el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true"/> <el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true"/>
<el-table-column label="货品数量" align="center" prop="fetchNum" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="货品数量" align="center" prop="fetchNum" :show-overflow-tooltip="true"></el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"></el-table-column>

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

@ -83,7 +83,7 @@
<el-table-column label="档口名称" align="center" prop="stallName" :show-overflow-tooltip="true"/> <el-table-column label="档口名称" align="center" prop="stallName" :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">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.fetchNum" placeholder="请输入" maxlength="10" clearable @change="patternValue(scope.row)"/> <el-input v-model="scope.row.fetchNum" placeholder="请输入" maxlength="7" clearable @change="patternValue(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true">

9
src/views/foodManage/pickManage/materialPicking/index.vue
View File

@ -90,7 +90,8 @@
</el-table-column> </el-table-column>
<el-table-column label="单据编号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" /> <el-table-column label="单据编号" align="center" prop="fetchMaterialCode" :show-overflow-tooltip="true" />
<el-table-column label="采购领料标题" align="center" prop="title" :show-overflow-tooltip="true" /> <el-table-column label="采购领料标题" align="center" prop="title" :show-overflow-tooltip="true" />
<el-table-column label="领料单状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
<!-- <el-table-column label="领料单状态" align="center" prop="commitStatus" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.commitStatus==1">待提交</span> <span v-if="scope.row.commitStatus==1">待提交</span>
<span v-if="scope.row.commitStatus==2">已提交</span> <span v-if="scope.row.commitStatus==2">已提交</span>
@ -109,12 +110,14 @@
<span v-if="scope.row.approveStatus==3">审批同意</span> <span v-if="scope.row.approveStatus==3">审批同意</span>
<span v-if="scope.row.approveStatus==4">审批拒绝</span> <span v-if="scope.row.approveStatus==4">审批拒绝</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/> <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/> <el-table-column label="所属食堂" align="center" prop="canteenName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="120"/> <el-table-column label="所属档口" align="center" prop="stallName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="货品数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="100"/> <el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="货品数量" align="center" prop="totalNum" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="已领取数量" align="center" prop="outNum" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="领料人" align="center" prop="fetchUser" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="领料日期" align="center" prop="fetchMaterialTime" :show-overflow-tooltip="true" width="150"/> <el-table-column label="领料日期" align="center" prop="fetchMaterialTime" :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="" :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="" :show-overflow-tooltip="true" width="120"/> -->

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

@ -134,12 +134,12 @@
</el-table-column> </el-table-column>
<el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true"> <el-table-column label="单价（元）" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/> <el-input v-model="scope.row.singlePrice" placeholder="请输入" maxlength="7" clearable @input="(v)=>(scope.row.singlePrice=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true"> <el-table-column label="数量" align="center" prop="orderNum" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model.number="scope.row.orderNum" placeholder="请输入" maxlength="10" clearable @input="(v)=>(scope.row.orderNum=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/> <el-input v-model.number="scope.row.orderNum" placeholder="请输入" maxlength="7" clearable @input="(v)=>(scope.row.orderNum=v.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1'))"/>
</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">

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

@ -283,6 +283,7 @@ export default {
this.baseInfo = response.data; this.baseInfo = response.data;
console.log("this.baseInfo",this.baseInfo); console.log("this.baseInfo",this.baseInfo);
this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime]) this.$set(this.baseInfo,'dateRange',[this.baseInfo.startTime,this.baseInfo.endTime])
this.$set(this.baseInfo,'supplierIds',this.baseInfo.supplierIds.split(','))
this.materialList = this.baseInfo.detailList; this.materialList = this.baseInfo.detailList;
supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => { supplierPageApi({ isPaging:1,areaIdList:[] }).then((response) => {
this.supplierOptions = response.rows||[]; this.supplierOptions = response.rows||[];
@ -488,7 +489,7 @@ export default {
param.startTime = this.formatDateTime(this.baseInfo.dateRange[0]) param.startTime = this.formatDateTime(this.baseInfo.dateRange[0])
param.endTime = this.formatDateTime(this.baseInfo.dateRange[1]) param.endTime = this.formatDateTime(this.baseInfo.dateRange[1])
param.requestArrivalTime = this.formatDateTime(this.baseInfo.requestArrivalTime) param.requestArrivalTime = this.formatDateTime(this.baseInfo.requestArrivalTime)
param.status=2 param.status=3
param.detailList = [] param.detailList = []
if(param.supplierIds.length==0){ if(param.supplierIds.length==0){
this.$modal.msgError("表格数据请填写完整！"); this.$modal.msgError("表格数据请填写完整！");

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

@ -297,7 +297,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除数据项？').then(function() { this.$modal.confirm('是否确认删除数据项？').then(function() {
return delGoodsTransferApi({outIds:[row.outId]}); return delGoodsTransferApi({goodsTransferId:row.goodsTransferId});
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");

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

@ -154,10 +154,7 @@
<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="intoCode" :show-overflow-tooltip="true" width="200"/> --> <el-table-column label="单价" align="center" prop="price" :show-overflow-tooltip="true">
<!-- <el-table-column label="入库时间" align="center" prop="intoDate" :show-overflow-tooltip="true" /> -->
<el-table-column label="入库数量" align="center" prop="purNum" :show-overflow-tooltip="true" />
<el-table-column label="单价" align="center" prop="price" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ (scope.row.price/100).toFixed(2) }}</span> <span>{{ (scope.row.price/100).toFixed(2) }}</span>
</template> </template>

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

@ -309,7 +309,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
this.$modal.confirm('是否确认删除数据项？').then(function() { this.$modal.confirm('是否确认删除数据项？').then(function() {
return delCheckInventoryApi({checkIds:[row.checkId]}); return delCheckInventoryApi({checkId:row.checkId});
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");

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

@ -74,7 +74,7 @@
<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">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model.number="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/> <el-input v-model="scope.row.fetchNum" placeholder="请输入" maxlength="8" clearable @change="patternValue(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -253,7 +253,7 @@ export default {
wareHouseOptions:[], wareHouseOptions:[],
pickerOptions: { pickerOptions: {
disabledDate(v) { disabledDate(v) {
return v.getTime() < (new Date().getTime() - 86400000);// - 86400000是否包括当天 return v.getTime() > (new Date().getTime() + 86400000);// - 86400000是否包括当天
} }
}, },
materialList:[],//货品信息-表格数据 materialList:[],//货品信息-表格数据

6
src/views/foodManage/stockReport/stockWarning/index.vue
View File

@ -50,9 +50,9 @@
<el-table-column label="最大库存" align="center" prop="maxNum" :show-overflow-tooltip="true" width="120"/> <el-table-column label="最大库存" align="center" prop="maxNum" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120"> <el-table-column label="库存状态" align="center" prop="inventoryStatus" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inventoryStatus==1">正常</span> <span v-if="scope.row.inventoryStatus==1" style="color: #1890ff;">正常</span>
<span v-if="scope.row.inventoryStatus==2">即将缺货</span> <span v-if="scope.row.inventoryStatus==2" style="color: #ffc833;">即将缺货</span>
<span v-if="scope.row.inventoryStatus==3">超额</span> <span v-if="scope.row.inventoryStatus==3" style="color: red;">超额</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

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

@ -72,7 +72,7 @@
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商编号" align="center" prop="supplierNum" :show-overflow-tooltip="true" width="120"/> <el-table-column label="供应商编号" align="center" prop="supplierCode" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120" /> <el-table-column label="供应商名称" align="center" prop="supplierName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/> <el-table-column label="所属区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" width="120"/> <el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" width="120"/>
@ -314,12 +314,12 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="职工人数" prop="workersNum"> <el-form-item label="职工人数" prop="workersNum">
<el-input v-model.number="form.workersNum" placeholder="请输入供应商电话" maxlength="10" clearable/> <el-input v-model.number="form.workersNum" placeholder="请输入职工人数" maxlength="9" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="目前服务的客户数量" prop="clientNum"> <el-form-item label="目前服务的客户数量" prop="clientNum">
<el-input v-model.number="form.clientNum" placeholder="请输入目前服务的客户数量" maxlength="10" clearable/> <el-input v-model.number="form.clientNum" placeholder="请输入目前服务的客户数量" maxlength="9" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@ -725,6 +725,7 @@ export default {
"imgUrl": "", "imgUrl": "",
fileList:[], fileList:[],
"mainFlag": 1, "mainFlag": 1,
isShowUpload:false
}, },
{ {
"qualificationCode": "", "qualificationCode": "",
@ -734,6 +735,7 @@ export default {
"imgUrl": "", "imgUrl": "",
fileList:[], fileList:[],
"mainFlag": 1, "mainFlag": 1,
isShowUpload:false
}, },
{ {
"qualificationCode": "", "qualificationCode": "",
@ -743,6 +745,7 @@ export default {
"imgUrl": "", "imgUrl": "",
fileList:[], fileList:[],
"mainFlag": 1, "mainFlag": 1,
isShowUpload:false
}, },
{ {
"qualificationCode": "", "qualificationCode": "",
@ -752,6 +755,7 @@ export default {
"imgUrl": "", "imgUrl": "",
fileList:[], fileList:[],
"mainFlag": 1, "mainFlag": 1,
isShowUpload:false
}, },
{ {
"qualificationCode": "", "qualificationCode": "",
@ -761,6 +765,7 @@ export default {
"imgUrl": "", "imgUrl": "",
fileList:[], fileList:[],
"mainFlag": 1, "mainFlag": 1,
isShowUpload:false
} }
] ]
this.fileList3=[] this.fileList3=[]
@ -870,7 +875,6 @@ export default {
if (res.code == 200) { if (res.code == 200) {
this.mainQualificationList[index].imgUrl = res.data.url; this.mainQualificationList[index].imgUrl = res.data.url;
this.mainQualificationList[index].isShowUpload = true; this.mainQualificationList[index].isShowUpload = true;
this.$forceUpdate()
} else { } else {
this.$modal.msgError(res.msg) this.$modal.msgError(res.msg)
} }
@ -878,11 +882,12 @@ export default {
.catch((error) => { .catch((error) => {
this.$modal.msgError(error) this.$modal.msgError(error)
}) })
}, },
handleRemoveMain(index) { handleRemoveMain(index) {
this.mainQualificationList[index].imgUrl=""; this.mainQualificationList[index].imgUrl="";
this.mainQualificationList[index].isShowUpload = false; this.mainQualificationList[index].isShowUpload = false;
this.$forceUpdate()
}, },
//附件上传 //附件上传