Merge remote-tracking branch 'origin/master'

lin

2024-03-01 f37ea219d986a7c785a4132cd281ebccb0ff2903

 src/views/message/sysMessage.vue

@@ -62,15 +62,16 @@
        editBtn: false,
        addBtnText: "消息发送",
        saveBtnText: "发送",
        delBtn:false,
        delBtn: false,
        column: [
          {
            label: "消息类型",
            prop: "type",
            type: "checkbox",
            search:true,
            dataType: "string",
            search: true,
            searchSpan: 4,
            searchLabelWidth:96,
            searchLabelWidth: 96,
            row: true,
            dicUrl: "/api/blade-system/dict-biz/dictionary?code=messageType",
            props: {
@@ -91,6 +92,7 @@
            multiple: true,
            dicUrl: `/api/blade-system/dept/lazy-list`,
            dicData: [],
            dataType: "string",
            props: {
              label: 'name',
              value: 'id'
@@ -129,7 +131,7 @@
            label: "发送时间",
            prop: "createTime",
            span: 24,
            display:false
            display: false
          },
          {
            label: "发送时间",
@@ -141,7 +143,7 @@
            hide: true,
            display: false,
            search: true,
            searchLabelWidth:96,
            searchLabelWidth: 96,
          },
        ]
      },
@@ -192,19 +194,8 @@
    },

    rowSave(row, done, loading) {
      console.log(typeof row.type,"+++++++++++")
      if (typeof  row.type == 'object'){
        row.type = row.type.sort((a,b)=>a-b).join(",")
      }else{
        row.type = row.type.split(",").sort((a,b)=>a-b).join(",")
      }

      if (typeof  row.receiver == 'object'){
        row.receiver = row.receiver.join(",")
      }

      // row.receiver = row.receiver.join(",")
      // row.type = row.type.join(",")
      console.log(row)
      row.type = row.type.split(",").sort((a, b) => a - b).join(",")
      row['messageResource'] = 1
      customizeSave(row).then(() => {
        this.onLoad(this.page);