From c93ff9ad645e964fab00c1b0f9d9c19497e851a3 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Feb 2025 17:50:31 +0800
Subject: [PATCH] =?UTF-8?q?2/26=20=E5=B7=A5=E4=BD=8D=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basic/workplace/addBusTypeDialog.vue | 16 ++++-----
src/views/basic/workplace/busTypeManage.vue | 9 -----
.../basic/workplace/cargowWorkplaceManage.vue | 17 ++++++++--
src/views/basic/workplace/workplaceManage.vue | 34 ++++++++++++++-----
src/views/collect/CollectOrderTabs.vue | 3 --
5 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index 35dda0b5..a275d263 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -117,14 +117,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/views/basic/workplace/busTypeManage.vue b/src/views/basic/workplace/busTypeManage.vue
index 97c7425e..c0893980 100644
--- a/src/views/basic/workplace/busTypeManage.vue
+++ b/src/views/basic/workplace/busTypeManage.vue
@@ -64,11 +64,6 @@
{{ orderCirTypes[scope.row.orderCirType] }}
-
-
- {{ productTypes[scope.row.productType] }}
-
-
{{ inAndOutTypes[scope.row.inAndOutType] }}
@@ -320,10 +315,6 @@ export default {
1: '流通计量单位',
2: '使用计量单位'
},
- productTypes: {
- 1: '器械业务',
- 2: '药品业务'
- },
inAndOutTypes: {
1: '入库',
2: '出库',
diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue
index 9173ec45..69edeb46 100644
--- a/src/views/basic/workplace/cargowWorkplaceManage.vue
+++ b/src/views/basic/workplace/cargowWorkplaceManage.vue
@@ -391,6 +391,14 @@
+
+
+
+
+
+
+
+
@@ -720,7 +728,8 @@ export default {
constituencies: null,
invRemindNumber: 0,
queueStatus: 0,
- remake: null
+ remake: null,
+ productType:1
},
fromDeptOptions: [],
invQuery: {
@@ -733,6 +742,9 @@ export default {
],
workplaceStatus: [
{ required: true, message: '请选择工位状态', trigger: 'blur' }
+ ],
+ productType: [
+ {required: true, message: '请选择所属业务类型', trigger: 'blur'}
]
// workplaceType: [
// { required: true, message: '请选择工位类型', trigger: 'blur' }
@@ -992,7 +1004,8 @@ export default {
constituencies: '1001',
invRemindNumber: 0,
queueStatus:0,
- remake: null
+ remake: null,
+ productType:1
}
if (this.groupData != null) {
this.formData.constituencies = this.groupData.code
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 2993fb75..5de49516 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -533,14 +533,17 @@
+
-
-
+
+
+
+
+
+
+
@@ -553,8 +556,16 @@
-
-
+
+
+
+
+
+
+
@@ -786,7 +797,8 @@ export default {
constituencies: null,
invRemindNumber: 0,
autoCollect:0,
- remake: null
+ remake: null,
+ productType:1
},
workplaceCode: '6001',
unitStorageList: [],
@@ -823,6 +835,9 @@ export default {
],
workplaceStatus: [
{required: true, message: '请选择工位状态', trigger: 'blur'}
+ ],
+ productType: [
+ {required: true, message: '请选择所属业务类型', trigger: 'blur'}
]
// workplaceType: [
// { required: true, message: '请选择工位类型', trigger: 'blur' }
@@ -1011,7 +1026,8 @@ export default {
constituencies: "1001",
invRemindNumber: 0,
remake: null,
- autoCollect:0
+ autoCollect:0,
+ productType:1
}
if (this.groupData != null) {
this.formData.constituencies = this.groupData.code
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index c2619a2e..0eb4f71c 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -774,7 +774,6 @@ export default {
let newQuery = { ...this.$route.query }
delete newQuery.billNo
newQuery.busType = val
- this.productType = info.productType
this.$router.push({ query: newQuery, path: this.$route.path })
this.formData.busName = info.busName
this.autoTag = info.autoTag
@@ -936,7 +935,6 @@ export default {
this.formData.busName = busType.busName
this.autoTag = busType.autoTag
this.inAndOutType = busType.inAndOutType
- this.productType = busType.productType
} else if (this.busTypeList.length == 1) {
this.formData.busType = this.busTypeList[0].documentTypeCode
this.autoTag = this.busTypeList[0].autoTag
@@ -947,7 +945,6 @@ export default {
})
this.selectBusTypeDisabled = false
this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName
- this.productType = this.busTypeList[0].productType
} else {
this.selectBusTypeDisabled = true
this.formData.busType = null