From 21ff6b97dbee4d6a163b2c3c32a85a6f6a9f9a6a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 11 Dec 2023 21:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E9=80=89=E6=8B=A9=E7=89=A9?= =?UTF-8?q?=E8=B5=84=E7=B1=BB=E5=88=AB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 8 +- src/api/thrsys/thrHsfl.js | 9 ++ src/views/basic/product/productEdit.vue | 49 ++++++-- src/views/inout/IoReturnedSearchOrder.vue | 2 + .../purchase/product/supProductEditDialog.vue | 10 +- .../company/basicCompanyProductsImport.vue | 118 ++++++++++++++---- .../company/basicCompanyproductEdit.vue | 50 ++++++-- .../products/supAddDiProductSelectUdi.vue | 44 ++++++- 8 files changed, 234 insertions(+), 56 deletions(-) diff --git a/.env.production b/.env.production index 5e56bff..44e3cdc 100644 --- a/.env.production +++ b/.env.production @@ -22,7 +22,7 @@ ENV = 'production' # 刘恩典 # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/' -VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/' # 漳州中医院 # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' @@ -31,17 +31,17 @@ VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/' # 长泰医院 -# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/' # 应用访问路径 例如使用前缀 /admin/ # 域名 -# VUE_APP_CONTEXT_PATH = '/' +VUE_APP_CONTEXT_PATH = '/' # 其他 -VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' +# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' # 监控地址 VUE_APP_MONITRO_ADMIN = '/admin/login' diff --git a/src/api/thrsys/thrHsfl.js b/src/api/thrsys/thrHsfl.js index 55b0acf..07eaae6 100644 --- a/src/api/thrsys/thrHsfl.js +++ b/src/api/thrsys/thrHsfl.js @@ -7,3 +7,12 @@ export function getHslbs(query) { params: query }); } + + +export function getThrProductType(query) { + return axios({ + url: "/udiwms/thrsys/getThrProductType", + method: "get", + params: query + }); +} diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 3c25fa3..bac1f44 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -242,12 +242,26 @@ - + filterable + remote + clearable="true" + reserve-keyword + placeholder="请选择物资类别" + :remote-method="findThrTypeMethod" + style="width: 80%" + > + + {{ item.name }} + {{ item.code }} + + @@ -593,7 +607,7 @@ import selectErp from "./udiInfoselectErpUdi"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import Treeselect from "@riophae/vue-treeselect"; import {getListMenu, getOneName} from '@/api/basic/basicHospType' -import {getHslbs} from "@/api/thrsys/thrHsfl"; +import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl"; export default { @@ -654,6 +668,7 @@ export default { }, loading: false, hsflOptions: [], + thrTypeOptions: [], } }, components: { @@ -675,6 +690,9 @@ export default { if (this.editQuery.basicPrductRemak8 != null) { this.findHsflMethod(this.editQuery.basicPrductRemak8); } + if (this.editQuery.basicPrductRemak7 != null) { + this.findThrTypeMethod(this.editQuery.basicPrductRemak7); + } }, methods: { diableChange() { @@ -905,8 +923,23 @@ export default { .catch(() => { this.loading = false; }); - } - , + }, + findThrTypeMethod(query) { + this.thrTypeOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getThrProductType(cQuery) + .then((response) => { + this.loading = false; + this.thrTypeOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + }, } } diff --git a/src/views/inout/IoReturnedSearchOrder.vue b/src/views/inout/IoReturnedSearchOrder.vue index 415e396..cb650ad 100644 --- a/src/views/inout/IoReturnedSearchOrder.vue +++ b/src/views/inout/IoReturnedSearchOrder.vue @@ -577,6 +577,7 @@ export default { mainAction: null, action: null, vueType: "supReturned", + statusType: "supReturned", page: 1, limit: 10, startTime: null, @@ -717,6 +718,7 @@ export default { mainAction: null, action: null, vueType: "supReturned", + statusType: "supReturned", page: 1, limit: 10, startTime: null, diff --git a/src/views/purchase/product/supProductEditDialog.vue b/src/views/purchase/product/supProductEditDialog.vue index 1946243..df2feb5 100644 --- a/src/views/purchase/product/supProductEditDialog.vue +++ b/src/views/purchase/product/supProductEditDialog.vue @@ -550,8 +550,8 @@ export default { return; } } - if(val==3){ - this.$confirm( "已审核通过，是否需要重新提交变更", { + if (val == 3) { + this.$confirm("已审核通过，是否需要重新提交变更", { confirmButtonText: "确定", type: "warning", showCancelButton: false, @@ -581,7 +581,7 @@ export default { } }); }); - }else{ + } else { this.$refs['inputQuery'].validate(valid => { if (valid) { // this.inputQuery.auditStatus = val; @@ -669,7 +669,7 @@ export default { this.imgList = []; previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => { if (response.code === 20000) { - this.imgList=response.data; + this.imgList = response.data; } }); this.imgViewerVisible = true; @@ -703,7 +703,7 @@ export default { this.loading = false; if (response.code === 20000) { this.inputQuery = response.data; - this.inputQuery.manufacturerId=this.inputQuery.manufacturerIdFk + this.inputQuery.manufacturerId = this.inputQuery.manufacturerIdFk this.selectSingleProductVisible = false; } else { this.$message.error(response.message); diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue index c58b753..031c55f 100644 --- a/src/views/supplier/company/basicCompanyProductsImport.vue +++ b/src/views/supplier/company/basicCompanyProductsImport.vue @@ -206,12 +206,12 @@ - - - - - - + + + + + + @@ -276,12 +276,12 @@ - - - - - - + + + + + + {{ replTitle }} -
- 选中导入 -
+
+ 选中导入 +
@@ -524,12 +524,26 @@
{{ productRemarkSet.remarkTitle7 }}: 
- + filterable + remote + clearable="true" + reserve-keyword + placeholder="请选择物资类别" + :remote-method="findThrTypeMethod" + style="width: 65%" + > + + {{ item.name }} + {{ item.code }} + + @@ -538,12 +552,27 @@
{{ productRemarkSet.remarkTitle8 }}: 
- + filterable + remote + style="width: 65%" + clearable="true" + reserve-keyword + placeholder="请选择物价类别" + :remote-method="findHsflMethod" + > + + {{ item.hsmc }} + {{ item.hsbm }} + + + @@ -560,6 +589,7 @@ import {filterByUuid} from "../../../api/basic/udiInfo"; import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/companyProductRelevance"; import store from "../../../store"; import {isBlank} from "@/utils/strUtil"; +import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl"; export default { name: "UdIInfoSelect", @@ -599,7 +629,7 @@ export default { supplementRequest: null, }, loading: false, - editQuery: null, + editQuery: {}, repEditQuery: { sptm: null, ybbm: null, @@ -652,6 +682,8 @@ export default { selectLocalVisible: false, productRemarkSet: {}, supplementRequest: null, + hsflOptions: [], + thrTypeOptions: [], }; }, @@ -750,6 +782,7 @@ export default { }, allExport() { + debugger this.postQuery.customerId = store.getters.customerId; this.postQuery.supplementRequest = this.repEditQuery; insertFilter(this.postQuery).then(response => { @@ -943,6 +976,39 @@ export default { } }); }, + findHsflMethod(query) { + this.hsflOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getHslbs(cQuery) + .then((response) => { + this.loading = false; + this.hsflOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + } + , + findThrTypeMethod(query) { + this.thrTypeOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getThrProductType(cQuery) + .then((response) => { + this.loading = false; + this.thrTypeOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + }, }, mounted() { }, diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue index 1135c5c..2d1d350 100644 --- a/src/views/supplier/company/basicCompanyproductEdit.vue +++ b/src/views/supplier/company/basicCompanyproductEdit.vue @@ -152,12 +152,26 @@ - + filterable + remote + clearable="true" + reserve-keyword + placeholder="请选择物资类别" + :remote-method="findThrTypeMethod" + style="width: 80%" + > + + {{ item.name }} + {{ item.code }} + + @@ -245,7 +259,7 @@ import {updateById} from '@/api/basic/udiRelevance' import {filterByUuid} from '@/api/basic/udiInfo' import selectErp from "./udiInfoselectErpUdi"; import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion' -import {getHslbs} from "@/api/thrsys/thrHsfl"; +import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl"; export default { name: 'productEdit', @@ -293,6 +307,7 @@ export default { editSingleDiDialogVisible: false, selectErpDialogVisible: false, //选入ERP产品 hsflOptions: [], + thrTypeOptions: [], } }, @@ -446,8 +461,24 @@ export default { .catch(() => { this.loading = false; }); - } - , + }, + + findThrTypeMethod(query) { + this.thrTypeOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getThrProductType(cQuery) + .then((response) => { + this.loading = false; + this.thrTypeOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + }, }, components: { @@ -464,6 +495,9 @@ export default { if (this.editQuery.basicPrductRemak8 != null) { this.findHsflMethod(this.editQuery.basicPrductRemak8); } + if (this.editQuery.basicPrductRemak7 != null) { + this.findThrTypeMethod(this.editQuery.basicPrductRemak7); + } }, } diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue index c4e9c95..fc4ac4d 100644 --- a/src/views/supplier/products/supAddDiProductSelectUdi.vue +++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue @@ -250,8 +250,26 @@ - + + + {{ item.name }} + {{ item.code }} + + @@ -310,7 +328,7 @@ import selectDiDetail from './selectDIDetailDialog' import store from '@/store' import {getBasicThirdSys} from '@/api/basic/basicThirdSys' import {finProductSet} from '@/api/param/systemParamConfig' -import {getHslbs} from "@/api/thrsys/thrHsfl"; +import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl"; export default { name: 'closeDialog', @@ -393,6 +411,7 @@ export default { selectThirdSys: [], productRemarkSet: {}, hsflOptions: [], + thrTypeOptions: [], } }, methods: { @@ -630,8 +649,23 @@ export default { .catch(() => { this.loading = false; }); - } - , + }, + findThrTypeMethod(query) { + this.thrTypeOptions = []; + let cQuery = { + key: query, + page: 1, + limit: 20 + }; + getThrProductType(cQuery) + .then((response) => { + this.loading = false; + this.thrTypeOptions = response.data.list || []; + }) + .catch(() => { + this.loading = false; + }); + }, }, created() {