Commit baa690df authored by 王飞龙's avatar 王飞龙

导入

parent 1978057c
...@@ -134,6 +134,13 @@ export const constantRoutes = [ ...@@ -134,6 +134,13 @@ export const constantRoutes = [
component: () => import('@/views/inventory-management/drug-management/drug-detail'), component: () => import('@/views/inventory-management/drug-management/drug-detail'),
meta: { title: '详情', icon: 'validCode' } meta: { title: '详情', icon: 'validCode' }
}, },
{
name: 'Drug-edit',
path: 'drug-edit/:id/:identify',
props: true,
component: () => import('@/views/inventory-management/drug-management/drug-detail'),
meta: { title: '编辑', icon: 'validCode' }
},
{ {
name: 'drug-delivery-management', name: 'drug-delivery-management',
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="药品ID"> <el-form-item label="药品ID">
{{ "-" }} <el-input placeholder="-" style="width: 250px" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -227,9 +227,10 @@ ...@@ -227,9 +227,10 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="规格" prop=""> <el-form-item label="规格" prop="">
<span v-if="form.normsNum !=0 &&form.normsUnit!=''&&form.stockUnit"> <span v-if="form.normsNum !=0 &&form.normsUnit!=''&&form.stockUnit">
{{ form.normsNum +form.normsUnit+"/"+ form.stockUnit }} <el-input :value="form.normsNum +form.normsUnit+'/'+ form.stockUnit" placeholder="-" style="width: 250px" disabled />
<!-- {{ form.normsNum +form.normsUnit+"/"+ form.stockUnit }}-->
</span> </span>
<span v-else>{{ "-" }}</span> <span v-else> <el-input placeholder="-" style="width: 250px" disabled /></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -281,9 +282,10 @@ ...@@ -281,9 +282,10 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="最小销售规格" prop=""> <el-form-item label="最小销售规格" prop="">
<span v-if="form.smallSallNormsNum !=0&&form.smallSallNormsNum !=undefined &&form.smallSallNormsUnit!=''"> <span v-if="form.smallSallNormsNum !=0&&form.smallSallNormsNum !=undefined &&form.smallSallNormsUnit!=''">
{{ form.smallSallNormsNum + form.smallSallNormsUnit }} <el-input :value=" form.smallSallNormsNum + form.smallSallNormsUnit" placeholder="-" style="width: 250px" disabled />
<!-- {{ form.smallSallNormsNum + form.smallSallNormsUnit }}-->
</span> </span>
<span v-else>{{ "-" }}</span> <span v-else> <el-input placeholder="-" style="width: 250px" disabled /></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="药品ID"> <el-form-item label="药品ID">
{{ "-" }} <el-input v-model="form.drugId" placeholder="-" style="width: 250px" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -226,9 +226,10 @@ ...@@ -226,9 +226,10 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="规格" prop=""> <el-form-item label="规格" prop="">
<span v-if="form.normsNum !=0 &&form.normsUnit!=''&&form.stockUnit"> <span v-if="form.normsNum !=0 &&form.normsUnit!=''&&form.stockUnit">
{{ form.normsNum +form.normsUnit+"/"+ form.stockUnit }} <el-input :value="form.normsNum +form.normsUnit+'/'+ form.stockUnit" placeholder="-" style="width: 250px" disabled />
<!-- {{ form.normsNum +form.normsUnit+"/"+ form.stockUnit }}-->
</span> </span>
<span v-else>{{ "-" }}</span> <span v-else> <el-input placeholder="-" style="width: 250px" disabled /></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -277,10 +278,11 @@ ...@@ -277,10 +278,11 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="最小销售规格" prop=""> <el-form-item label="最小销售规格" prop="">
<span v-if="form.smallSallNormsNum !=0 &&form.smallSallNormsNum !=undefined&& form.smallSallNormsUnit!=''"> <span v-if="form.smallSallNormsNum !=0&&form.smallSallNormsNum !=undefined &&form.smallSallNormsUnit!=''">
{{ form.smallSallNormsNum + form.smallSallNormsUnit }} <el-input :value=" form.smallSallNormsNum + form.smallSallNormsUnit" placeholder="-" style="width: 250px" disabled />
<!-- {{ form.smallSallNormsNum + form.smallSallNormsUnit }}-->
</span> </span>
<span v-else>{{ "-" }}</span> <span v-else> <el-input placeholder="-" style="width: 250px" disabled /></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -349,7 +351,7 @@ ...@@ -349,7 +351,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="药品ID"> <el-form-item label="药品ID">
{{ form.drugId }} <el-input v-model="form.drugId" placeholder="-" style="width: 250px" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -560,7 +562,12 @@ ...@@ -560,7 +562,12 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="规格"> <el-form-item label="规格">
{{ form.normsNum +form.normsUnit+"/"+ form.stockUnit }} <span v-if="form.normsNum !=0 &&form.normsUnit!=''&&form.stockUnit">
<el-input :value="form.normsNum +form.normsUnit+'/'+ form.stockUnit" placeholder="-" style="width: 250px" disabled />
<!-- {{ form.normsNum +form.normsUnit+"/"+ form.stockUnit }}-->
</span>
<span v-else> <el-input placeholder="-" style="width: 250px" disabled /></span>
<!-- {{ form.normsNum +form.normsUnit+"/"+ form.stockUnit }}-->
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -612,7 +619,11 @@ ...@@ -612,7 +619,11 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="最小销售规格" disabled> <el-form-item label="最小销售规格" disabled>
{{ form.smallSallNormsNum + form.smallSallNormsUnit }} <span v-if="form.smallSallNormsNum !=0&&form.smallSallNormsNum !=undefined &&form.smallSallNormsUnit!=''">
<el-input :value=" form.smallSallNormsNum + form.smallSallNormsUnit" placeholder="-" style="width: 250px" disabled />
<!-- {{ form.smallSallNormsNum + form.smallSallNormsUnit }}-->
</span>
<span v-else> <el-input placeholder="-" style="width: 250px" disabled /></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -287,7 +287,7 @@ ...@@ -287,7 +287,7 @@
ref="dialogTable" ref="dialogTable"
v-loading="loading" v-loading="loading"
:data="drugInventoryList" :data="drugInventoryList"
:header-cell-style="{ background:'#E8E9E8'}" :header-cell-style="{ background:'#f4f4f4'}"
> >
<el-table-column label="变动类型" align="left" prop="type" show-overflow-tooltip> <el-table-column label="变动类型" align="left" prop="type" show-overflow-tooltip>
...@@ -639,7 +639,7 @@ export default { ...@@ -639,7 +639,7 @@ export default {
/** 跳转到编辑页*/ /** 跳转到编辑页*/
editDevice(id) { editDevice(id) {
this.$router.push({ this.$router.push({
name: 'Drug-detail', name: 'Drug-edit',
params: { params: {
identify: '1', identify: '1',
id: id id: id
......
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