Skip to content

F
factory_front
Commit ba6f71f2 by wuqian
Options

操作按钮位置挪动

parent 2de224b9
Showing with 200 additions and 254 deletions
src/views/AccountStatementNote.vue
...@@ -76,31 +76,27 @@ ...@@ -76,31 +76,27 @@
<ElFormItem> <ElFormItem>
<ElButton @click="resetSearchForm">重置</ElButton> <ElButton @click="resetSearchForm">重置</ElButton>
</ElFormItem> </ElFormItem>
</ElForm> <ElFormItem v-if="nodeId === 10">
</div> <el-button type="primary" @click="confirmOrder">
<div class="btn-list">
<el-button
v-if="nodeId === 10"
type="primary"
@click="confirmOrder"
>
确认对账单 确认对账单
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeId === 10" <ElFormItem v-if="nodeId === 10">
type="warning" <el-button type="warning" @click="rejectOrder">
@click="rejectOrder"
>
驳回 驳回
</el-button> </el-button>
<el-button type="success" @click="exportExcel"> 导出 </el-button> </ElFormItem>
<el-button <ElFormItem>
v-if="nodeId === 30" <el-button type="success" @click="exportExcel">
type="danger" 导出
@click="auditOrder('archive')" </el-button>
> </ElFormItem>
<ElFormItem v-if="nodeId === 30">
<el-button type="danger" @click="auditOrder('archive')">
归档 归档
</el-button> </el-button>
</ElFormItem>
</ElForm>
</div> </div>
<div <div
class="delivery-note-content flex-1 flex-column overflow-hidden" class="delivery-note-content flex-1 flex-column overflow-hidden"
......
src/views/order/index.vue
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
v-model="searchForm.mainSku" v-model="searchForm.mainSku"
placeholder=" SKU" placeholder=" SKU"
clearable clearable
style="width: 130px" style="width: 125px"
@blur="searchForm.mainSku = searchForm.mainSku.trim()" @blur="searchForm.mainSku = searchForm.mainSku.trim()"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
v-model="searchForm.endProductId" v-model="searchForm.endProductId"
placeholder="请输入成品ID" placeholder="请输入成品ID"
clearable clearable
style="width: 130px" style="width: 125px"
@blur=" @blur="
searchForm.endProductId = searchForm.endProductId.trim() searchForm.endProductId = searchForm.endProductId.trim()
" "
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
v-model="searchForm.subOrderNumber" v-model="searchForm.subOrderNumber"
placeholder="生产单号" placeholder="生产单号"
clearable clearable
style="width: 130px" style="width: 125px"
@blur=" @blur="
searchForm.subOrderNumber = searchForm.subOrderNumber.trim() searchForm.subOrderNumber = searchForm.subOrderNumber.trim()
" "
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
v-model="searchForm.orderNumber" v-model="searchForm.orderNumber"
placeholder="订单号" placeholder="订单号"
clearable clearable
style="width: 130px" style="width: 125px"
@blur="searchForm.orderNumber = searchForm.orderNumber.trim()" @blur="searchForm.orderNumber = searchForm.orderNumber.trim()"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
v-model="searchForm.shopNumber" v-model="searchForm.shopNumber"
placeholder="店铺单号" placeholder="店铺单号"
clearable clearable
style="width: 130px" style="width: 125px"
@blur="searchForm.shopNumber = searchForm.shopNumber.trim()" @blur="searchForm.shopNumber = searchForm.shopNumber.trim()"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
v-model="searchForm.internalMemo" v-model="searchForm.internalMemo"
placeholder="内部标签" placeholder="内部标签"
clearable clearable
style="width: 130px" style="width: 125px"
@blur=" @blur="
searchForm.internalMemo = searchForm.internalMemo.trim() searchForm.internalMemo = searchForm.internalMemo.trim()
" "
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
v-model="searchForm.logisticsTracking" v-model="searchForm.logisticsTracking"
placeholder="物流跟踪号" placeholder="物流跟踪号"
clearable clearable
style="width: 130px" style="width: 125px"
@blur=" @blur="
searchForm.logisticsTracking = searchForm.logisticsTracking =
searchForm.logisticsTracking.trim() searchForm.logisticsTracking.trim()
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
v-model="searchForm.billNumber" v-model="searchForm.billNumber"
placeholder="发货单号" placeholder="发货单号"
clearable clearable
style="width: 130px" style="width: 125px"
@blur="searchForm.billNumber = searchForm.billNumber.trim()" @blur="searchForm.billNumber = searchForm.billNumber.trim()"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
v-model="searchForm.lanshouName" v-model="searchForm.lanshouName"
placeholder="收货人" placeholder="收货人"
clearable clearable
style="width: 130px" style="width: 125px"
></ElInput> ></ElInput>
</ElFormItem> </ElFormItem>
<ElFormItem label="排序"> <ElFormItem label="排序">
...@@ -152,39 +152,13 @@ ...@@ -152,39 +152,13 @@
<!-- <ElFormItem>--> <!-- <ElFormItem>-->
<!-- <ElButton @click="resetSearchForm">重置</ElButton>--> <!-- <ElButton @click="resetSearchForm">重置</ElButton>-->
<!-- </ElFormItem>--> <!-- </ElFormItem>-->
</ElForm> <ElFormItem v-if="statusCode === 2">
</div>
<div class="header-filter-tab">
<div class="tabs">
<div
v-for="item in tabsNav"
:key="item.statusCode"
class="tabs-node"
:class="
item.statusCode === statusCode ? 'tabs-node_active' : ''
"
@click="changeTab(item)"
>
<span class="tabs-node_label">{{ item.statusName }}</span>
<span class="tabs-node_count">{{ `(${item.quantity})` }}</span>
</div>
</div>
</div>
</div>
</template>
<template #bottom>
<div class="order-content flex-1 flex-column overflow-hidden">
<!-- 操作按钮 -->
<div class="order-operate-btn">
<span v-if="statusCode === 2" class="item">
<ElButton type="success" @click="confirmProduce" <ElButton type="success" @click="confirmProduce"
>确认生产</ElButton >确认生产</ElButton
> >
</span> </ElFormItem>
<ElFormItem
<span
v-if="statusCode === 2 || statusCode === 3 || statusCode === 4" v-if="statusCode === 2 || statusCode === 3 || statusCode === 4"
class="item"
> >
<ElButton <ElButton
:disabled=" :disabled="
...@@ -195,10 +169,9 @@ ...@@ -195,10 +169,9 @@
@click="downloadManuscript" @click="downloadManuscript"
>下载稿件</ElButton >下载稿件</ElButton
> >
</span> </ElFormItem>
<span <ElFormItem
v-if="statusCode === 2 || statusCode === 3 || statusCode === 4" v-if="statusCode === 2 || statusCode === 3 || statusCode === 4"
class="item"
> >
<ElButton <ElButton
:disabled=" :disabled="
...@@ -210,10 +183,9 @@ ...@@ -210,10 +183,9 @@
@click="reGenerateManuscript" @click="reGenerateManuscript"
>重新打包稿件 >重新打包稿件
</ElButton> </ElButton>
</span> </ElFormItem>
<span <ElFormItem
v-if="statusCode === 2 || statusCode === 3 || statusCode === 4" v-if="statusCode === 2 || statusCode === 3 || statusCode === 4"
class="item"
> >
<ElButton <ElButton
:disabled=" :disabled="
...@@ -225,10 +197,9 @@ ...@@ -225,10 +197,9 @@
@click="reCreateManuscript" @click="reCreateManuscript"
>重新生成稿件 >重新生成稿件
</ElButton> </ElButton>
</span> </ElFormItem>
<span <ElFormItem
v-if="statusCode === 2 || statusCode === 3 || statusCode === 4" v-if="statusCode === 2 || statusCode === 3 || statusCode === 4"
class="item"
> >
<ElButton <ElButton
:loading="btnLoading" :loading="btnLoading"
...@@ -237,35 +208,56 @@ ...@@ -237,35 +208,56 @@
@click="printManuscript" @click="printManuscript"
>打印生产单</ElButton >打印生产单</ElButton
> >
</span> </ElFormItem>
<span <ElFormItem
v-if="statusCode === 2 || statusCode === 3 || statusCode === 7" v-if="statusCode === 2 || statusCode === 3 || statusCode === 7"
class="item"
> >
<ElButton type="success" dark @click="exportManuscript" <ElButton type="success" dark @click="exportManuscript"
>导出生产单</ElButton >导出生产单</ElButton
> >
</span> </ElFormItem>
<span class="item"> <ElFormItem>
<ElButton type="warning" @click="addInternalTag" <ElButton type="warning" @click="addInternalTag"
>添加内部标签</ElButton >添加内部标签</ElButton
> >
</span> </ElFormItem>
<span <ElFormItem
v-if="statusCode === 2 || statusCode === 3 || statusCode === 4" v-if="statusCode === 2 || statusCode === 3 || statusCode === 4"
class="item"
> >
<ElButton type="primary" @click="refreshProduct" <ElButton type="primary" @click="refreshProduct"
>刷新商品信息</ElButton >刷新商品信息</ElButton
> >
</span> </ElFormItem>
<span v-if="statusCode === 3 || statusCode === 4" class="item"> <ElFormItem v-if="statusCode === 3 || statusCode === 4">
<ElButton type="success" @click="confirmDelivery">发货</ElButton> <ElButton type="success" @click="confirmDelivery"
</span> >发货</ElButton
<span v-if="statusCode === 6" class="item"> >
</ElFormItem>
<ElFormItem v-if="statusCode === 6">
<ElButton type="success" @click="confirmCheck">质检</ElButton> <ElButton type="success" @click="confirmCheck">质检</ElButton>
</span> </ElFormItem>
</ElForm>
</div>
<div class="header-filter-tab">
<div class="tabs">
<div
v-for="item in tabsNav"
:key="item.statusCode"
class="tabs-node"
:class="
item.statusCode === statusCode ? 'tabs-node_active' : ''
"
@click="changeTab(item)"
>
<span class="tabs-node_label">{{ item.statusName }}</span>
<span class="tabs-node_count">{{ `(${item.quantity})` }}</span>
</div>
</div>
</div> </div>
</div>
</template>
<template #bottom>
<div class="order-content flex-1 flex-column overflow-hidden">
<div <div
ref="tableWrapperRef" ref="tableWrapperRef"
v-loading="loading" v-loading="loading"
......
src/views/order/pod/index.vue
...@@ -150,71 +150,45 @@ ...@@ -150,71 +150,45 @@
<el-option value="multiple" label="多面"></el-option> <el-option value="multiple" label="多面"></el-option>
</el-select> </el-select>
</ElFormItem> </ElFormItem>
<ElFormItem> <ElFormItem>
<ElButton type="primary" @click="loadDiffList">查询</ElButton> <ElButton type="primary" @click="loadDiffList">查询</ElButton>
</ElFormItem> </ElFormItem>
</ElForm> <ElFormItem v-if="status === 'TO_BE_CONFIRMED'">
</div>
<div class="header-filter-tab">
<div class="tabs">
<div
v-for="item in tabsNav"
:key="item.status"
class="tabs-node"
:class="item.status === status ? 'tabs-node_active' : ''"
@click="changeTab(item)"
>
<span class="tabs-node_label">{{ item.statusName }}</span>
<span class="tabs-node_count">{{ `(${item.quantity})` }}</span>
</div>
</div>
</div>
<div class="order-content flex-1 flex-column overflow-hidden mt-10">
<div style="margin-bottom: 10px">
<span v-if="status === 'TO_BE_CONFIRMED'" class="item">
<ElButton type="success" @click="confirmProduce">确认生产</ElButton> <ElButton type="success" @click="confirmProduce">确认生产</ElButton>
</span> </ElFormItem>
<span v-if="status === 'IN_PRODUCTION'" class="item"> <ElFormItem v-if="status === 'IN_PRODUCTION'">
<ElButton type="success" dark @click="fastToProduction('快捷生产', 1)" <ElButton type="success" dark @click="fastToProduction('快捷生产', 1)"
>快捷生产</ElButton >快捷生产</ElButton
> >
</span> </ElFormItem>
<span <ElFormItem
v-if=" v-if="
status === 'TO_BE_CONFIRMED' || ['TO_BE_CONFIRMED', 'IN_PRODUCTION', 'PART_SHIPPING'].includes(
status === 'IN_PRODUCTION' || status,
status === 'PART_SHIPPING' )
" "
class="item"
> >
<ElButton type="primary" dark @click="printManuscript" <ElButton type="primary" dark @click="printManuscript"
>打印生产单</ElButton >打印生产单</ElButton
> >
</span> </ElFormItem>
<!-- <span v-if="status === 'TO_BE_CONFIRMED'" class="item">--> <ElFormItem>
<!-- <ElButton type="success" dark @click="exportManuscript"-->
<!-- >导出生产单</ElButton-->
<!-- >-->
<!-- </span>-->
<span class="item">
<ElButton type="warning" @click="addInternalTag" <ElButton type="warning" @click="addInternalTag"
>添加内部标签</ElButton >添加内部标签</ElButton
> >
</span> </ElFormItem>
<span <ElFormItem
v-if=" v-if="
status === 'TO_BE_CONFIRMED' || ['TO_BE_CONFIRMED', 'IN_PRODUCTION', 'PART_SHIPPING'].includes(
status === 'IN_PRODUCTION' || status,
status === 'PART_SHIPPING' )
" "
class="item"
> >
<ElButton type="warning" is-dark @click="downloadMaterial"> <ElButton type="warning" is-dark @click="downloadMaterial">
下载素材</ElButton 下载素材</ElButton
> >
</span> </ElFormItem>
<span <ElFormItem
v-if=" v-if="
[ [
'TO_BE_CONFIRMED', 'TO_BE_CONFIRMED',
...@@ -223,41 +197,34 @@ ...@@ -223,41 +197,34 @@
'WAIT_SHIPMENT', 'WAIT_SHIPMENT',
].includes(status) ].includes(status)
" "
class="item"
> >
<ElButton type="primary" @click="refreshProduct" <ElButton type="primary" @click="refreshProduct"
>刷新商品信息</ElButton >刷新商品信息</ElButton
> >
</span> </ElFormItem>
<span <ElFormItem
v-if="status === 'WAIT_SHIPMENT' || status === 'PART_SHIPPING'" v-if="status === 'WAIT_SHIPMENT' || status === 'PART_SHIPPING'"
class="item"
> >
<ElButton type="success" @click="confirmDelivery">发货</ElButton> <ElButton type="success" @click="confirmDelivery">发货</ElButton>
</span> </ElFormItem>
<span v-if="status === 'WAIT_SHIPMENT'" class="item"> <ElFormItem v-if="status === 'WAIT_SHIPMENT'">
<ElButton type="warning" @click="completeDelivery">完成发货</ElButton> <ElButton type="warning" @click="completeDelivery">完成发货</ElButton>
</span> </ElFormItem>
<span <ElFormItem
v-if="['TO_BE_CONFIRMED', 'IN_PRODUCTION'].includes(status)" v-if="['TO_BE_CONFIRMED', 'IN_PRODUCTION'].includes(status)"
class="item"
> >
<ElButton type="danger" @click="voidedBtn">作废</ElButton> <ElButton type="danger" @click="voidedBtn">作废</ElButton>
</span> </ElFormItem>
<span <ElFormItem v-if="['WAIT_SHIPMENT', 'IN_PRODUCTION'].includes(status)">
v-if="['WAIT_SHIPMENT', 'IN_PRODUCTION'].includes(status)"
class="item"
>
<ElButton type="warning" is-dark @click="applyForReplacement"> <ElButton type="warning" is-dark @click="applyForReplacement">
申请补胚</ElButton 申请补胚</ElButton
> >
</span> </ElFormItem>
<span v-if="['COMPLETE'].includes(status)" class="item"> <ElFormItem v-if="['COMPLETE'].includes(status)">
<ElButton type="success" @click="toExport"> 导出对账单</ElButton> <ElButton type="success" @click="toExport"> 导出对账单</ElButton>
</span> </ElFormItem>
<span <ElFormItem
v-if="['TO_BE_CONFIRMED', 'IN_PRODUCTION'].includes(status)" v-if="['TO_BE_CONFIRMED', 'IN_PRODUCTION'].includes(status)"
class="item"
> >
<ElButton <ElButton
:loading="syncLoading" :loading="syncLoading"
...@@ -267,8 +234,24 @@ ...@@ -267,8 +234,24 @@
> >
同步素材图</ElButton 同步素材图</ElButton
> >
</span> </ElFormItem>
</ElForm>
</div> </div>
<div class="header-filter-tab">
<div class="tabs">
<div
v-for="item in tabsNav"
:key="item.status"
class="tabs-node"
:class="item.status === status ? 'tabs-node_active' : ''"
@click="changeTab(item)"
>
<span class="tabs-node_label">{{ item.statusName }}</span>
<span class="tabs-node_count">{{ `(${item.quantity})` }}</span>
</div>
</div>
</div>
<div class="order-content flex-1 flex-column overflow-hidden mt-10">
<template <template
v-if=" v-if="
[ [
......
src/views/podBillOrder/index.vue
...@@ -79,32 +79,24 @@ ...@@ -79,32 +79,24 @@
<ElFormItem> <ElFormItem>
<ElButton @click="reset">重置</ElButton> <ElButton @click="reset">重置</ElButton>
</ElFormItem> </ElFormItem>
</ElForm> <ElFormItem v-if="nodeId === 15">
</div> <el-button type="warning" @click="rejectOrder">
<div class="btn-list">
<!-- <el-button
v-if="nodeId === 10"
type="primary"
@click="confirmOrder()"
>
确认
</el-button> -->
<el-button
v-if="nodeId === 15"
type="warning"
@click="rejectOrder"
>
驳回 驳回
</el-button> </el-button>
<el-button type="success" @click="exportExcel"> 导出</el-button> </ElFormItem>
<el-button <ElFormItem>
v-if="nodeId === 30" <el-button type="success" @click="exportExcel">
type="danger" 导出</el-button
@click="auditOrder('archive')"
> >
</ElFormItem>
<ElFormItem v-if="nodeId === 30">
<el-button type="danger" @click="auditOrder('archive')">
归档 归档
</el-button> </el-button>
</ElFormItem>
</ElForm>
</div> </div>
<div <div
class="delivery-note-content flex-1 flex-column overflow-hidden" class="delivery-note-content flex-1 flex-column overflow-hidden"
> >
...@@ -1205,7 +1197,7 @@ const submitPodPrice = async () => { ...@@ -1205,7 +1197,7 @@ const submitPodPrice = async () => {
try { try {
const res = await apiSetCraftData({ const res = await apiSetCraftData({
id: currentRow.value?.id, id: currentRow.value?.id,
craftTotalPrice:currentRow.value?.craft_total_amount, craftTotalPrice: currentRow.value?.craft_total_amount,
recNumber: currentRow.value?.rec_number, recNumber: currentRow.value?.rec_number,
craftPriceList: filteredList, craftPriceList: filteredList,
}) })
......
src/views/typesetting/TypesettingManagement.vue
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
<div class="search-form"> <div class="search-form">
<ElForm <ElForm
:model="searchForm" :model="searchForm"
size="large"
inline inline
@submit.prevent @submit.prevent
@keyup.enter="search" @keyup.enter="search"
...@@ -59,12 +58,12 @@ ...@@ -59,12 +58,12 @@
></ElInput> ></ElInput>
</ElFormItem> --> </ElFormItem> -->
<ElFormItem> <ElFormItem>
<ElButton type="primary" size="large" @click="search" <ElButton type="primary" @click="search"
>查询</ElButton >查询</ElButton
> >
</ElFormItem> </ElFormItem>
<ElFormItem v-if="treeId === '201'"> <ElFormItem v-if="treeId === '201'">
<el-button size="large" type="danger" @click="reject" <el-button type="danger" @click="reject"
>驳回</el-button >驳回</el-button
> >
</ElFormItem> </ElFormItem>
......
src/views/warehouse/issueDoc.vue
...@@ -93,62 +93,52 @@ ...@@ -93,62 +93,52 @@
<ElFormItem> <ElFormItem>
<ElButton @click="resetSearchForm">重置</ElButton> <ElButton @click="resetSearchForm">重置</ElButton>
</ElFormItem> </ElFormItem>
</ElForm> <ElFormItem v-if="nodeCode === 'PENDING_SUBMIT'">
</div> <el-button type="primary" @click="addDialog(1, null)">
<div class="btn-list">
<el-button
v-if="nodeCode === 'PENDING_SUBMIT'"
type="primary"
@click="addDialog(1, null)"
>
新增 新增
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_AUDIT'" <ElFormItem v-if="nodeCode === 'PENDING_AUDIT'">
type="danger" <el-button type="danger" @click="rejectedInRecord">
@click="rejectedInRecord"
>
驳回 驳回
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_SUBMIT'" <ElFormItem v-if="nodeCode === 'PENDING_SUBMIT'">
type="danger" <el-button type="danger" @click="handleBatchDelete">
@click="handleBatchDelete"
>
删除 删除
</el-button> </el-button>
<el-button type="success" @click="handleExport"> 导出 </el-button> </ElFormItem>
<el-button type="primary" @click="printProductTag"> <ElFormItem>
打印库存SKU标签 <el-button type="success" @click="handleExport">
导出
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_AUDIT'" <ElFormItem v-if="nodeCode === 'PENDING_AUDIT'">
type="warning" <el-button type="warning" @click="auditOrder('audit')">
@click="auditOrder('audit')"
>
审核 审核
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_SUBMIT'" <ElFormItem v-if="nodeCode === 'PENDING_SUBMIT'">
type="success" <el-button type="success" @click="auditOrder('submitAudit')">
@click="auditOrder('submitAudit')"
>
提交审核 提交审核
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_AUDIT'" <ElFormItem v-if="nodeCode === 'PENDING_AUDIT'">
type="danger" <el-button type="danger" @click="auditOrder('invalid')">
@click="auditOrder('invalid')"
>
作废 作废
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'COMPLETED'" <ElFormItem v-if="nodeCode === 'COMPLETED'">
type="success" <el-button type="success" @click="auditOrder('archiving')">
@click="auditOrder('archiving')"
>
归档 归档
</el-button> </el-button>
</ElFormItem>
<ElFormItem>
<el-button type="primary" @click="printProductTag">
打印库存SKU标签
</el-button>
</ElFormItem>
</ElForm>
</div> </div>
<div <div
class="delivery-note-content flex-1 flex-column overflow-hidden" class="delivery-note-content flex-1 flex-column overflow-hidden"
...@@ -1159,9 +1149,9 @@ const handleLocalImport = async ({ ...@@ -1159,9 +1149,9 @@ const handleLocalImport = async ({
.filter((item) => item.warehouseSku) .filter((item) => item.warehouseSku)
if (importedData.length === 0) { if (importedData.length === 0) {
ElMessage.warning('导入数据中没有有效的库存SKU'); ElMessage.warning('导入数据中没有有效的库存SKU')
importDialogVisible.value = false; importDialogVisible.value = false
return; return
} }
// 2. 提取导入的 SKU 列表 // 2. 提取导入的 SKU 列表
...@@ -1171,10 +1161,10 @@ const handleLocalImport = async ({ ...@@ -1171,10 +1161,10 @@ const handleLocalImport = async ({
const filteredSkusList = await batchAddCommodity(importedSkus) const filteredSkusList = await batchAddCommodity(importedSkus)
if (filteredSkusList.length === 0) { if (filteredSkusList.length === 0) {
ElMessage.warning('导入的库存SKU已存在或无效'); ElMessage.warning('导入的库存SKU已存在或无效')
importedFileUrl.value = path; importedFileUrl.value = path
importDialogVisible.value = false; importDialogVisible.value = false
return; return
} }
// 4. 将备注信息合并到获取到的商品列表中 // 4. 将备注信息合并到获取到的商品列表中
......
src/views/warehouse/receiptDoc.vue
...@@ -93,55 +93,47 @@ ...@@ -93,55 +93,47 @@
<ElFormItem> <ElFormItem>
<ElButton @click="resetSearchForm">重置</ElButton> <ElButton @click="resetSearchForm">重置</ElButton>
</ElFormItem> </ElFormItem>
</ElForm> <ElFormItem v-if="nodeCode === 'PENDING_SUBMIT'">
</div> <el-button type="primary" @click="addDialog(1, null)">
<div class="btn-list">
<el-button
v-if="nodeCode === 'PENDING_SUBMIT'"
type="primary"
@click="addDialog(1, null)"
>
新增 新增
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_AUDIT'" <ElFormItem v-if="nodeCode === 'PENDING_AUDIT'">
type="danger" <el-button type="danger" @click="rejectedInRecord">
@click="rejectedInRecord"
>
驳回 驳回
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_SUBMIT'" <ElFormItem v-if="nodeCode === 'PENDING_SUBMIT'">
type="danger" <el-button type="danger" @click="handleBatchDelete">
@click="handleBatchDelete"
>
删除 删除
</el-button> </el-button>
<el-button type="success" @click="handleExport"> 导出</el-button> </ElFormItem>
<el-button type="primary" @click="printProductTag"> <ElFormItem>
打印库存SKU标签 <el-button type="success" @click="handleExport">
</el-button> 导出</el-button
<el-button
v-if="nodeCode === 'PENDING_AUDIT'"
type="warning"
@click="auditOrder('audit')"
> >
</ElFormItem>
<ElFormItem v-if="nodeCode === 'PENDING_AUDIT'">
<el-button type="warning" @click="auditOrder('audit')">
审核 审核
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_SUBMIT'" <ElFormItem v-if="nodeCode === 'PENDING_SUBMIT'">
type="success" <el-button type="success" @click="auditOrder('submitAudit')">
@click="auditOrder('submitAudit')"
>
提交审核 提交审核
</el-button> </el-button>
<el-button </ElFormItem>
v-if="nodeCode === 'PENDING_AUDIT'" <ElFormItem v-if="nodeCode === 'PENDING_AUDIT'">
type="danger" <el-button type="danger" @click="auditOrder('invalid')">
@click="auditOrder('invalid')"
>
作废 作废
</el-button> </el-button>
</ElFormItem>
<ElFormItem>
<el-button type="primary" @click="printProductTag">
打印库存SKU标签
</el-button>
</ElFormItem>
<ElFormItem>
<el-button <el-button
v-if="nodeCode === 'COMPLETED'" v-if="nodeCode === 'COMPLETED'"
type="success" type="success"
...@@ -149,6 +141,8 @@ ...@@ -149,6 +141,8 @@
> >
归档 归档
</el-button> </el-button>
</ElFormItem>
</ElForm>
</div> </div>
<div <div
class="delivery-note-content flex-1 flex-column overflow-hidden" class="delivery-note-content flex-1 flex-column overflow-hidden"
...@@ -823,7 +817,7 @@ ...@@ -823,7 +817,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ElMessage, ElRadioGroup, ElTree } from 'element-plus' import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
import { CirclePlusFilled} from '@element-plus/icons-vue' import { CirclePlusFilled } from '@element-plus/icons-vue'
import splitDiv from '@/components/splitDiv/splitDiv.vue' import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { ElTable } from 'element-plus' import { ElTable } from 'element-plus'
import usePageList from '@/utils/hooks/usePageList' import usePageList from '@/utils/hooks/usePageList'
...@@ -1211,7 +1205,7 @@ const handleLocalImport = async ({ ...@@ -1211,7 +1205,7 @@ const handleLocalImport = async ({
const importedItem = importedData.find( const importedItem = importedData.find(
(item) => item.warehouseSku === skuItem.sku, (item) => item.warehouseSku === skuItem.sku,
) )
const target = locationList.value.find((item:InterProductList) => { const target = locationList.value.find((item: InterProductList) => {
return item.locationCode == importedItem?.locationCode return item.locationCode == importedItem?.locationCode
}) })
return { return {
...@@ -1541,7 +1535,7 @@ const addOtherCurrency = async () => { ...@@ -1541,7 +1535,7 @@ const addOtherCurrency = async () => {
(item: InterProductList) => item.locationId === arr[i].locationId, (item: InterProductList) => item.locationId === arr[i].locationId,
) )
if (!arr[i].locationCode) { if (!arr[i].locationCode) {
arr[i].locationCode =found? found?.locationCode:'' arr[i].locationCode = found ? found?.locationCode : ''
} }
} }
if (!formId.value) { if (!formId.value) {
......
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