Skip to content

P
pet-finance-web
Commit d520a8e9 authored by 王飞龙's avatar 王飞龙
Browse files
Options

药品bug

parent f86e976a
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 50 deletions
src/views/inventory-management/drug-delivery-management/drug-delivery-management.vue
View file @ d520a8e9
......@@ -186,6 +186,7 @@
<el-table-column label="当前库存" align="left" prop="currentQty" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.currentQty }}</span>
<span style="margin-left: 5px">{{ scope.row.stockUnit }}</span>
</template>
</el-table-column>
<el-table-column label="取药状态" align="left" prop="status">
......@@ -271,7 +272,11 @@
{{ scope.row.sallNum + scope.row.sallUnit }}
</template>
</el-table-column>
<el-table-column label="当前库存 " align="left" :min-width="50" prop="currentQty" />
<el-table-column label="当前库存 " align="left" :min-width="50" prop="currentQty">
<template slot-scope="scope">
{{ scope.row.currentQty + scope.row.stockUnit }}
</template>
</el-table-column>
<el-table-column label="货架" align="left" :min-width="50" prop="location" />
<el-table-column label="出库数量" :min-width="100" align="left" prop=" number">
<template #default="{row, $index}">
......@@ -281,8 +286,6 @@
{ validator: (rule, value, callback) => {
if (value === 0) {
callback(new Error('出库数量不能为0'))
} else if (value > row.currentQty) {
callback(new Error('库存不足'))
} else {
callback()
}}, trigger: 'blur' }]"
......@@ -341,14 +344,15 @@
<el-form-item label="当前库存">
<span :class="{ 'test': currentQtyClass }">
<div style="display: flex;align-items: center;">
<el-input v-model.trim="form.currentQty" disabled />
<!-- <span class="unit-text-price" style="margin-left: 0.625rem">{{ form.stockUnit }}</span>-->
<el-input v-model.trim="form.currentQty" disabled class="picker-style-unit" />
<span style="margin-left: 0.625rem">{{ form.stockUnit }}</span>
</div></span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="安全库存">
<el-input v-model.trim="form.safeQty" disabled />
<el-input v-model.trim="form.safeQty" disabled class="picker-style-unit" />
<span style="margin-left: 0.625rem">{{ form.stockUnit }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -487,7 +491,7 @@
<script>
import { parseTime } from '@/utils/ruoyi'
import { parseStrEmpty, parseTime } from '@/utils/ruoyi'
import { mapGetters } from 'vuex'
import { drugOut, getDrug, listDrugDelivery } from '../../../api/financial/drug'
import { deepClone, moneyFormat } from '@/utils'
......@@ -636,8 +640,9 @@ export default {
number: [
{ required: true, message: '请输入出库数量', trigger: 'blur' },
{ validator: (rules, value, callback) => {
if (this.form.number > this.form.currentQty) {
callback(new Error('库存不足'))
console.log('value', value)
if (parseStrEmpty(this.form.number) === '') {
callback(new Error('请输入出库数量'))
} else if (this.form.number === 0) {
callback(new Error('出库数量不能为0'))
} else if (this.form.number > 0) {
......
src/views/inventory-management/drug-management/add-drug.vue
View file @ d520a8e9
......@@ -333,6 +333,7 @@
:min="0"
:max="99999.99"
:precision="2"
class="picker-style1"
@keydown.native="keydown($event)"
/>
{{ form.smallSallNormsUnit }}
......@@ -378,14 +379,16 @@
<el-col :span="8">
<el-form-item label="当前库存">
<span class="test">
<el-input v-model.trim="form.currentQty" placeholder="-" disabled />
<el-input v-model.trim="form.currentQty" placeholder="-" class="picker-style-unit" disabled />
<span style="margin-left: 0.625rem">{{ form.stockUnit }}</span>
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="安全库存">
<el-input v-model.trim="form.safeQty" placeholder="-" disabled />
<el-input v-model.trim="form.safeQty" placeholder="-" class="picker-style-unit" disabled />
<span style="margin-left: 0.625rem">{{ form.stockUnit }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -444,7 +447,7 @@
</el-row>
</el-form>
<!-- 1-- 入库信息--标签头 -->
<div class="title-paragraph" style="margin-top: 8px">
<div class="title-paragraph" style="margin-top: 10px">
<span class="title-text">入库信息</span>
</div>
<el-form ref="addform" :model="form" :rules="dialogRules" label-width="5.5rem">
......@@ -959,7 +962,10 @@ export default {
.picker-style {
width: 100% !important;
}
/*选择框样式*/
.picker-style1 {
width: 80% !important;
}
/*基本信息整体表单布局*/
.base-message-module {
margin-left: -2.5rem !important;
......@@ -978,7 +984,9 @@ export default {
.bottom-bth-style-thirty{
margin-bottom: 0.5rem;
}
.picker-style-unit{
width: 85% !important;
}
/*入库弹窗底部按钮样式*/
.dialog-footer-drug{
margin-right: 0.3rem;
......
src/views/inventory-management/drug-management/drug-detail.vue
View file @ d520a8e9
......@@ -733,20 +733,23 @@
<el-form ref="form" :model="form" label-width="5.5rem">
<!-- 1-- 药品信息--标签头 -->
<div class="title-paragraph">
<span class="title-text">基本信息</span>
<span class="title-text">药品信息</span>
</div>
<div style="margin-left: 1rem;">
<el-row :gutter="41" class="input-bottom-style">
<el-col :span="8">
<el-form-item label="当前库存">
<span :class="{ 'test': currentQtyClass }">
<el-input v-model.trim="form.currentQty" placeholder="-" disabled />
<el-input v-model.trim="form.currentQty" placeholder="-" class="picker-style-unit" disabled />
<span style="margin-left: 0.625rem">{{ form.stockUnit }}</span>
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="安全库存">
<el-input v-model.trim="form.safeQty" placeholder="-" disabled />
<el-input v-model.trim="form.safeQty" placeholder="-" class="picker-style-unit" disabled />
<span style="margin-left: 0.625rem">{{ form.stockUnit }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -812,7 +815,7 @@
</el-form>
<el-form ref="addForm" :model="addForm" :rules="addRules" label-width="4.9rem">
<!-- 1-- 药品信息--标签头 -->
<div class="title-paragraph">
<div class="title-paragraph" style="margin-top: 10px">
<span class="title-text">入库信息</span>
</div>
<div style="margin-left: 1rem;">
......@@ -848,7 +851,7 @@
<el-date-picker
v-model="addForm.periodValidityDate"
type="date"
class="picker-style-time"
class="picker-style"
placeholder="请选择保质期"
value-format="yyyy/MM/dd"
/>
......@@ -1324,21 +1327,6 @@ export default {
//right: 0;
//left: 0;
}
.title-paragraph {
margin-bottom: 20px;
border-left: 5px solid #5FB54B;
.title-text {
margin-left: 10px;
}
.title {
color: #666666;
font-weight: 600;
font-size: 17px
}
}
.headerTitle {
width: 100%;
......@@ -1408,8 +1396,13 @@ export default {
margin-left: 1rem !important;
}
.dialogClass{
.title-paragraph {
margin-top: 40px;
::v-deep.el-dialog__body {
padding: 1.875rem 1.25rem 1.25rem 1.25rem;
color: #606266;
font-size: 0.875rem;
word-break: break-all;
}
::v-deep.title-paragraph {
margin-bottom: 30px;
border-left: 3px solid #5FB54B;
border-radius: 2px;
......@@ -1417,18 +1410,13 @@ export default {
.title-text {
font-weight: bold;
margin-left: 10px;
margin-left: 12px;
font-size: 16px;
color: #333333;
line-height: 24px;
}
}
::v-deep.el-dialog__body {
padding: 1.875rem 1.25rem 1.25rem 1.25rem;
color: #606266;
font-size: 0.875rem;
word-break: break-all;
}
}
/*输入框下边距应为24*/
.input-bottom-style{
......@@ -1450,6 +1438,9 @@ export default {
display: flex;
justify-content: end;
}
.picker-style-unit{
width: 85% !important;
}
/*底部表格样式*/
.ward-table-style{
margin-left: 1rem!important;
......
src/views/inventory-management/drug-management/drug-management.vue
View file @ d520a8e9
......@@ -185,14 +185,14 @@
<span
v-if=" scope.row.currentQty <scope.row.safeQty"
style="color: #DB4747 "
>{{ scope.row.currentQty || "0" }}</span>
<span v-else>{{ scope.row.currentQty || "0" }}</span>
>{{ scope.row.currentQty + scope.row.stockUnit || "0" }}</span>
<span v-else>{{ scope.row.currentQty + scope.row.stockUnit || "0" }}</span>
</template>
</el-table-column>
<el-table-column label="安全库存" align="left" prop="safeQty" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.safeQty || "-" }}</span>
<span>{{ scope.row.safeQty+ scope.row.stockUnit || "-" }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="left" prop="status">
......@@ -256,16 +256,20 @@
<el-col :span="8">
<el-form-item label="当前库存">
<span v-if="form.currentQty < form.safeQty" class="test">
<el-input v-model.trim="form.currentQty" disabled />
<el-input v-model.trim="form.currentQty" class="number-style" disabled />
<span class="span-style">{{ form.stockUnit }}</span>
</span>
<span v-else>
<el-input v-model.trim="form.currentQty" disabled />
<el-input v-model.trim="form.currentQty" class="number-style" disabled />
<span class="span-style">{{ form.stockUnit }}</span>
</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="安全库存">
<el-input v-model.trim="form.safeQty" disabled />
<el-input v-model.trim="form.safeQty" class="number-style" disabled />
<span class="span-style">{{ form.stockUnit }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -961,7 +965,12 @@ export default {
.picker-style {
width: 100% !important;
}
.number-style{
width: 85% !important;
}
.span-style{
margin-left: 10px;
}
/*基本信息整体表单布局*/
.base-message-module {
margin-left: -2.5rem !important;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment