Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

20240912_adapter
wangwei 5 months ago
commit 0248ca7160

@ -250,6 +250,26 @@
<p class="form-title">基本信息</p>
</template>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="明细分类:" prop="detailSort">
<el-select v-model="newProductData.detailSort" style="width: 90%" placeholder="选择明细分类">
<el-option label="麻醉药品原料药" :value="1"></el-option>
<el-option label="第一类精神药品原料药" :value="2"></el-option>
<el-option label="第二类精神药品原料药" :value="3"></el-option>
<el-option label="麻醉药品" :value="4"></el-option>
<el-option label="第一类精神药品" :value="5"></el-option>
<el-option label="第二类精神药品" :value="6"></el-option>
<el-option label="中药注射剂" :value="7"></el-option>
<el-option label="疫苗" :value="8"></el-option>
<el-option label="血液制品" :value="9"></el-option>
<el-option label="国家基本药品目录入网药品" :value="10"></el-option>
<el-option label="非基本药物" :value="11"></el-option>
<el-option label="各省增补基本药物" :value="12"></el-option>
<el-option label="特殊药品复方制剂" :value="13"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="医保编码:" prop="ybbm">
<el-input style="width: 90%" size="small" placeholder="请输入医保编码"
@ -258,6 +278,10 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="商品条码:" prop="sptm">
<el-input style="width: 90%" size="small" placeholder="请输入药品商品条码"
@ -265,9 +289,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="药品通用名称:" prop="cpmctymc">
<el-input style="width: 90%" size="small" placeholder="请输入药品通用名称"
@ -275,6 +296,9 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="商品名称:" prop="spmc">
<el-input style="width: 90%" size="small" placeholder="请输入商品名称"
@ -282,8 +306,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="包装规格:" prop="bzgg">
<el-input style="width: 90%" size="small" placeholder="请输入包装规格"
@ -291,6 +313,9 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="最小包装单位:" prop="packUnit">
<el-input style="width: 90%" size="small" placeholder="请输入最小包装单位"
@ -298,8 +323,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="制剂规格:" prop="prepnSpec">
<el-input style="width: 90%" size="small" placeholder="请输入制剂规格"
@ -307,6 +330,9 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="剂型:" prop="prepnUnit">
<el-input style="width: 90%" size="small" placeholder="请输入剂型"
@ -314,15 +340,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="包装材质:" prop="packMatrial">
<el-input style="width: 90%" size="small" placeholder="请输入包装材质"
v-model.trim="newProductData.packMatrial"
></el-input>
</el-form-item>
</el-col>
<!--<el-col :span="11" class="el-col">-->
<!-- <el-form-item label="包装比例:" prop="packRatio">-->
<!-- <el-input style="width: 90%" size="small" placeholder="请输入制剂单位"-->
@ -339,7 +356,13 @@
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="包装材质:" prop="packMatrial">
<el-input style="width: 90%" size="small" placeholder="请输入包装材质"
v-model.trim="newProductData.packMatrial"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="生产企业:" prop="manufactory">
<el-input style="width: 90%" size="small" placeholder="请输入生产企业"
@ -347,6 +370,9 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="药品类型:" prop="physicType">
<el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型">
@ -357,9 +383,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" type="flex">
<el-form-item label="药品分类:" prop="majorType">
<el-select v-model="newProductData.majorType" style="width: 90%" placeholder="选择药品分类" clearable>
@ -369,6 +392,10 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="医保分类:" prop="medicareType">
<el-select v-model="newProductData.medicareType" style="width: 90%" placeholder="选择医保分类"
@ -381,10 +408,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="药品价格:" prop="price">
<el-input
@ -396,13 +419,7 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="存储条件:" prop="ylqxzcrbarmc">
<el-input style="width: 90%" size="small" placeholder="请输入存储条件"
v-model.trim="newProductData.storageCondition"
></el-input>
</el-form-item>
</el-col>
</el-row>
<!--<el-row type="flex">-->
@ -421,7 +438,13 @@
<!-- </el-col>-->
<!--</el-row>-->
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="存储条件:" prop="ylqxzcrbarmc">
<el-input style="width: 90%" size="small" placeholder="请输入存储条件"
v-model.trim="newProductData.storageCondition"
></el-input>
</el-form-item>
</el-col>
<el-col :span="11" class="el-col">
<el-form-item label="运输条件:" prop="transportCondition">
<el-input style="width: 90%" size="small" placeholder="请输入运输条件"
@ -429,6 +452,9 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="统一社会信用号:" prop="tyshxydm">
<el-input style="width: 90%" size="small" placeholder="请输入统一社会信用号"
@ -436,9 +462,6 @@
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col :span="11" class="el-col">
<el-form-item label="药品状态:" prop="majorStatus">
<el-select v-model="newProductData.majorStatus" style="width: 90%" placeholder="选择药品状态">
@ -447,6 +470,7 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<!--<el-row type="flex" class="edit-row">-->
<!--<el-col :span="11">-->
@ -793,6 +817,9 @@ export default {
useLevel: [
{required: true, message: '请选择计量单位', trigger: 'blur'}
],
detailSort: [
{required: true, message: '请选择明细分类', trigger: 'blur'}
],
// useMaxLevel: [
// {required: true, message: '', trigger: 'blur'}
// ],
@ -1007,18 +1034,21 @@ export default {
this.$message.error('层级标识不能为空')
return
}
if (isBlank(row.packLevel)) {
this.$message.error('包装级别不能为空')
if (isBlank(row.bhxjsl)) {
row.bhxjsl = 0
}
if (isNaN(row.packLevel)) {
row.packLevel = 0
}
if(this.newProductData.detailSort > 9 && row.packLevel == '0' ){
this.$message.error('包装级别必须大于0')
return
}
if (isBlank(row.packUnit)) {
this.$message.error('层级单位不能为空')
return
}
if (isBlank(row.bhxjsl)) {
this.$message.error('请填写下级数量')
return
}
let editQuery = {
nameCode: row.nameCode,
@ -1055,8 +1085,8 @@ export default {
addDrugLevel() {
this.detailList.push({
nameCode: '',
packLevel: null,
bhxjsl: null,
packLevel: 0,
bhxjsl: 0,
isDisabled: false,
rowDisabled: false,
isUpDisabled: true

Loading…
Cancel
Save