diff --git a/.env.production b/.env.production index acf02e9f..29d69aa7 100644 --- a/.env.production +++ b/.env.production @@ -43,7 +43,7 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' # 三明大田医院 -VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' +# VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/' @@ -60,6 +60,10 @@ VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.0.207:9160/UDI_WMS_MC/' +# 云霄妇幼保健 +# VUE_APP_BASE_API = 'http://192.168.0.11:9150/UDI_WMS_MC/' +VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/' + # 应用访问路径 例如使用前缀 /admin/ VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' diff --git a/src/api/inventory/stockCompareApi.js b/src/api/inventory/stockCompareApi.js index 6c02096d..4462b1f1 100644 --- a/src/api/inventory/stockCompareApi.js +++ b/src/api/inventory/stockCompareApi.js @@ -16,6 +16,7 @@ export function selectInvProductDetail(params) { }); } + export function stockCompareSave(params) { return axios({ url: "/udiwms/stockCompare/save", @@ -47,6 +48,23 @@ export function stockCompareDetailPage(params) { }); } +export function stockCompareResultPage(params) { + return axios({ + url: "/udiwms/stockCompare/detail/result", + method: "POST", + data: params + }); +} + +export function dlThrCpProduct(params) { + return axios({ + url: "/udiwms/stockCompare/addThrProduct", + method: "POST", + data: params + }); +} + + export function stockCompareDetailDel(params) { return axios({ url: "/udiwms/stockCompare/detail/del", @@ -54,3 +72,22 @@ export function stockCompareDetailDel(params) { data: params }); } + +export function uploadCompare(compareId) { + return axios({ + url: `/udiwms/stockCompare/compare/${compareId}`, + method: "POST", + }); +} + + + + +export function compareExportExcel(data) { + return axios({ + url: "/udiwms/stockCompare/compare/exportExcel", + method: "post", + responseType: 'blob', + data: data + }); +} diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 43a7d87b..bd54be71 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -1392,7 +1392,7 @@ diff --git a/src/views/basic/product/productCategory.vue b/src/views/basic/product/productCategory.vue index 1a093ee3..2cfe07f0 100644 --- a/src/views/basic/product/productCategory.vue +++ b/src/views/basic/product/productCategory.vue @@ -1299,7 +1299,7 @@ diff --git a/src/views/basic/product/test.vue b/src/views/basic/product/test.vue index 8ff7a630..a37e2b40 100644 --- a/src/views/basic/product/test.vue +++ b/src/views/basic/product/test.vue @@ -1237,7 +1237,7 @@ diff --git a/src/views/inventory/stockCompare.js b/src/views/inventory/stockCompare.js index f4b171bb..cd72cb1b 100644 --- a/src/views/inventory/stockCompare.js +++ b/src/views/inventory/stockCompare.js @@ -1,11 +1,16 @@ import { + compareExportExcel, + dlThrCpProduct, + dlThrProduct, selectInvProductDetail, stockCompareAddProduct, stockCompareDelete, stockCompareDetailDel, stockCompareDetailPage, - stockComparePage, - stockCompareSave + stockComparePage, stockCompareResultPage, + stockCompareSave, uploadCompare } from "@/api/inventory/stockCompareApi"; import {mainActionMap, stockCompareStatusEnum} from "@/utils/data"; import data from "@/views/system/dict/data.vue"; +import fa from "element-ui/src/locale/lang/fa"; +import {postExcelInoutImport} from "@/api/inout/orderDetailResult"; let filterQuery = { page: 1, @@ -115,6 +120,8 @@ export default { }, firstDayOfWeek: 1 }, + + currentRow: null, } }, created() { @@ -134,8 +141,8 @@ export default { } this.$message.success(res.message) this.showAddProductDialog = false - this.stockCompareDetailQuery.page = 1 - this.getStockCompareDetailList() + let query = {compareId: this.compareId,}; + this.getResultList(query) }) }, addProductSelectionChange(row) { @@ -151,10 +158,35 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }); - setTimeout(() => { + let query = { + compareId: this.compareId + } + dlThrCpProduct(query).then(res => { loading.close(); - }, 2000); + if (res.code != 20000) { + this.$message.error(res.message) + return + } + this.getResultList(query) + }).catch(e => { + loading.close(); + }) + }, + + uploadCompare() { + uploadCompare(this.compareId).then(res => { + if (res.code != 20000) { + this.$message.error(res.message) + return + } else { + this.$message.success("提交成功！"); + this.showDialog = false; + this.getList() + } + }) }, + + showAddProduct() { this.selectProductQuery = {...selectProductQuery, compareId: this.compareId} this.productList = [] @@ -165,18 +197,19 @@ export default { }, getStockCompareDetailList() { this.stockCompareDetailQuery.compareId = this.compareId - this.stockCompareDetailLoading = true - stockCompareDetailPage(this.stockCompareDetailQuery).then(res => { - this.stockCompareDetailLoading = false - if (res.code != 20000) { - this.$message.error(res.message) - return - } - this.stockCompareDetailList = res.data.list || [] - this.stockCompareDetailTotal = res.data.total || 0 - }).catch(e => { - this.stockCompareDetailLoading = false - }) + // this.stockCompareDetailLoading = true + // stockCompareDetailPage(this.stockCompareDetailQuery).then(res => { + // this.stockCompareDetailLoading = false + // if (res.code != 20000) { + // this.$message.error(res.message) + // return + // } + // this.stockCompareDetailList = res.data.list || [] + // this.stockCompareDetailTotal = res.data.total || 0 + // }).catch(e => { + // this.stockCompareDetailLoading = false + // }) + this.getResultList(this.stockCompareDetailQuery) }, selectInvProductDetailList() { this.productLoading = true @@ -305,6 +338,43 @@ export default { }).catch(res => { this.loading = false }) + }, + handleSelectionChange(val) { + this.currentRow = val; + let query = { + compareId: this.currentRow.id + } + this.getResultList(query); + }, + + getResultList(query) { + stockCompareResultPage(query).then(res => { + this.loading = false + if (res.code != 20000) { + this.$message.error(res.message) + return + } + this.stockCompareDetailList = res.data || [] + this.total = res.data.total || 0 + }).catch(res => { + this.loading = false + }) + }, + + exportExcel(row) { + let printParams = { + compareId: row.id + }; + compareExportExcel(printParams).then((response) => { + let blob = new Blob([response], {type: "application/vnd.ms-excel"}); + let url = window.URL.createObjectURL(blob); // 创建一个临时的url指向blob对象 + let a = document.createElement("a"); + a.href = url; + a.click(); + this.$message("生成文件成功！") + }) } + + } } diff --git a/src/views/inventory/stockCompare.vue b/src/views/inventory/stockCompare.vue index f41f04ea..681e9002 100644 --- a/src/views/inventory/stockCompare.vue +++ b/src/views/inventory/stockCompare.vue @@ -11,7 +11,8 @@ - + @@ -66,11 +67,11 @@ + > @@ -97,7 +98,8 @@ @@ -111,14 +113,80 @@ @pagination="getList" > + + + {{ currentRow == null ? '' : currentRow.id }}-库存对比结果 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 刷新 - - 添加产品 - 立即对比 + + 添加本地产品 + 下载第三产品 + 提交比对 + + + + @@ -190,19 +263,46 @@ max-height="300" height="300"> - - - - + + + + + - - - - - + + + + + + + + + + + + + + + @@ -265,8 +366,8 @@ - - + +