diff --git a/src/api/basic/product/udiRelevance.js b/src/api/basic/product/udiRelevance.js index 78141f69..138b6dd5 100644 --- a/src/api/basic/product/udiRelevance.js +++ b/src/api/basic/product/udiRelevance.js @@ -217,6 +217,12 @@ export function getGgxhListOptimize(params) { } - +export function getYbHcflDetail(query) { + return axios({ + url: "/udi/udirel/ybHcflDetail", + method: "post", + data: query + }); +} diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index f1a22a89..e6aa3383 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -1134,6 +1134,67 @@ + + +
+
+ 一级分类:  +
+ +
+
+ +
+
+ 二级分类:  +
+ +
+
+
+ + +
+
+ 三级分类:  +
+ +
+
+ +
+
+ 耗材材质:  +
+ +
+
+
+
@@ -1840,6 +1901,10 @@ export default { packUnit: null, measname: null, nameCode: null, + catalogname1: "", + catalogname2: "", + catalogname3: "", + matrial: "", }, isDisableMap: { true: "停用", @@ -2334,6 +2399,9 @@ export default { this.loading = false; }); }, + closeHandler(){ + // this.visible = false; + }, closeUdi(val) { this.selectUdiDialogVisible = false; this.selectErpDialogVisible = false; diff --git a/src/views/basic/product/productAdd.vue b/src/views/basic/product/productAdd.vue index 5dba43f1..92b0f276 100644 --- a/src/views/basic/product/productAdd.vue +++ b/src/views/basic/product/productAdd.vue @@ -6,6 +6,16 @@ + + + + + + + + + + @@ -78,7 +88,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113,7 +147,7 @@ diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue index 6e157bbd..0a0d906d 100644 --- a/src/views/basic/product/productEdit.vue +++ b/src/views/basic/product/productEdit.vue @@ -120,10 +120,62 @@ size="small" splaceholder="请输入内容" v-model="editQuery.ybbm" + v-debounce-input:500ms="getYbHcData" > + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -643,7 +695,7 @@ diff --git a/src/views/dev/DeptDeviceDetail.vue b/src/views/dev/DeptDeviceDetail.vue index 56ff76ba..e2490c08 100644 --- a/src/views/dev/DeptDeviceDetail.vue +++ b/src/views/dev/DeptDeviceDetail.vue @@ -195,10 +195,22 @@ + + + + + + @@ -258,6 +270,9 @@ import inspectSetModifyDialog from "@/views/dev/InspectSetModifyDialog.vue"; import checkResultPanel from "@/views/dev/invDeviceEditDialog.vue"; import technical from "@/views/dev/invTechniclDialog.vue"; import invDeviceUserEditDialog from "@/views/dev/invDeviceUserEditDialog.vue"; +import invDeviceUsageEditDialog from "@/views/dev/invDeviceUsageEditDialog.vue"; +import invDeviceInspectEditDialog from "@/views/dev/invDeviceInspectEditDialog.vue"; +import invDeviceCheckEditDialog from "@/views/dev/invDeviceCheckEditDialog.vue"; import {getBasicUnitMaintains, getCorpList} from "@/api/basic/basicUnitMaintain"; export default { @@ -575,7 +590,10 @@ export default { inspectSetModifyDialog, DeviceModelDetail, deviceModifyDialog, - invDeviceUserEditDialog + invDeviceUserEditDialog, + invDeviceUsageEditDialog, + invDeviceInspectEditDialog, + invDeviceCheckEditDialog, }, created() { this.filterQuery = this.rowData diff --git a/src/views/dev/invDeviceCheckEditDialog.vue b/src/views/dev/invDeviceCheckEditDialog.vue new file mode 100644 index 00000000..c7189860 --- /dev/null +++ b/src/views/dev/invDeviceCheckEditDialog.vue @@ -0,0 +1,456 @@ + + + + diff --git a/src/views/dev/invDeviceInspectEditDialog.vue b/src/views/dev/invDeviceInspectEditDialog.vue new file mode 100644 index 00000000..1ae06bff --- /dev/null +++ b/src/views/dev/invDeviceInspectEditDialog.vue @@ -0,0 +1,456 @@ + + + + diff --git a/src/views/dev/invDeviceUsageEditDialog.vue b/src/views/dev/invDeviceUsageEditDialog.vue new file mode 100644 index 00000000..1b76f87a --- /dev/null +++ b/src/views/dev/invDeviceUsageEditDialog.vue @@ -0,0 +1,456 @@ + + + +