|
@@ -215,7 +215,7 @@
|
|
|
<!-- </el-row> -->
|
|
<!-- </el-row> -->
|
|
|
|
|
|
|
|
<el-table
|
|
<el-table
|
|
|
- v-loading="loading"
|
|
|
|
|
|
|
+ v-loading="tableLoading"
|
|
|
:data="prescriptionList"
|
|
:data="prescriptionList"
|
|
|
@selection-change="handleSelectionChange"
|
|
@selection-change="handleSelectionChange"
|
|
|
:border="true"
|
|
:border="true"
|
|
@@ -450,6 +450,7 @@ export default {
|
|
|
loading: true,
|
|
loading: true,
|
|
|
// 导出遮罩层
|
|
// 导出遮罩层
|
|
|
exportLoading: false,
|
|
exportLoading: false,
|
|
|
|
|
+ tableLoading: false,
|
|
|
// 选中数组
|
|
// 选中数组
|
|
|
ids: [],
|
|
ids: [],
|
|
|
// 非单个禁用
|
|
// 非单个禁用
|
|
@@ -601,11 +602,14 @@ export default {
|
|
|
},
|
|
},
|
|
|
/** 查询处方传输列表 */
|
|
/** 查询处方传输列表 */
|
|
|
getList() {
|
|
getList() {
|
|
|
- this.loading = true;
|
|
|
|
|
|
|
+ this.tableLoading = true;
|
|
|
listPrescription(this.queryParams).then((response) => {
|
|
listPrescription(this.queryParams).then((response) => {
|
|
|
- this.prescriptionList = response.rows;
|
|
|
|
|
|
|
+ this.prescriptionList = Array.isArray(response.rows) ? response.rows.map(item => Object.assign(item, {
|
|
|
|
|
+ updateBy: item.updateBy|| item.createBy,
|
|
|
|
|
+ updateTime: item.updateTime|| item.createTime,
|
|
|
|
|
+ })) : []
|
|
|
this.total = response.total;
|
|
this.total = response.total;
|
|
|
- this.loading = false;
|
|
|
|
|
|
|
+ this.tableLoading = false;
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
/** 查询药房列表 */
|
|
/** 查询药房列表 */
|