农场绑定修改

Administrator

2022-07-11 5115f0c87cb1c11778fbd02253184ecaf7780643

农场绑定修改

 src/api/farm/farm.js

@@ -11,6 +11,15 @@
        }
    })
}
export const getFarmList = (params) => {
    return request({
        url: '/api/farm/getFarmList',
        method: 'get',
        params: {
            ...params,
        }
    })
}
export const remove = (ids) => {
    return request({
        url: '/api/farm/remove',

 src/store/modules/common.js

@@ -38,6 +38,9 @@
        setpolygonsFarm: (state, data) => {
            state.polygonsFarm = data;
        },
        clear_polygon: (state) => {
            state.polygons = '';
        },
        clear_polygonsFarm: (state) => {
            state.polygonsFarm = '';
        },

 src/views/land/cs.vue

@@ -74,7 +74,7 @@
      >
      </el-pagination>
    </div>
    <landAdd v-if="landVisible" ref="land"></landAdd>
    <landAdd v-if="landVisible" ref="land" @refreshOnLoad="onLoad"></landAdd>
  </div>
</template>


 src/views/land/landAdd.vue

@@ -23,6 +23,7 @@
<script>

import {mapGetters} from "vuex";
import {getFarmList} from "@/api/farm/farm";
import {getDeptTree} from "@/api/system/dept";
import {add} from "@/api/land/land";
import website from '@/config/website';
@@ -52,11 +53,12 @@
          },
          {
            label: "所属农场",
            prop: "deptId",
            prop: "farmId",
            type: "tree",
            dicData: [],
            props: {
              label: "title"
              label: "farmName",
              value:"id"
            },
            slot: true,
            rules: [{
@@ -115,19 +117,29 @@
  },
  methods: {
    initData(tenantId) {
      getDeptTree(tenantId).then(res => {        console.log(res)
      // getDeptTree(tenantId).then(res => {        console.log(res)

        const column = this.findObject(this.option.column, "deptId");
        column.dicData = res.data.data;
      });
      //   const column = this.findObject(this.option.column, "deptId");
      //   column.dicData = res.data.data;
      // });
      const data = {
          deptId:this.userInfo.dept_id
        }
      getFarmList(data).then(res => {
          const column = this.findObject(this.option.column, "farmId");
          column.dicData = res.data.data;
        });
    },
    //初始化
    init() {
      //清空面的数据
      this.$store.commit('clear_polygon');
      //计算当前时间
      this.visible = true;
    },
    // 表单提交
    submit(row, loading) {
      row['deptId'] = this.userInfo.dept_id;
      var that = this;
      if (this.polygons.length == 0) {
        //没有面的数据
@@ -149,6 +161,7 @@
        row.landRange = usePolygons;
      }
      add(row).then(() => {
        that.$emit("refreshOnLoad");
        that.$refs.form.resetFields();
        that.visible = false;
        this.$message({

 src/views/system/user.vue

@@ -179,6 +179,7 @@
  } from "@/api/system/user";
  import {exportBlob} from "@/api/common";
  import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
  import {getFarmList} from "@/api/farm/farm";
  import {getRoleTree} from "@/api/system/role";
  import {getPostList} from "@/api/system/post";
  import {mapGetters} from "vuex";
@@ -307,31 +308,31 @@
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              type: "select",
              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              search: true,
              hide: true,
              display: false,
              prop: "userType",
              rules: [{
                required: true,
                message: "请选择用户平台",
                trigger: "blur"
              }]
            },
            // {
            //   label: "用户平台",
            //   prop: "userTypeName",
            //   slot: true,
            //   display: false
            // },
            // {
            //   label: "用户平台",
            //   type: "select",
            //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
            //   props: {
            //     label: "dictValue",
            //     value: "dictKey"
            //   },
            //   dataType: "number",
            //   search: true,
            //   hide: true,
            //   display: false,
            //   prop: "userType",
            //   rules: [{
            //     required: true,
            //     message: "请选择用户平台",
            //     trigger: "blur"
            //   }]
            // },
          ],
          group: [
            {
@@ -368,23 +369,23 @@
                    trigger: "blur"
                  }],
                },
                {
                  label: "用户平台",
                  type: "select",
                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  },
                  dataType: "number",
                  slot: true,
                  prop: "userType",
                  rules: [{
                    required: true,
                    message: "请选择用户平台",
                    trigger: "blur"
                  }]
                },
                // {
                //   label: "用户平台",
                //   type: "select",
                //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                //   props: {
                //     label: "dictValue",
                //     value: "dictKey"
                //   },
                //   dataType: "number",
                //   slot: true,
                //   prop: "userType",
                //   rules: [{
                //     required: true,
                //     message: "请选择用户平台",
                //     trigger: "blur"
                //   }]
                // },
                {
                  label: '密码',
                  prop: 'password',
@@ -483,10 +484,10 @@
              prop: 'dutyInfo',
              icon: 'el-icon-s-custom',
              column: [
                {
                  label: "用户编号",
                  prop: "code",
                },
                // {
                //   label: "用户编号",
                //   prop: "code",
                // },
                {
                  label: "所属角色",
                  prop: "roleId",
@@ -505,38 +506,57 @@
                  }]
                },
                {
                  label: "所属部门",
                  prop: "deptId",
                  label: "负责的农场",
                  prop: "farmId",
                  labelWidth:110,
                  type: "tree",
                  multiple: true,
                  dicData: [],
                  props: {
                    label: "title"
                    label: "farmName",
                    value:"id"
                  },
                  checkStrictly: true,
                  slot: true,
                  rules: [{
                    required: true,
                    message: "请选择所属部门",
                    message: "请选择负责的农场",
                    trigger: "click"
                  }]
                },
                {
                  label: "所属岗位",
                  prop: "postId",
                  type: "tree",
                  multiple: true,
                  dicData: [],
                  props: {
                    label: "postName",
                    value: "id"
                  },
                  rules: [{
                    required: true,
                    message: "请选择所属岗位",
                    trigger: "click"
                  }],
                },
                // {
                //   label: "所属部门",
                //   prop: "deptId",
                //   type: "tree",
                //   multiple: true,
                //   dicData: [],
                //   props: {
                //     label: "title"
                //   },
                //   checkStrictly: true,
                //   slot: true,
                //   rules: [{
                //     required: true,
                //     message: "请选择所属部门",
                //     trigger: "click"
                //   }]
                // },
                // {
                //   label: "所属岗位",
                //   prop: "postId",
                //   type: "tree",
                //   multiple: true,
                //   dicData: [],
                //   props: {
                //     label: "postName",
                //     value: "id"
                //   },
                //   rules: [{
                //     required: true,
                //     message: "请选择所属岗位",
                //     trigger: "click"
                //   }],
                // },
              ]
            },
          ]
@@ -723,14 +743,21 @@
          const column = this.findObject(this.option.group, "roleId");
          column.dicData = res.data.data;
        });
        getDeptTree(tenantId).then(res => {
          const column = this.findObject(this.option.group, "deptId");
        const data = {
          deptId:this.userInfo.dept_id
        }
        getFarmList(data).then(res => {
          const column = this.findObject(this.option.group, "farmId");
          column.dicData = res.data.data;
        });
        getPostList(tenantId).then(res => {
          const column = this.findObject(this.option.group, "postId");
          column.dicData = res.data.data;
        });
        // getDeptTree(tenantId).then(res => {
        //   const column = this.findObject(this.option.group, "deptId");
        //   column.dicData = res.data.data;
        // });
        // getPostList(tenantId).then(res => {
        //   const column = this.findObject(this.option.group, "postId");
        //   column.dicData = res.data.data;
        // });
      },
      submitRole() {
        const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -744,9 +771,10 @@
        });
      },
      rowSave(row, done, loading) {
        row.deptId = row.deptId.join(",");
        row['deptId'] = this.userInfo.dept_id;
        row.roleId = row.roleId.join(",");
        row.postId = row.postId.join(",");
        row.farmId = row.farmId.join(",");
        // row.postId = row.postId.join(",");
        add(row).then(() => {
          this.initFlag = false;
          this.onLoad(this.page);
@@ -761,9 +789,10 @@
        });
      },
      rowUpdate(row, index, done, loading) {
        row.deptId = row.deptId.join(",");
        debugger;
        row['deptId'] = this.userInfo.dept_id;
        row.roleId = row.roleId.join(",");
        row.postId = row.postId.join(",");
        row.farmId = row.farmId.join(",");
        update(row).then(() => {
          this.initFlag = false;
          this.onLoad(this.page);
@@ -926,12 +955,15 @@
            if(this.form.hasOwnProperty("deptId")){
              this.form.deptId = this.form.deptId.split(",");
            }
            if(this.form.hasOwnProperty("farmId")){
              this.form.farmId = this.form.farmId.split(",");
            }
            if(this.form.hasOwnProperty("roleId")){
              this.form.roleId = this.form.roleId.split(",");
            }
            if(this.form.hasOwnProperty("postId")){
              this.form.postId = this.form.postId.split(",");
            }
            // if(this.form.hasOwnProperty("postId")){
            //   this.form.postId = this.form.postId.split(",");
            // }
          });
        }
        this.initFlag = true;