UDI
/
udi-spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
ywj_dev
郑明梁 2 years ago
parent 636ce14017 755a483ea6
commit 63ea8e6fb8
40 changed files with 3022 additions and 1986 deletions
Show Stats Download Patch File Download Diff File

871
src/views/basic/business/stockOrder.vue
Unescape Escape View File

@ -1,184 +1,185 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="query" label-width="100px" v-show="showSearch">
<el-row style="width: 100%">
<el-col :span="6">
<el-form-item label="单据号:">
<el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单据号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务类型:">
<el-select v-model="query.action" style="width: 90%" placeholder="请选择业务类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="往来单位:">
<el-input v-model="query.corpName" style="width: 90%" placeholder="请输入往来单位" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当前仓库:">
<el-select v-model="query.invCode" style="width: 90%" placeholder="请选择当前仓库" clearable="true"
@change="subInvChange"
size="mini">
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="单据日期:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
style="width: 90%"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div>
<el-card class="el-card">
<el-form :model="query" label-width="100px" v-show="showSearch">
<el-row style="width: 100%">
<el-col :span="8">
<el-form-item label="单号:">
<el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="送货单位:">
<el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="收货仓库:">
<el-select v-model="query.invCode" style="width: 90%" placeholder="请选择收货仓库" clearable="true"
@change="subInvChange"
size="mini">
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单据类型:">
<el-select v-model="query.action" style="width: 90%" placeholder="请选择单据类型" clearable="true" size="mini">
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
style="width: 90%"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
</el-button-group>
</div>
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="getStockOrderDetailList" ref="multipleTable">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="送货单位" prop="fromName" show-overflow-tooltip></el-table-column>
<el-table-column label="单据来源" prop="fromType" width="150">
<template slot-scope="scope">
<span>{{ sourceMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="单据日期" prop="createTime"></el-table-column>
<el-table-column label="单据状态">
<template slot-scope="scope">
{{ scope.row.status | statusFilterName }}
</template>
</el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="送货部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="送货仓库" prop="invName" width="150">
</el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="qrcodeDetail(scope.row)"
>内部码详情
</el-button
>
</template>
</el-table-column>
</el-table>
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row @row-click="getStockOrderDetailList" ref="multipleTable">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="往来单位" prop="fromName" show-overflow-tooltip></el-table-column>
<el-table-column label="单据来源" prop="fromType" width="150">
<template slot-scope="scope">
<span>{{ sourceMap[scope.row.fromType] }}</span>
</template>
</el-table-column>
<el-table-column label="单据日期" prop="createTime"></el-table-column>
<el-table-column label="单据状态">
<template slot-scope="scope">
{{ scope.row.status | statusFilterName }}
</template>
</el-table-column>
<el-table-column label="业务类型" prop="billTypeName" width="150">
</el-table-column>
<el-table-column label="当前仓库" prop="invName" width="150">
</el-table-column>
<pagination
v-show="total>0"
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="handleCurrentChange"
></pagination>
<el-table-column label="所属科室" prop="deptName" width="120">
</el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="qrcodeDetail(scope.row)"
>内部码详情
</el-button
>
</template>
</el-table-column>
</el-table>
</el-card>
<pagination
v-show="total>0"
:total="total"
:limit.sync="query.limit"
:page.sync="query.page"
@pagination="handleCurrentChange"
></pagination>
<el-card class="el-card">
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="物资名称" prop="coName"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="实际数量" prop="reCount"></el-table-column>
<el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
</el-card>
<el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
<el-card class="el-card">
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="物资名称" prop="coName"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="实际数量" prop="reCount"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"></el-table-column>
</el-table>
</el-table>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="detailHandleCurrentChange"
></pagination>
</el-card>
<pagination
v-show="detailTotal>0"
:total="detailTotal"
:limit.sync="detailQuery.limit"
:page.sync="detailQuery.page"
@pagination="detailHandleCurrentChange"
></pagination>
</el-card>
<el-dialog
title="内部码详情"
:visible.sync="qrcodeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="70%"
append-to-body
v-if="qrcodeDetailVisible"
@close='closeQRCodeDetailDialog'
>
<stockOrderQRCodeDetail
:closeDialog="closeQRCodeDetailDialog"
:idQuery="idQuery"
></stockOrderQRCodeDetail>
</el-dialog>
<el-dialog
title="内部码详情"
:visible.sync="qrcodeDetailVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="70%"
append-to-body
v-if="qrcodeDetailVisible"
@close='closeQRCodeDetailDialog'
>
<stockOrderQRCodeDetail
:closeDialog="closeQRCodeDetailDialog"
:idQuery="idQuery"
></stockOrderQRCodeDetail>
</el-dialog>
</div>
</div>
</template>
<script>
import {stockOrderList, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById,
copyStockOrderDetail, submitStockOrder,
uploadStockOrderDetail, uploadStockOrderDetailCount,
generateStockOrderQRCodeText
import {
stockOrderList, stockOrderDetail, deleteStockOrderById, deleteStockOrderDetailById,
copyStockOrderDetail, submitStockOrder,
uploadStockOrderDetail, uploadStockOrderDetailCount,
generateStockOrderQRCodeText
} from "@/api/inout/stockOrder";
import stockOrderDistribution from "./stockOrderDistribution";
import stockOrderQRCodeDetail from "./stockOrderQRCodeDetail";
@ -188,294 +189,294 @@ import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile}
import store from "@/store";
import {getLocalJoinBusType, getLocalJoinByUser} from "@/api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
import { filterSubByInv, findInvByUser } from '@/api/system/invSubWarehouse'
import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
import {convertDate} from "@/utils/date"
export default {
name: "stockOrder",
data() {
return {
showSearch: true,
convertDateFun: convertDate,
query: {
billType: null,
corpName: null,
locStorageCode: this.$store.getters.locInvCode,
invWarehouseCode: this.$store.getters.locSubInvCode,
billNo: "",
status: "",
page: 1,
limit: 10,
startTime: "",
endTime: "",
},
detailQuery: {
orderIdFk: "",
page: 1,
limit: 20
},
isSp: store.getters.customerId,
storageList: [],
subInvList: [],
busTypes: [],
list: [],
detailList: [],
total: 0,
detailTotal: 0,
loading: false,
detailLoading: false,
sourceMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda已校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "单据流转",
"7": "供应商平台",
"8": "平衡补单",
"9": "单据验收直接补单",
"10": "单据复制",
"11": "盘点单据转单",
"12": "申购计划转单",
"13": "领用单据转单",
"14": "第三方单据转单",
name: "stockOrder",
data() {
return {
showSearch: true,
convertDateFun: convertDate,
query: {
billType: null,
corpName: null,
locStorageCode: this.$store.getters.locInvCode,
invWarehouseCode: this.$store.getters.locSubInvCode,
billNo: "",
status: "",
page: 1,
limit: 10,
startTime: "",
endTime: "",
},
detailQuery: {
orderIdFk: "",
page: 1,
limit: 20
},
isSp: store.getters.customerId,
storageList: [],
subInvList: [],
busTypes: [],
list: [],
detailList: [],
total: 0,
detailTotal: 0,
loading: false,
detailLoading: false,
sourceMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda已校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "单据流转",
"7": "供应商平台",
"8": "平衡补单",
"9": "单据验收直接补单",
"10": "单据复制",
"11": "盘点单据转单",
"12": "申购计划转单",
"13": "领用单据转单",
"14": "第三方单据转单",
},
idQuery: {
id: "",
filterUDIType: null,
},
distributionVisible: false,
detailFormRules: {
batchNo: [
{required: true, message: "请输入批次号", trigger: "blur"}
],
productDate: [
{required: true, message: "请输入生产日期", trigger: "blur"}
],
expireDate: [
{required: true, message: "请输入失效日期", trigger: "blur"}
],
sweepCount: [
{required: true, message: "请输入扫码数量", trigger: "blur"}
]
},
detailFormVisible: false,
detailFormData: {},
detailFormLoading: false,
haveDistributionVisible: true,
qrcodeDetailVisible: false,
qrcodeExportVisible: false,
filterUDIType: true,
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
idQuery: {
id: "",
filterUDIType: null,
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
distributionVisible: false,
detailFormRules: {
batchNo: [
{required: true, message: "请输入批次号", trigger: "blur"}
],
productDate: [
{required: true, message: "请输入生产日期", trigger: "blur"}
],
expireDate: [
{required: true, message: "请输入失效日期", trigger: "blur"}
],
sweepCount: [
{required: true, message: "请输入扫码数量", trigger: "blur"}
]
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
detailFormVisible: false,
detailFormData: {},
detailFormLoading: false,
haveDistributionVisible: true,
qrcodeDetailVisible: false,
qrcodeExportVisible: false,
filterUDIType: true,
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
}
},
methods: {
onReset() {
this.$router.push({
path: ""
});
this.query = {
billNo: "",
status: "3",
page: 1,
limit: 10,
startTime: "",
endTime: "",
};
this.getList();
},
],
},
}
},
methods: {
onReset() {
this.$router.push({
path: ""
});
this.query = {
billNo: "",
status: "3",
page: 1,
limit: 10,
startTime: "",
endTime: "",
};
this.getList();
this.haveDistributionVisible = true;
this.actDateRange = [];
},
hideSearch() {
this.showSearch = !this.showSearch;
},
onSubmit() {
this.query.page=1;
this.getList();
this.haveDistributionVisible = true;
},
handleCurrentChange(val) {
this.query.page = val.page;
this.getList();
},
detailHandleCurrentChange(val) {
this.detailQuery.page = val.page;
this.getStockOrderDetailList();
},
this.haveDistributionVisible = true;
this.actDateRange = [];
},
hideSearch() {
this.showSearch = !this.showSearch;
},
onSubmit() {
this.query.page = 1;
this.getList();
this.haveDistributionVisible = true;
},
handleCurrentChange(val) {
this.query.page = val.page;
this.getList();
},
detailHandleCurrentChange(val) {
this.detailQuery.page = val.page;
this.getStockOrderDetailList();
},
// 刷新表单
resetForm() {
if (this.$refs["dataForm"]) {
// 清空验证信息表单
this.$refs["dataForm"].clearValidate();
// 刷新表单
resetForm() {
if (this.$refs["dataForm"]) {
// 清空验证信息表单
this.$refs["dataForm"].clearValidate();
// 刷新表单
this.$refs["dataForm"].resetFields();
this.getList();
}
},
getList() {
this.loading = true;
this.query.corpId = store.getters.customerId;
if (this.actDateRange !== null) {
this.query.startTime = this.actDateRange[0];
this.query.endTime = this.actDateRange[1];
} else {
this.query.startTime = null;
this.query.endTime = null;
}
this.query.status=3
stockOrderList(this.query)
.then(response => {
this.loading = false;
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
this.detailList = [];
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.detailList = [];
this.total = 0;
});
},
this.$refs["dataForm"].resetFields();
this.getList();
}
},
getList() {
this.loading = true;
this.query.corpId = store.getters.customerId;
if (this.actDateRange !== null) {
this.query.startTime = this.actDateRange[0];
this.query.endTime = this.actDateRange[1];
} else {
this.query.startTime = null;
this.query.endTime = null;
}
this.query.status = 3
stockOrderList(this.query)
.then(response => {
this.loading = false;
if (response.code == 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
this.detailList = [];
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
this.list = [];
this.detailList = [];
this.total = 0;
});
},
closeDialog(type) {
this.distributionVisible = false;
this.getList();
if (this.$isNotBlank(type)) {
this.detailList = [];
}
},
closeDialog(type) {
this.distributionVisible = false;
this.getList();
if (this.$isNotBlank(type)) {
this.detailList = [];
}
},
qrcodeDetail(row) {
this.idQuery.id = '';
if (this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;
this.idQuery.formData = row;
this.idQuery.filterUDIType = this.filterUDIType;
this.qrcodeDetailVisible = true;
}
},
closeQRCodeDetailDialog() {
this.qrcodeDetailVisible = false;
this.getList();
},
getStockOrderDetailList(row) {
if (this.$isNotBlank(row)) {
this.detailQuery.orderIdFk = row.billNo;
}
this.detailLoading = true;
stockOrderDetail(this.detailQuery)
.then((response) => {
this.detailLoading = false;
this.detailList = response.data.list || [];
this.detailTotal = response.data.total;
})
.catch(() => {
this.detailLoading = false;
this.detailList = [];
});
},
getBusType() {
let query = {
code: this.query.invWarehouseCode,
enabled: true,
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.action = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
getSubInvList() {
findInvByUser()
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
qrcodeDetail(row) {
this.idQuery.id = '';
if (this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;
this.idQuery.formData = row;
this.idQuery.filterUDIType = this.filterUDIType;
this.qrcodeDetailVisible = true;
}
},
closeQRCodeDetailDialog() {
this.qrcodeDetailVisible = false;
this.getList();
},
getStockOrderDetailList(row) {
if (this.$isNotBlank(row)) {
this.detailQuery.orderIdFk = row.billNo;
}
this.detailLoading = true;
stockOrderDetail(this.detailQuery)
.then((response) => {
this.detailLoading = false;
this.detailList = response.data.list || [];
this.detailTotal = response.data.total;
})
.catch(() => {
this.detailLoading = false;
this.detailList = [];
});
},
getBusType() {
let query = {
code: this.query.invWarehouseCode,
enabled: true,
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.action = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
});
},
getSubInvList() {
findInvByUser()
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
subInvChange() {
this.getBusType();
},
subInvChange() {
this.getBusType();
},
components: {
draggable,
stockOrderDistribution,
stockOrderQRCodeDetail,
stockQRCodeExport,
},
components: {
draggable,
stockOrderDistribution,
stockOrderQRCodeDetail,
stockQRCodeExport,
},
filters: {
statusFilterType(status) {
const statusMap = {
0: "gray",
1: "success"
};
return statusMap[status];
},
filters: {
statusFilterType(status) {
const statusMap = {
0: "gray",
1: "success"
};
return statusMap[status];
},
statusFilterName(status) {
const statusMap = {
"1": "草稿",
"2": "未配货",
"3": "待校验",
};
return statusMap[status];
},
typeFilterName(type) {
const typeMap = {
1: "预入库",
2: "普通采购",
};
return typeMap[type];
}
statusFilterName(status) {
const statusMap = {
"1": "草稿",
"2": "未配货",
"3": "待校验",
};
return statusMap[status];
},
created() {
// 加载表格数据
this.getSubInvList();
this.getBusType();
this.getList();
typeFilterName(type) {
const typeMap = {
1: "预入库",
2: "普通采购",
};
return typeMap[type];
}
},
created() {
// 加载表格数据
this.getSubInvList();
this.getBusType();
this.getList();
}
}
</script>

55
src/views/basic/corpMaintain/corpMaintain.vue
Unescape Escape View File

@ -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,
};
}

2
src/views/basic/product/udiInfoManageSp.vue
Unescape Escape View File

@ -108,7 +108,7 @@
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
<el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
<el-table-column
v-if="isSpCombine"
label="状态"

34
src/views/inout/InvoiceRegistration.vue
Unescape Escape View File

@ -10,21 +10,21 @@
clearable="true"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </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.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </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.invCode" placeholder="请选择收货仓库" clearable="true"
@ -41,8 +41,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
@ -58,6 +56,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker

103
src/views/inout/IoArrivalSearchOrder.vue
Unescape Escape View File

@ -19,39 +19,39 @@
<!-- </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="请选择单据类型"
<el-form-item class="query-form-item" label="到货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择到货仓库" clearable="true"
style="width: 90%"
clearable>
@change="invChange"
>
<el-option
v-for="item in busTypes"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.action">
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</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.invCode" placeholder="请选择到货仓库" clearable="true"
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
@change="invChange"
>
clearable>
<el-option
v-for="item in invList"
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.code">
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
@ -109,8 +109,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 +117,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 +137,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 +227,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"
></el-table-column>
<el-table-column
label="扫码数量"
prop="scanCount"
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="计量单位"
prop="price"
label="失效日期"
prop="expireDate" width="120"
></el-table-column>
<el-table-column
label="价格"
prop="price"
label="单据数量" width="100"
prop="count"
></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 +313,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 +403,7 @@
<el-table-column
label="UDI码"
prop="code"
width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column
@ -423,23 +418,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>

68
src/views/inout/IoCheckErrorOrder.vue
Unescape Escape View File

@ -4,55 +4,64 @@
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="送货单号:">
<el-input v-model="filterQuery.billNo" placeholder="请输入送货单号"
<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-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </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="请选择单据类型"
<el-form-item class="query-form-item" label="收货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%"
clearable>
@change="invChange"
>
<el-option
v-for="item in busTypes"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.action">
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="送货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true"
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
@change="invChange"
>
clearable>
<el-option
v-for="item in subInvList"
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.code">
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
@ -69,22 +78,7 @@
</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">

62
src/views/inout/IoCreateBusOrder.vue
Unescape Escape View File

@ -6,33 +6,39 @@
ref="form"
class="query-form" size="mini" label-width="100px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="单号:" prop="billNo">
<el-col :span="8">
<el-form-item class="query-form-item" label="单号:">
<el-input v-model="filterQuery.billNo" placeholder="单号"
style="width: 90%"
prop="noticeTitle"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="出入库类型:" prop="mainAction">
<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-form-item class="query-form-item" label="单据类型:" prop="action">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </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.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%"
clearable>
@change="invChange"
>
<el-option
v-for="item in busTypes"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.action">
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
@ -40,23 +46,25 @@
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:" prop="invCode">
<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.action" placeholder="请选择单据类型"
style="width: 90%"
@change="invChange"
>
clearable>
<el-option
v-for="item in invList"
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.code">
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
@ -72,6 +80,8 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">

59
src/views/inout/IoCreateScanOrder.vue
Unescape Escape View File

@ -3,32 +3,39 @@
<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-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </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.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%"
clearable>
@change="invChange"
>
<el-option
v-for="item in busTypes"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.action">
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
@ -36,23 +43,25 @@
</el-col>
</el-row>
<el-row>
<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.action" placeholder="请选择单据类型"
style="width: 90%"
@change="invChange"
>
clearable>
<el-option
v-for="item in invList"
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.code">
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
@ -68,6 +77,8 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">

59
src/views/inout/IoDealOrder.vue
Unescape Escape View File

@ -3,32 +3,39 @@
<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-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="采购部门:">-->
<!-- <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in deptList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </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.invCode" placeholder="请选择收货仓库" clearable="true"
style="width: 90%"
clearable>
@change="invChange"
>
<el-option
v-for="item in busTypes"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.action">
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
@ -36,23 +43,25 @@
</el-col>
</el-row>
<el-row>
<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.action" placeholder="请选择单据类型"
style="width: 90%"
@change="invChange"
>
clearable>
<el-option
v-for="item in invList"
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.code">
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
@ -68,6 +77,8 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">

82
src/views/inout/IoDeliverySearchOrder.vue
Unescape Escape View File

@ -19,32 +19,33 @@
<!-- </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="请选择单据类型"
<el-form-item class="query-form-item" label="送货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择送货仓库" clearable="true"
style="width: 90%"
clearable>
@change="invChange"
>
<el-option
v-for="item in busTypes"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.action">
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</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.invCode" placeholder="请选择送货仓库" clearable="true"
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
style="width: 90%"
@change="invChange"
>
clearable>
<el-option
v-for="item in invList"
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.code">
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
@ -108,8 +109,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 +117,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 +139,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 +155,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 +246,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 +329,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 +419,7 @@
<el-table-column
label="UDI码"
prop="code"
width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column
@ -434,23 +434,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>

159
src/views/inout/IoInoutSearchOrder.vue
Unescape Escape View File

@ -2,51 +2,49 @@
<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-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
<!-- <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.invCode" placeholder="请选择采购仓库" clearable="true"
style="width: 90%"
clearable>
@change="invChange"
>
<el-option
v-for="item in busTypes"
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.action">
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</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.action" placeholder="请选择单据类型"
style="width: 90%"
@change="invChange"
>
clearable>
<el-option
v-for="item in invList"
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.code">
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
@ -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();
},

991
src/views/inout/IoReturnedSearchOrder.vue
Unescape Escape View File

@ -0,0 +1,991 @@
<template>
<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="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="8">
<el-form-item class="query-form-item" label="退货仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择退货仓库" clearable="true"
style="width: 90%"
@change="invChange"
>
<el-option
v-for="item in invList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</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%"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
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-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">
<el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
>重置
</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询
</el-button
>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border
@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 width="180"></el-table-column>
<el-table-column label="供应商" prop="fromName" width="220">
</el-table-column>
<el-table-column label="退货部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="退货仓库" prop="invName" width="120">
</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>
</template>
</el-table-column>
<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>
</template>
</el-table-column>
<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>
</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">
<el-button
type="text"
size="small"
@click.native.stop="printOrder(scope.row)"
>打印
</el-button
>
<el-button
type="text"
size="small"
@click.native.stop="rollback(scope.row)"
>撤回
</el-button
>
<el-button
type="text"
size="small"
v-if="customerId == 110 && scope.row.status == 5"
@click.native.stop="reviewOrder(scope.row)"
>审核
</el-button
>
<el-button
type="text"
size="small"
v-if="customerId == 110"
@click.native.stop="deleteDialog(scope.row)"
>删除
</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="getList"
></pagination>
</el-card>
<el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-业务详情</span>
<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:">
<el-input
v-model="bizQuery.productName"
placeholder="请输入产品名称"
clearable
>
</el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onBizReset"
>重置
</el-button>
<el-button type="primary" @click="onBizSubmit"
icon="el-icon-search"
>查询
</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column
label="物资名称"
prop="coName" width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="160"
prop="spec"
></el-table-column>
<el-table-column
label="批次号" width="120"
prop="batchNo"
></el-table-column>
<el-table-column
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate" width="120"
></el-table-column>
<el-table-column
label="单据数量" width="100"
prop="count"
></el-table-column>
<el-table-column
label="扫码数量"
prop="scanCount" width="100"
></el-table-column>
<el-table-column
label="价格" width="100"
prop="price"
></el-table-column>
<el-table-column
label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号"
prop="certCode" width="180"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="bizTotal>0"
:total="bizTotal"
:page.sync="bizQuery.page"
:limit.sync="bizQuery.limit"
@pagination="getBizDetailList"
/>
</el-tab-pane>
<!--单据扫码详情-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码详情</span>
<el-form :inline="true" :model="codeQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:">
<el-input
v-model="codeQuery.productName"
placeholder="请输入产品名称"
clearable
>
</el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onCodeReset"
>重置
</el-button>
<el-button type="primary" @click="onCodeSubmit"
icon="el-icon-search"
>查询
</el-button>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="物资名称" width="160"
prop="coName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号" width="160"
prop="spec"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号" width="120"
prop="batchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期" width="120"
prop="productDate"
></el-table-column>
<el-table-column
label="失效日期" width="120"
prop="expireDate"
></el-table-column>
<el-table-column
label="单据数量" width="100"
prop="orderCount"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount" width="100"
></el-table-column>
<el-table-column
label="供应商"
prop="supName" width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业" width="180"
prop="manufacturer"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案凭证号" width="180"
prop="certCode"
show-overflow-tooltip
></el-table-column>
</el-table>
<pagination
v-show="codeTotal>0"
:total="codeTotal"
:page.sync="codeQuery.page"
:limit.sync="codeQuery.limit"
@pagination="getCodeDetailList"
/>
</el-tab-pane>
<!--单据扫码明细-->
<el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
<el-form :inline="true" :model="resultQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="产品名称:">
<el-input
v-model="resultQuery.code"
placeholder="请输入UDI码"
clearable
>
</el-input>
</el-form-item>
<el-form-item>
<el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onResultReset"
>重置
</el-button>
<el-button type="primary" @click="onResultSubmit"
icon="el-icon-search"
>查询
</el-button
>
</el-button-group>
</el-form-item>
</el-form>
<el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
row-key="id"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="UDI码"
prop="code"
width="220"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产日期"
prop="produceDate"
width="120"
></el-table-column>
<el-table-column
label="失效日期"
prop="expireDate"
width="120"
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo" width="120"
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo" width="120"
></el-table-column>
<el-table-column
label="供应商"
prop="supName" width="180"
></el-table-column>
<el-table-column
label="扫码数量"
prop="count" width="100"
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount" width="100"
></el-table-column>
</el-table>
<pagination
v-show="resultTotal>0"
:total="resultTotal"
:page.sync="resultQuery.page"
:limit.sync="resultQuery.limit"
@pagination="getResultDetailList"
/>
</el-tab-pane>
</el-tabs>
<el-dialog
title="单据验收"
:visible.sync="acceptOrderVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="acceptOrderVisible"
>
<accept-order
:closeDialog="closeAcceptDialog"
:orderQuery="acceptQuery"
v-on:childByValue="parentByFn"
></accept-order>
</el-dialog>
</div>
</template>
<script>
import {
deleteByOrderId,
getOrderList, rollUnReceivebackOrder
} from "../../api/inout/order";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getInvListByUser} from "@/api/system/invWarehouse";
import {isBlank} from "@/utils/strUtil";
import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {getBizDetailList} from "@/api/inout/orderDetailBiz";
import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code";
import AcceptOrder from "@/views/inout/DialogReviewOrder";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
const formJson = {
site_id: "",
site_name: "",
describe: "",
ads: [],
};
export default {
name: "IoReturnedSearchOrder",
data() {
return {
showSearch: true,
filterQuery: {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "supSearch",
page: 1,
limit: 10,
startTime: null,
endTime: null,
startAduditTime: null,
endAduditTime: null,
invCode: this.$store.getters.locInvCode,
},
customerId: this.$store.getters.customerId,
checkStatus: {
1: "草稿",
2: "等待处理",
3: "等待校验",
4: "处理异常",
5: "待审核",
6: "校验异常",
7: "已审核",
8: "审核拒绝",
9: "正在处理"
},
storageList: [],
invList: [],
list: [],
total: 0,
loading: false,
index: null,
enableDept: false,
fromTypeMap: {
"1": "UDIMS平台",
"2": "网页新增",
"3": "pda即时校验",
"4": "pda未校验",
"5": "pc端扫码精灵",
"6": "缺量补录单据",
"7": "UDI供应商平台",
"8": "平衡补录单据",
"10": "手动补单",
"11": "仓库盘点",
"12": "采购计划",
"13": "领用单据",
"14": "第三方系统单据",
},
deleteData: {
id: "",
status: 10,
},
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
formData: formJson,
deleteLoading: false,
busTypes: [],
currentRow: {
billNo: ""
},
actDateRange: [],
auditDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
},
bizQuery: {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
},
bizTotal: 0,
bizDetailLoading: false,
bizDetailList: [],
codeQuery: {
orderIdFk: null,
page: 1,
limit: 10
},
codeTotal: 0,
codeDetailLoading: false,
codeDetailList: [],
resultQuery: {
orderId: null,
code: null,
page: 1,
limit: 10
},
resultTotal: 0,
resultDetailLoading: false,
resultDetailList: [],
acceptQuery: null,
acceptOrderVisible: false,
};
},
components: {AcceptOrder},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
id: "",
billNo: null,
mainAction: null,
action: null,
statusType: "supSearch",
page: 1,
limit: 10,
startTime: null,
endTime: null,
invCode: this.$store.getters.locInvCode,
};
this.getList();
},
onSubmit() {
this.loading = true;
if (this.actDateRange !== null) {
this.filterQuery.startTime = this.actDateRange[0];
this.filterQuery.endTime = this.actDateRange[1];
} else {
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();
},
hideSearch() {
this.showSearch = !this.showSearch;
},
invChange() {
this.filterQuery.action = null;
this.getBusType();
},
printOrder(row) {
let tQuery = {
action: row.action,
moduleId: 2,
}
this.loading = true;
inspectionOrderPDFFromTemplateFile(tQuery).then((response) => {
if (response.code === 20000) {
tQuery = {
templateId: response.data,
orderIdFk: row.billNo,
action: row.action,
moduleId: 2,
}
orderPDFFromTemplateFile(tQuery).then((response) => {
//将pdf文件转换为url。
const binaryData = [];
binaryData.push(response);
//获取blob链接。
let url = window.URL.createObjectURL(
new Blob(binaryData, {type: "application/pdf"})
);
this.loading = false;
window.open(url);//打开新标签页，预览pdf。
}).catch(() => {
this.loading = false;
});
} else {
this.loading = false;
this.$message.error(response.message);
}
}).catch(() => {
this.loading = false;
});
},
getBusType() {
let query = {
code: this.filterQuery.invCode,
enabled: true,
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
})
.catch(() => {
});
},
handleSelectionChange(val) {
this.currentRow = val;
this.getOrderDetails();
},
// 获取单据 业务详情、扫码详情、扫码明细
getOrderDetails() {
this.bizQuery.page = 1;
this.codeQuery.page = 1;
this.resultQuery.page = 1;
this.getBizDetailList();
this.getCodeDetailList();
this.getResultDetailList();
},
// 清空单据详情数据列表
clearDetailList() {
// 清空业务详情
this.bizDetailList = [];
this.bizTotal = 0;
// 清空扫码详情
this.codeDetailList = [];
this.codeTotal = 0;
// 清空扫码明细
this.resultDetailList = [];
this.resultTotal = 0;
},
//获取订单列表
getList() {
this.loading = true;
this.currentRow = {billNo: ""};
this.clearDetailList();
this.filterQuery.busType = 4; //退货出入库单据类型
getOrderList(this.filterQuery)
.then((response) => {
this.loading = false;
if (response.code === 20000) {
this.list = response.data.list || [];
this.total = response.data.total || 0;
} else {
this.$message.error(response.message);
}
})
.catch((error) => {
this.$message.error(error.message)
this.loading = false;
this.list = [];
this.total = 0;
});
},
deleteOrders(data) {
this.loading = true;
this.deleteData.billNo = data.billNo;
deleteByOrderId(this.deleteData)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功！",
});
} else if (response.code == 520) {
this.$message.error("新增扫码单据列表已不存在该扫码单据！");
this.getList();
}
})
.catch(() => {
});
},
deleteDialog(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.deleteOrders(row);
})
.catch(() => {
});
},
getInvList() {
getInvListByUser()
.then((response) => {
this.invList = response.data || [];
})
.catch(() => {
});
},
onBizReset() {
this.bizQuery = {
productName: null,
orderIdFk: null,
page: 1,
limit: 10
};
this.getBizDetailList();
},
onBizSubmit() {
this.bizQuery.page = 1;
this.getBizDetailList();
},
getBizDetailList() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！")
return;
}
this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo;
getBizDetailList(this.bizQuery).then((res) => {
this.bizDetailLoading = false;
if (res.code === 20000) {
this.bizDetailList = res.data.list || [];
this.bizTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
this.bizDetailList = [];
this.bizTotal = 0;
}
}).catch((error) => {
this.bizDetailLoading = false;
this.$message.error(error.message);
this.bizDetailList = [];
this.bizTotal = 0;
})
},
onCodeReset() {
this.codeQuery = {
orderIdFk: null,
page: 1,
limit: 10
};
this.getCodeDetailList();
},
onCodeSubmit() {
this.codeQuery.page = 1;
this.getCodeDetailList();
},
getCodeDetailList() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！")
return;
}
this.codeQuery.orderIdFk = this.currentRow.billNo;
this.codeDetailLoading = true;
getCodeDetailList(this.codeQuery).then((res) => {
this.codeDetailLoading = false;
if (res.code === 20000) {
this.codeDetailList = res.data.list || [];
this.codeTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
this.codeDetailList = [];
this.codeTotal = 0;
}
}).catch((error) => {
this.codeDetailLoading = true;
this.$message.error(error.message);
this.codeDetailList = [];
this.codeTotal = 0;
})
},
onResultReset() {
this.resultQuery = {
orderId: null,
code: null,
page: 1,
limit: 10
};
this.getResultDetailList();
},
onResultSubmit() {
this.resultQuery.page = 1;
this.getResultDetailList();
},
getResultDetailList() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要查询的单据！")
return;
}
this.resultQuery.orderId = this.currentRow.billNo;
this.resultDetailLoading = true;
getCodeList(this.resultQuery).then((res) => {
this.resultDetailLoading = false;
if (res.code === 20000) {
this.resultDetailList = res.data.list || [];
this.resultTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
this.resultDetailList = [];
this.resultTotal = 0;
}
}).catch((error) => {
this.resultDetailLoading = false;
this.$message.error(error.message);
this.resultDetailList = [];
this.resultTotal = 0;
});
},
//单据撤回
rollback(row) {
this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let param = {billNo: row.billNo};
rollUnReceivebackOrder(param).then((res) => {
if (res.code === 20000) {
this.$message.success("撤回成功");
this.getList();
} else {
this.$message.error(res.message);
}
})
}).catch(() => {
// this.$message.info('回退失败');
});
},
//验收结束
closeAcceptDialog() {
this.acceptOrderVisible = false;
},
//开始验收
reviewOrder(row) {
this.acceptQuery = row;
this.acceptOrderVisible = true;
},
parentByFn: function (childValue) {
this.getList();
},
statusFilterType(status) {
const statusMap = {
5: "warning",
1: "warning",
6: "danger",
7: "success",
};
return statusMap[status];
},
}
,
mounted() {
document.body.ondrop = function (event) {
event.preventDefault();
event.stopPropagation();
};
}
,
created() {
this.getInvList();
this.getBusType();
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
if (res.code === 20000) {
if (res.data.paramValue === "0") {
this.enableDept = true;
}
}
});
this.getList();
}
,
}
;
</script>
<style type="text/scss" lang="scss">
</style>

4
src/views/inout/IoSupSearchOrder.vue
Unescape Escape View File

@ -41,8 +41,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="filterQuery.action" placeholder="请选择单据类型"
@ -58,6 +56,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="创建时间:">
<el-date-picker

4
src/views/inout/PanelCreateOrderBizDetail.vue
Unescape Escape View File

@ -163,7 +163,7 @@
</el-table>
<el-dialog
title="业务详情-产品录入"
title="业务详情-物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
@ -177,7 +177,7 @@
></stockOrderNewSelectProduct>
</el-dialog>
<el-dialog
title="库存产品录入"
title="库存物资录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/inout/receive/DialogNewReceive.vue
Unescape Escape View File

@ -102,7 +102,7 @@
@click.native.stop="selectProductFunction()"
style="margin: 0px 60px 10px auto; height: 35px"
:loading="loading"
>产品录入
>物资录入
</el-button
>
</el-button-group>
@ -138,7 +138,7 @@
<el-dialog
title="库存产品录入"
title="库存物资录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/inventory/DeviceReceiveOrderModify.vue
Unescape Escape View File

@ -222,7 +222,7 @@
<el-dialog
title="库存产品录入"
title="库存物资录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/inventory/InvCountOrderModify.vue
Unescape Escape View File

@ -149,7 +149,7 @@
<el-dialog
title="库存产品录入"
title="库存物资录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/inventory/InvMAOrderModify.vue
Unescape Escape View File

@ -183,7 +183,7 @@
<el-dialog
title="库存产品录入"
title="库存物资录入"
:visible.sync="selectInvProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

37
src/views/inventory/InvSupPreInSerach.vue
Unescape Escape View File

@ -33,19 +33,19 @@
@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="billNo" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType">
<el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="来源" prop="fromType" width="150">
<template slot-scope="scope">
<span>{{ fromTypeMap[scope.row.orderFromType] }}</span>
</template>
</el-table-column>
<el-table-column label="往来单位" prop="fromCorpName" width="220">
<el-table-column label="往来单位" prop="fromCorpName" width="180">
</el-table-column>
<el-table-column label="当前部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="当前仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip>
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="160">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span>{{ scope.row.createTime }}</span>
@ -107,13 +107,28 @@
<el-table-column
label="UDI码"
prop="code"
width="180"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="产品名称"
prop="productName"
width="160"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo" width="120"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount"
></el-table-column>
<el-table-column
label="生产日期"
prop="produceDate"
@ -124,22 +139,10 @@
prop="expireDate"
width="120"
></el-table-column>
<el-table-column
label="批次号"
prop="batchNo"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="序列号"
prop="serialNo"
></el-table-column>
<el-table-column
label="扫码数量"
prop="reCount"
></el-table-column>
<el-table-column
label="实际数量"
prop="reCount"
width="120"
></el-table-column>
</el-table>
<pagination

47
src/views/inventory/InvSupPreProducts.vue
Unescape Escape View File

@ -3,29 +3,28 @@
<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="4">
<el-form-item class="query-form-item" label="产品标识DI:">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
<el-col :span="6">
<el-form-item class="query-form-item" label="DI标识:">
<el-input v-model="filterQuery.nameCode" placeholder="DI标识"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="产品名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
<el-col :span="6">
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@ -40,27 +39,25 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="批准文号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="生产厂家:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
<el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
@ -87,23 +84,23 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="仓库" prop="invName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button

37
src/views/inventory/InvSupProuducts.vue
Unescape Escape View File

@ -3,28 +3,28 @@
<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="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="DI标识:">
<el-input v-model="filterQuery.nameCode" placeholder="DI标识"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="物资名称:">
<el-input v-model="filterQuery.cpmctymc" placeholder="物资名称"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="所属仓库:">
<el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
style="width: 90%"
@ -40,25 +40,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:">
<el-input v-model="filterQuery.ggxh" placeholder="规格型号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item class="query-form-item" label="批准文号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item class="query-form-item" label="生产厂家:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
<el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业"
style="width: 90%"
clearable="true"></el-input>
</el-form-item>
@ -85,23 +84,23 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
border>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="DI标识" prop="nameCode" width="150"></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="180"></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="120"></el-table-column>
<el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="部门" prop="deptName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="仓库" prop="invName" v-if="showSup"
show-overflow-tooltip width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
width="120"></el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button

6
src/views/inventory/inner/innerOrderEditDialog.vue
Unescape Escape View File

@ -38,8 +38,8 @@
<el-card>
<el-button-group style="display: flex">
<el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 0px 10px auto; height: 35px" :loading="loading">产品录入</el-button>
<el-button type="primary" size="small" @click.native.stop="stockOrderList()" style=" height: 35px">内部码</el-button>
<el-button type="primary" size="small" @click.native.stop="selectProductFunction()" style="margin: 0px 0px 10px auto; height: 35px" :loading="loading">物资录入</el-button>
<el-button type="primary" size="small" @click.native.stop="stockOrderList()" style=" height: 35px">选入单据</el-button>
</el-button-group>
@ -96,7 +96,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/purchase/purApply/purApplyEditDiaolog.vue
Unescape Escape View File

@ -70,7 +70,7 @@
@click.native.stop="selectProductFunction()"
style="margin: 0px 60px 10px auto; height: 35px"
:loading="loading"
>产品录入
>物资录入
</el-button
>
</el-button-group>
@ -106,7 +106,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/purchase/purApply/pureApplyDetailDialog.vue
Unescape Escape View File

@ -104,7 +104,7 @@
</el-card>
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/purchase/purArrival/purArrivalDetailDialog.vue
Unescape Escape View File

@ -188,7 +188,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/purchase/purArrival/purArrivalEditDialog.vue
Unescape Escape View File

@ -93,7 +93,7 @@
<el-row type="flex" justify="end">
<el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">物资录入</el-button>
<el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入送货单据</el-button>
</el-button-group>
@ -162,7 +162,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/purchase/purDelivery/purDeliveryDetailDialog.vue
Unescape Escape View File

@ -120,7 +120,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/purchase/purDelivery/purDeliveryEditDialog.vue
Unescape Escape View File

@ -67,7 +67,7 @@
<el-row type="flex" justify="end">
<el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">物资录入</el-button>
<el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购订单</el-button>
</el-button-group>
@ -134,7 +134,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/purchase/purOrder/purOrderDetailDialog.vue
Unescape Escape View File

@ -120,7 +120,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/purchase/purOrder/purOrderEditDialog.vue
Unescape Escape View File

@ -67,7 +67,7 @@
<el-row type="flex" justify="end">
<el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">物资录入</el-button>
<el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入采购单</el-button>
</el-button-group>
@ -103,7 +103,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/purchase/purPlan/purPlanDetailDialog.vue
Unescape Escape View File

@ -120,7 +120,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/purchase/purPlan/purPlanEditDialog.vue
Unescape Escape View File

@ -67,7 +67,7 @@
<el-row type="flex" justify="end">
<el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">物资录入</el-button>
<el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>
</el-button-group>
@ -103,7 +103,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

2
src/views/purchase/purReturned/purReturnedDetailDialog.vue
Unescape Escape View File

@ -125,7 +125,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

4
src/views/purchase/purReturned/purReturnedEditDialog.vue
Unescape Escape View File

@ -95,7 +95,7 @@
<el-row type="flex" justify="end">
<el-button-group style="display: flex">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
<el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">物资录入</el-button>
</el-button-group>
@ -135,7 +135,7 @@
</el-form>
<el-dialog
title="产品录入"
title="物资录入"
:visible.sync="selectProductVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"

87
src/views/remind/invRemindMsg.vue
Unescape Escape View File

@ -38,7 +38,7 @@
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="产品名称:">
<el-form-item class="query-form-item" label="物资名称:">
<el-autocomplete
class="inline-input"
style="width: 90%"
@ -88,20 +88,20 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="query-form-item" label="忽略状态:">
<el-select v-model="filterQuery.ignoreStatus"
placeholder="请选择消息忽略状态"
clearable
style="width: 90%"
>
<el-option label="不忽略" :value="0"></el-option>
<el-option label="忽略7天" :value="1"></el-option>
<el-option label="忽略15天" :value="2"></el-option>
<el-option label="忽略30天" :value="3"></el-option>
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="忽略状态:">-->
<!-- <el-select v-model="filterQuery.ignoreStatus"-->
<!-- placeholder="请选择消息忽略状态"-->
<!-- clearable-->
<!-- style="width: 90%"-->
<!-- >-->
<!-- <el-option label="不忽略" :value="0"></el-option>-->
<!-- <el-option label="忽略7天" :value="1"></el-option>-->
<!-- <el-option label="忽略15天" :value="2"></el-option>-->
<!-- <el-option label="忽略30天" :value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="6">
<el-form-item class="query-form-item" label="预警类型:">
@ -134,31 +134,35 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="仓库名称" prop="invName" width="200"></el-table-column>
<el-table-column label="货位名称" prop="invSpaceName" width="200"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="300" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="150" show-overflow-tooltip></el-table-column>
<el-table-column label="消息状态" prop="status" width="100">
<template slot-scope="scope">
<el-tag>{{ statusMap[scope.row.status] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="忽略预警" prop="ignoreStatus" width="100">
<el-table-column label="仓库名称" prop="invName" width="120"></el-table-column>
<el-table-column label="货位名称" prop="invSpaceName" width="120"></el-table-column>
<el-table-column label="产品名称" prop="productName" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="消息状态" prop="status" width="120">
<template slot-scope="scope">
<el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>
<el-tag :type="statusFilterType(scope.row.status)">{{
statusMap[scope.row.status]
}}
</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="忽略预警" prop="ignoreStatus" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="预警类型" prop="productionDate" width="120">
<template slot-scope="scope">
<el-tag>{{ typeMap[scope.row.type] }}</el-tag>
<el-tag type="danger">{{ typeMap[scope.row.type] }}</el-tag>
</template>
</el-table-column>
<el-table-column label="预警内容" prop="msg" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="预警内容" prop="msg" width="250" show-overflow-tooltip></el-table-column>
<el-table-column label="处理方式" prop="handleMsg" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="100"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="100"></el-table-column>
<el-table-column label="库存数量" prop="productionDate" width="100"></el-table-column>
<el-table-column label="库存数量" prop="reCount" width="100"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
<el-table-column label="供应商" prop="supName" width="150" show-overflow-tooltip></el-table-column>
@ -173,13 +177,13 @@
@click.native="confirmMsg(scope.row)"
>确认
</el-button>
<el-button
type="text"
size="small"
v-if="scope.row.ignoreStatus === 0"
@click.native="ignoreMsg(scope.row)"
>忽略
</el-button>
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.ignoreStatus === 0"-->
<!-- @click.native="ignoreMsg(scope.row)"-->
<!-- >忽略-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
@ -421,6 +425,15 @@ export default {
this.currentId = null;
})
},
statusFilterType(status) {
const statusMap = {
1: "warning",
2: "success",
};
return statusMap[status];
},
},
created() {
this.getInvList();

6
src/views/supplier/company/basicCompanyProducts.vue
Unescape Escape View File

@ -59,7 +59,6 @@
</el-col>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
@ -75,11 +74,12 @@
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="物资分类" prop="qxlb" show-overflow-tooltip></el-table-column>
<el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
<el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
<template slot-scope="scope">
{{ lockStatusMap[scope.row.lockStatus] }}

15
src/views/supplier/products/supDiProductsCheck.vue
Unescape Escape View File

@ -102,9 +102,9 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
title="产品信息详情"
:visible.sync="thrProductsDetailVisible"
:visible.sync="thrProductsDiDetailVisible"
width="60%"
v-if="thrProductsDetailVisible"
v-if="thrProductsDiDetailVisible"
>
<selectDiDetail :editQuery="thisData"></selectDiDetail>
</el-dialog>
@ -113,9 +113,9 @@
:close-on-click-modal="false"
:close-on-press-escape="false"
title="产品信息详情"
:visible.sync="thrProductsDiDetailVisible"
:visible.sync="thrProductsDetailVisible"
width="80%"
v-if="thrProductsDiDetailVisible"
v-if="thrProductsDetailVisible"
>
<thrProductsDetail
:data="thisDetail"
@ -268,19 +268,20 @@ export default {
})
},
detailDialog(row) {
debugger
if(row.type==1){
let query = { uuid: row.uuid }
getDiProductDetail(query).then((res) => {
if (res.code === 20000) {
this.diDetails = res.data
this.detailDialog = true
this.thisData = res.data
this.thrProductsDiDetailVisible = true
} else {
this.$message.error('参数错误')
}
})
}else{
this.thisDetail = row;
this.thrProductsDiDetailVisible = true;
this.thrProductsDetailVisible = true;
}
},
handleCurrentChange(val) {

2
src/views/supplier/products/supProductsDetail.vue
Unescape Escape View File

@ -7,7 +7,7 @@
<el-row>
<el-col :span="12" class="el-col">
<el-form-item label="产品编码:">
<el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容" v-model.trim="data.code"></el-input>
<el-input style="width: 90%" size="small" :disabled="true" placeholder="请输入内容" v-model="data.code"></el-input>
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">

1100
src/views/userManage/customerManage.vue
View File

File diff suppressed because it is too large Load Diff

1072
src/views/userManage/registerManage.vue
View File

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