diff --git a/project/xumu/AppBreedArchive/AppBreedArchive.vue b/project/xumu/AppBreedArchive/AppBreedArchive.vue
index e0a4781d..75edf900 100644
--- a/project/xumu/AppBreedArchive/AppBreedArchive.vue
+++ b/project/xumu/AppBreedArchive/AppBreedArchive.vue
@@ -17,7 +17,7 @@ export default {
}
},
created() {
- this.dict.load("archiveStatus", "category", "variety")
+ this.dict.load("archiveStatus", "category", "variety", "insuranceType", "deathReason", "dataSources", "yesOrNo")
}
}
diff --git a/project/xumu/AppBreedArchive/add.vue b/project/xumu/AppBreedArchive/add.vue
index 9b0e2405..1a30090a 100644
--- a/project/xumu/AppBreedArchive/add.vue
+++ b/project/xumu/AppBreedArchive/add.vue
@@ -8,10 +8,78 @@ const columns = {
{label: "称重时间", prop: "createTime"},
{label: "数据来源", prop: "source", dict: "dataSources"},
{label: "是否变更过", prop: "isUpdate", dict: "yesOrNo"},
+ ],
+ immunityList: [
+ {label: "序号", type: "index"},
+ {label: "疫苗名称", prop: "vaccineName"},
+ {label: "用药方式", prop: "method"},
+ {label: "药量", prop: "dosage"},
+ {label: "生产厂家", prop: "factory"},
+ {label: "厂家批号", prop: "batchNumber"},
+ {label: "免疫时间", prop: "immunityTime"},
+ {label: "登记时间", prop: "createTime"},
+ {label: "防疫员", prop: "userName"},
+ ],
+ treatmentList: [
+ {label: "序号", type: "index"},
+ {label: "药品名称", prop: "drugName"},
+ {label: "药量", prop: "dosage"},
+ {label: "生产厂家", prop: "factory"},
+ {label: "厂家批号", prop: "batchNumber"},
+ {label: "疾病名称", prop: "diseaseName"},
+ {label: "症状", prop: "symptom"},
+ {label: "兽医", prop: "userName"},
+ {label: "治疗时间", prop: "immunityTime"},
+ {label: "登记时间", prop: "createTime"},
+ ],
+ outList: [
+ {label: "序号", type: "index"},
+ {label: "养殖场", prop: "userName", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+ {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+ {label: "类别", prop: "category", dict: "category", width: 120},
+ {label: "品种", prop: "variety", dict: "variety", width: 120},
+ {label: "日龄(天)", prop: "age", width: 80},
+ {label: "淘汰时间", prop: "outTime"},
+ {label: "淘汰原因", prop: "reason"}
+ ],
+ deathList: [
+ {label: "序号", type: "index"},
+ {label: "养殖场", prop: "userName", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+ {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+ {label: "类别", prop: "category", dict: "category", width: 120},
+ {label: "品种", prop: "variety", dict: "variety", width: 120},
+ {label: "日龄(天)", prop: "age", width: 80},
+ {label: "死亡时间", prop: "deathTime"},
+ {label: "死亡原因", prop: "reason", dict: "deathReason", width: 80},
+ {label: "登记时间", prop: "createTime"},
+ {label: "操作人", prop: "userName", width: 100},
+ ],
+ insuranceList: [
+ {label: "序号", type: "index"},
+ {label: "保险类型", prop: "insuranceType", dict: "insuranceType"},
+ {label: "保单编号", prop: "orderNo"},
+ ]
+}
+const forms = {
+ device: [
+ {label: "当前温度", prop: "temperature"},
+ {label: "温度状态", prop: "temperatureStatus", dict: "temperatureStatus"},
+ {label: "运动状态", prop: "sportsSituation", dict: "sportsSituation"},
+ {label: "在栏状态", prop: "status", dict: "archiveStatus"},
+ ],
+ loan: [
+ {label: "贷款合同编号", prop: "contractNo"},
]
}
const navs = [
- {label: "体重记录", value: "weightList"}
+ {label: "体重记录", value: "weightList"},
+ {label: "免疫记录", value: "immunityList"},
+ {label: "治疗记录", value: "treatmentList"},
+ {label: "淘汰记录", value: "outList"},
+ {label: "死亡记录", value: "deathList"},
+ {label: "设备检测", value: "device"},
+ {label: "贷款信息", value: "loan"},
+ {label: "保险信息", value: "insuranceList"},
]
export default {
name: "baAdd",
@@ -24,7 +92,7 @@ export default {
return {
detail: {detailList: []},
active: "weightList",
- columns, navs
+ columns, navs, forms
}
},
computed: {
@@ -46,7 +114,10 @@ export default {
return id && this.instance.post("/api/report/getInfo", null, {params: {biochipEarNumber: id}}).then(res => {
if (res?.data) {
const detail = res.data
- return this.detail = {detailList: [], ...detail}
+ Object.keys(columns).forEach(key => {
+ detail[key] = detail[key] || []
+ })
+ return this.detail = {...detail}
}
})
},
@@ -86,9 +157,18 @@ export default {
-