Commit 1a0f850f by qinjianhui

fix: 优化

parent cb618011
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
style="width: 130px" style="width: 130px"
/> />
</ElFormItem> --> </ElFormItem> -->
<ElFormItem label="定制生产单号"> <ElFormItem label="生产单号">
<ElInput <ElInput
v-model="searchForm.factorySubOrderNumber" v-model="searchForm.factorySubOrderNumber"
placeholder="定制生产单号" placeholder="定制生产单号"
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
style="width: 130px" style="width: 130px"
/> />
</ElFormItem> </ElFormItem>
<ElFormItem label="定制订单号"> <ElFormItem label="订单号">
<ElInput <ElInput
v-model="searchForm.factoryOrderNumber" v-model="searchForm.factoryOrderNumber"
placeholder="定制订单号" placeholder="定制订单号"
...@@ -242,10 +242,18 @@ ...@@ -242,10 +242,18 @@
> >
<span>{{ memo.operatorEmployeeName || '' }}</span> <span>{{ memo.operatorEmployeeName || '' }}</span>
</div> </div>
<div v-if="memo.operatorTime" class="order-memo-item__time"> <div
v-if="memo.operatorTime"
class="order-memo-item__time"
:title="memo.operatorTime"
>
<span>{{ memo.operatorTime || '' }}</span> <span>{{ memo.operatorTime || '' }}</span>
</div> </div>
<div v-if="memo.content" class="order-memo-item__content"> <div
v-if="memo.content"
class="order-memo-item__content"
:title="memo.content"
>
<span>{{ memo.content || '' }}</span> <span>{{ memo.content || '' }}</span>
</div> </div>
</div> </div>
...@@ -644,7 +652,7 @@ const tableColumns = computed<CustomColumn<OrderData[]>>(() => { ...@@ -644,7 +652,7 @@ const tableColumns = computed<CustomColumn<OrderData[]>>(() => {
{ {
label: '内部便签', label: '内部便签',
key: 'customerName', key: 'customerName',
width: 280, width: 300,
showOverflowTooltip: true, showOverflowTooltip: true,
}, },
{ {
...@@ -872,11 +880,7 @@ const printManuscript = async () => { ...@@ -872,11 +880,7 @@ const printManuscript = async () => {
offset: window.innerHeight / 2, offset: window.innerHeight / 2,
}) })
} }
const loading = ElLoading.service({
lock: true,
text: '加载中...',
background: 'rgba(0, 0, 0, 0.7)',
})
const ids = selection.value.map((item) => item.id) const ids = selection.value.map((item) => item.id)
try { try {
await showConfirm('是否打印生产单', { await showConfirm('是否打印生产单', {
...@@ -887,6 +891,11 @@ const printManuscript = async () => { ...@@ -887,6 +891,11 @@ const printManuscript = async () => {
} catch { } catch {
return return
} }
const loading = ElLoading.service({
lock: true,
text: '加载中...',
background: 'rgba(0, 0, 0, 0.7)',
})
try { try {
const res = await printOrder(ids) const res = await printOrder(ids)
window.open(filePath + res.message) window.open(filePath + res.message)
...@@ -905,11 +914,7 @@ const exportManuscript = async () => { ...@@ -905,11 +914,7 @@ const exportManuscript = async () => {
offset: window.innerHeight / 2, offset: window.innerHeight / 2,
}) })
} }
const loading = ElLoading.service({
lock: true,
text: '加载中...',
background: 'rgba(0, 0, 0, 0.7)',
})
const ids = selection.value.map((item) => item.id) const ids = selection.value.map((item) => item.id)
try { try {
await showConfirm('是否导出生产单', { await showConfirm('是否导出生产单', {
...@@ -920,6 +925,11 @@ const exportManuscript = async () => { ...@@ -920,6 +925,11 @@ const exportManuscript = async () => {
} catch { } catch {
return return
} }
const loading = ElLoading.service({
lock: true,
text: '加载中...',
background: 'rgba(0, 0, 0, 0.7)',
})
try { try {
const res = await exportOrder(ids, status.value) const res = await exportOrder(ids, status.value)
window.open(filePath + res.message) window.open(filePath + res.message)
...@@ -1073,7 +1083,7 @@ onMounted(() => { ...@@ -1073,7 +1083,7 @@ onMounted(() => {
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
.order-memo { .order-memo {
width: 280px; width: 300px;
border-right: 1px solid #eee; border-right: 1px solid #eee;
} }
...@@ -1081,6 +1091,12 @@ onMounted(() => { ...@@ -1081,6 +1091,12 @@ onMounted(() => {
padding: 20px; padding: 20px;
font-size: 14px; font-size: 14px;
} }
.order-memo-item__content,
.order-memo-item__time {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.order-memo-info { .order-memo-info {
padding: 20px; padding: 20px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment