|
@@ -22,31 +22,22 @@
|
|
|
style="width: 100%"
|
|
|
>
|
|
|
<el-table-column prop="id" label="序号" width="60"></el-table-column>
|
|
|
- <el-table-column prop="inTime" label="入库日期"></el-table-column>
|
|
|
+ <el-table-column prop="outTime" label="出库日期"></el-table-column>
|
|
|
<el-table-column prop="medicineName" label="药品名"></el-table-column>
|
|
|
<el-table-column prop="factory" label="生产厂家"></el-table-column>
|
|
|
- <el-table-column prop="batchNumber" label="生产批号"></el-table-column>
|
|
|
- <el-table-column prop="source" label="来源"></el-table-column>
|
|
|
<el-table-column label="数量">
|
|
|
<template v-slot="scope">
|
|
|
<div>{{ scope.row['number'] + scope.row['specifications']}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="购买人">
|
|
|
+ <el-table-column label="领取人">
|
|
|
<template v-slot="scope">
|
|
|
<div v-for="item in $store.state['workerList']" :key="item.value">
|
|
|
- <span v-if="item.id == scope.row['buyer']">{{ `${item.name}(${item.position})` }}</span>
|
|
|
+ <span v-if="item.id == scope.row['user']">{{ `${item.name}(${item.position})` }}</span>
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" width="150">
|
|
|
- <template v-slot="scope">
|
|
|
- <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
|
|
|
- <el-popconfirm title="是否删除此设备的信息?" @onConfirm="del(scope.row)">
|
|
|
- <el-button slot="reference" type="text" size="small">删除</el-button>
|
|
|
- </el-popconfirm>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
+ <el-table-column prop="remark" label="备注"></el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
<el-row type="flex" justify="end">
|
|
@@ -71,12 +62,12 @@
|
|
|
:rules="rules"
|
|
|
label-width="140px"
|
|
|
>
|
|
|
- <el-form-item label="入库日期">
|
|
|
+ <el-form-item label="出库日期">
|
|
|
<el-date-picker
|
|
|
- v-model="formData.inTime"
|
|
|
+ v-model="formData.outTime"
|
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- placeholder="默认当前时间"
|
|
|
+ placeholder="选择日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="药品">
|
|
@@ -89,17 +80,8 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="生产批号">
|
|
|
- <el-input v-model="formData.batchNumber"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="来源">
|
|
|
- <el-input v-model="formData.source"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="数量">
|
|
|
- <el-input v-model.number="formData.number"></el-input>
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="购买人">
|
|
|
- <el-select v-model="formData.buyer" filterable placeholder="请选择">
|
|
|
+ <el-select v-model="formData.user" filterable placeholder="请选择">
|
|
|
<el-option
|
|
|
v-for="item in $store.state['workerList']"
|
|
|
:key="item.id"
|
|
@@ -108,6 +90,12 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="数量">
|
|
|
+ <el-input v-model.number="formData.number"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="备注">
|
|
|
+ <el-input autosize v-model="formData.remark"></el-input>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button @click="isShow=false">取 消</el-button>
|
|
|
<el-button type="primary" @click="submitForm('addMOutStore')">保 存</el-button>
|
|
@@ -139,12 +127,11 @@ export default {
|
|
|
totalPages: 0,
|
|
|
isShow: false,
|
|
|
formData: {
|
|
|
- inTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
|
|
|
+ outTime: this.$moment().format('YYYY-MM-DD HH:mm:ss'),
|
|
|
medicineId: null,
|
|
|
- batchNumber: '129656560',
|
|
|
- source: "xx药厂",
|
|
|
number: 120,
|
|
|
- buyer: null
|
|
|
+ user: null,
|
|
|
+ remark: "备注",
|
|
|
},
|
|
|
isAdd: false,
|
|
|
rules
|
|
@@ -163,8 +150,6 @@ export default {
|
|
|
.then(res => {
|
|
|
// 基础信息列表
|
|
|
this.getMOutStoreList();
|
|
|
- // 获取基础药品列表 给后面下拉选择器使用
|
|
|
- this.$store.dispatch("getDrugBasicsList");
|
|
|
this.$message.success("成功!");
|
|
|
// this.isShow = false
|
|
|
})
|
|
@@ -197,27 +182,6 @@ export default {
|
|
|
// 有id是update 没id是add
|
|
|
delete this.formData.id;
|
|
|
},
|
|
|
- edit(row) {
|
|
|
- this.formData = row;
|
|
|
- this.isShow = true;
|
|
|
- },
|
|
|
- del(row) {
|
|
|
- reqDelMOutStore(row.id)
|
|
|
- .then(res => {
|
|
|
- // 基础信息列表
|
|
|
- this.getMOutStoreList();
|
|
|
- if (res.code == "success") {
|
|
|
- this.$message.success(res.msg);
|
|
|
- }
|
|
|
- if (res.errCode == "delete failed") {
|
|
|
- this.$message.error(res.errMsg);
|
|
|
- }
|
|
|
- })
|
|
|
- .catch(err => {
|
|
|
- console.log(err);
|
|
|
- this.$message.error("删除失败!");
|
|
|
- });
|
|
|
- },
|
|
|
pageChange(p) {
|
|
|
console.log(p);
|
|
|
this.pageNum = p;
|