|
|
|
@ -2,26 +2,24 @@
|
|
|
|
<div>
|
|
|
|
<div>
|
|
|
|
<el-card class="el-card">
|
|
|
|
<el-card class="el-card">
|
|
|
|
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
|
|
|
|
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item class="query-form-item" label="单号:">
|
|
|
|
<el-form-item class="query-form-item" label="单号:">
|
|
|
|
<el-input v-model="filterQuery.billNo" placeholder="请输入单号"
|
|
|
|
<el-input v-model="filterQuery.billNo" placeholder="请输入单号"
|
|
|
|
style="width: 90%"
|
|
|
|
style="width: 90%"
|
|
|
|
clearable="true"></el-input>
|
|
|
|
clearable="true"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<!-- <el-col :span="6">-->
|
|
|
|
<el-form-item class="query-form-item" label="出入库类型:">
|
|
|
|
<!-- <el-form-item class="query-form-item" label="出入库类型:">-->
|
|
|
|
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
|
|
|
|
<!-- <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
|
|
|
|
<el-option label="全部" value=""></el-option>
|
|
|
|
<!-- <el-option label="全部" value=""></el-option>-->
|
|
|
|
<el-option label="入库" value="WareHouseIn"></el-option>
|
|
|
|
<!-- <el-option label="入库" value="WareHouseIn"></el-option>-->
|
|
|
|
<el-option label="出库" value="WareHouseOut"></el-option>
|
|
|
|
<!-- <el-option label="出库" value="WareHouseOut"></el-option>-->
|
|
|
|
</el-select>
|
|
|
|
<!-- </el-select>-->
|
|
|
|
</el-form-item>
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
</el-col>
|
|
|
|
<!-- </el-col>-->
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item class="query-form-item" label="单据类型:">
|
|
|
|
<el-form-item class="query-form-item" label="单据类型:">
|
|
|
|
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
|
|
|
|
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
|
|
|
|
style="width: 90%"
|
|
|
|
style="width: 90%"
|
|
|
|
@ -36,9 +34,9 @@
|
|
|
|
</el-select>
|
|
|
|
</el-select>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item class="query-form-item" label="所属仓库:">
|
|
|
|
<el-form-item class="query-form-item" label="采购仓库:">
|
|
|
|
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
|
|
|
|
<el-select v-model="filterQuery.invCode" placeholder="请选择采购仓库" clearable="true"
|
|
|
|
style="width: 90%"
|
|
|
|
style="width: 90%"
|
|
|
|
@change="invChange"
|
|
|
|
@change="invChange"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
@ -54,7 +52,7 @@
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-form-item class="query-form-item" label="创建时间:">
|
|
|
|
<el-form-item class="query-form-item" label="创建时间:">
|
|
|
|
<el-date-picker
|
|
|
|
<el-date-picker
|
|
|
|
:picker-options="pickerOptions"
|
|
|
|
:picker-options="pickerOptions"
|
|
|
|
@ -70,6 +68,22 @@
|
|
|
|
</el-date-picker>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
|
|
|
|
|
|
<el-form-item class="query-form-item" label="审核时间:">
|
|
|
|
|
|
|
|
<el-date-picker
|
|
|
|
|
|
|
|
:picker-options="pickerOptions"
|
|
|
|
|
|
|
|
v-model="auditDateRange"
|
|
|
|
|
|
|
|
type="daterange"
|
|
|
|
|
|
|
|
format="yyyy 年 MM 月 dd 日"
|
|
|
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
|
|
|
range-separator="至"
|
|
|
|
|
|
|
|
start-placeholder="开始日期"
|
|
|
|
|
|
|
|
end-placeholder="结束日期"
|
|
|
|
|
|
|
|
style="width: 90%"
|
|
|
|
|
|
|
|
>
|
|
|
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
</el-row>
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
<div class="top-right-btn">
|
|
|
|
<div class="top-right-btn">
|
|
|
|
@ -93,10 +107,10 @@
|
|
|
|
@current-change="handleSelectionChange">
|
|
|
|
@current-change="handleSelectionChange">
|
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="单据类型" prop="billTypeName"></el-table-column>
|
|
|
|
<el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
|
|
|
|
<el-table-column label="订单号" prop="billNo" show-overflow-tooltip></el-table-column>
|
|
|
|
<el-table-column label="订单号" prop="billNo" width="180" show-overflow-tooltip></el-table-column>
|
|
|
|
<el-table-column label="来源订单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
|
|
|
|
<el-table-column label="来源订单号" prop="corpOrderId" width="180" show-overflow-tooltip></el-table-column>
|
|
|
|
<el-table-column label="来源" prop="fromType">
|
|
|
|
<el-table-column label="来源" prop="fromType" width="120">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
|
|
|
|
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
@ -107,9 +121,7 @@
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="当前仓库" prop="invName" width="120">
|
|
|
|
<el-table-column label="当前仓库" prop="invName" width="120">
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="所属科室" prop="deptName" width="120" v-if="enableDept">
|
|
|
|
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150">
|
|
|
|
</el-table-column>
|
|
|
|
|
|
|
|
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
|
|
|
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<i class="el-icon-time"></i>
|
|
|
|
<i class="el-icon-time"></i>
|
|
|
|
<span>{{ scope.row.createTime }}</span>
|
|
|
|
<span>{{ scope.row.createTime }}</span>
|
|
|
|
@ -149,8 +161,6 @@
|
|
|
|
>撤回
|
|
|
|
>撤回
|
|
|
|
</el-button
|
|
|
|
</el-button
|
|
|
|
>
|
|
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="text"
|
|
|
|
type="text"
|
|
|
|
size="small"
|
|
|
|
size="small"
|
|
|
|
@ -212,48 +222,48 @@
|
|
|
|
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
|
|
|
|
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
|
|
|
|
row-key="id"
|
|
|
|
row-key="id"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index" width="50"></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="物资名称"
|
|
|
|
label="物资名称"
|
|
|
|
prop="coName"
|
|
|
|
prop="coName" width="160"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="规格型号"
|
|
|
|
label="规格型号" width="160"
|
|
|
|
prop="spec"
|
|
|
|
prop="spec"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="批次号"
|
|
|
|
label="批次号" width="120"
|
|
|
|
prop="batchNo"
|
|
|
|
prop="batchNo"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="生产日期"
|
|
|
|
label="生产日期" width="120"
|
|
|
|
prop="productDate"
|
|
|
|
prop="productDate"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="失效日期"
|
|
|
|
label="失效日期"
|
|
|
|
prop="expireDate"
|
|
|
|
prop="expireDate" width="120"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="单据数量"
|
|
|
|
label="单据数量" width="100"
|
|
|
|
prop="count"
|
|
|
|
prop="count"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="扫码数量"
|
|
|
|
label="扫码数量"
|
|
|
|
prop="scanCount"
|
|
|
|
prop="scanCount" width="100"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="价格"
|
|
|
|
label="价格" width="100"
|
|
|
|
prop="price"
|
|
|
|
prop="price"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="生产企业"
|
|
|
|
label="生产企业" width="180"
|
|
|
|
prop="manufacturer"
|
|
|
|
prop="manufacturer"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="注册/备案凭证号"
|
|
|
|
label="注册/备案凭证号"
|
|
|
|
prop="certCode"
|
|
|
|
prop="certCode" width="180"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
@ -298,48 +308,48 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="物资名称"
|
|
|
|
label="物资名称" width="160"
|
|
|
|
prop="coName"
|
|
|
|
prop="coName"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="规格型号"
|
|
|
|
label="规格型号" width="160"
|
|
|
|
prop="spec"
|
|
|
|
prop="spec"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="批次号"
|
|
|
|
label="批次号" width="120"
|
|
|
|
prop="batchNo"
|
|
|
|
prop="batchNo"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="生产日期"
|
|
|
|
label="生产日期" width="120"
|
|
|
|
prop="productDate"
|
|
|
|
prop="productDate"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="失效日期"
|
|
|
|
label="失效日期" width="120"
|
|
|
|
prop="expireDate"
|
|
|
|
prop="expireDate"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="单据数量"
|
|
|
|
label="单据数量" width="100"
|
|
|
|
prop="orderCount"
|
|
|
|
prop="orderCount"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="扫码数量"
|
|
|
|
label="扫码数量"
|
|
|
|
prop="reCount"
|
|
|
|
prop="reCount" width="100"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="供应商"
|
|
|
|
label="供应商"
|
|
|
|
prop="supName"
|
|
|
|
prop="supName" width="180"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="生产企业"
|
|
|
|
label="生产企业" width="180"
|
|
|
|
prop="manufacturer"
|
|
|
|
prop="manufacturer"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="注册/备案凭证号"
|
|
|
|
label="注册/备案凭证号" width="180"
|
|
|
|
prop="certCode"
|
|
|
|
prop="certCode"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
@ -388,6 +398,7 @@
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="UDI码"
|
|
|
|
label="UDI码"
|
|
|
|
prop="code"
|
|
|
|
prop="code"
|
|
|
|
|
|
|
|
width="220"
|
|
|
|
show-overflow-tooltip
|
|
|
|
show-overflow-tooltip
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
@ -402,23 +413,23 @@
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="批次号"
|
|
|
|
label="批次号"
|
|
|
|
prop="batchNo"
|
|
|
|
prop="batchNo" width="120"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="序列号"
|
|
|
|
label="序列号"
|
|
|
|
prop="serialNo"
|
|
|
|
prop="serialNo" width="120"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="供应商"
|
|
|
|
label="供应商"
|
|
|
|
prop="supName"
|
|
|
|
prop="supName" width="180"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="扫码数量"
|
|
|
|
label="扫码数量"
|
|
|
|
prop="count"
|
|
|
|
prop="count" width="100"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
<el-table-column
|
|
|
|
label="实际数量"
|
|
|
|
label="实际数量"
|
|
|
|
prop="reCount"
|
|
|
|
prop="reCount" width="100"
|
|
|
|
></el-table-column>
|
|
|
|
></el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
|
|
|
|
@ -538,6 +549,7 @@ export default {
|
|
|
|
billNo: ""
|
|
|
|
billNo: ""
|
|
|
|
},
|
|
|
|
},
|
|
|
|
actDateRange: [],
|
|
|
|
actDateRange: [],
|
|
|
|
|
|
|
|
auditDateRange: [],
|
|
|
|
pickerOptions: {
|
|
|
|
pickerOptions: {
|
|
|
|
shortcuts: [
|
|
|
|
shortcuts: [
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -628,6 +640,15 @@ export default {
|
|
|
|
this.filterQuery.startTime = null;
|
|
|
|
this.filterQuery.startTime = null;
|
|
|
|
this.filterQuery.endTime = null;
|
|
|
|
this.filterQuery.endTime = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.auditDateRange !== null) {
|
|
|
|
|
|
|
|
this.filterQuery.startAduditTime = this.auditDateRange[0];
|
|
|
|
|
|
|
|
this.filterQuery.endAduditTime = this.auditDateRange[1];
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.filterQuery.startAduditTime = null;
|
|
|
|
|
|
|
|
this.filterQuery.endAduditTime = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
this.filterQuery.page = 1;
|
|
|
|
this.filterQuery.page = 1;
|
|
|
|
this.getList();
|
|
|
|
this.getList();
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
anthonywj
2 years ago