diff --git a/src/api/thrsys/thrHsfl.js b/src/api/thrsys/thrHsfl.js
index 07eaae6..f7c1262 100644
--- a/src/api/thrsys/thrHsfl.js
+++ b/src/api/thrsys/thrHsfl.js
@@ -16,3 +16,14 @@ export function getThrProductType(query) {
params: query
});
}
+
+
+ export function getTBasicProducts(query) {
+ return axios({
+ url: "/udiwms/thrsys/getBasicProducts",
+ method: "get",
+ params: query
+ });
+ }
+
+
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 7759f1d..6aeb8df 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -67,14 +67,28 @@
>
-
-
-
+
+
+ filterable
+ remote
+ clearable="true"
+ reserve-keyword
+ placeholder="请选择生产企业"
+ :remote-method="findProducts"
+ style="width: 80%"
+ >
+
+ {{ item.name }}
+ {{ item.unitId }}
+
+
@@ -713,7 +727,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, getThrProductType} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType,getTBasicProducts} from "@/api/thrsys/thrHsfl";
export default {
@@ -776,6 +790,7 @@ export default {
loading: false,
hsflOptions: [],
thrTypeOptions: [],
+ probucts:[],
}
},
components: {
@@ -800,6 +815,7 @@ export default {
if (this.editQuery.basicPrductRemak7 != null) {
this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
}
+ this.findProducts()
},
methods: {
getYbHcData(){
@@ -1059,6 +1075,23 @@ export default {
this.loading = false;
});
},
+ findProducts(query) {
+ this.probucts = [];
+ let cQuery = {
+ key: query,
+ page: 1,
+ limit: 20
+ };
+ getTBasicProducts(cQuery)
+ .then((response) => {
+ console.log("heiheiehi",response)
+ this.loading = false;
+ this.probucts = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ });
+ },
findThrTypeMethod(query) {
this.thrTypeOptions = [];
let cQuery = {
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index 41c3e2f..66777bf 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -64,10 +64,34 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.unitId }}
+
+
@@ -366,7 +390,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, getThrProductType} from "@/api/thrsys/thrHsfl";
+import {getHslbs, getThrProductType,getTBasicProducts} from "@/api/thrsys/thrHsfl";
export default {
name: 'productEdit',
@@ -415,6 +439,7 @@ export default {
selectErpDialogVisible: false, //选入ERP产品
hsflOptions: [],
thrTypeOptions: [],
+ probucts:[],
}
},
@@ -623,7 +648,23 @@ export default {
this.loading = false;
});
},
-
+ findProducts(query) {
+ this.probucts = [];
+ let cQuery = {
+ key: query,
+ page: 1,
+ limit: 20
+ };
+ getTBasicProducts(cQuery)
+ .then((response) => {
+ console.log("heiheiehi",response)
+ this.loading = false;
+ this.probucts = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ });
+ },
},
components: {
selectErp
@@ -639,8 +680,9 @@ export default {
// if (this.editQuery.basicPrductRemak8 != null) {
this.findHsflMethod(this.editQuery.basicPrductRemak8);
// }
- // if (this.editQuery.basicPrductRemak7 != null) {
+ // if (this.editQuery.basicPrductRemak7 != null) { manufactory
this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
+ this.findProducts()
// }
console.log("editQuery:",this.editQuery)
}, directives: {
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 1194127..9df6e7c 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -372,6 +372,30 @@
+
+
+
+
+ {{ item.name }}
+ {{ item.unitId }}
+
+
+
+
@@ -430,7 +454,7 @@ import selectDiDetail from './selectDIDetailDialog'
import store from '@/store'
import {getBasicThirdSys} from '@/api/basic/basicThirdSys'
import {finProductSet} from '@/api/param/systemParamConfig'
-import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
+import { getHslbs, getTBasicProducts, getThrProductType } from '@/api/thrsys/thrHsfl'
export default {
name: 'closeDialog',
@@ -520,6 +544,7 @@ export default {
productRemarkSet: {},
hsflOptions: [],
thrTypeOptions: [],
+ probucts:[],
}
},
methods: {
@@ -804,6 +829,23 @@ export default {
this.loading = false;
});
},
+ findProducts(query) {
+ this.probucts = [];
+ let cQuery = {
+ key: query,
+ page: 1,
+ limit: 20
+ };
+ getTBasicProducts(cQuery)
+ .then((response) => {
+ console.log("heiheiehi",response)
+ this.loading = false;
+ this.probucts = response.data.list || [];
+ })
+ .catch(() => {
+ this.loading = false;
+ });
+ },
findThrTypeMethod(query) {
this.thrTypeOptions = [];
let cQuery = {
@@ -825,6 +867,7 @@ export default {
created() {
this.getBasicThirdSys()
this.findBasicProductSet()
+ this.findProducts()
},
components: {
selectDiDetail
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index 8407589..4710ef2 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -385,6 +385,41 @@
+
+
+ 设备管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -871,6 +906,9 @@ export default {
udiCodeLost: null,
udiCodeRel: null,
orderInvoice: null,
+ deviceInfo: null,
+ deviceCheck: null,
+ deviceRepairApply: null,
},
checkedBusTypes: [],
checkedToInBusTypes: [],