diff --git a/src/api/biz/traceQuery.js b/src/api/biz/traceQuery.js index 30af345e..67339511 100644 --- a/src/api/biz/traceQuery.js +++ b/src/api/biz/traceQuery.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import axios from '@/utils/request' /** * 获取单据记录 @@ -18,12 +19,12 @@ export function getOrderRecords(data) { * @param {Object} data 查询参数 * @returns {Promise} 请求结果 */ -export function getOrderDetails(data) { - return request({ - url: '/udiwms/inout/bizDetail/filterList', - method: 'post', - data - }) +export function getOrderDetails(query) { + return axios({ + url: "/udiwms/basic/collect/ioCollectCodeBackup/getOrderDetails", + method: "get", + params: query + }); } /** @@ -31,10 +32,10 @@ export function getOrderDetails(data) { * @param {Object} data 查询参数 * @returns {Promise} 请求结果 */ -export function getDrugInfo(data) { - return request({ - url: '/di/udirel/filterUdi', - method: 'post', - data - }) +export function getDrugInfo(query) { + return axios({ + url: "/udiwms/basic/collect/ioCollectCodeBackup/retrace", + method: "get", + params: query + }); } diff --git a/src/views/biz/DrugTraceQuery.vue b/src/views/biz/DrugTraceQuery.vue index ea45b559..e5bec711 100644 --- a/src/views/biz/DrugTraceQuery.vue +++ b/src/views/biz/DrugTraceQuery.vue @@ -8,17 +8,17 @@ 药品信息查询 - + - - - @@ -28,37 +28,37 @@ - - + +
- 药品基本信息 + 药品基本信息
{{ drugInfo.cpmctymc || '-' }} {{ drugInfo.nameCode || '-' }} {{ drugInfo.prepnSpec || '-' }} - {{ drugInfo.bzgg || '-' }} + {{ drugInfo.ggxh || '-' }} {{ drugInfo.manufactory || '-' }} {{ drugInfo.zczbhhzbapzbh || '-' }} - {{ drugInfo.measname || '-' }} + - -
+ +
- 追溯记录 + 追溯记录
- + @@ -76,7 +76,7 @@
- 流通流程 + 流通流程
- - + +
- 单据明细 - - - +
-
+
+ 单据明细 + + + +
+
单据号： {{ currentOrder.billNo }}
单据类型： - {{ currentOrder.billTypeName }} + {{ currentOrder.busTypeName }}
单据时间： @@ -118,14 +121,15 @@ - - + + + - - + +
@@ -134,10 +138,9 @@ - - + - 重新查询 @@ -153,12 +156,17 @@ export default { // 折叠面板激活项 activeNames: ['1', '2', '3'], // 查询表单 - queryForm: { - traceCode: '', - drugName: '', + filterQuery: { + code: '', + cpmctymc: '', batchNo: '', page: 1, - limit: 50 + limit: 20 + }, + orderDetailQuery: { + billNo:'', + page: 1, + limit: 20 }, // 表格加载状态 tableLoading: false, @@ -168,31 +176,38 @@ export default { nameCode: '', cpmctymc: '', prepnSpec: '', - bzgg: '', + ggxh: '', manufactory: '', zczbhhzbapzbh: '', - packMatrial: '', measname: '' }, + showDrugInfo: false, + showorderRecords: false, + showOrderDetails: false, + noData : true, + dataLog: " 请查询相关追溯记录", // 单据记录 orderRecords: [], // 单据明细 orderDetails: [], // 是否显示明细 - showOrderDetail: false, // 当前选中的单据 - currentOrder: null + currentOrder: { + billNo: "", + busTypeName:"", + createTime:"" + } } }, beforeCreate() { // 确保在组件创建前就初始化数据 - if (!this.queryForm) { - this.$set(this, 'queryForm', { - traceCode: '', - drugName: '', + if (!this.filterQuery) { + this.$set(this, 'filterQuery', { + code: '', + cpmctymc: '', batchNo: '', page: 1, - limit: 50 + limit: 20 }) } }, @@ -223,93 +238,65 @@ export default { // 搜索 handleSearch() { - if (!this.queryForm.traceCode && !this.queryForm.drugName && !this.queryForm.batchNo) { + if (!this.filterQuery.code && !this.filterQuery.cpmctymc && !this.filterQuery.batchNo) { this.$message.warning('请至少输入一个查询条件') return } - this.tableLoading = true - this.drugInfo = { - nameCode: '', - cpmctymc: '', - prepnSpec: '', - bzgg: '', - manufactory: '', - zczbhhzbapzbh: '', - packMatrial: '', - measname: '' - } + // this.tableLoading = true this.orderRecords = [] this.orderDetails = [] - this.showOrderDetail = false + this.currentOrder = {} + this.showDrugInfo = false + this.showorderRecords = false + this.showOrderDetails = false // 查询药品信息 this.queryDrugInfo() // 查询单据记录 - this.queryOrderRecords() + // this.queryOrderRecords() }, // 查询药品信息 queryDrugInfo() { - if (!this.queryForm) return - - getDrugInfo({ - nameCode: this.queryForm.traceCode, - drugName: this.queryForm.drugName, - batchNo: this.queryForm.batchNo, - page: 1, - limit: 1 - }).then(response => { - if (response.code === 20000 && response.data.list && response.data.list.length > 0) { + getDrugInfo(this.filterQuery).then(response => { + if (response.code === 20000 && response.data.list.length > 0) { + this.showDrugInfo = true + this.showorderRecords = true + this.noData = false this.drugInfo = response.data.list[0] + + // this.orderRecords.push( this.drugInfo.order); + response.data.list.forEach(item => { + this.orderRecords.push(item.order); + }) + // orderRecords + // this.currentOrder } else { + this.showDrugInfo = false + this.showorderRecords = false + this.noData = true this.drugInfo = {} + this.dataLog = "未查询到相关追溯记录" } }).catch(() => { this.drugInfo = {} }) }, - // 查询单据记录 - queryOrderRecords() { - if (!this.queryForm) { - this.tableLoading = false - return - } - - getOrderRecords({ - traceCode: this.queryForm.traceCode, - drugName: this.queryForm.drugName, - batchNo: this.queryForm.batchNo, - page: this.queryForm.page || 1, - limit: this.queryForm.limit || 50 - }).then(response => { - this.tableLoading = false - if (response.code === 20000) { - this.orderRecords = response.data.list || [] - } else { - this.$message.error(response.message || '查询失败') - this.orderRecords = [] - } - }).catch(() => { - this.tableLoading = false - this.orderRecords = [] - }) + colseOrderClick(){ + this.showOrderDetails = false }, // 查看单据明细 viewOrderDetail(row) { this.currentOrder = row this.detailLoading = true - this.showOrderDetail = true - - getOrderDetails({ - orderIdFk: row.billNo, - page: 1, - limit: 100 - }).then(response => { + this.orderDetailQuery.billNo = row.billNo + getOrderDetails(this.orderDetailQuery).then(response => { this.detailLoading = false if (response.code === 20000) { + this.showOrderDetails = true this.orderDetails = response.data.list || [] if (this.orderDetails.length === 0) { this.$message.info('该单据暂无明细记录') @@ -326,17 +313,27 @@ export default { // 重置表单 resetForm() { - this.queryForm = { - traceCode: '', - drugName: '', + this.filterQuery = { + code: '', + cpmctymc: '', batchNo: '', page: 1, - limit: 50 + limit: 20 } this.drugInfo = {} + this.currentOrder = {} this.orderRecords = [] this.orderDetails = [] - this.showOrderDetail = false + this.showDrugInfo = false + this.showorderRecords = false + this.showOrderDetails = false + this.noData = true + this.orderDetailQuery = { + billNo:'', + page: 1, + limit: 20 + } + this.dataLog = " 请查询相关追溯记录" }, // 格式化日期 @@ -353,20 +350,12 @@ export default { } }, mounted() { - // 防止拖拽文件到页面 - document.body.ondrop = function (event) { - event.preventDefault() - event.stopPropagation() - } + // // 防止拖拽文件到页面 + // document.body.ondrop = function (event) { + // event.preventDefault() + // event.stopPropagation() + // } - // 如果URL中有查询参数，自动查询 - const { traceCode, drugName, batchNo } = this.$route.query - if (traceCode || drugName || batchNo) { - this.queryForm.traceCode = traceCode || '' - this.queryForm.drugName = drugName || '' - this.queryForm.batchNo = batchNo || '' - this.handleSearch() - } } } diff --git a/src/views/collect/IosplitFifoStock.vue b/src/views/collect/IosplitFifoStock.vue index 178934e1..8f0d4525 100644 --- a/src/views/collect/IosplitFifoStock.vue +++ b/src/views/collect/IosplitFifoStock.vue @@ -25,8 +25,8 @@

{{ item.productName }}

- {{ item.batchNo }} - {{ item.expireDate }} + {{ item.prepnSpec }} + {{ item.ggxh }}
@@ -130,17 +130,16 @@ export default { if (response.code === 20000) { // 处理返回的数据 this.total = response.data.total || 0; - console.log("jkjsjsjs",this.total) // 转换数据格式以适应展示需求 this.displayData = (response.data.list || []).map(item => { return { productName: item.cpmctymc || '未知产品', - batchNo: item.batchNo || '无批次', - expireDate: item.expireDate || '无效期', + prepnSpec: item.prepnSpec , + ggxh: item.ggxh , workplaceStock: item.remCount || 0, - workplaceTotal: item.workplaceTotal || 100, + workplaceTotal: item.maxDrugCount || 100, splitStock: item.splitRemCount || 0, - splitTotal: item.splitTotal || 100 + splitTotal: item.maxDrugCount || 100 }; }); } else {