From 5e0b78cb60332234ff6074dd8dba6c5694885dde Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 16:49:15 +0800
Subject: [PATCH] 溯源码显示页面随农场切换，添加溯源码时机构id更改为存储农场id
---
src/views/traceability/addTraceability.vue | 8 +++++---
src/views/traceability/traceability.vue | 15 ++++++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/views/traceability/addTraceability.vue b/src/views/traceability/addTraceability.vue
index 1f1f187..a95d189 100644
--- a/src/views/traceability/addTraceability.vue
+++ b/src/views/traceability/addTraceability.vue
@@ -29,7 +29,7 @@
<div style="width: 65%; float: left; font-size: 12px">
<div style="margin-top: 5px">
<input type="radio" v-model="radio" value="1" />
- 男不使用禁用农药兽药、停用兽药和非法添加物
+ 不使用禁用农药兽药、停用兽药和非法添加物
</div>
<div style="margin-top: 3px">
<input type="radio" v-model="radio" value="1" />
@@ -224,6 +224,7 @@
radio: "1",
title: "创建溯源码",
form: {},
+ farm:{},
formLabelAlign: {
productName: "",
createTime: "",
@@ -400,6 +401,7 @@
computed: {
...mapState({
userInfo: (state) => state.user.userInfo,
+ $farmId: state => state.user.$farmId,
}),
},
methods: {
@@ -436,7 +438,7 @@
submit() {
var that = this;
that.formLabelAlign['tenantId'] = this.userInfo.tenant_id;
- that.formLabelAlign['deptId'] = this.userInfo.dept_id;
+ that.formLabelAlign['deptId'] = this.$farmId
this.$refs["formLabelAlign"].validate((valid) => {
if (valid) {
that.formLabelAlign.createTime =
@@ -501,7 +503,7 @@
that.formLabelAlign['bind'] = '0';
}
that.formLabelAlign['tenantId'] = this.userInfo.tenant_id;
- that.formLabelAlign['deptId'] = this.userInfo.dept_id;
+ that.formLabelAlign['deptId'] = this.$farmId;
//新增
save(that.formLabelAlign).then(
() => {
diff --git a/src/views/traceability/traceability.vue b/src/views/traceability/traceability.vue
index 4ffed82..c7ec1d7 100644
--- a/src/views/traceability/traceability.vue
+++ b/src/views/traceability/traceability.vue
@@ -215,8 +215,16 @@
created() {
this.initData();
},
+ watch: {
+ '$farmId':{
+ handler (newName, oldName) {
+ this.query={}
+ this.onLoad(this.page)
+ }
+ }
+ },
computed: {
- ...mapGetters(["permission", "userInfo"]),
+ ...mapGetters(["permission", "userInfo","$farmId"]),
// permissionList() {
// return {
// addBtn: this.vaildData(this.permission.social_add, true),
@@ -384,11 +392,12 @@
this.onLoad(this.page, this.query);
},
onLoads(){
- this.onLoad(this.page, this.query);
+ // this.onLoad(this.page, this.query);
+ this.onLoad(this.page);
},
onLoad(page, params = {}) {
params['tenantId'] = this.userInfo.tenant_id;
- params['deptId'] = this.userInfo.dept_id;
+ params.deptId = this.$farmId
this.loading = true;
getList(
page.currentPage,
--
Gitblit v1.9.3