修改
This commit is contained in:
parent
a9aa3706d7
commit
b5e07e6e64
@ -216,12 +216,12 @@ const routes: RouteRecordRaw[] = [
|
||||
meta: { title: '设备状态监控', icon: 'PulseOutline' }
|
||||
},
|
||||
// 入库管理
|
||||
{
|
||||
path: 'biz/stockIn',
|
||||
name: 'BizStockIn',
|
||||
component: () => import('@/views/biz/stockIn/index.vue'),
|
||||
meta: { title: '入库管理', icon: 'ArchiveOutline' }
|
||||
},
|
||||
// {
|
||||
// path: 'biz/stockIn',
|
||||
// name: 'BizStockIn',
|
||||
// component: () => import('@/views/biz/stockIn/index.vue'),
|
||||
// meta: { title: '入库管理', icon: 'ArchiveOutline' }
|
||||
// },
|
||||
// 甘特图排产
|
||||
{
|
||||
path: 'biz/orderProject/gantt',
|
||||
|
||||
@ -348,7 +348,7 @@ const columns: DataTableColumns<ErrorNotification> = [
|
||||
minWidth:150,
|
||||
render(row) {
|
||||
const vals = Array.isArray(row.subscriptionDeviceIds) ? row.subscriptionDeviceIds : (row.subscriptionDeviceIds ? String(row.subscriptionDeviceIds).split(',') : [])
|
||||
return vals.map(v => deviclist.value.find(o => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-'
|
||||
return vals.map(v => deviclist.value.find((o:any) => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-'
|
||||
},
|
||||
},
|
||||
|
||||
@ -386,7 +386,7 @@ const columns: DataTableColumns<ErrorNotification> = [
|
||||
minWidth:150,
|
||||
render(row) {
|
||||
const vals = Array.isArray(row.notifier) ? row.notifier : (row.notifier ? String(row.notifier).split(',') : [])
|
||||
return vals.map(v => userlist.value.find(o => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-'
|
||||
return vals.map(v => userlist.value.find((o:any) => String(o.value) === String(v))?.label ?? v).filter(Boolean).join(', ') || '-'
|
||||
},
|
||||
},
|
||||
{
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
</div>
|
||||
|
||||
<!-- 工具栏 -->
|
||||
<div class="table-toolbar">
|
||||
<!-- <div class="table-toolbar">
|
||||
<n-space>
|
||||
<n-button type="primary" @click="handleAdd">
|
||||
<template #icon><n-icon><AddOutline /></n-icon></template>
|
||||
@ -51,7 +51,7 @@
|
||||
删除
|
||||
</n-button>
|
||||
</n-space>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<!-- 表格 -->
|
||||
<n-data-table
|
||||
@ -476,7 +476,7 @@ const formRules = {
|
||||
|
||||
// 表格列
|
||||
const columns: DataTableColumns<QualityTesting> = [
|
||||
{ type: 'selection' },
|
||||
// { type: 'selection' },
|
||||
{ title: '质检编号', key: 'qcNo',align: 'center' },
|
||||
{ title: '来源类型', key: 'sourceType',align: 'center',
|
||||
render(row) {
|
||||
@ -525,9 +525,9 @@ const columns: DataTableColumns<QualityTesting> = [
|
||||
h(NButton, { size: 'small', quaternary: true, onClick: () => handleEdit(row) }, {
|
||||
default: () => [h(NIcon, null, { default: () => h(CreateOutline) }), ' 编辑']
|
||||
}),
|
||||
h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, {
|
||||
default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 删除']
|
||||
}),
|
||||
// h(NButton, { size: 'small', quaternary: true, type: 'error', onClick: () => handleDelete(row) }, {
|
||||
// default: () => [h(NIcon, null, { default: () => h(TrashOutline) }), ' 删除']
|
||||
// }),
|
||||
h(NDropdown, {
|
||||
trigger: 'click', // 点击展开
|
||||
options: [
|
||||
@ -917,7 +917,7 @@ function queryResultDetail(row:any) {
|
||||
onMounted(() => {
|
||||
loadData()
|
||||
loadDictOptions()
|
||||
loadAssignWorkOrder()
|
||||
//loadAssignWorkOrder()
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ export default defineConfig({
|
||||
emptyOutDir: true
|
||||
},
|
||||
server: {
|
||||
host:'192.168.12.4', //true,
|
||||
//host:'192.168.12.4', //true,
|
||||
port: 3000,
|
||||
proxy: {
|
||||
'/api': {
|
||||
@ -24,8 +24,8 @@ export default defineConfig({
|
||||
// target:'http://192.168.12.4:8888/',
|
||||
//target:'http://192.168.12.230:8888',
|
||||
//target:'http://192.168.5.230:8888',
|
||||
//target:'http://192.168.5.232:8888/',
|
||||
target:'http://localhost:8888',
|
||||
target:'http://192.168.5.232:8888/',
|
||||
//target:'http://localhost:8888',
|
||||
changeOrigin: true
|
||||
},
|
||||
'/druid': {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user