入库单据 作废 审核 确认
This commit is contained in:
liuhanqing
@@ -42,3 +42,29 @@ export function delStockIn(stockinGuid) {
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
// 作废入库单据
|
||||
export function invalidatedStockIn(data) {
|
||||
return request({
|
||||
url: '/in/stockIn',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
// 审核入库单据
|
||||
export function reviewStockIn(data) {
|
||||
return request({
|
||||
url: '/in/stockIn',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
// 确认入库单据
|
||||
export function confirmationStockIn(data) {
|
||||
return request({
|
||||
url: '/in/stockIn',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -9,140 +9,140 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="入库类型" prop="inType">
|
||||
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.in_bill_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="建立时间" prop="createDate">
|
||||
<el-input
|
||||
v-model="queryParams.createDate"
|
||||
placeholder="请输入建立时间"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建人" prop="createManId">
|
||||
<el-input
|
||||
v-model="queryParams.createManId"
|
||||
placeholder="请输入创建人"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据状态" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.in_bill_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库ID" prop="warehouseId">
|
||||
<el-input
|
||||
v-model="queryParams.warehouseId"
|
||||
placeholder="请输入仓库ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label=" 完成日期" prop="finishDate">
|
||||
<el-input
|
||||
v-model="queryParams.finishDate"
|
||||
placeholder="请输入 完成日期"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="erp单号" prop="erpBill">
|
||||
<el-input
|
||||
v-model="queryParams.erpBill"
|
||||
placeholder="请输入erp单号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据来源" prop="stockSource">
|
||||
<el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.bill_resource"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户编码" prop="customerNo">
|
||||
<el-input
|
||||
v-model="queryParams.customerNo"
|
||||
placeholder="请输入客户编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="班组编码" prop="classNo">
|
||||
<el-input
|
||||
v-model="queryParams.classNo"
|
||||
placeholder="请输入班组编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="供应商编码" prop="supplierNo">
|
||||
<el-input
|
||||
v-model="queryParams.supplierNo"
|
||||
placeholder="请输入供应商编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段1" prop="spare1">
|
||||
<el-input
|
||||
v-model="queryParams.spare1"
|
||||
placeholder="请输入备用字段1"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段2" prop="spare2">
|
||||
<el-input
|
||||
v-model="queryParams.spare2"
|
||||
placeholder="请输入备用字段2"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段4" prop="spare4">
|
||||
<el-input
|
||||
v-model="queryParams.spare4"
|
||||
placeholder="请输入备用字段4"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段3" prop="spare3">
|
||||
<el-input
|
||||
v-model="queryParams.spare3"
|
||||
placeholder="请输入备用字段3"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段5" prop="spare5">
|
||||
<el-input
|
||||
v-model="queryParams.spare5"
|
||||
placeholder="请输入备用字段5"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="入库类型" prop="inType">
|
||||
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.in_bill_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="建立时间" prop="createDate">
|
||||
<el-input
|
||||
v-model="queryParams.createDate"
|
||||
placeholder="请输入建立时间"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建人" prop="createManId">
|
||||
<el-input
|
||||
v-model="queryParams.createManId"
|
||||
placeholder="请输入创建人"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据状态" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.in_bill_status"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库ID" prop="warehouseId">
|
||||
<el-input
|
||||
v-model="queryParams.warehouseId"
|
||||
placeholder="请输入仓库ID"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label=" 完成日期" prop="finishDate">
|
||||
<el-input
|
||||
v-model="queryParams.finishDate"
|
||||
placeholder="请输入 完成日期"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="erp单号" prop="erpBill">
|
||||
<el-input
|
||||
v-model="queryParams.erpBill"
|
||||
placeholder="请输入erp单号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单据来源" prop="stockSource">
|
||||
<el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.bill_resource"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="客户编码" prop="customerNo">
|
||||
<el-input
|
||||
v-model="queryParams.customerNo"
|
||||
placeholder="请输入客户编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="班组编码" prop="classNo">
|
||||
<el-input
|
||||
v-model="queryParams.classNo"
|
||||
placeholder="请输入班组编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="供应商编码" prop="supplierNo">
|
||||
<el-input
|
||||
v-model="queryParams.supplierNo"
|
||||
placeholder="请输入供应商编码"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段1" prop="spare1">
|
||||
<el-input
|
||||
v-model="queryParams.spare1"
|
||||
placeholder="请输入备用字段1"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段2" prop="spare2">
|
||||
<el-input
|
||||
v-model="queryParams.spare2"
|
||||
placeholder="请输入备用字段2"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段4" prop="spare4">
|
||||
<el-input
|
||||
v-model="queryParams.spare4"
|
||||
placeholder="请输入备用字段4"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段3" prop="spare3">
|
||||
<el-input
|
||||
v-model="queryParams.spare3"
|
||||
placeholder="请输入备用字段3"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段5" prop="spare5">
|
||||
<el-input
|
||||
v-model="queryParams.spare5"
|
||||
placeholder="请输入备用字段5"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
@@ -150,15 +150,29 @@
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleInvalidated"
|
||||
v-hasPermi="['in:stockIn:edit']"
|
||||
>单据作废
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['in:stockIn:add']"
|
||||
>新增</el-button>
|
||||
:disabled="single"
|
||||
@click="handleReview"
|
||||
v-hasPermi="['in:stockIn:edit']"
|
||||
>单据审核
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
@@ -167,21 +181,11 @@
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
@click="handleConfirmation"
|
||||
v-hasPermi="['in:stockIn:edit']"
|
||||
>修改</el-button>
|
||||
>单据确认
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['in:stockIn:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>-->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
@@ -190,62 +194,75 @@
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['in:stockIn:export']"
|
||||
>导出</el-button>
|
||||
>单据导出
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="info"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleBarcodePrinting"
|
||||
v-hasPermi="['in:stockIn:barcodePrinting']"
|
||||
>打印条码
|
||||
</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="stockInList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false" />
|
||||
<el-table-column label="入库订单ID" align="center" prop="stockinId" />
|
||||
<el-table v-loading="loading" :data="stockInList" @selection-change="handleSelectionChange"
|
||||
@row-click="handleRowClick">
|
||||
<el-table-column type="selection" width="55" align="center"/>
|
||||
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
|
||||
<el-table-column label="入库订单ID" align="center" prop="stockinId"/>
|
||||
<el-table-column label="入库类型" align="center" prop="inType">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="建立时间" align="center" prop="createDate" />
|
||||
<el-table-column label="创建人" align="center" prop="createManId" />
|
||||
<el-table-column label="建立时间" align="center" prop="createDate"/>
|
||||
<el-table-column label="创建人" align="center" prop="createManId"/>
|
||||
<el-table-column label="单据状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
|
||||
<el-table-column label=" 完成日期" align="center" prop="finishDate" />
|
||||
<el-table-column label="erp单号" align="center" prop="erpBill" />
|
||||
<el-table-column label="仓库ID" align="center" prop="warehouseId"/>
|
||||
<el-table-column label=" 完成日期" align="center" prop="finishDate"/>
|
||||
<el-table-column label="erp单号" align="center" prop="erpBill"/>
|
||||
<el-table-column label="单据来源" align="center" prop="stockSource">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="部门编码" align="center" prop="departmentNo" />
|
||||
<!-- <el-table-column label="客户编码" align="center" prop="customerNo" />-->
|
||||
<el-table-column label="班组编码" align="center" prop="classNo" />
|
||||
<el-table-column label="供应商编码" align="center" prop="supplierNo" />
|
||||
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
|
||||
<el-table-column label="备用字段2" align="center" prop="spare2" />
|
||||
<el-table-column label="备用字段4" align="center" prop="spare4" />
|
||||
<el-table-column label="备用字段3" align="center" prop="spare3" />
|
||||
<el-table-column label="备用字段5" align="center" prop="spare5" />-->
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['in:stockIn:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['in:stockIn:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
<el-table-column label="部门编码" align="center" prop="departmentNo"/>
|
||||
<!-- <el-table-column label="客户编码" align="center" prop="customerNo" />-->
|
||||
<el-table-column label="班组编码" align="center" prop="classNo"/>
|
||||
<el-table-column label="供应商编码" align="center" prop="supplierNo"/>
|
||||
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
|
||||
<el-table-column label="备用字段2" align="center" prop="spare2" />
|
||||
<el-table-column label="备用字段4" align="center" prop="spare4" />
|
||||
<el-table-column label="备用字段3" align="center" prop="spare3" />
|
||||
<el-table-column label="备用字段5" align="center" prop="spare5" />-->
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['in:stockIn:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['in:stockIn:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
@@ -256,67 +273,79 @@
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleSelectionChange" >
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="子单ID" align="center" prop="stockinDetailId" />
|
||||
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" />-->
|
||||
<el-table-column label="主单ID" align="center" prop="stockinId" />
|
||||
<el-table-column label="批次号" align="center" prop="lotNo" />
|
||||
<el-table-column label="物料ID" align="center" prop="productGuid" />
|
||||
<el-table-column label="物料编码" align="center" prop="productId" />
|
||||
<el-table-column label="计划数量" align="center" prop="quantity" />
|
||||
<el-table-column label="计划数量(箱)" align="center" prop="quantityX" />
|
||||
<el-table-column label="计划数量(件)" align="center" prop="quantityJ" />
|
||||
<el-table-column label="参考单价" align="center" prop="price" />
|
||||
<el-table-column label="品牌" align="center" prop="cargoNo" />
|
||||
<el-table-column label="描述" align="center" prop="remark" />
|
||||
<el-table-column label="实际数量" align="center" prop="assignNum" />
|
||||
<el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
|
||||
<el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />
|
||||
<el-table-column label="入库日期" align="center" prop="printDate" />
|
||||
<el-table-column label="单据状态" align="center" prop="stockStatus" />
|
||||
<!-- <el-table-column label="供应商编码" align="center" prop="supplierId" />
|
||||
<el-table-column label="客户编码" align="center" prop="customerId" />-->
|
||||
<el-table-column label="单位" align="center" prop="unit" />
|
||||
<el-table-column label="规格" align="center" prop="spec" />
|
||||
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
|
||||
<el-table-column label="备用字段2" align="center" prop="spare2" />
|
||||
<el-table-column label="备用字段3" align="center" prop="spare3" />
|
||||
<el-table-column label="备用字段4" align="center" prop="spare4" />
|
||||
<el-table-column label="备用字段5" align="center" prop="spare5" />
|
||||
<el-table-column label="备用字段6" align="center" prop="spare6" />-->
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['in:stockInDetail:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['in:stockInDetail:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
<el-table v-loading="detailLoading" :data="stockInDetailList">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" />-->
|
||||
<el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
|
||||
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" />-->
|
||||
<el-table-column label="主单ID" align="center" prop="stockinId"/>
|
||||
<el-table-column label="批次号" align="center" prop="lotNo"/>
|
||||
<el-table-column label="物料ID" align="center" prop="productGuid"/>
|
||||
<el-table-column label="物料编码" align="center" prop="productId"/>
|
||||
|
||||
<!-- <el-table-column label="计划数量(箱)" align="center" prop="quantityX" />
|
||||
<el-table-column label="计划数量(件)" align="center" prop="quantityJ" />-->
|
||||
<el-table-column label="参考单价" align="center" prop="price"/>
|
||||
<el-table-column label="品牌" align="center" prop="cargoNo"/>
|
||||
<el-table-column label="描述" align="center" prop="remark"/>
|
||||
|
||||
<!-- <el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
|
||||
<el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
|
||||
<el-table-column label="入库日期" align="center" prop="printDate"/>
|
||||
<!-- <el-table-column label="单据状态" align="center" prop="stockStatus" />-->
|
||||
<!-- <el-table-column label="供应商编码" align="center" prop="supplierId" />
|
||||
<el-table-column label="客户编码" align="center" prop="customerId" />-->
|
||||
<el-table-column label="单位" align="center" prop="unit"/>
|
||||
<el-table-column label="规格" align="center" prop="spec"/>
|
||||
<el-table-column label="计划数量" align="center" prop="quantity"/>
|
||||
<el-table-column label="扫码数量" align="center" prop="scanNum"/>
|
||||
<el-table-column label="实际数量" align="center" prop="assignNum"/>
|
||||
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
|
||||
<el-table-column label="备用字段2" align="center" prop="spare2" />
|
||||
<el-table-column label="备用字段3" align="center" prop="spare3" />
|
||||
<el-table-column label="备用字段4" align="center" prop="spare4" />
|
||||
<el-table-column label="备用字段5" align="center" prop="spare5" />
|
||||
<el-table-column label="备用字段6" align="center" prop="spare6" />-->
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['in:stockInDetail:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['in:stockInDetail:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
v-show="detailTotal>0"
|
||||
:total="detailTotal"
|
||||
:page.sync="queryDetailParams.pageNum"
|
||||
:limit.sync="queryDetailParams.pageSize"
|
||||
@pagination="getDetailList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listStockIn, getStockIn, delStockIn, addStockIn, updateStockIn } from "@/api/in/stockIn"
|
||||
import { listStockInDetail } from "@/api/in/stockInDetail"
|
||||
import {
|
||||
listStockIn,
|
||||
getStockIn,
|
||||
delStockIn,
|
||||
addStockIn,
|
||||
updateStockIn,
|
||||
invalidatedStockIn,
|
||||
reviewStockIn,
|
||||
confirmationStockIn
|
||||
} from "@/api/in/stockIn"
|
||||
import {listStockInDetail, barcodePrinting} from "@/api/in/stockInDetail"
|
||||
|
||||
|
||||
export default {
|
||||
@@ -329,6 +358,8 @@ export default {
|
||||
detailLoading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 主表选中的数据
|
||||
stockInListSelected: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
@@ -337,11 +368,11 @@ export default {
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
detailTotal:0,
|
||||
detailTotal: 0,
|
||||
// 入库单据表格数据
|
||||
stockInList: [],
|
||||
// 入库单据子表表格数据
|
||||
stockInDetailList:[],
|
||||
stockInDetailList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
@@ -369,26 +400,26 @@ export default {
|
||||
spare3: null,
|
||||
spare5: null
|
||||
},
|
||||
queryDetailParams:{
|
||||
queryDetailParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
stockinId:null
|
||||
stockinId: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
stockinId: [
|
||||
{ required: true, message: "入库订单ID不能为空", trigger: "blur" }
|
||||
{required: true, message: "入库订单ID不能为空", trigger: "blur"}
|
||||
],
|
||||
inType: [
|
||||
{ required: true, message: "入库类型不能为空", trigger: "change" }
|
||||
{required: true, message: "入库类型不能为空", trigger: "change"}
|
||||
],
|
||||
createDate: [
|
||||
{ required: true, message: "建立时间不能为空", trigger: "blur" }
|
||||
{required: true, message: "建立时间不能为空", trigger: "blur"}
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: "单据状态不能为空", trigger: "change" }
|
||||
{required: true, message: "单据状态不能为空", trigger: "change"}
|
||||
],
|
||||
}
|
||||
}
|
||||
@@ -405,10 +436,10 @@ export default {
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
var length = this.stockInList.length;
|
||||
if (length > 0){
|
||||
if (length > 0) {
|
||||
var data = this.stockInList.at(0);
|
||||
this.getDetailList(data.stockinId);
|
||||
}else {
|
||||
} else {
|
||||
console.log("没有数据")
|
||||
this.stockInDetailList = []
|
||||
this.detailLoading = false
|
||||
@@ -458,7 +489,8 @@ export default {
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.stockinGuid)
|
||||
this.single = selection.length!==1
|
||||
this.stockInListSelected = selection
|
||||
this.single = selection.length !== 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
@@ -477,6 +509,67 @@ export default {
|
||||
this.title = "修改入库单据"
|
||||
})
|
||||
},
|
||||
/** 作废单据按钮操作 */
|
||||
handleInvalidated(row){
|
||||
let stockIn = this.stockInListSelected[0];
|
||||
if (stockIn.status === "1") {
|
||||
console.log(1)
|
||||
let data = {
|
||||
"stockinGuid": stockIn.stockinGuid,
|
||||
"status":"5"
|
||||
}
|
||||
invalidatedStockIn(data).then(response => {
|
||||
this.$modal.msgSuccess("作废成功")
|
||||
this.getList()
|
||||
})
|
||||
}else {
|
||||
this.$modal.msgError("操作失败")
|
||||
}
|
||||
|
||||
},
|
||||
/** 审核单据按钮操作 */
|
||||
handleReview(row){
|
||||
let stockIn = this.stockInListSelected[0];
|
||||
if (stockIn.status === "2") {
|
||||
this.$modal.msgError("单据已审核，请勿重复审核")
|
||||
return
|
||||
}
|
||||
if (stockIn.status === "1") {
|
||||
let data = {
|
||||
"stockinGuid": stockIn.stockinGuid,
|
||||
"status":"2"
|
||||
}
|
||||
reviewStockIn(data).then(response => {
|
||||
this.$modal.msgSuccess("审核成功")
|
||||
this.getList()
|
||||
})
|
||||
}else {
|
||||
this.$modal.msgError("操作失败")
|
||||
}
|
||||
},
|
||||
/**确认单据按钮操作 */
|
||||
handleConfirmation(row){
|
||||
let stockIn = this.stockInListSelected[0];
|
||||
if (stockIn.status === "3"){
|
||||
let data = {
|
||||
"stockinGuid": stockIn.stockinGuid,
|
||||
"status":"4"
|
||||
}
|
||||
confirmationStockIn(data).then(response => {
|
||||
this.$modal.msgSuccess("确认成功")
|
||||
this.getList()
|
||||
})
|
||||
}else {
|
||||
this.$modal.msgError("操作失败")
|
||||
}
|
||||
},
|
||||
/** 打印条码按钮操作 */
|
||||
handleBarcodePrinting(row){
|
||||
barcodePrinting(row.stockinGuid).then(response => {
|
||||
this.$modal.msgSuccess("打印成功")
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
@@ -500,12 +593,14 @@ export default {
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const stockinGuids = row.stockinGuid || this.ids
|
||||
this.$modal.confirm('是否确认删除入库单据编号为"' + stockinGuids + '"的数据项？').then(function() {
|
||||
this.$modal.confirm('是否确认删除入库单据编号为"' + stockinGuids + '"的数据项？').then(function () {
|
||||
return delStockIn(stockinGuids)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
}).catch(() => {
|
||||
this.$modal.msgSuccess("删除失败")
|
||||
})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
@@ -522,7 +617,7 @@ export default {
|
||||
this.detailLoading = false;
|
||||
});
|
||||
},
|
||||
handleRowClick(selection){
|
||||
handleRowClick(selection) {
|
||||
this.detailLoading = true;
|
||||
this.queryDetailParams.stockinId = selection.stockinId;
|
||||
listStockInDetail(this.queryDetailParams).then(response => {
|
||||
|
||||
@@ -200,13 +200,13 @@
|
||||
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />
|
||||
<el-table-column label="备用字段4" align="center" prop="spare4" />
|
||||
<el-table-column label="备用字段3" align="center" prop="spare3" />-->
|
||||
<el-table-column label=" 完成日期" align="center" prop="finishDate"/>
|
||||
<!-- <el-table-column label=" 完成日期" align="center" prop="finishDate"/>-->
|
||||
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />
|
||||
<el-table-column label="备用字段1" align="center" prop="spare1" />-->
|
||||
<el-table-column label="erp单号" align="center" prop="erpBill"/>
|
||||
<el-table-column label="单据来源" align="center" prop="stockSource"/>
|
||||
<el-table-column label="部门编码" align="center" prop="departmentNo"/>
|
||||
<el-table-column label="客户编码" align="center" prop="customerNo"/>
|
||||
<!-- <el-table-column label="客户编码" align="center" prop="customerNo"/>-->
|
||||
<el-table-column label="班组编码" align="center" prop="classNo"/>
|
||||
<el-table-column label="供应商编码" align="center" prop="supplierNo"/>
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
@@ -288,10 +288,10 @@
|
||||
<!-- <el-table-column label="实际数量" align="center" prop="assignNum" />
|
||||
<el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
|
||||
<el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
|
||||
<el-table-column label="入库日期" align="center" prop="printDate"/>
|
||||
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
|
||||
<el-table-column label="单据状态" align="center" prop="stockStatus"/>
|
||||
<el-table-column label="供应商编码" align="center" prop="supplierId"/>
|
||||
<el-table-column label="客户编码" align="center" prop="customerId"/>
|
||||
<!-- <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->
|
||||
<!-- <el-table-column label="客户编码" align="center" prop="customerId"/>-->
|
||||
<el-table-column label="单位" align="center" prop="unit"/>
|
||||
<el-table-column label="规格" align="center" prop="spec"/>
|
||||
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
|
||||
@@ -553,7 +553,7 @@ export default {
|
||||
let data = {
|
||||
stockinGuidList: stockinGuid
|
||||
}
|
||||
console.log(data)
|
||||
//console.log(data)
|
||||
createStockin(data).then(response => {
|
||||
this.getList()
|
||||
})
|
||||
@@ -643,7 +643,7 @@ export default {
|
||||
list: selectedDetails,
|
||||
stockinId: selectedDetails[0].stockinId
|
||||
};
|
||||
console.log(data);
|
||||
//console.log(data);
|
||||
qualityInspection(data).then(response => {
|
||||
this.getDetailList(data.stockinId)
|
||||
this.$modal.msgSuccess("质检成功");
|
||||
|
||||
Reference in New Issue
Block a user