耗材字典,单据界面修整

ywj_dev
anthonywj 2 years ago
parent 58c775680c
commit d33c38a19c

@ -3,22 +3,22 @@
<el-card class="el-card">
<el-form :model="query" label-width="100px" class="query-form" size="mini" v-show="showSearch">
<el-row>
<el-col span="6">
<el-col span="8">
<el-form-item label="搜索:">
<el-input v-model="query.key" placeholder="搜索" style="width: 90%" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col span="6">
<el-form-item label="往来单位类型:">
<el-select v-model="query.corpType" style="width: 90%" placeholder="请选择往来单位类型">
<el-option label="全部" value=""></el-option>
<el-option label="客户" value="1"></el-option>
<el-option label="供应商" value="2"></el-option>
<el-option label="特殊科室" value="3"></el-option>
<el-option label="特殊往来" value="4"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col span="6">-->
<!-- <el-form-item label="往来单位类型:">-->
<!-- <el-select v-model="query.corpType" style="width: 90%" placeholder="请选择往来单位类型">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="客户" value="1"></el-option>-->
<!-- <el-option label="供应商" value="2"></el-option>-->
<!-- <el-option label="特殊科室" value="3"></el-option>-->
<!-- <el-option label="特殊往来" value="4"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
@ -161,18 +161,18 @@
</el-col>
</el-row>
<el-row :type="flex">
<el-col :span="12" type="flex">
<el-form-item label="往来单位类型" prop="corpType">
<el-select v-model="editQuery.corpType" style="width: 90%" placeholder="请选择往来单位类型">
<el-option
v-for="item in corpTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12" type="flex">-->
<!-- <el-form-item label="往来单位类型" prop="corpType">-->
<!-- <el-select v-model="editQuery.corpType" style="width: 90%" placeholder="请选择往来单位类型">-->
<!-- <el-option-->
<!-- v-for="item in corpTypeList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="12" type="flex">
<el-form-item label="拼音码" prop="spell">
<el-input v-model="editQuery.spell" placeholder="请输入拼音码" auto-complete="off"
@ -236,8 +236,8 @@ export default {
checked: false,
formName: null,
formMap: {
add: "新增",
update: "编辑"
add: "往来信息字典-新增",
update: "往来信息字典-编辑"
},
formLoading: false,
formVisible: false,
@ -375,7 +375,8 @@ export default {
type: "",
creditNo: "",
contact: "",
mobile: ""
mobile: "",
corpType:2,
};
}

@ -51,7 +51,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
@ -109,8 +108,7 @@
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></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" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
@ -118,7 +116,7 @@
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
@ -138,6 +136,8 @@
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
@ -226,55 +226,48 @@
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
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
label="物资名称"
prop="coName"
prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
label="规格型号" width="160"
prop="spec"
></el-table-column>
<el-table-column
label="批次号"
label="批次号" width="120"
prop="batchNo"
></el-table-column>
<el-table-column
label="送货数量"
prop="count"
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="扫码数量"
prop="scanCount"
label="失效日期"
prop="expireDate" width="120"
></el-table-column>
<el-table-column
label="计量单位"
prop="price"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
label="价格"
prop="price"
></el-table-column>
<!--todo-->
<el-table-column
label="生产日期"
prop="productDate"
label="扫码数量"
prop="scanCount" width="100"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
label="价格" width="100"
prop="price"
></el-table-column>
<el-table-column
label="生产企业"
label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号"
prop="certCode"
prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
</el-table>
@ -319,48 +312,48 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
label="物资名称" width="160"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
label="规格型号" width="160"
prop="spec"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
label="批次号" width="120"
prop="batchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
label="失效日期" width="120"
prop="expireDate"
></el-table-column>
<el-table-column
label="送货数量"
label="单据数量" width="100"
prop="orderCount"
></el-table-column>
<el-table-column
label="到货数量"
prop="reCount"
label="扫码数量"
prop="reCount" width="100"
></el-table-column>
<el-table-column
label="供应商"
prop="supName"
prop="supName" width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业"
label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号"
label="注册/备案凭证号" width="180"
prop="certCode"
show-overflow-tooltip
></el-table-column>
@ -409,6 +402,7 @@
<el-table-column
label="UDI码"
prop="code"
width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column
@ -423,23 +417,23 @@
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
prop="batchNo" width="120"
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo"
prop="serialNo" width="120"
></el-table-column>
<el-table-column
label="供应商"
prop="supName"
prop="supName" width="180"
></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
prop="count" width="100"
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount"
prop="reCount" width="100"
></el-table-column>
</el-table>

@ -108,8 +108,7 @@
@current-change="handleSelectionChange">
<el-table-column label="序号" type="index"></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" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="送货单位" prop="fromName" width="220">
</el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
@ -117,7 +116,7 @@
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip></el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="120">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.fromType] }}</span>
@ -139,7 +138,6 @@
</el-table-column>
<el-table-column label="审核状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag :type="statusFilterType(scope.row.status)">{{
@ -156,7 +154,7 @@
</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="审核状态" prop="status" width="100">-->
<!-- <el-table-column label="审核状态" prop="status" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="statusFilterType(scope.row.status)">{{-->
<!-- checkStatus[scope.row.status]-->
@ -247,45 +245,45 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
prop="coName"
prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
label="规格型号" width="160"
prop="spec"
></el-table-column>
<el-table-column
label="批次号"
label="批次号" width="120"
prop="batchNo"
></el-table-column>
<el-table-column
label="生产日期"
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
prop="expireDate" width="120"
></el-table-column>
<el-table-column
label="单据数量"
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
label="扫码数量"
prop="scanCount"
prop="scanCount" width="100"
></el-table-column>
<el-table-column
label="价格"
label="价格" width="100"
prop="price"
></el-table-column>
<el-table-column
label="生产企业"
label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号"
prop="certCode"
prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
</el-table>
@ -330,48 +328,48 @@
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称"
label="物资名称" width="160"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
label="规格型号" width="160"
prop="spec"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
label="批次号" width="120"
prop="batchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
label="失效日期" width="120"
prop="expireDate"
></el-table-column>
<el-table-column
label="单据数量"
label="单据数量" width="100"
prop="orderCount"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
prop="reCount" width="100"
></el-table-column>
<el-table-column
label="供应商"
prop="supName"
prop="supName" width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业"
label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号"
label="注册/备案凭证号" width="180"
prop="certCode"
show-overflow-tooltip
></el-table-column>
@ -420,6 +418,7 @@
<el-table-column
label="UDI码"
prop="code"
width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column
@ -434,23 +433,23 @@
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
prop="batchNo" width="120"
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo"
prop="serialNo" width="120"
></el-table-column>
<el-table-column
label="供应商"
prop="supName"
prop="supName" width="180"
></el-table-column>
<el-table-column
label="扫码数量"
prop="count"
prop="count" width="100"
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount"
prop="reCount" width="100"
></el-table-column>
</el-table>

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save