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 
# Conflicts:
#	src/views/inout/InvoiceRegistration.vue
ywj_dev
wangwei 2 years ago
parent c256c8f93d 89fb04f56e
commit 4765a7ee4f
4 changed files with 668 additions and 646 deletions
Show Stats Download Patch File Download Diff File

1
src/views/basic/locUdi/UdiInfoDb.vue
Unescape Escape View File

@ -113,6 +113,7 @@
<el-button type="primary" icon="el-icon-bottom-right" style="margin-left: 15px">导入器械信息</el-button> <el-button type="primary" icon="el-icon-bottom-right" style="margin-left: 15px">导入器械信息</el-button>
</el-upload> </el-upload>
</div> </div>
<el-divider style="margin: 15px"></el-divider>
<el-table <el-table
:data="udidlList" :data="udidlList"
style="width: 100%" style="width: 100%"

38
src/views/basic/product/udiInfoImport.vue
Unescape Escape View File

@ -22,20 +22,20 @@
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group>
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <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-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button> <el-button type="primary" icon="search" @click="getList">查询</el-button>
<el-upload :action="uploadFileUrl" multiple :limit="1" :data="uploadData" :show-file-list="false" :on-success="handleChange" :file-list="fileList"> <el-upload :action="uploadFileUrl" multiple :limit="1" :data="uploadData" :show-file-list="false"
:on-success="handleChange" :file-list="fileList">
<el-button icon="el-icon-upload2" type="primary">导入器械信息</el-button> <el-button icon="el-icon-upload2" type="primary">导入器械信息</el-button>
</el-upload> </el-upload>
</el-button-group> </el-button-group>
</div> </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%" @selection-change="handleSelectionChange" border
<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row> highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column> <el-table-column label="记录ID" prop="genKey" show-overflow-tooltip></el-table-column>
<el-table-column label="来源" prop="fromType" show-overflow-tooltip> <el-table-column label="来源" prop="fromType" show-overflow-tooltip>
@ -78,12 +78,12 @@
</template> </template>
<script> <script>
import axios from "axios"; import axios from "axios";
import {filterDetail, filterLog, deleteLog, downloadSmp} from "@/api/basic/udiinfoImport"; import {filterDetail, filterLog, deleteLog, downloadSmp} from "@/api/basic/udiinfoImport";
import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
import udiInfoImportDetail from "./udiInfoImportDetail"; import udiInfoImportDetail from "./udiInfoImportDetail";
export default { export default {
data() { data() {
return { return {
showSearch: true, showSearch: true,
@ -263,29 +263,29 @@
this.getBasicThirdSys(); this.getBasicThirdSys();
this.getList(); this.getList();
}, },
}; };
</script> </script>
<style> <style>
.itemTag { .itemTag {
float: left; float: left;
text-align: left; text-align: left;
margin-top: 10px; margin-top: 10px;
width: 100px; width: 100px;
} }
.text { .text {
font-size: 13px; font-size: 13px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
} }
.el-row { .el-row {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.el-col { .el-col {
border-radius: 4px; border-radius: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} }
</style> </style>

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

@ -185,7 +185,7 @@
<!--单据业务详情--> <!--单据业务详情-->
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span> <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border <el-table :data="codeDetailList" style="width: 100%" border
@current-change="BizDetail" @current-change="BizDetail"
row-key="id" highlight-current-row row-key="id" highlight-current-row
> >
@ -273,66 +273,66 @@
</el-tabs> </el-tabs>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<!--单据业务详情--> <!--单据业务详情-->
<el-tab-pane> <el-tab-pane>
<span slot="label">单据 {{ currentRow.billNo }}-发票信息</span> <span slot="label">单据 {{ currentRow.billNo }}-发票信息</span>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border <el-table :data="bizDetailList" style="width: 100%" border
row-key="id" row-key="id"
> >
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="规格型号" label="物资名称"
prop="ggxh" prop="cpmctymc" width="150"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="物资名称" label="规格型号" width="150"
prop="cpmctymc" prop="ggxh"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="批次号" label="批次号" width="100"
prop="batchNo" prop="batchNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="机器编码" label="机器编码" width="150"
prop="machineNo" prop="machineNo"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票代码" label="发票代码" width="150"
prop="invoiceCode" prop="invoiceCode"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票编码" label="发票编码" width="150"
prop="invoiceEncode" prop="invoiceEncode"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="开票日期" label="开票日期" width="150"
prop="invoiceDate" prop="invoiceDate"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="发票价格" label="发票价格"
prop="price" prop="price" width="100"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="生产日期" label="生产日期" width="100"
prop="productDate" prop="productDate"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="失效日期" label="失效日期"
prop="expireDate" prop="expireDate" width="100"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="备注" label="备注"
prop="remark" prop="remark" width="140"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -440,8 +440,6 @@ import {previewImage} from '@/api/purchase/supCompany'
import ElImageViewer from "element-ui/packages/image/src/image-viewer"; import ElImageViewer from "element-ui/packages/image/src/image-viewer";
const formJson = { const formJson = {
site_id: "", site_id: "",
site_name: "", site_name: "",
@ -531,7 +529,7 @@ export default {
billNo: "" billNo: ""
}, },
actDateRange: [], actDateRange: [],
auditDateRange:[], auditDateRange: [],
pickerOptions: { pickerOptions: {
shortcuts: [ shortcuts: [
{ {
@ -591,6 +589,7 @@ export default {
resultDetailList: [], resultDetailList: [],
acceptQuery: null, acceptQuery: null,
acceptOrderVisible: false, acceptOrderVisible: false,
subRow: null,
}; };
}, },
components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer}, components: {AcceptOrder, DialogInvoice, InvoiceRegister, ElImageViewer},
@ -614,7 +613,13 @@ export default {
this.getList(); this.getList();
}, },
InvoiceRegister(row) { InvoiceRegister(row) {
insertInvoice(row)
this.$confirm('是否登记新的发票？', '提示', {
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.insertInvoice(row)
.then(response => { .then(response => {
if (response.code === 20000) { if (response.code === 20000) {
this.closeInvoice(row); this.closeInvoice(row);
@ -625,6 +630,10 @@ export default {
.catch((response) => { .catch((response) => {
this.$message.error(response.message); this.$message.error(response.message);
}); });
}).catch(() => {
});
}, },
onSubmit() { onSubmit() {
this.loading = true; this.loading = true;
@ -704,7 +713,7 @@ export default {
}, },
deleteInvoice(row) { deleteInvoice(row) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该发票信息, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -714,7 +723,7 @@ export default {
deleteById(params) deleteById(params)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.getBizDetailList(); this.getBizDetailList(this.subRow);
this.$message({ this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",
@ -911,6 +920,8 @@ export default {
} }
this.bizDetailLoading = true; this.bizDetailLoading = true;
this.bizQuery.orderIdFk = this.currentRow.billNo; this.bizQuery.orderIdFk = this.currentRow.billNo;
this.bizQuery.batchNo = row.batchNo;
this.bizQuery.relId = row.bindRlFk;
filterListInvoice(this.bizQuery).then((res) => { filterListInvoice(this.bizQuery).then((res) => {
this.bizDetailLoading = false; this.bizDetailLoading = false;
if (res.code === 20000) { if (res.code === 20000) {
@ -929,11 +940,11 @@ export default {
}) })
}, },
BizDetail(val){
this.bizQuery.page=1; BizDetail(row) {
this.bizQuery.productName=val.coName; this.bizQuery.page = 1;
this.bizQuery.batchNo=val.batchNo; this.subRow = row;
this.getBizDetailList(); this.getBizDetailList(row);
}, },

68
src/views/inventory/inner/innerOrderSelectProduct.vue
Unescape Escape View File

@ -3,35 +3,44 @@
<el-card class="el-card"> <el-card class="el-card">
<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="12"> <el-col :span="18">
<el-form-item label="UDI码:" class="query-form-item"> <el-form-item label="UDI码:" class="query-form-item">
<el-input v-model="listQuery.UdiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true" @keyup.enter.native="keyup_submit($event)"></el-input> <el-input v-model="listQuery.UdiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
</el-form-item> @keyup.enter.native="keyup_submit($event)"></el-input>
</el-col>
<el-col :span="6">
<el-form-item label="第三方产品编码:" class="query-form-item">
<el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="第三方产品编码:" class="query-form-item">
<el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="物品编码:" class="query-form-item"> <el-form-item label="物品编码:" class="query-form-item">
<el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input> <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="物资名称:" class="query-form-item"> <el-form-item label="物资名称:" class="query-form-item">
<el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称" clearable="true"></el-input> <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="规格型号:" class="query-form-item"> <el-form-item label="规格型号:" class="query-form-item">
<el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input> <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="8">
<el-form-item label="生产企业:" class="query-form-item"> <el-form-item label="生产企业:" class="query-form-item">
<el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人" <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input> clearable="true"></el-input>
@ -50,7 +59,8 @@
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row :row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable"> <el-table :data="dataList" style="width: 100%" v-loading="loading" border highlight-current-row
:row-class-name="tableRowClassName" @current-change="handleChange" ref="multipleTable">
<el-table-column label width="45"> <el-table-column label width="45">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
@ -114,7 +124,7 @@
<script> <script>
import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance"; import {filterCompanyProductRelevance} from "../../../api/basic/udiRlSuptRelevance";
import {addApplyDetail,addApply} from "../../../api/purchase/purApply"; import {addApplyDetail, addApply} from "../../../api/purchase/purApply";
import store from "../../../store"; import store from "../../../store";
import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog"; import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog";
import {addOrderDetail} from "@/api/inventory/innerOrder"; import {addOrderDetail} from "@/api/inventory/innerOrder";
@ -160,7 +170,7 @@ export default {
erpName: "", erpName: "",
keys: [], keys: [],
}, },
ids:[], ids: [],
radioCheck: null, radioCheck: null,
dataList: [], dataList: [],
pageTotal: 1, pageTotal: 1,
@ -301,9 +311,9 @@ export default {
return; return;
} }
if(this.ids.length>0){ if (this.ids.length > 0) {
for(var i=0;i<this.ids.length;i++){ for (var i = 0; i < this.ids.length; i++) {
if(this.ids[i]==this.multipleSelection.rlId){ if (this.ids[i] == this.multipleSelection.rlId) {
this.$message.error("该产品已录入！"); this.$message.error("该产品已录入！");
return return
} }
@ -322,12 +332,12 @@ export default {
combine() { combine() {
this.loading = true; this.loading = true;
let tQuery = { let tQuery = {
productId:this.multipleSelection.rlId, productId: this.multipleSelection.rlId,
productName:this.multipleSelection.cpmctymc, productName: this.multipleSelection.cpmctymc,
count:1, count: 1,
orderIdFk:this.pId, orderIdFk: this.pId,
supId:this.multipleSelection.customerId, supId: this.multipleSelection.customerId,
zczbhhzbapzbh:this.multipleSelection.zczbhhzbapzbh zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
}; };
addOrderDetail(tQuery).then((response) => { addOrderDetail(tQuery).then((response) => {
this.loading = false; this.loading = false;
@ -350,7 +360,7 @@ export default {
selectCert() { selectCert() {
if (this.currentCert == null) { if (this.currentCert == null) {
this.$message.error("请先选择对应的注册证！"); this.$message.error("请先选择对应的注册证！");
}else{ } else {
this.multipleSelection.zczbhhzbapzbh = this.currentCert; this.multipleSelection.zczbhhzbapzbh = this.currentCert;
this.combine(); this.combine();
} }
@ -362,9 +372,9 @@ export default {
created() { created() {
console.log(this.data) console.log(this.data)
if (this.$isNotBlank(this.data)) { if (this.$isNotBlank(this.data)) {
this.ids=[]; this.ids = [];
if(this.data.stockOrderLists.length>0){ if (this.data.stockOrderLists.length > 0) {
for(var i=0;i<this.data.stockOrderLists.length;i++){ for (var i = 0; i < this.data.stockOrderLists.length; i++) {
this.ids.push(this.data.stockOrderLists[i].productId); this.ids.push(this.data.stockOrderLists[i].productId);
} }
} }

Write Preview
Loading…
Cancel
Save