main
kkk-ops 2 months ago
parent 09cb2e267e
commit 26b21b78fe

@ -1,5 +1,5 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1080">
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1500">
<el-form
ref="formRef"
:model="formData"
@ -45,7 +45,7 @@
<!-- 子表的表单 -->
<ContentWrap>
<el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
<el-tab-pane label="盘点产品清单" name="item">
<el-tab-pane label="盘点产品物料清单" name="item">
<StockCheckItemForm ref="itemFormRef" :items="formData.items" :disabled="disabled" />
</el-tab-pane>
</el-tabs>

@ -54,20 +54,20 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="账面库存" min-width="100">
<el-table-column label="产品物料编码" min-width="150">
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
<el-input disabled v-model="row.productBarCode" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="条码" min-width="150">
<el-table-column label="账面库存" min-width="100">
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.productBarCode" />
<el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
</el-form-item>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="单位" min-width="80">
<template #default="{ row }">
<el-form-item class="mb-0px!">

@ -88,7 +88,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<!-- <el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
@ -96,7 +96,7 @@
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -140,14 +140,14 @@
@selection-change="handleSelectionChange"
>
<el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="盘点单号" align="center" prop="no" />
<el-table-column label="产品信息" align="left" sortable prop="productNames" min-width="200" />
<el-table-column label="盘点单号" align="center" prop="no" />
<!-- <el-table-column label="产品物料编码" align="left" sortable prop="productBarCode" min-width="200" /> -->
<el-table-column label="产品物料名称" align="left" sortable prop="productNames"/>
<el-table-column
label="盘点时间"
align="center"
prop="checkTime"
:formatter="dateFormatter2"
width="120px"
/>
<el-table-column label="创建人" align="center" prop="creatorName" />
<el-table-column

@ -1,5 +1,5 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1080">
<Dialog :title="dialogTitle" v-model="dialogVisible" width="1500">
<el-form
ref="formRef"
:model="formData"
@ -10,12 +10,12 @@
>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="调单号" prop="no">
<el-form-item label="调单号" prop="no">
<el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="调时间" prop="moveTime">
<el-form-item label="调时间" prop="moveTime">
<el-date-picker
v-model="formData.moveTime"
type="date"

@ -77,20 +77,20 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="库存" min-width="100">
<el-table-column label="编码" min-width="150">
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
<el-input disabled v-model="row.productBarCode" />
</el-form-item>
</template>
</el-table-column>
<el-table-column label="条码" min-width="150">
<el-table-column label="库存" min-width="100">
<template #default="{ row }">
<el-form-item class="mb-0px!">
<el-input disabled v-model="row.productBarCode" />
<el-input disabled v-model="row.stockCount" :formatter="erpCountInputFormatter" />
</el-form-item>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="单位" min-width="80">
<template #default="{ row }">
<el-form-item class="mb-0px!">

@ -9,10 +9,10 @@
:inline="true"
label-width="68px"
>
<el-form-item label="调单号" prop="no">
<el-form-item label="调单号" prop="no">
<el-input
v-model="queryParams.no"
placeholder="请输入调单号"
placeholder="请输入调单号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -87,7 +87,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remark">
<!-- <el-form-item label="备注" prop="remark">
<el-input
v-model="queryParams.remark"
placeholder="请输入备注"
@ -95,7 +95,7 @@
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
</el-form-item> -->
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -138,16 +138,15 @@
:show-overflow-tooltip="true"
@selection-change="handleSelectionChange"
>
<el-table-column width="30" label="选择" type="selection" />
<el-table-column min-width="180" label="调度单号" align="center" prop="no" />
<el-table-column label="产品信息" align="left" prop="productNames" min-width="200" />
<el-table-column label="选择" type="selection" />
<el-table-column label="调拨单号" align="center" prop="no" />
<el-table-column label="产品信息" align="left" prop="productNames" />
<el-table-column
label="调度时间"
align="center"
prop="moveTime"
sortable
:formatter="dateFormatter2"
width="120px"
/>
<el-table-column label="创建人" align="center" prop="creatorName" />
<el-table-column
@ -164,12 +163,12 @@
prop="totalPrice"
:formatter="erpPriceTableColumnFormatter"
/>
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
<el-table-column label="状态" align="center" fixed="right" prop="status">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="220">
<el-table-column label="操作" align="center" fixed="right">
<template #default="scope">
<el-button
link
@ -315,7 +314,7 @@ const handleDelete = async (ids: number[]) => {
const handleUpdateStatus = async (id: number, status: number) => {
try {
//
await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该调单吗?`)
await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该调单吗?`)
//
await StockMoveApi.updateStockMoveStatus(id, status)
message.success(`${status === 20 ? '审批' : '反审批'}成功`)
@ -332,7 +331,7 @@ const handleExport = async () => {
//
exportLoading.value = true
const data = await StockMoveApi.exportStockMove(queryParams)
download.excel(data, '库存调单.xls')
download.excel(data, '库存调单.xls')
} catch {
} finally {
exportLoading.value = false

@ -79,8 +79,10 @@
</el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="产品" align="left" sortable prop="productName" />
<el-table-column label="编码" align="left" sortable prop="barCode" />
<el-table-column label="名称" align="left" sortable prop="productName" />
<el-table-column label="分类" align="center" prop="categoryName" />
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column
label="库存量"
align="right"
@ -88,7 +90,7 @@
prop="count"
:formatter="erpCountTableColumnFormatter"
/>
<el-table-column label="单位" align="center" prop="unitName" />
<el-table-column label="仓库" align="center" prop="warehouseName" />
</el-table>
<!-- 分页 -->

Loading…
Cancel
Save