Commit 7c9aed85 by linjinhong

fix:修改问题

parent 1bdbbed5
...@@ -836,14 +836,12 @@ ...@@ -836,14 +836,12 @@
</span> </span>
</ElFormItem> </ElFormItem>
<ElFormItem v-if="status === 'WAIT_SHIPMENT'"> <ElFormItem v-if="status === 'WAIT_SHIPMENT'">
<span class="item"> <span class="item">
<ElButton type="warning" @click="showPrintSku" <ElButton type="warning" @click="showPrintSku"
>打印库存sku标签</ElButton >打印库存sku标签</ElButton
> >
</span> </span>
</ElFormItem> </ElFormItem>
</ElForm> </ElForm>
</div> </div>
<div class="header-filter-tab"> <div class="header-filter-tab">
...@@ -1793,7 +1791,7 @@ ...@@ -1793,7 +1791,7 @@
underline="never" underline="never"
type="success" type="success"
@click="uploadFile(row)" @click="uploadFile(row)"
>上传PRN</el-link >上传PRN</el-link
> >
<el-icon <el-icon
v-if="row.isUpload" v-if="row.isUpload"
...@@ -1809,12 +1807,12 @@ ...@@ -1809,12 +1807,12 @@
:title="fileName(row)" :title="fileName(row)"
type="success" type="success"
@click="downloadRowProFile(row)" @click="downloadRowProFile(row)"
>下载PRN >下载PRN
</el-link> </el-link>
<el-icon <el-icon
v-if="row.prnDownloadStatus" v-if="row.prnDownloadStatus"
class="download-icon" class="download-icon"
style="position:relative;right: 7px" style="position: relative; right: 7px"
> >
<CircleCheckFilled /> <CircleCheckFilled />
</el-icon> </el-icon>
...@@ -1856,7 +1854,6 @@ ...@@ -1856,7 +1854,6 @@
/></el-icon> /></el-icon>
</span> </span>
<span class="operate-item"> <span class="operate-item">
<ElButton <ElButton
:disabled="!row.url && !row.tiffUrl" :disabled="!row.url && !row.tiffUrl"
link link
...@@ -1866,7 +1863,7 @@ ...@@ -1866,7 +1863,7 @@
下载素材 下载素材
</ElButton> </ElButton>
<el-icon v-if="row.downloadStatus" class="download-icon" <el-icon v-if="row.downloadStatus" class="download-icon"
><CircleCheckFilled ><CircleCheckFilled
/></el-icon> /></el-icon>
</span> </span>
<span class="operate-item"> <span class="operate-item">
...@@ -3137,13 +3134,15 @@ const updateTrackingNumber = async (row: PodUsOrderListData) => { ...@@ -3137,13 +3134,15 @@ const updateTrackingNumber = async (row: PodUsOrderListData) => {
} }
const showPrintSku = async () => { const showPrintSku = async () => {
if(!selection.value.length) { if (!selection.value.length) {
return ElMessage.warning('请选择数据') return ElMessage.warning('请选择数据')
} }
await printWarehouseSkuDialogRef.value?.open(2,selection.value.map((item) => item.id).join(',')) await printWarehouseSkuDialogRef.value?.open(
2,
selection.value.map((item) => item.id).join(','),
)
} }
const exportData = () => { const exportData = () => {
exportVisible.value = true exportVisible.value = true
} }
...@@ -4212,11 +4211,15 @@ const uploadFile = (row: PodUsOrderListData) => { ...@@ -4212,11 +4211,15 @@ const uploadFile = (row: PodUsOrderListData) => {
input.onchange = async function () { input.onchange = async function () {
try { try {
if (input.files && input.files.length) { if (input.files && input.files.length) {
if(!input.files[0].name.startsWith(row.batchArrangeNumber || '')) { if (!input.files[0].name.startsWith(row.batchArrangeNumber || '')) {
await ElMessageBox.confirm(`文件名不是以批次号开头是否继续上传?`, '提示', { await ElMessageBox.confirm(
confirmButtonText: '确定', `文件名不是以批次号开头是否继续上传?`,
type: 'warning', '提示',
}) {
confirmButtonText: '确定',
type: 'warning',
},
)
} }
row.isUpload = true row.isUpload = true
uploadList.value.push(row) uploadList.value.push(row)
...@@ -4957,6 +4960,13 @@ const downloadMaterial = async () => { ...@@ -4957,6 +4960,13 @@ const downloadMaterial = async () => {
const res = await downloadMaterialApi(selectedIds) const res = await downloadMaterialApi(selectedIds)
if (res.code !== 200) return if (res.code !== 200) return
window.open(filePath + res.message) window.open(filePath + res.message)
const a = document.createElement('a')
a.href = filePath + res.message
a.download = res.message!
a.target = '_blank'
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
} catch (e) { } catch (e) {
// showError(e) // showError(e)
console.error(e) console.error(e)
...@@ -6949,7 +6959,7 @@ const printNormal = async () => { ...@@ -6949,7 +6959,7 @@ const printNormal = async () => {
.operate-item { .operate-item {
position: relative; position: relative;
} }
.download-icon{ .download-icon {
color: var(--el-color-success); color: var(--el-color-success);
} }
.check-icon { .check-icon {
......
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