Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

liukangdong

2024-08-28 8ab31157536e116dba27e942a05a20e3caaa4812

 admin/src/views/meeting/components/OperaRoomsWindow.vue

@@ -42,8 +42,7 @@
            v-for="item in userList()"
            :key="item.id"
            :value="item.id"

            :label="item.department?`${item.department.name}-${item.realname}`:item.realname"
            :label="item.companyId?`${item.companyName}-${item.companyName}`:item.realname"
          />
        </el-select>
      </el-form-item>
@@ -101,7 +100,7 @@
        id: null,
        sysList: [],
        projectList: [],
        createDate: null,
        createDate: '',
        editor: '',
        editDate: null,
        isdeleted: 0,
@@ -225,7 +224,7 @@
            this.$emit('success')
          })
          .catch(e => {
            this.$tip.apiFailed(e)
            // this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.isWorking = false
@@ -261,7 +260,7 @@
            this.$emit('success')
          })
          .catch(e => {
            this.$tip.apiFailed(e)
            // this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.isWorking = false