diff --git a/src/api/pharmaceuticals/receiveDrugOrder.js b/src/api/pharmaceuticals/receiveDrugOrder.js
new file mode 100644
index 0000000..8c3ecb8
--- /dev/null
+++ b/src/api/pharmaceuticals/receiveDrugOrder.js
@@ -0,0 +1,80 @@
+import axios from '@/utils/request'
+import request from "@/utils/request";
+
+//--------------获取领用单据-------------------
+export function getReceiveOrder(query) {
+ return axios({
+ url: "/udiwms/receive/order/filter",
+ method: "get",
+ params: query
+ });
+}
+
+
+export function addDetail(query) {
+ return axios({
+ url: "/udiwms/receive/detail/add",
+ method: "post",
+ data: query
+ });
+}
+export function addWarlockBag(query) {
+ return axios({
+ url: "/udiwms/receive/detail/addWarlockBag",
+ method: "post",
+ data: query
+ });
+}
+
+export function repeatAdd(query) {
+ return axios({
+ url: "/udiwms/thrsys/order/repeatAdd",
+ method: "post",
+ data: query
+ });
+}
+
+
+export function getOrderDetail(query) {
+ return axios({
+ url: "/udiwms/receive/drug/order/detail",
+ method: "get",
+ params: query
+ });
+}
+
+export function getAudit(query) {
+ return axios({
+ url: "/udiwms/receive/order/audit",
+ method: "post",
+ data: query
+ });
+}
+
+// 根据领用单单添加详情表
+export function addOrderDetailAndApply(data) {
+ return request({
+ url: "/receive/order/addOrderDetailAndApply",
+ method: 'post',
+ data: data
+ })
+}
+
+
+export function printOrder(data) {
+ return axios({
+ url: "/pur/receive/order/printOrder",
+ method: "post",
+ data: data,
+ headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+ responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf
+ });
+}
+
+
+
+
+
+
+
+
diff --git a/src/api/thrsys/medicalSupplies.js b/src/api/thrsys/medicalSupplies.js
new file mode 100644
index 0000000..88958df
--- /dev/null
+++ b/src/api/thrsys/medicalSupplies.js
@@ -0,0 +1,58 @@
+import axios from "../../utils/request";
+
+
+export function getAll(query) {
+ return axios({
+ url: "/udiwms/thrInsFee/material/filter",
+ method: "get",
+ params: query
+ });
+}
+
+export function deleteMaterial(query) {
+ return axios({
+ url: "/udiwms/thrInsFee/material/deleteMaterial",
+ method: "post",
+ data: query
+ });
+}
+
+
+
+//获取中西药列表
+export function chDrugList(query) {
+ return axios({
+ url: "/udiwms/thrInsFee/chDrug/filter",
+ method: "get",
+ params: query
+ });
+}
+
+
+export function deleteChDrug(query) {
+ return axios({
+ url: "/udiwms/thrInsFee/material/deleteChDrug",
+ method: "post",
+ data: query
+ });
+}
+
+
+
+
+//获取中药饮品List
+export function drugList(query) {
+ return axios({
+ url: "/udiwms/thrInsFee/drug/filter",
+ method: "get",
+ params: query
+ });
+}
+//删除中药饮品
+export function deleteDrug(query) {
+ return axios({
+ url: "/udiwms/thrInsFee/material/deleteDrug",
+ method: "post",
+ data: query
+ });
+}
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 54cd212..e4612bf 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -37,26 +37,236 @@
+ margin-bottom: 8px;"
+ >
+
+
+
+
解绑DI器械信息
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流通时采用的计量单位设置
+
+
+
+
+
+
+
+ 单位:{{ item.packUnit }}
+ 层级:{{ item.packLevel }}
+
+
+
+
+
+
+
+
+
+ 单位:{{ item.packUnit }}
+ 层级:{{ item.packLevel }}
+
+
+
+
+
+
+
+ 使用时采用的计量单位设置
+
+
+
+
+
+
+
+ 单位:{{ item.packUnit }}
+ 层级:{{ item.packLevel }}
+
+
+
+
+
+
+
+
+
+ 单位:{{ item.packUnit }}
+ 层级:{{ item.packLevel }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -294,26 +505,12 @@
-
-
- {{ item.name }}
- {{ item.code }}
-
-
+ size="small"
+ splaceholder="请输入内容"
+ v-model="editQuery.basicPrductRemak7"
+ >
@@ -326,6 +523,7 @@
reserve-keyword
placeholder="请选择物价类别"
:remote-method="findHsflMethod"
+ :loading="loading"
style="width: 80%"
>
{{ item.hsmc }}
- {{ item.hsbm }}
@@ -379,6 +576,20 @@
+
+
+
+
+
+
+
@@ -402,6 +613,7 @@
+
是否需要扫码
@@ -419,6 +631,7 @@
+
是否禁用
@@ -454,6 +667,7 @@
+
采购类型
@@ -472,6 +686,7 @@
+
产品属性
@@ -486,7 +701,7 @@
- 采购类型
+ 产品属性
@@ -503,7 +718,7 @@
- 耗材类别
+ 产品属性
@@ -524,54 +739,56 @@
+
- 最小包装可使用次数
+ 多次/重复使用耗材
-
+
+
+
+
- 最小包装可使用次数
+ 多次/重复使用耗材
- 启用使用单元
+ 最小包装可使用次数
-
-
-
-
+
- 启用使用单元
+ 最小包装可使用次数
- 多次/重复使用耗材
+ 启用使用单元
-
+
- 多次/重复使用耗材
+ 启用使用单元
@@ -706,6 +923,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
使用周期
@@ -724,8 +975,98 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -763,7 +1104,7 @@
>
- 提交
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1197,6 +1809,13 @@ export default {
width: 500px;
}
+.form-title2 {
+ font-size: 16px;
+ font-family: Noto Sans SC;
+ font-weight: bold;
+ color: #303133;
+}
+
.el-divider {
margin: 6px 0px 8px 0px;
background: 0 0;
diff --git a/src/views/basic/product/selectmedicalSuppliesDialog.vue b/src/views/basic/product/selectmedicalSuppliesDialog.vue
new file mode 100644
index 0000000..a6f67a6
--- /dev/null
+++ b/src/views/basic/product/selectmedicalSuppliesDialog.vue
@@ -0,0 +1,526 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 显示/隐藏搜索栏
+ 重置
+ 查询
+ 选入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+