diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 2f4537f..f95b389 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -93,5 +93,5 @@ body { .el-popper.is-light.type-popper, .el-popper.is-light>.el-popper__arrow:before{ background:#F5FAFF !important; padding: 0 !important; - border: 1px solid #4D6DE4 !important; + //border: 1px solid #4D6DE4 !important; } \ No newline at end of file diff --git a/src/components/common/InputNumber.vue b/src/components/common/InputNumber.vue new file mode 100644 index 0000000..ca62878 --- /dev/null +++ b/src/components/common/InputNumber.vue @@ -0,0 +1,70 @@ + + + + + + - + + + + + + + \ No newline at end of file diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue index 9cd3fbb..b5cca49 100644 --- a/src/components/common/goods/GoodsDetail.vue +++ b/src/components/common/goods/GoodsDetail.vue @@ -1,7 +1,8 @@ - - + + - + ¥{{ scope.row.selectedPrice }} - + - - {{ scope.row.selectedUnit }} + style="margin-right: 5px"> + + {{ scope.row.selectedUnit }} - + {{ scope.row.packagingUnit }} @@ -61,6 +62,7 @@ + {{ scope.row.selectedUnit }} {{ scope.row.selectedNum }} {{ scope.row.selectedUnit }} @@ -91,7 +93,7 @@ :width="1000" > - 合计:¥{{ getTotalPrice() }} + 合计:¥{{ getTotalPrice() }} @@ -156,14 +158,13 @@ const goodsSelect = (row: any) => { row.selectedNum = 1 row.selectedUnit = row.packagingUnit row.selectedPrice = row.unitPrice - row.shouldNumber = 1; + row.shouldNumber = 1; row.idCode = row.idCode?.split(",") if (goodsDetail.value.find((i: any) => i.id == row.id)) { ElMessage.warning("数据已存在,只能加数量") goodsDetail.value.find((i: any) => i.id == row.id).selectedNum += 1 - goodsDetail.value.find((i: any) => i.id == row.id).selectedUnit = row.packagingUnit goodsDetail.value.find((i: any) => i.id == row.id).selectedPrice = row.unitPrice emit('totalPriceChange') return @@ -182,7 +183,7 @@ const selectUnit = (item: any, unit: any) => { } const emit = defineEmits(["totalPriceChange", 'focus']) -const handleNumChange = (row:any) => { +const handleNumChange = (row: any) => { //应采数量 let shouldNumber = 0; if (row.selectedUnit == row.packagingUnit) { @@ -220,8 +221,11 @@ const colosInfo = () => { } \ No newline at end of file diff --git a/src/components/registration/CardDefault.vue b/src/components/registration/CardDefault.vue index aa93e1b..16ae171 100644 --- a/src/components/registration/CardDefault.vue +++ b/src/components/registration/CardDefault.vue @@ -82,7 +82,6 @@ const getInfoFor1101 = (params: any) => { duration: 1000, }); emit('socialCardUpdate', socialCard.value) - }).catch(() => { isReading.value = false; emit('changeLoading', false) diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue index c97c9ad..0f8776e 100644 --- a/src/components/registration/Edit.vue +++ b/src/components/registration/Edit.vue @@ -2,7 +2,6 @@ - { nextTick(() => { cardDefaultRef.value?.close() height.value = 470 + console.log(socialCard.value,'socialCard') }) } }, diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue index bd4c6a1..79d000c 100644 --- a/src/views/registration/index.vue +++ b/src/views/registration/index.vue @@ -93,6 +93,7 @@ const isShowNum = ref(-1) const roleList = ref([]) onMounted(() => { + selectedDate.value = [getToday().start, getToday().end] initDoctor() getPatientList() }) @@ -119,7 +120,6 @@ const handleDateChange = (date: any[]) => { const getPatientList = () => { isShowNum.value = -1 id.value = null - selectedDate.value = [getToday().start, getToday().end] post('registration/list', { page: page.value, size: size.value,