diff --git a/src/api/basic/collectPoint/userWorkplace.js b/src/api/basic/collectPoint/userWorkplace.js
index e2d8723a..2b723775 100644
--- a/src/api/basic/collectPoint/userWorkplace.js
+++ b/src/api/basic/collectPoint/userWorkplace.js
@@ -38,5 +38,11 @@ export function delUserBindWork(query) {
});
}
-
+export function getUserWorkByWorkplaceCode(query) {
+ return axios({
+ url: '/udiwms/sysWorkplace/getUserWorkByWorkplaceCode',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 80c5bcdc..c79854b1 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -505,7 +505,6 @@ export default {
},
workDetail(row) {
- console.log("woshishhss",row)
this.formData = row
this.addWorkplaceDialogVisible = true
},
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 70d5d4a4..fed2b01f 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -545,6 +545,7 @@ import {
delDrugLevel,
updateLevelDrug, calculateDistCount, calculateUseCount
} from '@/api/basic/product/drugUdiinfos'
+import {isBlank} from "@/utils/strUtil";
import {
getYbDrugDetail, removeRl, thirdSysDetail
@@ -605,6 +606,7 @@ export default {
status: false,
relId: null,
drugLevelLists: [],
+ productId:null,
useLevelDi: null,
distributeLevelDi: null,
@@ -834,15 +836,16 @@ export default {
//层级保存
levelSave(row) {
- if (row.nameCode == null) {
+ console.log("djdjdjjd",row)
+ if (isBlank(row.nameCode)) {
this.$message.error('层级标识不能为空')
return
}
- if (row.packLevel == null) {
+ if (isBlank(row.packLevel)) {
this.$message.error('包装级别不能为空')
return
}
- if (row.packUnit == null) {
+ if (isBlank(row.packUnit)) {
this.$message.error('层级单位不能为空')
return
}
@@ -854,7 +857,8 @@ export default {
bhxjcpbm: row.bhxjcpbm,
bhxjsl: row.bhxjsl,
relId: this.newProductData.id,
- uuid: this.newProductData.uuid
+ uuid: this.newProductData.uuid,
+ productId:this.newProductData.productId
}
updateLevelDrug(editQuery).then(res => {
this.saveLoading = false
@@ -885,6 +889,7 @@ export default {
rowDisabled: false,
isUpDisabled: true
})
+ this.newProductData.productId = null
this.selectedIndex = this.detailList.length - 1
this.isSave = false
},
diff --git a/src/views/collect/IoDestroyOrder.vue b/src/views/collect/IoDestroyOrder.vue
index 26374e33..26ae46cd 100644
--- a/src/views/collect/IoDestroyOrder.vue
+++ b/src/views/collect/IoDestroyOrder.vue
@@ -409,7 +409,7 @@ export default {
};
this.actDateRange = [];
- // this.getList();
+ this.getList();
},
onSubmit(_this) {
if (_this == null)
diff --git a/src/views/collect/bindWorkDialog.vue b/src/views/collect/bindWorkDialog.vue
index dbadeabd..1a735da2 100644
--- a/src/views/collect/bindWorkDialog.vue
+++ b/src/views/collect/bindWorkDialog.vue
@@ -37,7 +37,7 @@
-
+
diff --git a/src/views/collect/fieldOperation.vue b/src/views/collect/fieldOperation.vue
index f4e3f69f..29e16f8e 100644
--- a/src/views/collect/fieldOperation.vue
+++ b/src/views/collect/fieldOperation.vue
@@ -54,7 +54,7 @@