Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2

cloudroam

2024-12-31 701392dda8429b164e180e3004c235eea58604ca

 pages/sms/send-batch/index.vue

@@ -53,13 +53,12 @@
        ],
        onResetView: (row) => {
          // this.$router.push(`${this.$route.path}/${row.id}`)

          // const searchFormRef = this.$refs.crud.$refs.searchForm
          // const searchFormValue = searchFormRef.getFormValue()
          const url = this.$router.resolve(
            `/sms/send-batch/${row.id}`
          ).href
          window.open(url, '_blank')
          this.$router.push(`${this.$route.path}/${row.id}`)
         
          // const url = this.$router.resolve(
          //   `/sms/send-batch/${row.id}`
          // ).href
          // window.open(url, '_blank')

        },
        columns: [
@@ -209,6 +208,10 @@
                trigger: 'change',
              },
            ],
            // outputFormat: (val) => {
            //   console.log(val)
            //   return '';
            // },
          },
          {
            label: '',
@@ -326,12 +329,11 @@
            hidden: (row) => row.type !== 'SELECT',
            rules: { required: true, message: '请选择领取用户' },
            inputFormat: (row) => {
              if ('smsUserDTOS' in row) {
              if ('smsUserDTOS' in row && row.smsUserDTOS && row.smsUserDTOS.length>0) {
                return row.smsUserDTOS.filter((i) => i)
              }
            },
            outputFormat: (val) => {
              console.log(val)
             return val?.length ? val.map((i) => {return {userId:i.userId,userPhone:i.tel} }) : []

            },