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

Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw

Browse Source
20231126-yw
yuanwei 2 years ago
parent e0ec2f32a1 4e798445a2
commit 2951e1b9ea
4 changed files with 124 additions and 96 deletions
Show Stats Download Patch File Download Diff File

9
src/api/basic/busType.js
Unescape Escape View File

@ -19,6 +19,15 @@ export function getLocalJoinByUser(params) {
} }
export function getOrderDetailBus(params) {
return axios({
url: "/udiwms/orderDetail/busTypes",
method: "get",
params: params
});
}
export function insertBusType(data) { export function insertBusType(data) {
return axios({ return axios({
url: "/udiwms/bussinessType/insert", url: "/udiwms/bussinessType/insert",

1
src/layout/components/Navbar.vue
Unescape Escape View File

@ -406,6 +406,7 @@ export default {
this.inv = store.getters.locInvName this.inv = store.getters.locInvName
this.deptName = store.getters.locDeptName this.deptName = store.getters.locDeptName
}); });
window.location.reload()
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }

84
src/views/inventory/supInoutSearchOrder.vue
Unescape Escape View File

@ -1,81 +1,61 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="出入库单号:"> <el-form-item label="出入库单号:">
<el-input v-model="filterQuery.orderIdFk" placeholder="请输入出入库单号" style="width: 90%" <el-input v-model="filterQuery.orderIdFk" placeholder="请输入出入库单号" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="DI/物资编码:"> <el-form-item label="DI/物资编码:">
<el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%" <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="物资名称:"> <el-form-item label="物资名称:">
<el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%" <el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="规格型号:"> <el-form-item label="规格型号:">
<el-input v-model="filterQuery.spec" placeholder="请输入规格型号" style="width: 90%" <el-input v-model="filterQuery.spec" placeholder="请输入规格型号" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="批次号:"> <el-form-item label="批次号:">
<el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%" <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="注册/备案号:"> <el-form-item label="注册/备案号:">
<el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号" <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="生产企业:"> <el-form-item label="生产企业:">
<el-input v-model="filterQuery.manufacturer" placeholder="生产企业" <el-input v-model="filterQuery.manufacturer" placeholder="生产企业"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="出入库时间:"> <el-form-item 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-row>
<el-row>
<el-col :span="6">
<el-form-item class="query-form-item" label="往来单位:">
<el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位" <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"
style="width: 90%" style="width: 90%"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item class="query-form-item" label="出入库类型:"> <el-form-item label="出入库类型:">
<el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%"> <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="入库" value="WareHouseIn"></el-option> <el-option label="入库" value="WareHouseIn"></el-option>
@ -83,7 +63,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="action" label="单据类型:"> <el-form-item prop="action" label="单据类型:">
<el-select <el-select
@ -102,7 +81,31 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6">
<el-form-item label="打印状态:">
<el-select v-model="filterQuery.inoutPrintStatus" placeholder="请选择打印状态" style="width: 90%">
<el-option label="全部" value=""></el-option>
<el-option label="未打印" :value="0"></el-option>
<el-option label="已打印" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-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-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -168,7 +171,7 @@ import {
printOrder, printOrder,
excelInoutImport, postExcelInoutImport excelInoutImport, postExcelInoutImport
} from '@/api/inout/orderDetailResult' } from '@/api/inout/orderDetailResult'
import {findByInvUser, getLocalJoinByUser} from "@/api/basic/busType"; import {findByInvUser, getLocalJoinByUser, getOrderDetailBus} from "@/api/basic/busType";
import {getCorrespondence} from "@/api/basic/basicUnitMaintain"; import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
import {excelImport} from "@/api/inout/statData"; import {excelImport} from "@/api/inout/statData";
@ -193,6 +196,8 @@ export default {
actionType: null, actionType: null,
fromCorp: null, fromCorp: null,
keyWords: null, keyWords: null,
inoutPrintStatus: null,
}, },
printMap: { printMap: {
@ -302,8 +307,9 @@ export default {
let query = { let query = {
code: this.$store.getters.locInvCode, code: this.$store.getters.locInvCode,
enabled: true, enabled: true,
detailType: this.actionType
}; };
getLocalJoinByUser(query) getOrderDetailBus(query)
.then((response) => { .then((response) => {
this.busTypeOptions = response.data.list || []; this.busTypeOptions = response.data.list || [];
}) })
@ -481,7 +487,7 @@ export default {
}, },
searchExport() { searchExport() {
this.$confirm("是否确定打印所有查询结果数据", "提示", { this.$confirm("是否确定导出所有查询结果数据", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -500,8 +506,14 @@ export default {
keyWords: this.filterQuery.keyWords, keyWords: this.filterQuery.keyWords,
mainAction: this.filterQuery.mainAction, mainAction: this.filterQuery.mainAction,
action: this.filterQuery.action action: this.filterQuery.action
}; };
if (this.filterQuery.actionType == 'preInDetail') {
printParams.invCode = '1000001'
} else if (this.filterQuery.actionType == 'preDetail') {
printParams.invCode = '1000002'
}
if (this.actDateRange !== null) { if (this.actDateRange !== null) {
printParams.startAduditTime = this.actDateRange[0]; printParams.startAduditTime = this.actDateRange[0];
printParams.endAduditTime = this.actDateRange[1]; printParams.endAduditTime = this.actDateRange[1];

126
src/views/purchase/purApply/purOrderSelectProduct.vue
Unescape Escape View File

@ -4,7 +4,7 @@
<el-form :model="listQuery" label-width="120px" v-show="showSearch"> <el-form :model="listQuery" label-width="120px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="UDI码:" > <el-form-item label="UDI码:">
<el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
@keyup.enter.native="keyup_submit($event)"></el-input> @keyup.enter.native="keyup_submit($event)"></el-input>
</el-form-item> </el-form-item>
@ -12,25 +12,25 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="拼音简写:" > <el-form-item label="拼音简写:">
<el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写" <el-input v-model="listQuery.pinyinInitial" @input="search" style="width: 100%" placeholder="请输入物资拼音简写"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="第三方物资编码:" > <el-form-item label="第三方物资编码:">
<el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码" <el-input v-model="listQuery.thrPiId" style="width: 100%" placeholder="第三方物资编码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="分类编码:" > <el-form-item label="分类编码:">
<el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码" <el-input v-model="listQuery.flbm" style="width: 100%" placeholder="请输入分类编码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="供应商:" > <el-form-item label="供应商:">
<el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商" <el-input v-model="listQuery.companyName" style="width: 100%" placeholder="请输入供应商"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
@ -38,24 +38,24 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="DI/物资编码:" > <el-form-item label="DI/物资编码:">
<el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码" <el-input v-model="listQuery.unionCode" style="width: 100%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物资名称:" > <el-form-item label="物资名称:">
<el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入物资名称" <el-input v-model="listQuery.cpmctymc" style="width: 100%" placeholder="请输入物资名称"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="规格型号:" > <el-form-item label="规格型号:">
<el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input> <el-input v-model="listQuery.ggxh" style="width: 100%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="生产企业:" > <el-form-item label="生产企业:">
<el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人" <el-input v-model="listQuery.manufactory" style="width: 100%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
@ -64,20 +64,20 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="物资分类:" > <el-form-item label="物资分类:">
<el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称" <el-input v-model="listQuery.category" style="width: 100%" placeholder="请输入物资分类名称"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable1"> <el-col :span="6" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" > <el-form-item :label="productRemarkSet.remarkTitle1+':'">
<el-input v-model="listQuery.basicPrductRemak1" style="width: 100%" <el-input v-model="listQuery.basicPrductRemak1" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle1" :placeholder="productRemarkSet.remarkTitle1"
clearable="true"></el-input> clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6" v-if="productRemarkSet.remarkEnable2"> <el-col :span="6" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2 +':'" > <el-form-item :label="productRemarkSet.remarkTitle2 +':'">
<el-input v-model="listQuery.basicPrductRemak2" style="width: 100%" <el-input v-model="listQuery.basicPrductRemak2" style="width: 100%"
:placeholder="productRemarkSet.remarkTitle2" :placeholder="productRemarkSet.remarkTitle2"
clearable="true"></el-input> clearable="true"></el-input>
@ -109,16 +109,22 @@
<el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column> <el-table-column label="医疗器械注册人" width="160" prop="ylqxzcrbarmc"></el-table-column>
<el-table-column label="器械类别" prop="qxlb" width="100" show-overflow-tooltip></el-table-column> <el-table-column label="器械类别" prop="qxlb" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="供应商" prop="companyName" width="160" show-overflow-tooltip></el-table-column> <el-table-column label="供应商" prop="companyName" width="160" show-overflow-tooltip></el-table-column>
<el-table-column <el-table-column
v-if="productRemarkSet.remarkEnable1" v-if="productRemarkSet.remarkEnable1"
:label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140" :label="productRemarkSet.remarkTitle1" prop="basicPrductRemak1" width="140"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column <el-table-column
v-if="productRemarkSet.remarkEnable2" v-if="productRemarkSet.remarkEnable2"
:label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140" :label="productRemarkSet.remarkTitle2" prop="basicPrductRemak2" width="140"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column
v-if="productRemarkSet.remarkEnable3"
:label="productRemarkSet.remarkTitle3" prop="basicPrductRemak3" width="140"
show-overflow-tooltip></el-table-column>
<el-table-column
v-if="productRemarkSet.remarkEnable4"
:label="productRemarkSet.remarkTitle4" prop="basicPrductRemak4" width="140"
show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="80" fixed="right"> <el-table-column label="操作" width="80" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button> <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
@ -127,23 +133,23 @@
</el-table> </el-table>
<pagination <pagination
v-show="pageTotal>0" v-show="pageTotal>0"
:total="pageTotal" :total="pageTotal"
:page.sync="listQuery.page" :page.sync="listQuery.page"
:limit.sync="listQuery.limit" :limit.sync="listQuery.limit"
@pagination="handleErpPageChange" @pagination="handleErpPageChange"
></pagination> ></pagination>
</el-card> </el-card>
<el-dialog <el-dialog
title="耗材字典详情" title="耗材字典详情"
:visible.sync="udiRlDetailVisible" :visible.sync="udiRlDetailVisible"
width="80%" width="80%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
append-to-body append-to-body
v-if="udiRlDetailVisible" v-if="udiRlDetailVisible"
> >
<udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog> <udiRlDetailDialog :editQuery="currentRow"></udiRlDetailDialog>
</el-dialog> </el-dialog>
@ -366,43 +372,43 @@ export default {
this.listQuery.customerId = store.getters.customerId; this.listQuery.customerId = store.getters.customerId;
this.listQuery.id = this.pId; this.listQuery.id = this.pId;
filterCompanyProductplanRelevance(this.listQuery) filterCompanyProductplanRelevance(this.listQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.dataList = response.data.list || []; this.dataList = response.data.list || [];
this.pageTotal = response.data.total || 0; this.pageTotal = response.data.total || 0;
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = []; this.dataList = [];
this.pageTotal = 0; this.pageTotal = 0;
}); }
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
}, },
getRationList() { getRationList() {
this.loading = true; this.loading = true;
filterCompanyProductRationRelevance(this.listQuery) filterCompanyProductRationRelevance(this.listQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.dataList = response.data.list || []; this.dataList = response.data.list || [];
this.pageTotal = response.data.total || 0; this.pageTotal = response.data.total || 0;
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
this.dataList = [];
this.pageTotal = 0;
}
})
.catch(() => {
this.loading = false;
this.dataList = []; this.dataList = [];
this.pageTotal = 0; this.pageTotal = 0;
}); }
})
.catch(() => {
this.loading = false;
this.dataList = [];
this.pageTotal = 0;
});
}, },
intentBack() { intentBack() {
this.closeDialog(); this.closeDialog();

Write Preview
Loading…
Cancel
Save