测试bug修改和调整
This commit is contained in:
1 parent
ea9a51f7b7
commit
c1ab44b7a1
8 files changed
+45
-7
No files matched your search
@@ -226,7 +226,7 @@ const getDishByType = async () => {
|
||||
// foodData.breakfast = r.dailyMenuVOS
|
||||
break
|
||||
case 2:
|
||||
foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 15)
|
||||
foodData.lunch = r.dailyMenuVOS.filter((v: any, index: number) => index < 11)
|
||||
break
|
||||
case 3:
|
||||
// foodData.dinner = r.dailyMenuVOS
|
||||
|
||||
@@ -51,9 +51,21 @@
|
||||
<vxe-column type="checkbox" width="60" align="center"></vxe-column>
|
||||
<vxe-column field="unit" title="包装单位" align="center" width="200"></vxe-column>
|
||||
<vxe-column field="quantity" title="数量" align="center" width="100"></vxe-column>
|
||||
<vxe-column field="purchasePrice" title="进价" align="center" width="100"></vxe-column>
|
||||
<vxe-column field="unitPrice" title="单价" align="center" width="100"></vxe-column>
|
||||
<vxe-column field="totalAmount" title="累计总金额" align="center" width="100"></vxe-column>
|
||||
<vxe-column field="purchasePrice" title="进价" align="center" width="100">
|
||||
<template #default="{ row }">
|
||||
{{ displayPrice(row.purchasePrice) }}
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column field="unitPrice" title="单价" align="center" width="100">
|
||||
<template #default="{ row }">
|
||||
{{ displayPrice(row.unitPrice) }}
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column field="totalAmount" title="累计总金额" align="center" width="100">
|
||||
<template #default="{ row }">
|
||||
{{ displayPrice(row.totalAmount) }}
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
|
||||
</vxe-table>
|
||||
|
||||
@@ -71,6 +83,7 @@ import { ref } from "vue"
|
||||
import { VxeTableEvents } from "vxe-table"
|
||||
import { getSimpleUserAll } from "/@/api/admin/user"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import { displayPrice } from "/@/utils/formatMoney"
|
||||
|
||||
const { check_status } = useDict("check_status")
|
||||
const linkCodeDialogVisible = defineModel()
|
||||
|
||||
@@ -50,14 +50,29 @@
|
||||
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default="scope">
|
||||
<el-button v-if="scope.row.checkStatus == '2'" icon="MessageBox" text type="success" @click="edit(scope.row)">详情</el-button>
|
||||
<el-button
|
||||
v-if="scope.row.checkStatus == '2' || scope.row.checkStatus == '3'"
|
||||
icon="MessageBox"
|
||||
text
|
||||
type="success"
|
||||
@click="edit(scope.row)"
|
||||
>
|
||||
详情
|
||||
</el-button>
|
||||
<el-button v-else icon="edit-pen" text type="primary" v-auth="'supermarket_smErpCgDd_edit'" @click="edit(scope.row)">
|
||||
编辑
|
||||
</el-button>
|
||||
<el-button icon="delete" text type="primary" v-auth="'supermarket_smErpCgDd_del'" @click="handleDelete([scope.row.id])">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button type="primary" size="small" v-if="scope.row.checkStatus != '2'" link icon="VideoPlay" @click="deal(scope.row)">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
v-if="scope.row.checkStatus != '2' && scope.row.taskId"
|
||||
link
|
||||
icon="VideoPlay"
|
||||
@click="deal(scope.row)"
|
||||
>
|
||||
开始处理
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
Reference in new issue
Block a user