From 6acd9572801af5e639840dd13832bf34ee5d165c Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 31 May 2024 17:18:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=200531=E5=A2=9E=E5=8A=A0=E6=98=AF?=
=?UTF-8?q?=E5=90=A6=E9=9C=80=E8=A6=81=E6=89=AB=E7=A0=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/basic/product/product.vue | 22 +++++
src/views/basic/product/productEdit.vue | 69 ++++++++++++++-
.../company/basicCompanyProductsImport.vue | 86 ++++++++++++++++---
.../company/basicCompanyproductDetail.vue | 18 ++++
.../company/basicCompanyproductEdit.vue | 43 +++++++++-
5 files changed, 220 insertions(+), 18 deletions(-)
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index abd1133..2fb58b1 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -808,6 +808,28 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 7759f1d..57501a5 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -341,6 +341,35 @@
+
+
+
+
+
+ {{ item.code }}
+ {{ item.name }}
+
+
+
+
+
+
+
@@ -364,8 +393,23 @@
-
-
+
+
+ 是否需要扫码
+
+
+
+
+
+
+
+
+
+
+ 是否需要扫码
+
+
+
是否禁用
@@ -714,7 +758,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect";
import {getListMenu, getOneName} from '@/api/basic/basicHospType'
import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
-
+import {filterClassify} from "@/api/purchase/classifyCode"
export default {
name: "productEdit",
@@ -776,6 +820,7 @@ export default {
loading: false,
hsflOptions: [],
thrTypeOptions: [],
+ classifyList: [],
}
},
components: {
@@ -800,8 +845,26 @@ export default {
if (this.editQuery.basicPrductRemak7 != null) {
this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
}
+ this.classifySearch()
},
methods: {
+ classifyChange(){
+ this.editQuery.requireScanCode = this.classifyList.find(item => item.code == this.editQuery.flbm).requireScanCode;
+ },
+ classifySearch(key) {
+ let query = {
+ key: key,
+ }
+ filterClassify(query)
+ .then(response => {
+ this.loading = false;
+ this.classifyList = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ this.classifyList = [];
+ });
+ },
getYbHcData(){
let query = {
specificationCode: this.editQuery.ybbm
diff --git a/src/views/supplier/company/basicCompanyProductsImport.vue b/src/views/supplier/company/basicCompanyProductsImport.vue
index a13ca14..2d4373d 100644
--- a/src/views/supplier/company/basicCompanyProductsImport.vue
+++ b/src/views/supplier/company/basicCompanyProductsImport.vue
@@ -331,14 +331,18 @@
-
-
+
+ 医保编码:
+
+
-
+
@@ -360,15 +364,18 @@
-
+
@@ -387,16 +394,20 @@
>
+
-
+
@@ -544,6 +555,35 @@
+
+
+
+
+ 分类编码:
+
+
+
+ {{ item.code }}
+ {{ item.name }}
+
+
+
+
+
@@ -720,6 +760,7 @@ import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/co
import store from "../../../store";
import {isBlank} from "@/utils/strUtil";
import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import {filterClassify} from "@/api/purchase/classifyCode"
export default {
name: "UdIInfoSelect",
@@ -785,6 +826,7 @@ export default {
purType: null,
attributeType: null,
hcType: null,
+ flbm: null,
},
relevanceEdit: {
@@ -823,10 +865,26 @@ export default {
supplementRequest: null,
hsflOptions: [],
thrTypeOptions: [],
+ classifyList: [],
};
},
methods: {
+
+ classifySearch(key) {
+ let query = {
+ key: key,
+ }
+ filterClassify(query)
+ .then(response => {
+ this.loading = false;
+ this.classifyList = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ this.classifyList = [];
+ });
+ },
getYbHcData(){
let query = {
specificationCode: this.repEditQuery.ybbm
@@ -1025,7 +1083,9 @@ export default {
this.repEditQuery.manufactory = this.currentRow.manufactory;
this.repEditQuery.spmc = this.currentRow.spmc;
this.repEditQuery.cpms = this.currentRow.cpms;
+ this.repEditQuery.flbm = this.currentRow.flbm;
this.getYbHcData()
+ this.classifySearch()
// if (isBlank(this.relevanceEdit.cpms)) {
// this.repEditQuery.cpms =this.currentRow.cpmctymc+this.currentRow.ggxh
// }
diff --git a/src/views/supplier/company/basicCompanyproductDetail.vue b/src/views/supplier/company/basicCompanyproductDetail.vue
index b46dedc..4e30229 100644
--- a/src/views/supplier/company/basicCompanyproductDetail.vue
+++ b/src/views/supplier/company/basicCompanyproductDetail.vue
@@ -160,6 +160,24 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 41c3e2f..cd5d425 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -160,7 +160,7 @@
v-model="editQuery.attributeType"
placeholder="请选择"
clearable
- style="width: 65%"
+ style="width: 80%"
>
@@ -321,7 +321,29 @@
-
+
+
+
+ {{ item.code }}
+ {{ item.name }}
+
+
@@ -367,6 +389,7 @@ import {filterByUuid} from '@/api/basic/udiInfo'
import selectErp from "./udiInfoselectErpUdi";
import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import { filterClassify } from '@/api/purchase/classifyCode'
export default {
name: 'productEdit',
@@ -415,10 +438,25 @@ export default {
selectErpDialogVisible: false, //选入ERP产品
hsflOptions: [],
thrTypeOptions: [],
+ classifyList: [],
}
},
methods: {
+ classifySearch(key) {
+ let query = {
+ key: key,
+ }
+ filterClassify(query)
+ .then(response => {
+ this.loading = false;
+ this.classifyList = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ this.classifyList = [];
+ });
+ },
getYbHcData(){
let query = {
specificationCode: this.editQuery.ybbm
@@ -642,6 +680,7 @@ export default {
// if (this.editQuery.basicPrductRemak7 != null) {
this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
// }
+ this.classifySearch()
console.log("editQuery:",this.editQuery)
}, directives: {
'debounce-input': {