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

测试问题修改

This commit is contained in:
zzyuan 2025-10-30 16:50:49 +08:00
parent a46d22933a
commit 18dd923bfa
26 changed files with 284 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ export function getMaterialListApi(data) {
params: data
})
}
export function fetchUsers(data) {
export function fetchUsersApi(data) {
return request({
url: '/smart-canteen/person_setting/getList',
method: 'get',

12
src/views/canteen/dish/dish/index.vue
View File

@ -555,7 +555,7 @@
</el-table-column>
<el-table-column label="主/辅料" align="center" key="materialType" prop="materialType">
<template slot-scope="scope">
<el-select v-model="scope.row.materialType" placeholder="请选择" style="width: 100%;margin-right: 20px;" clearable>
<el-select v-model="scope.row.materialType" placeholder="请选择" style="width: 100%;margin-right: 20px;">
<el-option label="主料" value="1" />
<el-option label="辅料" value="2" />
</el-select>
@ -1231,16 +1231,16 @@
if(this.baseForm.sizeType==1){
let obj = {
materialId: null,
materialType: null,
weight: null
materialType: "1",
weight: 0
}
this.dishesMaterialList.push(obj)
}else{
let obj = {
materialId: null,
materialType: null,
littleWeight: null,
largeWeight: null
materialType: "1",
littleWeight: 0,
largeWeight: 0
}
this.dishesMaterialList.push(obj)
}

101
src/views/canteen/dish/menu/detail.vue
View File

@ -406,12 +406,12 @@ export default {
}
}],
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 * 30);// - 86400000是否包括当天
}
},
pickerOptions2: {
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 * 30);// - 86400000是否包括当天
}
},
recipeDateList:[
@ -1150,6 +1150,33 @@ export default {
let currentItem = this.recipeOptions[index]
this.dialogQueryParams.recipeType = currentItem.recipeType
// console.log(currentItem)
this.dialogDetailList = [
{
mealtimeType:"1",
mealtimeName:"早餐",
dishesList:[]
},
{
mealtimeType:"2",
mealtimeName:"午餐",
dishesList:[]
},
{
mealtimeType:"3",
mealtimeName:"下午茶",
dishesList:[]
},
{
mealtimeType:"4",
mealtimeName:"晚餐",
dishesList:[]
},
{
mealtimeType:"5",
mealtimeName:"夜宵",
dishesList:[]
}
]
if(currentItem.recipeType==1){//日期
this.dialogQueryParams.applyDate = currentItem.applyDateList[0]||null;
this.pickerOptions2 = {
@ -1505,6 +1532,7 @@ export default {
//确认复制
confirmCopyMenu(){
this.$modal.confirm('当前日期会被覆盖！确定复制？').then(() => {
this.detailList=[]
this.detailList = [
{
mealtimeType:"1",
@ -1607,34 +1635,36 @@ export default {
this.$modal.confirm('所选日期数据会被覆盖！确定复制？').then(() => {
this.checkDateList.forEach(item=>{
let index = this.dateRangeList.findIndex(v=>v.applyDate.indexOf(item)>-1)
const arr = [
{
mealtimeType:"1",
mealtimeName:"早餐",
dishesList:[...this.detailList[0].dishesList]
},
{
mealtimeType:"2",
mealtimeName:"午餐",
dishesList:[...this.detailList[1].dishesList]
},
{
mealtimeType:"3",
mealtimeName:"下午茶",
dishesList:[...this.detailList[2].dishesList]
},
{
mealtimeType:"4",
mealtimeName:"晚餐",
dishesList:[...this.detailList[3].dishesList]
},
{
mealtimeType:"5",
mealtimeName:"夜宵",
dishesList:[...this.detailList[4].dishesList]
}
];
this.dateRangeList[index].detailList = JSON.parse(JSON.stringify(arr))
if(index>-1){
const arr = [
{
mealtimeType:"1",
mealtimeName:"早餐",
dishesList:[...this.detailList[0].dishesList]
},
{
mealtimeType:"2",
mealtimeName:"午餐",
dishesList:[...this.detailList[1].dishesList]
},
{
mealtimeType:"3",
mealtimeName:"下午茶",
dishesList:[...this.detailList[2].dishesList]
},
{
mealtimeType:"4",
mealtimeName:"晚餐",
dishesList:[...this.detailList[3].dishesList]
},
{
mealtimeType:"5",
mealtimeName:"夜宵",
dishesList:[...this.detailList[4].dishesList]
}
];
this.dateRangeList[index].detailList = JSON.parse(JSON.stringify(arr))
}
});
this.$modal.msgSuccess("复制成功");
this.openCopyDate = false
@ -1728,15 +1758,16 @@ export default {
// 获取日期弹窗数据
getRecentMonthDates() {
let startDate = new Date(new Date().getTime()-2*24*60*60*1000); // 获取当前日期
let currentDate = new Date(new Date().getTime()); // 获取当前日期
getRecentMonthDates() {
let startDate = new Date(new Date(this.dateRangeList[0].applyDate).getTime()-2*24*60*60*1000); // 获取当前日期
let currentDate = new Date(new Date(this.dateRangeList[0].applyDate).getTime()); // 获取当前日期
let monthDates = [];
let currentDates = [];
let month = new Date().getMonth() + 1; // 月份是从0开始计数的，所以要+1
let year = new Date().getFullYear();
this.currentMonth = `${year}年${month < 10 ? '0' + month : month}月`;
for (let i = 0; i < 14; i++) {
let dateLength = this.dateRangeList.length
for (let i = 0; i < (dateLength+7); i++) {
let day = startDate.getDate();
let month = startDate.getMonth() + 1; // 月份是从0开始计数的，所以要+1
//日期
@ -1752,7 +1783,7 @@ export default {
}
let arr = this.dateRangeRadio.split("-")
let str = arr[1]+'-'+arr[2]
for (let i = 0; i < 7; i++) {
for (let i = 0; i < dateLength; i++) {
let day = currentDate.getDate();
let month = currentDate.getMonth() + 1; // 月份是从0开始计数的，所以要+1
//日期

46
src/views/canteen/dish/menu/edit.vue
View File

@ -407,12 +407,12 @@ export default {
}
}],
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 * 30);// - 86400000是否包括当天
}
},
pickerOptions2: {
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 * 30);// - 86400000是否包括当天
}
},
recipeDateList:[
@ -1377,7 +1377,34 @@ export default {
let index = this.recipeOptions.findIndex(v=>v.recipeId==this.dialogQueryParams.recipeId)
let currentItem = this.recipeOptions[index]
this.dialogQueryParams.recipeType = currentItem.recipeType
console.log(currentItem)
// console.log(currentItem)
this.dialogDetailList = [
{
mealtimeType:"1",
mealtimeName:"早餐",
dishesList:[]
},
{
mealtimeType:"2",
mealtimeName:"午餐",
dishesList:[]
},
{
mealtimeType:"3",
mealtimeName:"下午茶",
dishesList:[]
},
{
mealtimeType:"4",
mealtimeName:"晚餐",
dishesList:[]
},
{
mealtimeType:"5",
mealtimeName:"夜宵",
dishesList:[]
}
]
if(currentItem.recipeType==1){//日期
this.dialogQueryParams.applyDate = currentItem.applyDateList[0]||null;
this.pickerOptions2 = {
@ -1735,7 +1762,7 @@ export default {
//确认复制
confirmCopyMenu(){
this.$modal.confirm('当前日期会被覆盖！确定复制？').then(() => {
// this.detailList=[]
this.detailList=[]
this.detailList = [
{
mealtimeType:"1",
@ -1960,14 +1987,15 @@ export default {
// 获取日期弹窗数据
getRecentMonthDates() {
let startDate = new Date(new Date().getTime()-2*24*60*60*1000); // 获取当前日期
let currentDate = new Date(new Date().getTime()); // 获取当前日期
let startDate = new Date(new Date(this.dateRangeList[0].applyDate).getTime()-2*24*60*60*1000); // 获取当前日期
let currentDate = new Date(new Date(this.dateRangeList[0].applyDate).getTime()); // 获取当前日期
let monthDates = [];
let currentDates = [];
let month = new Date().getMonth() + 1; // 月份是从0开始计数的，所以要+1
let year = new Date().getFullYear();
this.currentMonth = `${year}年${month < 10 ? '0' + month : month}月`;
for (let i = 0; i < 14; i++) {
let dateLength = this.dateRangeList.length
for (let i = 0; i < (dateLength+7); i++) {
let day = startDate.getDate();
let month = startDate.getMonth() + 1; // 月份是从0开始计数的，所以要+1
//日期
@ -1981,9 +2009,9 @@ export default {
monthDates.push(formattedDate);
startDate.setDate(startDate.getDate() + 1); // 获取前一天的日期
}
let arr = this.dateRangeRadio.split("-")
let arr = this.dateRangeRadio.split("-")
let str = arr[1]+'-'+arr[2]
for (let i = 0; i < 7; i++) {
for (let i = 0; i < dateLength; i++) {
let day = currentDate.getDate();
let month = currentDate.getMonth() + 1; // 月份是从0开始计数的，所以要+1
//日期

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

@ -537,7 +537,7 @@ export default {
{
type: "category",
inverse: true,
offset: -40,
offset: -30,
axisTick: "none",
axisLine: "none",
show: true,

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

@ -89,7 +89,7 @@
<el-input v-model="baseInfo.contractPerson" placeholder="请输入负责人" maxlength="20" clearable style="width: 240px"/>
</el-form-item> -->
<el-form-item label="负责人" prop="contractPerson">
<el-select v-model="contractPerson" placeholder="请选择负责人" clearable style="width: 240px">
<el-select v-model="baseInfo.contractPerson" placeholder="请选择负责人" clearable style="width: 240px">
<el-option
v-for="option in contractPersonOptions"
:key="option.value"
@ -158,7 +158,7 @@
</el-table-column>
<el-table-column label="总金额（元）" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.orderNum*scope.row.singlePrice).toFixed(4) }}</span>
<span>{{ (scope.row.orderNum*scope.row.singlePrice).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true">
@ -271,7 +271,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text"
@click="confirmImport(scope.row)" v-if="scope.row.orderStatus==2"
@click="confirmImport(scope.row)" v-if="scope.row.orderStatus==2||scope.row.orderStatus==3||scope.row.orderStatus==4"
>导入</el-button>
</template>
</el-table-column>
@ -297,7 +297,7 @@ import { imgUpLoadTwo } from '@/api/system/upload'
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";
import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/purchaseManage";
import { getPurchaseContractInfoApi,addPurchaseContractApi,editPurchaseContractApi,delPurchaseContractApi } from "@/api/foodManage/purchaseManage";
import { purchaseOrderPageApi,getPurchaseOrderInfoApi,fetchUsers } from "@/api/foodManage/purchaseManage";
import { purchaseOrderPageApi,getPurchaseOrderInfoApi,fetchUsersApi } from "@/api/foodManage/purchaseManage";
export default {
name: "ContractEdit",
dicts: [],
@ -401,13 +401,13 @@ export default {
methods: {
// 公用方法
fetchUsers() {
let param = {
pageNum:1,
pageSize: 1000,
roleId: 1
}
fetchUsers(param).then((response) => {
console.log(response);
let param = {
pageNum:1,
pageSize: 1000,
roleId: 1
}
fetchUsersApi(param).then((response) => {
console.log(response);
if (response.rows) {
// 从接口返回的数据中提取用户选项
this.contractPersonOptions = response.rows.map(user => ({
@ -573,15 +573,28 @@ export default {
confirmChosen(){
if(this.batchChosenMaterial.length>0){
this.loading = true;
let items = [...this.contractMaterialList,...this.batchChosenMaterial]
let uniqueItems = items.filter((item, index, array) => {
return array.findIndex((t) => (t.materialId === item.materialId)) === index;
});
this.contractMaterialList = uniqueItems
setTimeout(()=>{
this.loading = false
this.openDialog=false
},500)
if(this.baseInfo.orderGoodsId&&this.baseInfo.orderGoodsId!=""){
this.$modal.confirm('是否确认覆盖货品明细?').then(() => {
this.baseInfo.orderGoodsId = null
this.contractMaterialList = this.batchChosenMaterial
this.loading = false
this.openDialog=false
}).catch(() => {
this.loading = false
this.openDialog=false
});
}else{
let items = [...this.contractMaterialList,...this.batchChosenMaterial]
let uniqueItems = items.filter((item, index, array) => {
return array.findIndex((t) => (t.materialId === item.materialId)) === index;
});
this.contractMaterialList = uniqueItems
setTimeout(()=>{
this.loading = false
this.openDialog=false
},500)
}
}
},
//保存草稿
@ -756,7 +769,7 @@ export default {
"pageNum": this.queryParams2.pageNum,
"orderGoodsCode": this.queryParams2.orderGoodsCode,
"orderStatus":2,
// "isInspect":2,
"isContract":1,
"areaId": this.baseInfo.areaId,
// "warehouseId": this.baseInfo.deliveryWarehouseId,
"supplierId": this.baseInfo.supplierId,
@ -789,7 +802,7 @@ export default {
// this.$set(item,"qualifiedNum",Number(item.orderNum))
// }
})
// this.baseInfo.relateOrderGoodsId = this.importRow.orderGoodsCode;
this.baseInfo.orderGoodsId = this.importRow.orderGoodsId;
this.$set(this.baseInfo,"remark","导入采购订单")
setTimeout(()=>{
this.openImportDialog=false

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

@ -12,15 +12,15 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">询价状态</template>
<span v-if="baseInfo.status==1">未开始</span>
<span v-if="baseInfo.status==2">进行中</span>
<span v-if="baseInfo.status==3">已结束</span>
<span v-if="baseInfo.status==1">待提交</span>
<span v-if="baseInfo.status==2">已决价</span>
<span v-if="baseInfo.status==3">进行中</span>
<span v-if="baseInfo.status==4">未决标</span>
<span v-if="baseInfo.status==5">已取消</span>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">报价时间</template>
{{ baseInfo.startTime }} - {{ baseInfo.startTime }}
{{ baseInfo.startTime }} - {{ baseInfo.endTime }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">要求到货时间</template>
@ -63,7 +63,11 @@
<el-table-column label="序号" align="center" width="80" type="index" />
<el-table-column label="询价供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
<el-table-column label="供应商评分" align="center" prop="supplierScore" :show-overflow-tooltip="true" />
<el-table-column label="报价总金额" align="center" prop="quoteAmount" :show-overflow-tooltip="true" />
<el-table-column label="报价总金额" align="center" prop="quoteAmount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.quoteAmount/100).toFixed(2)||"" }}</span>
</template>
</el-table-column>
<el-table-column label="报价时间" align="center" prop="quoteTime" :show-overflow-tooltip="true" />
<el-table-column label="交货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
<el-table-column label="中选状态" align="center" prop="bidStatus" :show-overflow-tooltip="true" >

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

@ -12,14 +12,15 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">询价状态</template>
<span v-if="baseInfo.status==1">未开始</span>
<span v-if="baseInfo.status==2">进行中</span>
<span v-if="baseInfo.status==3">已结束</span>
<span v-if="baseInfo.status==1">待提交</span>
<span v-if="baseInfo.status==2">已决价</span>
<span v-if="baseInfo.status==3">进行中</span>
<span v-if="baseInfo.status==4">未决标</span>
<span v-if="baseInfo.status==5">已取消</span>
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">报价时间</template>
{{ baseInfo.startTime }} - {{ baseInfo.startTime }}
{{ baseInfo.startTime }} - {{ baseInfo.endTime }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">要求到货时间</template>

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

@ -54,7 +54,7 @@
<el-input v-model="baseInfo.linkMan" placeholder="请输入联系人" maxlength="20" clearable style="width: 240px"/>
</el-form-item> -->
<el-form-item label="联系人" prop="linkMan">
<el-select v-model="contractPerson" placeholder="请输入联系人" clearable style="width: 240px">
<el-select v-model="baseInfo.linkMan" placeholder="请输入联系人" clearable style="width: 240px">
<el-option
v-for="option in contractPersonOptions"
:key="option.value"
@ -259,7 +259,7 @@
</template>
<script>
import { fetchUsers } from "@/api/foodManage/purchaseManage";
import { fetchUsersApi } from "@/api/foodManage/purchaseManage";
import { imgUpLoadTwo } from '@/api/system/upload'
import { systemAreaTreeApi } from "@/api/base/stall";
import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi } from "@/api/foodManage/stockManage";
@ -407,7 +407,7 @@ export default {
pageSize: 1000,
roleId: 1
}
fetchUsers(param).then((response) => {
fetchUsersApi(param).then((response) => {
if (response.rows) {
// 从接口返回的数据中提取用户选项
this.contractPersonOptions = response.rows.map(user => ({

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

@ -286,7 +286,7 @@
</template>
<script>
import { fetchUsers } from "@/api/foodManage/purchaseManage";
import { fetchUsersApi } from "@/api/foodManage/purchaseManage";
import { imgUpLoadTwo } from '@/api/system/upload'
import { systemAreaTreeApi,getCanteenByAreaApi,getStallByCanteenApi } from "@/api/base/stall";
import { systemMaterialTreeApi,getMaterialListApi,supplierPageApi,drpWareHousePageApi } from "@/api/foodManage/purchaseManage";
@ -418,7 +418,7 @@ export default {
pageSize: 1000,
roleId: 1
}
fetchUsers(param).then((response) => {
fetchUsersApi(param).then((response) => {
console.log(response);
if (response.rows) {
// 从接口返回的数据中提取用户选项
@ -789,11 +789,11 @@ export default {
this.$set(item,"unitPrice",Number(item.singlePrice))
this.$set(item,"orderNum",item.orderNum)
if(item.totalQualifiedNum&&item.totalQualifiedNum>0){
this.$set(item,"deliveryNum",Number(item.orderNum)-Number(item.totalQualifiedNum))
this.$set(item,"qualifiedNum",Number(item.orderNum)-Number(item.totalQualifiedNum))
this.$set(item,"deliveryNum",(Number(item.orderNum)-Number(item.totalQualifiedNum)).toFixed(2))
this.$set(item,"qualifiedNum",(Number(item.orderNum)-Number(item.totalQualifiedNum)).toFixed(2))
}else{
this.$set(item,"deliveryNum",Number(item.orderNum))
this.$set(item,"qualifiedNum",Number(item.orderNum))
this.$set(item,"deliveryNum",Number(item.orderNum).toFixed(2))
this.$set(item,"qualifiedNum",Number(item.orderNum).toFixed(2))
}
})
// this.materialList = [];
@ -893,6 +893,12 @@ export default {
row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
},200)
}
}else{
if(Number(row.qualifiedNum)>Number(row.deliveryNum)){
setTimeout(()=>{
row.qualifiedNum = Number(row.deliveryNum)
},200)
}
}
// if(Number(row.deliveryNum)<(Number(row.orderNum)-Number(row.totalQualifiedNum))){
// setTimeout(()=>{

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

@ -652,7 +652,10 @@ export default {
this.materialList = this.batchChosenMaterial
this.loading = false
this.openDialog=false
}).catch(() => {});
}).catch(() => {
this.loading = false
this.openDialog=false
});
}else{
let items = [...this.materialList,...this.batchChosenMaterial]
let uniqueItems = items.filter((item, index, array) => {

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

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

2
src/views/foodManage/purchaseManage/purchasePlan/edit.vue
View File

@ -94,7 +94,7 @@
</el-table-column>
<el-table-column label="预计采购金额(元)" align="center" prop="" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.purchaseNum*scope.row.unitPrice }}</span>
<span>{{ (scope.row.purchaseNum*scope.row.unitPrice).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true">

6
src/views/foodManage/stockManage/depotManage/index.vue
View File

@ -172,7 +172,7 @@
<el-input v-model="form.manager" placeholder="请输入负责人" maxlength="20" style="width: 100%;"/>
</el-form-item> -->
<el-form-item label="负责人" prop="manager">
<el-select v-model="contractPerson" placeholder="请选择负责人" clearable style="width: 240px">
<el-select v-model="form.manager" placeholder="请选择负责人" clearable style="width: 240px">
<el-option
v-for="option in contractPersonOptions"
:key="option.value"
@ -200,7 +200,7 @@
<script>
import { systemAreaTreeApi,getCanteenByAreaApi } from "@/api/base/stall";
import { fetchUsers } from "@/api/foodManage/purchaseManage";
import { fetchUsersApi } from "@/api/foodManage/purchaseManage";
import { getWareHousePageApi,addWareHouseApi,editWareHouseApi,delWareHouseApi } from "@/api/foodManage/stockManage";
export default {
name: "",
@ -367,7 +367,7 @@ export default {
pageSize: 1000,
roleId: 1
}
fetchUsers(param).then((response) => {
fetchUsersApi(param).then((response) => {
console.log(response);
if (response.rows) {
// 从接口返回的数据中提取用户选项

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

@ -4,11 +4,11 @@
<el-descriptions style="margin-bottom: 20px;" title="基本信息" :column="4" size="medium" border>
<el-descriptions-item>
<template slot="label">调拨单号</template>
{{baseInfo.goodsTransferCode}}
{{ baseInfo.goodsTransferCode }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">调拨时间</template>
{{ }}
{{ baseInfo.createTime }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">调拨状态</template>
@ -61,7 +61,7 @@
<span v-if="scope.row.salesMode==2">称重</span>
</template> -->
</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="fetchNum" :show-overflow-tooltip="true"></el-table-column> -->
<el-table-column label="调货数量" align="center" prop="orderNum" :show-overflow-tooltip="true"></el-table-column>
</el-table>
</div>

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

@ -59,13 +59,14 @@
<el-table-column label="调拨区域" align="center" prop="areaName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="调出仓库" align="center" prop="outWarehouseName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="调入仓库" align="center" prop="intoWarehouseName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="调拨商品种类数量" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="调拨商品总数" align="center" prop="" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="调拨商品种类数量" align="center" prop="materialCount" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="调拨商品总数" align="center" prop="orderNumTotal" :show-overflow-tooltip="true" width="150"/>
<!-- <el-table-column label="总金额(元)" align="center" prop="" :show-overflow-tooltip="true" width="150">
<template slot-scope="scope">
<span>{{ (scope.row.totalAmount/100).toFixed(2) }}</span>
</template>
</el-table-column> -->
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" width="150"/>
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button

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

@ -516,7 +516,10 @@ export default {
this.materialList = this.batchChosenMaterial
this.loading = false
this.openDialog=false
}).catch(() => {});
}).catch(() => {
this.loading = false
this.openDialog=false
});
}else{
let items = [...this.materialList,...this.batchChosenMaterial]
let uniqueItems = items.filter((item, index, array) => {

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

@ -445,7 +445,10 @@ export default {
this.materialList = this.batchChosenMaterial
this.loading = false
this.openDialog=false
}).catch(() => {});
}).catch(() => {
this.loading = false
this.openDialog=false
});
}else{
let items = [...this.materialList,...this.batchChosenMaterial]
let uniqueItems = items.filter((item, index, array) => {

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

@ -63,7 +63,11 @@
<el-table-column label="数据来源" align="center" prop="dataForm" :show-overflow-tooltip="true" />
<el-table-column label="批次号" align="center" prop="intoCode" :show-overflow-tooltip="true" />
<el-table-column label="当前批次库存数" align="center" prop="inventoryNum" :show-overflow-tooltip="true" />
<el-table-column label="当前批次总金额（元）" align="center" prop="totalMoney" :show-overflow-tooltip="true" />
<el-table-column label="当前批次总金额（元）" align="center" prop="totalMoney" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.totalMoney/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
<el-table-column label="保质期" align="center" prop="expireTime" :show-overflow-tooltip="true" />
<el-table-column label="过期状态" align="center" prop="expireState" :show-overflow-tooltip="true" width="120">

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

@ -47,7 +47,7 @@
<el-table-column label="货品仓库" align="center" prop="warehouseName" :show-overflow-tooltip="true" />
<el-table-column label="发生时间" align="center" prop="outDate" :show-overflow-tooltip="true" />
<el-table-column label="发生人员" align="center" prop="fetchUserName" :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="outType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.recordType==1&&scope.row.outType==1">采购入库</span>

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

@ -28,7 +28,7 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">报价时间</template>
{{ baseInfo.startTime }} - {{ baseInfo.startTime }}
{{ baseInfo.startTime }} - {{ baseInfo.endTime }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">要求到货时间</template>
@ -67,7 +67,11 @@
</template> -->
</el-table-column>
<el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true" />
<el-table-column label="报价数量" align="center" prop="quoteNum" :show-overflow-tooltip="true" />
<el-table-column label="报价数量" align="center" prop="quoteNum" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ Number(scope.row.quoteNum).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="中选单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>

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

@ -33,7 +33,7 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">报价时间</template>
{{ baseInfo.startTime }} - {{ baseInfo.startTime }}
{{ baseInfo.startTime }} - {{ baseInfo.endTime }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">要求到货时间</template>

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

@ -73,7 +73,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="备选供应商" align="center" prop="supplierIdList" :show-overflow-tooltip="true" width="240">
<!-- <el-table-column label="备选供应商" align="center" prop="supplierIdList" :show-overflow-tooltip="true" width="240">
<template slot-scope="scope">
<el-select v-model="scope.row.supplierIdList" multiple collapse-tags :multiple-limit="3" placeholder="请选择供应商" style="width: 100%;" @change="changSupplierList(scope.row)" @clear="changSupplierList(scope.row)" clearable>
<el-option v-for="item in supplierOptions"
@ -84,7 +84,7 @@
></el-option>
</el-select>
</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="purchaseGoodsTime" :show-overflow-tooltip="true">
</el-table-column>
@ -154,7 +154,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="备选供应商" align="center" prop="supplierIdList" :show-overflow-tooltip="true">
<!-- <el-table-column label="备选供应商" align="center" prop="supplierIdList" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-select v-model="scope.row.supplierIdList" multiple collapse-tags :multiple-limit="3" placeholder="请选择供应商" style="width: 100%;" @change="changSupplierList(scope.row)" @clear="changSupplierList(scope.row)" clearable>
<el-option v-for="item in supplierOptions"
@ -165,7 +165,7 @@
></el-option>
</el-select>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<pagination
@ -221,7 +221,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<!-- <el-col :span="24">
<el-form-item label="备选供应商" prop="supplierIdList">
<el-select v-model="batchForm.supplierIdList" multiple :multiple-limit="3" collapse-tags placeholder="请选择备选供应商" style="width: 100%;" @change="dialogChangeSupplierList">
<el-option v-for="item in supplierOptions"
@ -232,7 +232,7 @@
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
<!-- <el-col :span="24">
<el-form-item label="是否供应" prop="ifSupply">
<el-select v-model="batchForm.ifSupply" placeholder="是否供应" style="width: 100%;">
@ -317,9 +317,9 @@ export default {
supplierId: [
{ required: true, message: "首选供应商不能为空", trigger: "change" }
],
supplierIdList: [
{ required: true, message: "备选供应商不能为空", trigger: "change" }
],
// supplierIdList: [
// { required: true, message: "备选供应商不能为空", trigger: "change" }
// ],
ifSupply: [
{ required: true, message: "是否供应不能为空", trigger: "change" }
],

12
src/views/ims/person_setting/index.vue
View File

@ -40,7 +40,7 @@
<el-table-column label="角色" align="center" prop="roleName" :show-overflow-tooltip="true"/>
<el-table-column label="照片" align="center" prop="photoUrl" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<img :src="scope.row.faceUrl" v-if="scope.row.faceUrl" alt="" style="width: 80px;height: 40px;" @click="openImg2(scope.row)">
<img :src="scope.row.photoUrl" v-if="scope.row.photoUrl" alt="" style="width: 80px;height: 40px;" @click="openImg2(scope.row)">
<span v-else>无</span>
</template>
</el-table-column>
@ -125,9 +125,7 @@
<el-col :span="12">
<el-form-item label="照片:">
<el-upload
:http-request="
(obj) => imgUpLoad0(obj, 'fileUrl')
"
:http-request="(obj) => imgUpLoad0(obj, 'fileUrl')"
action="#"
:limit="1"
:file-list="fileList0"
@ -353,7 +351,7 @@ export default {
imgUpLoadTwo(param).then((res) => {
if (res.code == 200) {
this.checkUrlList0.push(res.data.url)
this.$set(this.form,"faceUrl",res.data.url)
this.$set(this.form,"photoUrl",res.data.url)
} else {
this.$modal.msgError(res.msg)
}
@ -383,7 +381,7 @@ export default {
}
})
this.checkUrlList0.splice(sum, 1)
this.$set(this.form,"faceUrl","")
this.$set(this.form,"photoUrl","")
},
//图片点击查看
handlePictureCardPreview(file) {
@ -396,7 +394,7 @@ export default {
this.dialogVisible = true;
},
openImg2(row) {
this.dialogImageUrl = row.faceUrl;
this.dialogImageUrl = row.photoUrl;
this.dialogVisible = true;
}
}

8
src/views/ims/supplier_person/index.vue
View File

@ -40,7 +40,7 @@
<el-table-column label="角色" align="center" prop="roleName" :show-overflow-tooltip="true"/>
<el-table-column label="照片" align="center" prop="photoUrl" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<img :src="scope.row.faceUrl" v-if="scope.row.faceUrl" alt="" style="width: 80px;height: 40px;" @click="openImg2(scope.row)">
<img :src="scope.row.photoUrl" v-if="scope.row.photoUrl" alt="" style="width: 80px;height: 40px;" @click="openImg2(scope.row)">
<span v-else>无</span>
</template>
</el-table-column>
@ -337,7 +337,7 @@ export default {
imgUpLoadTwo(param).then((res) => {
if (res.code == 200) {
this.checkUrlList0.push(res.data.url)
this.$set(this.form,"faceUrl",res.data.url)
this.$set(this.form,"photoUrl",res.data.url)
} else {
this.$modal.msgError(res.msg)
}
@ -367,7 +367,7 @@ export default {
}
})
this.checkUrlList0.splice(sum, 1)
this.$set(this.form,"faceUrl","")
this.$set(this.form,"photoUrl","")
},
//图片点击查看
handlePictureCardPreview(file) {
@ -380,7 +380,7 @@ export default {
this.dialogVisible = true;
},
openImg2(row) {
this.dialogImageUrl = row.faceUrl;
this.dialogImageUrl = row.photoUrl;
this.dialogVisible = true;
}
}

111
src/views/kitchen/index.vue
View File

@ -75,7 +75,7 @@
<div style="background: #fff;padding: 10px;margin: 5px;margin-bottom: 10px;border-radius: 4px;">
<div style="width: 100%;text-align: center;position: relative;margin-top: 24px;">
<span>环境告警</span>
<span style="position: absolute;right: 10px;font-size: 14px;color: #F35C5C;" @click="goList">查看详情></span>
<span style="position: absolute;right: 10px;font-size: 14px;color: #F35C5C;" @click="goList2">查看详情></span>
</div>
<div id="lineChartFive" style="width: 100%;height: 200px;margin-bottom: 20px;"></div>
</div>
@ -363,7 +363,7 @@ export default {
}
}
let v = tarValue;
let p = Math.round((tarValue / total) * 100); //占比
let p = Math.round((v/total)*100)||0; //占比
return `${name} (${p}%)`;
}
},
@ -490,8 +490,7 @@ export default {
parms.data.value +
"</br>" +
"占比：" +
parms.percent +
"%";
parms.percent + "%";
return str;
},
},
@ -516,7 +515,7 @@ export default {
}
}
let v = tarValue;
let p = Math.round((tarValue / total) * 100); //占比
let p = Math.round((tarValue / total) * 100)||0; //占比
return `${name} (${p}%)`;
}
},
@ -607,7 +606,7 @@ export default {
var str = "";
var no = "NO.";
num = index + 1;
// value = value.length > 6 ? value.slice(0, 6) + '...' : value
value = value.length > 5 ? value.slice(0, 5) + '...' : value
if (index === 0) {
str = " {num1|" + num + "} {title1|" + value + "}";
} else if (index === 1) {
@ -622,53 +621,53 @@ export default {
rich: {
no: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no1: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no2: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no3: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
num: {
color: "#fff",
backgroundColor: "#5281F8",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num1: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num2: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num3: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
@ -708,7 +707,7 @@ export default {
interval: 0,
color: "#666",
align: "left",
margin: 20,
margin: 30,
fontSize: 13,
formatter: function (value, index) {
return (
@ -830,53 +829,53 @@ export default {
rich: {
no: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no1: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no2: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no3: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
num: {
color: "#fff",
backgroundColor: "#5281F8",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num1: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num2: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num3: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
@ -1038,53 +1037,53 @@ export default {
rich: {
no: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no1: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no2: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
no3: {
color: "#333",
fontSize: 14,
fontSize: 12,
},
num: {
color: "#fff",
backgroundColor: "#5281F8",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num1: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num2: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
num3: {
color: "#fff",
backgroundColor: "#EDA54F",
width: 20,
height: 20,
fontSize: 14,
width: 16,
height: 16,
fontSize: 12,
align: "center",
borderRadius: 100,
},
@ -1181,7 +1180,7 @@ export default {
// });
},
goList(){
this.$router.push({ path: "/kitchen/violation/cameraRecord"});
this.$router.push({ path: "/kitchen/staffManage/violation"});
},
goList2(){
this.$router.push({ path: "/kitchen/environment/alarmRecord",query: {activeName:5}});