diff --git a/chenhai-ui/src/views/muhu/consultation/index.vue b/chenhai-ui/src/views/muhu/consultation/index.vue
index 4d00695..13d995b 100644
--- a/chenhai-ui/src/views/muhu/consultation/index.vue
+++ b/chenhai-ui/src/views/muhu/consultation/index.vue
@@ -846,6 +846,15 @@ export default {
width: 90px;
}
+::v-deep .el-descriptions-row th{
+ text-align: center !important;color: #7b7c7f;
+}
+
+::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
+ border: 1px solid #cac9c9;
+ padding: 12px 10px;
+}
+
::v-deep .el-descriptions-row th {
text-align: center !important;
color: #7b7c7f;
diff --git a/chenhai-ui/src/views/system/VacRegistration/index.vue b/chenhai-ui/src/views/system/VacRegistration/index.vue
index 288405f..8b541d0 100644
--- a/chenhai-ui/src/views/system/VacRegistration/index.vue
+++ b/chenhai-ui/src/views/system/VacRegistration/index.vue
@@ -35,6 +35,16 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -155,10 +156,10 @@
-
-
-
-
+
+
+
+
@@ -183,8 +184,8 @@
{{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }}
-
-
+
+
@@ -207,7 +208,8 @@
type="text"
icon="el-icon-check"
@click="handleConfirm(scope.row)"
- style="color: #67C23A;"
+ style="color: #42B983"
+ class="info-btn alter-btn"
v-hasPermi="['system:VacRegistration:confirm']"
>确认
完成
取消
-
+
-
+
@@ -310,9 +316,9 @@
placeholder="请选择取消时间">
-
-
-
+
+
+
@@ -540,3 +546,138 @@ export default {
}
}
+
+
+
+
+
+
+
diff --git a/chenhai-ui/src/views/system/recommendation/index.vue b/chenhai-ui/src/views/system/recommendation/index.vue
index d9e1e19..7a82ab0 100644
--- a/chenhai-ui/src/views/system/recommendation/index.vue
+++ b/chenhai-ui/src/views/system/recommendation/index.vue
@@ -1155,11 +1155,10 @@ export default {
::v-deep .el-descriptions-row th{
text-align: center !important;color: #7b7c7f;
- background: #faf7f7;
}
::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
- border: 1px solid #bcbbbb;
+ border: 1px solid #cac9c9;
padding: 12px 10px;
}
@@ -1225,7 +1224,7 @@ export default {
}
::v-deep .el-dialog__header {
- background: linear-gradient(135deg, #42b983 0%, #83df92 100%);
+ background: linear-gradient(135deg, #2c7a4d 0%, #42b983 100%);
padding: 18px 24px;
border-bottom: none;
position: relative;
diff --git a/chenhai-ui/src/views/system/vacCategory/index.vue b/chenhai-ui/src/views/system/vacCategory/index.vue
index 14cea79..61f39bd 100644
--- a/chenhai-ui/src/views/system/vacCategory/index.vue
+++ b/chenhai-ui/src/views/system/vacCategory/index.vue
@@ -1,22 +1,22 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
{{ parseTime(scope.row.manufactureDate, '{y}-{m}-{d}') }}
@@ -246,20 +246,20 @@
{{ parseTime(scope.row.expiryDate, '{y}-{m}-{d}') }}
-
+
-
-
+
+
-
-
+
+
@@ -286,12 +286,23 @@
-
+
+
+ 详情
+
修改
@@ -299,6 +310,8 @@
size="mini"
type="text"
icon="el-icon-delete"
+ style="color: #f56c6c"
+ class="info-btn delete-btn"
@click="handleDelete(scope.row)"
v-hasPermi="['system:vacCategory:remove']"
>删除
@@ -306,16 +319,18 @@
-
+
-
+
@@ -442,6 +457,60 @@
取 消
+
+
+
+
+
+ {{ currentDetail.approvalNumber || '--' }}
+
+
+ {{ currentDetail.batchNumber || '--' }}
+
+
+ {{ currentDetail.type || '--' }}
+
+
+ {{ currentDetail.tradeName || '--' }}
+
+
+ {{ currentDetail.specification || '--' }}
+
+
+ {{ currentDetail.manufacturer || '--' }}
+
+
+ {{ currentDetail.manufactureDate || '--' }}
+
+
+ {{ currentDetail.expiryDate || '--' }}
+
+
+ {{ currentDetail.livestockTypes || '--' }}
+
+
+ {{ currentDetail.isMandatory || '--' }}
+
+
+ {{ currentDetail.immunePeriod || '--' }}
+
+
+ {{ currentDetail.administrationRoute || '--' }}
+
+
+ {{ currentDetail.dosage || '--' }}
+
+
+ {{ currentDetail.storageCondition || '--' }}
+
+
+ {{ currentDetail.precautions || '--' }}
+
+
+
+
@@ -455,6 +524,7 @@ export default {
return {
// 遮罩层
loading: true,
+ detailLoading: true,
// 选中数组
ids: [],
// 非单个禁用
@@ -467,10 +537,13 @@ export default {
total: 0,
// 疫苗类别表格数据
vacCategoryList: [],
+ // 当前查看的详情
+ currentDetail: {},
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
+ detailViews: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -595,6 +668,22 @@ export default {
this.single = selection.length!==1
this.multiple = !selection.length
},
+ /** 详情按钮操作 */
+ handleDetail(row) {
+ this.detailViews = true;
+ this.detailLoading = true;
+ this.currentDetail = {};
+
+ const id = row.id;
+ getVacCategory(id).then(response => {
+ if (response.code === 200) {
+ this.currentDetail = response.data;
+ } else {
+ this.$modal.msgError("获取详情失败");
+ }
+ this.detailLoading = false;
+ });
+ },
/** 新增按钮操作 */
handleAdd() {
this.reset()
@@ -652,3 +741,127 @@ export default {
}
}
+
+
+
+
diff --git a/chenhai-ui/src/views/system/vacInfo/index.vue b/chenhai-ui/src/views/system/vacInfo/index.vue
index bf2c784..ae8ee36 100644
--- a/chenhai-ui/src/views/system/vacInfo/index.vue
+++ b/chenhai-ui/src/views/system/vacInfo/index.vue
@@ -29,6 +29,16 @@
+
+
+
+
+
{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}
-
+
-
+
+
+
+
+
+
+
疫苗详细信息
@@ -369,26 +385,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-