Merge remote-tracking branch 'origin/master'

lin

2024-03-20 6964261bb35ec980f0511d06aeab0e7edba28cd9

Merge remote-tracking branch 'origin/master'

 src/api/task/labelReporting.js

@@ -28,4 +28,14 @@
    method: "post",
    data: row,
  });
};

export const remove = (ids) => {
  return request({
    url: "/api/blade-taskLabelReportingEvent/taskLabelReportingEvent/remove",
    method: "post",
    params: {
      ids
    },
  });
};

 src/views/publicSecurity/positionManage/TransactRegist.vue

@@ -63,7 +63,7 @@
  import {
    getList,
    getDetail,
    removeTask,
    remove as removeTask,
    update,
    add,
  } from "@/api/task/labelReporting"
@@ -628,8 +628,8 @@
            type: "warning",
          })
          .then(() => {
            row.isDeleted = 1
            return removeTask(row)
            // row.isDeleted = 1
            return removeTask(row.id)
          })
          .then(() => {
            this.onLoad(this.page)

 src/views/userHouse/houseHoldList.vue

@@ -229,24 +229,7 @@
          dialogType: 'drawer',
          dialogClickModal: false,
          menuFixed: 'right',
          column: [{
              label: "与业主关系",
              prop: "relationship",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
              dataType: "number",
              // hide: true,
              width: 120,
              props: {
                label: "dictValue",
                value: "dictKey",
              },
              rules: [{
                required: true,
                message: "请选择与业主关系",
                trigger: "blur",
              }],
            },
          column: [

            {
              width: 110,
@@ -381,6 +364,24 @@
                value: "dictKey",
              },
            },
            {
              label: "与业主关系",
              prop: "relationship",
              type: "select",
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=roleRelation",
              dataType: "number",
              // hide: true,
              width: 100,
              props: {
                label: "dictValue",
                value: "dictKey",
              },
              rules: [{
                required: true,
                message: "请选择与业主关系",
                trigger: "blur",
              }],
            },

            // {
            // label: "关系",