qdintc/intc-vue-h5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 列表功能展示优化，必填字段修改。

Browse Source
This commit is contained in:
tianyongbao
2024-12-14 00:32:44 +08:00
parent 64582ae57e
commit 12267711b6
5 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/health/activity/addEdit.vue
View File

@@ -41,7 +41,7 @@
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="活动量" prop="activityVolume" >
<u--input v-model="form.exerciseTime" placeholder="请填写活动量"
<u--input v-model="form.activityVolume" placeholder="请填写活动量"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="总费用" prop="totalCost" >

74
src/pages/health/medicineBasic/addEdit.vue
View File

@@ -19,32 +19,6 @@
<u--input v-model="form.shortName" placeholder="请填写药品简称"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="药品编码" prop="code" required >
<u--input v-model="form.code" placeholder="请填写药品编码"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="药品剂型" prop="dosageFormName" required @click="handleDosageForm">
<u--input v-model="form.dosageFormName" disabled disabledColor="#ffffff" placeholder="请选择药品剂型"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="治疗类型" prop="treatmentTypeName" required @click="handleTreatmentType">
<u--input v-model="form.treatmentTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="药品分类" prop="classificationName" required @click="handleClassification">
<u--input v-model="form.classificationName" disabled disabledColor="#ffffff" placeholder="请选择药品分类"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="类别" prop="categoryName" required @click="handleCategory">
<u--input v-model="form.categoryName" disabled disabledColor="#ffffff" placeholder="请选择类别"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="品牌" prop="brand" required >
<u--input v-model="form.brand" placeholder="请填写品牌"
inputAlign="right" border="none"></u--input>
@@ -53,15 +27,43 @@
<u--input v-model="form.packaging" placeholder="请填写药品包装"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="包装单位" prop="packageUnitName" required @click="handlePackageUnit">
<u-form-item label="生产厂家" prop="manufacturers" >
<u--input v-model="form.manufacturers" placeholder="请填写生产厂家"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="药品编码" prop="code" >
<u--input v-model="form.code" placeholder="请填写药品编码"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="药品剂型" prop="dosageFormName" @click="handleDosageForm">
<u--input v-model="form.dosageFormName" disabled disabledColor="#ffffff" placeholder="请选择药品剂型"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="治疗类型" prop="treatmentTypeName" @click="handleTreatmentType">
<u--input v-model="form.treatmentTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="药品分类" prop="classificationName" @click="handleClassification">
<u--input v-model="form.classificationName" disabled disabledColor="#ffffff" placeholder="请选择药品分类"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="类别" prop="categoryName" @click="handleCategory">
<u--input v-model="form.categoryName" disabled disabledColor="#ffffff" placeholder="请选择类别"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="包装单位" prop="packageUnitName" @click="handlePackageUnit">
<u--input v-model="form.packageUnitName" disabled disabledColor="#ffffff" placeholder="请选择包装单位"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="生产厂家" prop="manufacturers" required >
<u--input v-model="form.manufacturers" placeholder="请填写生产厂家"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="是否进口" prop="isImportName" @click="handleIsImport">
<u--input v-model="form.isImportName" disabled disabledColor="#ffffff" placeholder="请选择是否进口"
inputAlign="right" border="none"></u--input>
@@ -216,13 +218,13 @@ form: {
rules: {
name: [{ required: true, message: '药品全称不能为空', trigger:['change', 'blur'] }],
shortName: [{ required: true, message: '药品简称不能为空', trigger: ['change', 'blur'] }],
classificationName: [{ required: true, message: '药品分类不能为空', trigger: ['change', 'blur'] }],
categoryName: [{ required: true, message: '类别不能为空', trigger: ['change', 'blur'] }],
// classificationName: [{ required: true, message: '药品分类不能为空', trigger: ['change', 'blur'] }],
// categoryName: [{ required: true, message: '类别不能为空', trigger: ['change', 'blur'] }],
brand: [{ required: true, message: '品牌不能为空', trigger: ['change', 'blur'] }],
packaging: [{ required: true, message: '药品包装不能为空', trigger: ['change', 'blur'] }],
manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: ['change', 'blur'] }],
code: [{ required: true, message: '药品编码不能为空', trigger: ['change', 'blur'] }],
dosageFormName: [{ required: true, message: '药品剂型不能为空', trigger: ['change', 'blur'] }]
// manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: ['change', 'blur'] }],
// code: [{ required: true, message: '药品编码不能为空', trigger: ['change', 'blur'] }],
// dosageFormName: [{ required: true, message: '药品剂型不能为空', trigger: ['change', 'blur'] }]
}
})
const { form, rules} = toRefs(data)

12
src/pages/health/medicineStock/list.vue
View File

@@ -12,20 +12,20 @@
<view class="list-item">
<view class="item-header" @click="enterDetails(item)">
<u--text lines="2" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
:text="item.medicineName" size="30rpx" color="#333333" :bold="true"></u--text>
:text="item.medicineName+'库存'+item.leftCount+dictStr(item.unit, unitList) " size="30rpx" color="#333333" :bold="true"></u--text>
</view>
<view class="item-row">
<text class="row-label">规格总数：</text>
<text class="row-value">{{ item.totalCount }}</text>
<text class="row-value">{{ item.totalCount+dictStr(item.unit, unitList) }}</text>
</view>
<view class="item-row">
<!-- <view class="item-row">
<text class="row-label">剩余数量：</text>
<text class="row-value">{{ item.leftCount }}</text>
</view>
<view class="item-row">
</view> -->
<!-- <view class="item-row">
<text class="row-label">规格单位：</text>
<text class="row-value">{{ dictStr(item.unit, unitList) }}</text>
</view>
</view> -->
</view>
</u-list-item>
<u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />

30
src/pages/health/medicineStockIn/addEdit.vue
View File

@@ -29,20 +29,25 @@
<u--input v-model="form.quantity" placeholder="请填写入库数量"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="购买时间" prop="purchaseDate" required @click="selectDate()">
<u--input v-model="form.purchaseDate" disabled disabledColor="#ffffff" placeholder="请选择购买时间" inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item label="使用状态" prop="stateName" required @click="handleState">
<u-form-item label="规格总数" prop="totalCount" required >
<u--input v-model="form.totalCount" placeholder="请填写规格总数"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="使用状态" prop="stateName" required @click="handleState">
<u--input v-model="form.stateName" disabled disabledColor="#ffffff" placeholder="请选择使用状态"
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="生产日期" prop="productionDate" required @click="selectProductionDate()">
<u-form-item label="购买时间" prop="purchaseDate" @click="selectDate()">
<u--input v-model="form.purchaseDate" disabled disabledColor="#ffffff" placeholder="请选择购买时间" inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item label="生产日期" prop="productionDate" @click="selectProductionDate()">
<u--input v-model="form.productionDate" disabled disabledColor="#ffffff" placeholder="请选择生产日期" inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item label="过期日期" prop="expiringDate" required @click="selectExpiringDate()">
<u-form-item label="过期日期" prop="expiringDate" @click="selectExpiringDate()">
<u--input v-model="form.expiringDate" disabled disabledColor="#ffffff" placeholder="请选择过期日期" inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
@@ -51,10 +56,7 @@
inputAlign="right" border="none"></u--input>
<u-icon slot="right" name="arrow-down"></u-icon>
</u-form-item>
<u-form-item label="规格总数" prop="totalCount" required >
<u--input v-model="form.totalCount" placeholder="请填写规格总数"
inputAlign="right" border="none"></u--input>
</u-form-item>
<u-form-item label="规格单位" prop="unitName" @click="handleUnit">
<u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择规格单位"
inputAlign="right" border="none"></u--input>
@@ -216,8 +218,10 @@ queryMedicineParams: {
rules: {
medicineName: [{ required: true, message: '药品名称不能为空', trigger: ['change', 'blur'] }],
quantity: [{type: 'number', required: true, message: '数量不能为空', trigger: ['change', 'blur'] }],
productionDate: [{ required: true, message: '生产日期不能为空', trigger: ['change', 'blur'] }],
expiringDate: [{ required: true, message: '过期日期不能为空', trigger: ['change', 'blur'] }],
// productionDate: [{ required: true, message: '生产日期不能为空', trigger: ['change', 'blur'] }],
// expiringDate: [{ required: true, message: '过期日期不能为空', trigger: ['change', 'blur'] }],
totalCount: [{ type: 'number', required: true, message: '规格总数不能为空', trigger: ['change', 'blur'] }],
code: [{ type: 'number', required: true, message: '入库编号不能为空', trigger: ['change', 'blur'] }],
stateName: [{ required: true, message: '使用状态不能为空', trigger: ['change', 'blur'] }]

10
src/pages/health/medicineStockIn/list.vue
View File

@@ -75,7 +75,7 @@
<view class="list-item">
<view class="item-header" @click="enterDetails(item)">
<u--text lines="2" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
:text="item.medicineName" size="30rpx" color="#333333" :bold="true"></u--text>
:text="item.medicineName+'入库'+item.quantity +dictStr(item.packageUnit, packageUnitList)" size="30rpx" color="#333333" :bold="true"></u--text>
</view>
<view class="item-row">
<text class="row-label">购买时间：</text>
@@ -89,14 +89,14 @@
<text class="row-label">入库编号：</text>
<text class="row-value">{{ item.code }}</text>
</view>
<view class="item-row">
<!-- <view class="item-row">
<text class="row-label">入库数量：</text>
<text class="row-value">{{ item.quantity }}</text>
</view>
<view class="item-row">
</view> -->
<!-- <view class="item-row">
<text class="row-label">包装单位：</text>
<text class="row-value">{{ dictStr(item.packageUnit, packageUnitList) }}</text>
</view>
</view> -->
<view class="item-row">
<text class="row-label">过期日期：</text>