diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index 7588b913..2803c2d8 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -83,8 +83,7 @@ export function filterInvoice(params) {
}
-export function orderListError(query) {+
- 6
+export function orderListError(query) {
return axios({
url: "/udiwms/inout/order/error",
method: "get",
@@ -532,7 +531,6 @@ export function deleteAllInvByCode(query) {
}
-
export function rollbackOrder(params) {
return axios({
url: "/udiwms/inout/order/received/rollback",
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 03b748e6..1ed26700 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -167,8 +167,8 @@
-
-
+
@@ -183,8 +183,8 @@
-
-
+
@@ -316,7 +316,7 @@
-
+
@@ -324,36 +324,36 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -546,8 +546,8 @@ import {
import {
getYbHcflDetail, removeRl, thirdSysDetail
} from '@/api/basic/product/udiRelevance'
-import { filterClassify } from '@/api/purchase/classifyCode'
-import { filterByUuid } from '@/api/basic/product/udiInfo'
+import {filterClassify} from '@/api/purchase/classifyCode'
+import {filterByUuid} from '@/api/basic/product/udiInfo'
import selectChargesProjectDialog from './selectChargesProjectDialog'
import chooseHouseDrug from './chooseHouseDrug'
@@ -584,7 +584,7 @@ export default {
required: true
}
},
- components: { selectChargesProjectDialog, chooseHouseDrug },
+ components: {selectChargesProjectDialog, chooseHouseDrug},
data() {
return {
ybHcflDetail: {},
@@ -621,45 +621,45 @@ export default {
activeNames: ['0', '1', '2'],
formRules: {
cpmctymc: [
- { required: true, message: '请输入药品通用名', trigger: 'blur' }
+ {required: true, message: '请输入药品通用名', trigger: 'blur'}
],
prepnSpec: [
- { required: true, message: '请输入制剂规格', trigger: 'blur' }
+ {required: true, message: '请输入制剂规格', trigger: 'blur'}
],
packUnit: [
- { required: true, message: '请输入包装单位', trigger: 'blur' }
+ {required: true, message: '请输入包装单位', trigger: 'blur'}
],
prepnUnit: [
- { required: true, message: '请输入制剂单位', trigger: 'blur' }
+ {required: true, message: '请输入制剂单位', trigger: 'blur'}
],
// packRatio: [
// {required: true, message: '请输入包装比例', trigger: 'blur'}
// ],
packMatrial: [
- { required: true, message: '请输入包装材质', trigger: 'blur' }
+ {required: true, message: '请输入包装材质', trigger: 'blur'}
],
zczbhhzbapzbh: [
- { required: true, message: '请输入批准文号', trigger: 'blur' }
+ {required: true, message: '请输入批准文号', trigger: 'blur'}
],
manufactory: [
- { required: true, message: '生产企业不能为空', trigger: 'blur' }
+ {required: true, message: '生产企业不能为空', trigger: 'blur'}
],
physicType: [
- { required: true, message: '药品类型不能为空', trigger: 'blur' }
+ {required: true, message: '药品类型不能为空', trigger: 'blur'}
],
ybbm: [
- { required: true, message: '医保编码不能为空', trigger: 'blur' }
+ {required: true, message: '医保编码不能为空', trigger: 'blur'}
],
price: [
- { required: true, message: '药品价格不能为空', trigger: 'blur' }
+ {required: true, message: '药品价格不能为空', trigger: 'blur'}
],
majorStatus: [
- { required: true, message: '请选择药品状态', trigger: 'blur' }
+ {required: true, message: '请选择药品状态', trigger: 'blur'}
]
},
detailList: [
// 初始化一个空对象或包含默认值的对象
- { nameCode: '', packLevel: null, bhxjsl: null, isDisabled: false, isUpDisabled: true, rowDisabled: false }
+ {nameCode: '', packLevel: null, bhxjsl: null, isDisabled: false, isUpDisabled: true, rowDisabled: false}
],
status: false,
rowDisabled: false,
@@ -718,7 +718,7 @@ export default {
},
saveNewProduct() {
- if (!this.isSave){
+ if (!this.isSave) {
return this.$message.error("请先保存药品层级")
}
this.addProductDialogVisible = false
@@ -879,7 +879,7 @@ export default {
type: 'warning'
}).then(() => {
if (row.id != null) {
- let params = { nameCode: row.nameCode }
+ let params = {nameCode: row.nameCode}
delDrugLevel(params).then((res) => {
if (res.code === 20000) {
this.isSave = true
diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index c4ce1211..96c79e56 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -66,7 +66,7 @@
-
+
@@ -76,7 +76,7 @@
-
+
@@ -108,35 +108,62 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -260,8 +287,8 @@ export default {
data() {
return {
formData: {
- scanType: 1,
- checkInsert: 1,
+ scanType: 2,
+ checkInsert: 2,
isMatching: 1,
inoutType: null,
documentTypeCode: null,
@@ -272,7 +299,9 @@ export default {
monopoly: 0,
orderFinishVerify: 0,
isPopular: 1,
- invCode: ''
+ invCode: '',
+ overCount: 1,
+ checkBatchInsert:2,
},
invList: [],
busTypes: [],
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 94ecad77..1ab080b5 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -210,14 +210,14 @@
-
-
- {{ orderFinishVerifys[scope.row.orderFinishVerify] }}
-
-
+
+
+
+
+
- {{ autoTagTypes[scope.row.autoTag] }}
+ {{ autoTagTypes[scope.row.autoTag] }}9
@@ -240,11 +240,11 @@
{{ checkInserts[scope.row.checkInsert] }}
-
-
- {{ warnTypeMap[scope.row.warnType] }}
-
-
+
+
+
+
+
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index ea30bd6b..e960645a 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -624,6 +624,7 @@ export default {
viewType: "tagCode",
workPlaceCode: this.workplaceId,
originCode: this.originCode,
+ busType: this.formData.busType,
code: this.filterQuery.code.trim(),
};
enterCodeWeb(tQuery).then((response) => {