农资统计

tangzy

2022-06-29 537a11b572c88e304cd73de7d7028b9a3b33588f

农资统计

 src/api/farm/farm.js

@@ -46,12 +46,12 @@
        }
    })
}
export const getDetails = (userId) => {
export const getDetails = (deptId) => {
    return request({
        url: '/api/farm/details',
        method: 'get',
        params: {
            userId
            deptId
        }
    })
}
}

 src/api/stockfactory/stockfactory.js

@@ -51,8 +51,8 @@

export const selectStockFa = () => {
    return request({
        url: '/api/stockfactory/stockfactory/selectStockFa',
        url: '/api/soldr/soldr/selectSol',
        method: 'get',
        params: {}
    })
}
}

 src/api/task/task.js

@@ -42,7 +42,15 @@

export const update = (row) => {
  return request({
    url: '/api/task/task/submit',
    url: '/api/task/task/update',
    method: 'post',
    data: row
  })
}

export const updatechuli = (row) => {
  return request({
    url: '/api/task/task/updatechuli',
    method: 'post',
    data: row
  })

 src/views/farm/farm.vue

@@ -189,7 +189,8 @@
  mounted() {
    var that = this;
    this.$nextTick(() => {
      getDetails(this.userInfo.user_id).then((res) => {
      getDetails(this.userInfo.dept_id).then((res) => {
        console.log( res.data.data,123)
        if (res.data.code == 200) {
          that.objBase = res.data.data;
          that.farmId = that.objBase.id;

 src/views/farm/farmReport.vue

@@ -155,7 +155,7 @@
  methods: {
    //新增
    rowSave(row, done, loading) {
      row["farmId"] = this.farmId;
      row["deptId"] = this.userInfo.dept_id;
      row["type"] = 1;
      save(row).then(
        () => {

 src/views/recovery/recovery.vue

@@ -315,7 +315,7 @@
          operatorcolumn.dicData = res.data.data;
        }
      });
      

    },
    //新增
    rowSave(row, done, loading) {
@@ -428,6 +428,8 @@
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      params['tenantId'] = this.userInfo.tenant_id;
      params['deptId'] = this.userInfo.dept_id;
      this.loading = true;
      getList(
        page.currentPage,

 src/views/soldrecord/soldrecord.vue

@@ -238,8 +238,7 @@
      onLoad(page, params = {}) {
        this.loading = true;
        var datas = this.$route.query;
        console.log(datas)
        params.stockId1=datas.stockId1;
        params.stockId1=datas.sid;
        getListbg(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data;
          this.page.total = data.total;

 src/views/statistics/stock.vue

@@ -174,7 +174,7 @@
  mounted() {
    var params = {
      startTime: this.getStartTime(),
      endTime: this.getEndTime()
      endTime: this.getEndTime(),
    }
    this.onLoad(this.page, params);
  }
@@ -375,6 +375,7 @@
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}) {
      params.deptId= this.userInfo.dept_id;
      this.loading = true;
      const {releaseTimeRange} = this.query;
      let values = {

 src/views/stock/stockmanage.vue

@@ -686,7 +686,7 @@
    };
  },
  computed: {
    ...mapGetters(["permission"]),
    ...mapGetters(["permission","userInfo"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.stock_add, false),
@@ -745,6 +745,7 @@
    },
    //农资入库按钮
    submitK(row, done, loading) {
      row.deptId=this.userInfo.dept_id;
      add(row).then(() => {
        this.onLoad(this.page);
        this.$message({
@@ -761,6 +762,7 @@
    },
//入库
    submitR(row, done, loading) {
      row.deptId=this.userInfo.dept_id;
      var that = this;
      add1(row).then(
        () => {
@@ -783,6 +785,7 @@
//出库
    submitC(row, done, loading) {
      var that = this;
      row.deptId=this.userInfo.dept_id;
      add1(row).then(
        () => {
          that.onLoad(this.page);

 src/views/task/task.vue

@@ -64,7 +64,7 @@
</template>

<script>
import {getList, getDetail, add, update, remove} from "@/api/task/task";
import {getList, getDetail, add, update, remove, updatechuli} from "@/api/task/task";
import {mapGetters} from "vuex";
import {getLandList} from "@/api/land/land";

@@ -74,6 +74,7 @@
      form: {},
      query: {},
      formchuli: {},
      formxq: {},
      loading: true,
      page: {
        pageSize: 10,
@@ -149,16 +150,39 @@
            }]
          },
          {
            label: "投入品",
            prop: "stockId",
            hide: true,
            type: "tree",
            dicUrl: `/api/soldr/soldr/selectSol`,
            props: {
              label: "spn",
              value: "id"
            },
            change: function (value) {
              console.log(value.value)
            }
          },
          {
            label: "农资量",
            prop: "stockNum",
            hide: true,
            span: 6,
            type: "number",
            labelWidth: 110,
            display: false,
          },
          {
            label: "拍照照片",
            prop: "type",
            span: 6,
            type: "switch",
            dicData: [{
              label: '开启',
              value: 0
            }, {
              label: '关闭',
              value: 1
              value: "1"
            }, {
              label: '开启',
              value: "0"
            }],
            mock: {
              type: 'dic'
@@ -167,20 +191,9 @@
            row: true,
          },
          {
            label: "任务说明",
            prop: "taskExplain",
            type: "textarea",
            span: 23,
            rules: [{
              required: true,
              message: "请输入任务说明",
              trigger: "blur"
            }]
          },
          {
            label: "任务状态",
            addDisplay: false,
            editDisplay: false,
            type: "select",
            prop: "status",
            dicData: [
              {
@@ -196,40 +209,49 @@
                value: 2
              }
            ],
            span: 23,
            span: 24
          },
          {
            label: "任务说明",
            prop: "taskExplain",
            type: "textarea",
            span: 24,
            rules: [{
              required: true,
              message: "请输入任务说明",
              trigger: "blur"
            }]
          },
          {
            label: "照片",
            prop: "tp",
            type: "upload",
            hide: true,
            dataType: "string",
            span: 24,
            limit: 5,
            addDisplay: false,
            editDisplay: false,
            listType: "picture-card",
            tip: "建议上传手机横屏拍摄的照片，宽高比16:9，最多上传5张",
            canvasOption: {
              text: "",
              ratio: 1.0,
            },
            propsHttp: {
              res: "data",
              url: "url"
            },
            action: "/api/blade-resource/oss/endpoint/put-files"
          },
          {
            label: "备注",
            hide:true,
            hide: true,
            addDisplay: false,
            editDisplay: false,
            prop: "remark",
            type: "textarea",
            span: 23,
          },
          {
            label: "图片",
            hide:true,
            prop: "tp",
            addDisplay: false,
            editDisplay: false,
            rules: [{
              required: true,
              message: "请输入图片",
              trigger: "blur"
            }]
          },
          {
            label: "农事操作",
            hide:true,
            addDisplay: false,
            editDisplay: false,
            prop: "farm",
            rules: [{
              required: true,
              message: "请输入农事操作",
              trigger: "blur"
            }]
            span: 24,
          },
        ]
      },
@@ -246,132 +268,111 @@
        dialogClickModal: false,
        column: [
          {
            label: "农资",
            prop: "stockId1",
            label: "任务名称",
            prop: "taskName",
            disabled: true,
          },
          {
            label: "任务说明",
            prop: "taskExplain",
            type: "textarea",
            span: 23,
            type: "select",
            disabled: true,
            dicUrl: "/api/stockfactory/stockfactory/selectStockFa",
          },
          {
            label: "地块",
            prop: "landId",
            type: "tree",
            disabled: true,
            dicData: [],
            props: {
              label: "dictValue",
              value: "dictKey"
              label: "landName",
              value: "id"
            },
          },
          {
            label: "负责人",
            prop: "taskUser",
            disabled: true,
            type: "tree",
            dicUrl: `/api/blade-user/user-list`,
            props: {
              label: "account",
              value: "id"
            },
            rules: [{
              required: true,
              message: "请输入农资",
              message: "请输入负责人",
              trigger: "blur"
            }]
          },
          {
            label: "规格",
            label: "截止时间",
            prop: "time",
            disabled: true,
            span: 6,
            prop: "spn",
            addDisplay: false,
          },
          {
            label: "规格",
            display: false,
            hide: true,
            prop: "specs1",
            span: 5,
            viewDisplay: false,
            rules: [{
              required: true,
              message: "请输入规格",
              trigger: "blur"
            }]
          },
          {
            label: "规格值1",
            display: false,
            hide: true,
            prop: "specsVal1",
            searchSpan: 4,
            span: 6,
            type: "select",
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=stockSpecs1",
            props: {
              label: "dictValue",
              value: "dictKey"
            },
            dataType: "number",
            search: true,
          },
          {
            label: "类型",
            display: false,
            hide: true,
            prop: "stockType1",
          },
          {
            label: "规格值2",
            display: false,
            hide: true,
            prop: "specsVal2",
            searchSpan: 4,
            span: 6,
            type: "select",
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=stockSpecs2",
            props: {
              label: "dictValue",
              value: "dictKey"
            },
            dataType: "number",
            search: true,
          },
          {
            label: "当前库存",
            disabled: true,
            span: 6,
            prop: "num",
          },
          {
            label: "入库数量",
            type: "number",
            span: 11,
            prop: "amount1",
          },
          {
            label: "入库类型",
            prop: "type1",
            type: "select",
            span: 12,
            searchSpan: 4,
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=stockPurchase",
            props: {
              label: "dictValue",
              value: "dictKey"
            },
            dataType: "number",
            search: true,
            rules: [{
              required: true,
              message: "请输入入库类型",
              trigger: "blur"
            }]
          },
          {
            label: "入库时间",
            prop: "time1",
            span: 7,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            span: 11,
            rules: [{
              required: true,
              message: "请输入入库时间",
              message: "请输入截止时间",
              trigger: "blur"
            }]
          },
          {
            label: "投入品",
            prop: "stockId",
            disabled: true,
            hide: true,
            type: "tree",
            span: 10,
            dicUrl: `/api/soldr/soldr/selectSol`,
            props: {
              label: "spn",
              value: "id"
            },
            change: function (value) {
              console.log(value.value)
            }
          },
          {
            label: "农资量",
            prop: "stockNum",
            hide: true,
            disabled: true,
            span: 6,
            type: "number",
            labelWidth: 110,
          },
          {
            label: "拍照照片",
            prop: "type",
            span: 6,
            disabled: true,
            type: "switch",
            dicData: [{
              label: '关闭',
              value: "1"
            }, {
              label: '开启',
              value: "0"
            }],
            mock: {
              type: 'dic'
            },
            hide: true,
            row: true,
          },
          {
            label: "单据、凭证照片",
            prop: "picture1",
            prop: "tp",
            type: "upload",
            labelWidth: 145,
            dataType: "string",
            span: 24,
            limit: 5,
            display: false,
            listType: "picture-card",
            tip: "建议上传手机横屏拍摄的照片，宽高比16:9，最多上传5张",
            canvasOption: {
@@ -386,13 +387,160 @@
          },
          {
            label: "备注",
            hide: true,
            addDisplay: false,
            editDisplay: false,
            prop: "remark",
            type: "textarea",
            prop: "remarks1",
            span: 23,
          },
        ]
      },
      gradeBoxVisiblechuli:false,
      optionxq: {
        height: 'auto',
        calcHeight: 30,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
        index: true,
        viewBtn: true,
        selection: true,
        dialogClickModal: false,
        column: [
          {
            label: "任务名称",
            prop: "taskName",
            disabled: true,
          },
          {
            label: "任务说明",
            prop: "taskExplain",
            type: "textarea",
            span: 23,
            disabled: true,
          },
          {
            label: "地块",
            prop: "landId",
            type: "tree",
            disabled: true,
            dicData: [],
            props: {
              label: "landName",
              value: "id"
            },
          },
          {
            label: "负责人",
            prop: "taskUser",
            disabled: true,
            type: "tree",
            dicUrl: `/api/blade-user/user-list`,
            props: {
              label: "account",
              value: "id"
            },
            rules: [{
              required: true,
              message: "请输入负责人",
              trigger: "blur"
            }]
          },
          {
            label: "截止时间",
            prop: "time",
            disabled: true,
            span: 7,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            rules: [{
              required: true,
              message: "请输入截止时间",
              trigger: "blur"
            }]
          },
          {
            label: "投入品",
            prop: "stockId",
            disabled: true,
            hide: true,
            type: "tree",
            span: 10,
            dicUrl: `/api/soldr/soldr/selectSol`,
            props: {
              label: "spn",
              value: "stock_id1"
            },
            change: function (value) {
              console.log(value.value)
            }
          },
          {
            label: "农资量",
            prop: "stockNum",
            hide: true,
            disabled: true,
            span: 6,
            type: "number",
            labelWidth: 110,
          },
          {
            label: "拍照照片",
            prop: "type",
            span: 6,
            disabled: true,
            type: "switch",
            dicData: [{
              label: '关闭',
              value: "1"
            }, {
              label: '开启',
              value: "0"
            }],
            mock: {
              type: 'dic'
            },
            hide: true,
            row: true,
          },
          {
            label: "单据、凭证照片",
            prop: "tp",
            type: "upload",
            labelWidth: 145,
            dataType: "string",
            disabled: true,
            span: 24,
            limit: 5,
            display: false,
            listType: "picture-card",
            tip: "建议上传手机横屏拍摄的照片，宽高比16:9，最多上传5张",
            canvasOption: {
              text: "",
              ratio: 1.0,
            },
            propsHttp: {
              res: "data",
              url: "url"
            },
            action: "/api/blade-resource/oss/endpoint/put-files"
          },
          {
            label: "备注",
            disabled: true,
            hide: true,
            addDisplay: false,
            editDisplay: false,
            prop: "remark",
            type: "textarea",
            span: 23,
          },
        ]
      },
      gradeBoxVisiblechuli: false,
      gradeBoxVisiblexq: false,
      data: []
    };
  },
@@ -417,32 +565,61 @@
      return ids.join(",");
    }
  },
  watch: {
    "form.stockId": {
      handler(val) {
        console.log(val)
        var stockIdcolumn = this.findObject(this.option.column, "stockNum");
        if (val != "") {
          stockIdcolumn.display = true;
        } else {
          stockIdcolumn.display = false;
        }
      },
      immediate: true,
    },
  },
  methods: {
    //入库
    submitR(row, done, loading) {
      that.gradeBoxVisible = false;
      // var that = this;
      // add1(row).then(
      //   () => {
      //     that.onLoad(this.page);
      //     that.$refs.formR.resetFields();
      //     that.$message({
      //       type: "success",
      //       message: "操作成功!"
      //     });
      //     that.gradeBoxVisible = false;
      //
      //     done();
      //   },
      //   error => {
      //     window.console.log(error);
      //     done();
      //   }
      // );
      var that = this;
      updatechuli(row).then(
        () => {
          that.onLoad(this.page);
          that.$message({
            type: "success",
            message: "操作成功!"
          });
          that.gradeBoxVisiblechuli = false;
          done();
        },
        error => {
          loading();
          window.console.log(error);
          done();
        }
      );
    },
    // 处理
    chuli(row) {
      this.formchuli = {};
      this.formchuli = {
        id: row.id,
        taskName: row.taskName,
        taskExplain: row.taskExplain,
        landId: row.landId,
        taskUser: row.taskUser,
        time: row.time,
        stockId: row.stockId,
        tp: row.tp,
        remark: row.remark,
        stockNum: row.stockNum,
        type: row.type

      };
      if (row.type === "0") {
        var tp = this.findObject(this.optionchuli.column, "tp");
        tp.display = true;
      }
      this.gradeBoxVisiblechuli = true;
    },
    initData() {
@@ -457,6 +634,9 @@
      })
    },
    rowSave(row, done, loading) {
      if(row.tp.length<=0){
        row.tp=""
      }
      add(row).then(() => {
        this.onLoad(this.page);
        this.$message({

 src/views/wel/farming.vue

@@ -7,23 +7,27 @@
    width="60%"
    :visible.sync="visible"
  >
    <avue-form ref="form" v-model="form" :option="option" @submit="submit">
    <avue-form ref="form" v-if="visible"  v-model="form" :option="option" @submit="submit">
    </avue-form>
  </el-dialog>
</template>

<script>

import { mapState } from "vuex";
import { getLandList } from "@/api/land/land";
import { getUserList } from "@/api/system/user";
import { selectStockFa } from "@/api/stockfactory/stockfactory";
import { save } from "@/api/farm/farmingrecord";
import {mapState} from "vuex";
import {getLandList} from "@/api/land/land";
import {getUserList} from "@/api/system/user";
import {getDetail} from "@/api/soldr/soldr";
import {selectStockFa} from "@/api/stockfactory/stockfactory";
import {save} from "@/api/farm/farmingrecord";

export default {
  data() {
    return {
      title:"农事操作",
      form: {},
      title: "农事操作",
      form: {
        num: ''
      },
      option: {
        emptyBtn: false,
        submitText: "保存",
@@ -69,6 +73,7 @@
          {
            label: "农产品",
            prop: "strainId",
            span: 7,
            type: "tree",
            dicData: [],
            props: {
@@ -89,10 +94,11 @@
            label: "农资",
            prop: "stockId",
            type: "tree",
            span: 8,
            dicData: [],
            props: {
              label: "dictValue",
              value: "dictKey",
              label: "spn",
              value: "id",
            },
            labelWidth: 110,
            rules: [
@@ -103,13 +109,31 @@
              },
            ],
            display: false,
            change: res => {
              this.getDe(res)
            },
          },
          {
            label: "待使用数量",
            prop: "num",
            disabled: true,
            span: 4,
            display: false,
          },
          {
            label: "使用数量",
            type: "number",
            prop: "snum",
            span: 5,
            display: false,
          },
          {
            label: "作业方式",
            prop: "jobWay",
            span: 6,
            labelWidth: 110,
            type: "select",
            value:'0',
            value: '0',
            dicData: [
              {
                label: "人工",
@@ -219,32 +243,47 @@
    },
  },
  methods: {
    //计算当前时间
    getNowTime(){
        var date = new Date();
        //年 getFullYear()：四位数字返回年份
        var year = date.getFullYear();  //getFullYear()代替getYear()
        //月 getMonth()：0 ~ 11
        var month = date.getMonth() + 1;
        //日 getDate()：(1 ~ 31)
        var day = date.getDate();
        //时 getHours()：(0 ~ 23)
        var hour = date.getHours();
        //分 getMinutes()： (0 ~ 59)
        var minute = date.getMinutes();
        //秒 getSeconds()：(0 ~ 59)
        var second = date.getSeconds();
        //赋值
        this.form['time'] = year + '-' 
                          + this.addZero(month) + '-' 
                          + this.addZero(day) + ' ' 
                          + this.addZero(hour);
    getDe(val) {
      if (val.value!='') {
        getDetail(val.value
        ).then(res => {
          var amount1 = res.data.data.amount1;
          this.form.num = amount1
          var numz = this.findObject(this.option.column, "num");
          var numzs = this.findObject(this.option.column, "snum");
          numz.display = true;
          numzs.display = true;
        });
      }
    },
    //小于10的拼接上0字符串
//计算当前时间
    getNowTime() {
      var date = new Date();
      //年 getFullYear()：四位数字返回年份
      var year = date.getFullYear();  //getFullYear()代替getYear()
      //月 getMonth()：0 ~ 11
      var month = date.getMonth() + 1;
      //日 getDate()：(1 ~ 31)
      var day = date.getDate();
      //时 getHours()：(0 ~ 23)
      var hour = date.getHours();
      //分 getMinutes()： (0 ~ 59)
      var minute = date.getMinutes();
      //秒 getSeconds()：(0 ~ 59)
      var second = date.getSeconds();
      //赋值
      this.form['time'] = year + '-'
        + this.addZero(month) + '-'
        + this.addZero(day) + ' '
        + this.addZero(hour);
    }
    ,
//小于10的拼接上0字符串
    addZero(s) {
      return s < 10 ? ('0' + s) : s;
    },
    //初始化
    }
    ,
//初始化
    init() {
      this.form['operator'] = this.userInfo.user_id;
      //计算当前时间
@@ -276,28 +315,38 @@
          stockIdcolumn.dicData = res.data.data;
        }
      });
    },
    // 表单提交
    submit(row,done) {
    }
    ,
// 表单提交
    submit(row, done) {
      var that = this;
      row['tenantId'] = this.userInfo.tenant_id;
      row['deptId'] = this.userInfo.dept_id;
      save(row).then(
        () => {
          that.$refs.form.resetFields();
          that.visible = false;
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
        },
        (error) => {
          done();
          window.console.log(error);
        }
      );
    },
  },
};
      if (row.snum > row.num) {
        this.$message.warning("使用农资数量大于农资数量");
        done();
      }
      else {
        save(row).then(
          () => {
            that.$refs.form.resetFields();
            that.visible = false;
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
          },
          (error) => {
            done();
            window.console.log(error);
          }
        );
      }
    }
    ,
  }
  ,
}
;
</script>

 src/views/wel/plant.vue

@@ -162,7 +162,7 @@
                required: true,
                message: "请输入作业方式",
                trigger: "blur",
              },  
              },
            ],
          },
          {
@@ -177,7 +177,7 @@
                required: true,
                message: "请选择移栽时间",
                trigger: "blur",
              },  
              },
            ],
          },
          {
@@ -193,7 +193,7 @@
                required: false,
                message: "请选预计采收时间",
                trigger: "blur",
              },  
              },
            ],
          },
          {
@@ -207,12 +207,12 @@
                required: false,
                message: "请输入预计亩产",
                trigger: "blur",
              },  
              },
            ],
          },
          {
            label: "株数",
            prop: "plantNumber", 
            prop: "plantNumber",
            labelWidth:110,
            type:"number",
            hide:true,
@@ -221,7 +221,7 @@
                required: false,
                message: "请输入株数",
                trigger: "blur",
              },  
              },
            ],
          },
          {
@@ -235,7 +235,7 @@
                required: false,
                message: "请输入株间距",
                trigger: "blur",
              },  
              },
            ],
          },
        ],
@@ -265,10 +265,10 @@
        //秒 getSeconds()：(0 ~ 59)
        var second = date.getSeconds();
        //赋值
        this.form['time'] = year + '-' 
                          + this.addZero(month) + '-' 
                          + this.addZero(day) + ' ' 
                          + this.addZero(hour) + ':' 
        this.form['time'] = year + '-'
                          + this.addZero(month) + '-'
                          + this.addZero(day) + ' '
                          + this.addZero(hour) + ':'
                          + this.addZero(minute);
    },
    //小于10的拼接上0字符串
@@ -283,7 +283,7 @@
      this.visible = true;
      var that = this;
      //获取农地数据
      getLandList(this.userInfo.user_id).then((res)=>{
      getLandList(this.userInfo.dept_id).then((res)=>{
          if(res.data.code==200){
              var landIdcolumn = that.findObject(that.option.column,"landId");
              that.landList = res.data.data;

 src/views/wel/recovery.vue

@@ -243,10 +243,10 @@
        //秒 getSeconds()：(0 ~ 59)
        var second = date.getSeconds();
        //赋值
        this.form['time'] = year + '-' 
                          + this.addZero(month) + '-' 
                          + this.addZero(day) + ' ' 
                          + this.addZero(hour) + ':' 
        this.form['time'] = year + '-'
                          + this.addZero(month) + '-'
                          + this.addZero(day) + ' '
                          + this.addZero(hour) + ':'
                          + this.addZero(minute);
    },
    //小于10的拼接上0字符串
@@ -271,14 +271,14 @@
      this.visible = true;
      var that = this;
      //获取农地数据
      getLandList(this.userInfo.user_id).then((res) => {
      getLandList(this.userInfo.dept_id).then((res) => {
        if (res.data.code == 200) {
          var landIdcolumn = that.findObject(that.option.column, "landId");
          that.landList = res.data.data;
          landIdcolumn.dicData = res.data.data;
        }
      });
      

      //获取操作人
      const user = {
        tenantId: this.userInfo.tenant_id,