wjx 2 weeks ago
parent
commit
003eb3fa87

+ 28 - 24
src/pages/weComTask/page/groupChat/create/components/groupUser/addGroupObject.tsx

@@ -235,7 +235,10 @@ export const ShowGroupUserTable: React.FC<GROUP_CHAT_CREATE.ShowGroupUserTablePr
             dataIndex: 'groupSendMsg',
             dataIndex: 'groupSendMsg',
             key: 'groupSendMsg',
             key: 'groupSendMsg',
             width: 140,
             width: 140,
-            ellipsis: true
+            ellipsis: true,
+            render(value) {
+                return value ? value : '--'
+            }
         },
         },
         {
         {
             title: '操作',
             title: '操作',
@@ -343,22 +346,30 @@ const AddGroupObjectModal: React.FC<GROUP_CHAT_CREATE.AddGroupObjectModalProps>
             >
             >
                 <Radio.Group options={[{ label: '开启', value: true }, { label: '关闭', value: false }]} />
                 <Radio.Group options={[{ label: '开启', value: true }, { label: '关闭', value: false }]} />
             </Form.Item>
             </Form.Item>
-            {isRepair && <Form.Item
-                name={'repairTimes'}
-                label={<strong>补缺群聊范围</strong>}
-                rules={[{ required: true, message: '请选择补缺群聊范围!' }]}
-                tooltip={{ title: '可补缺的群聊范围:在本建群策略内创建的群聊', placement: 'top' }}
-            >
-                <Select
-                    showSearch
-                    allowClear
-                    placeholder="请选择补缺群聊范围"
-                    filterOption={(input, option) =>
-                        (option?.label as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    }
-                    options={Array(30).fill('').map((_, index) => ({ label: `近${index + 1}天`, value: index + 1 }))}
-                />
-            </Form.Item>}
+            {isRepair && <>
+                <Form.Item
+                    name={'repairTimes'}
+                    label={<strong>补缺群聊范围</strong>}
+                    rules={[{ required: true, message: '请选择补缺群聊范围!' }]}
+                    tooltip={{ title: '可补缺的群聊范围:在本建群策略内创建的群聊', placement: 'top' }}
+                >
+                    <Select
+                        showSearch
+                        allowClear
+                        placeholder="请选择补缺群聊范围"
+                        filterOption={(input, option) =>
+                            (option?.label as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
+                        options={Array(30).fill('').map((_, index) => ({ label: `近${index + 1}天`, value: index + 1 }))}
+                    />
+                </Form.Item>
+                <Form.Item
+                    name={'groupSendMsg'}
+                    label={<strong>客服消息</strong>}
+                >
+                    <Input.TextArea placeholder="请输入建群成功发送内容" />
+                </Form.Item>
+            </>}
             <Form.Item
             <Form.Item
                 label={<strong>进群对象配置</strong>}
                 label={<strong>进群对象配置</strong>}
                 required
                 required
@@ -455,13 +466,6 @@ const AddGroupObjectModal: React.FC<GROUP_CHAT_CREATE.AddGroupObjectModalProps>
                     <MindTags />
                     <MindTags />
                 </Form.Item>
                 </Form.Item>
             </Card>
             </Card>
-            <Form.Item
-                name={'groupSendMsg'}
-                label={<strong>建群成功发送内容</strong>}
-                rules={[{ required: true, message: '请输入建群成功发送内容!' }]}
-            >
-                <Input.TextArea placeholder="请输入建群成功发送内容" />
-            </Form.Item>
         </Form>
         </Form>
     </Modal>
     </Modal>
 })
 })

+ 4 - 1
src/pages/weComTask/page/groupChat/create/tableConfig.tsx

@@ -90,7 +90,7 @@ export const PreviewColumns = (bookPlatForm: TASK_CREATE.BookPlatFormProps[], bo
                 return value ? <Space>
                 return value ? <Space>
                     <Badge status="success" text="开启" />
                     <Badge status="success" text="开启" />
                     <span>近{record.repairTimes}天</span>
                     <span>近{record.repairTimes}天</span>
-                </Space>: <Badge status="error" text="关闭" />
+                </Space> : <Badge status="error" text="关闭" />
             },
             },
         },
         },
         {
         {
@@ -206,6 +206,9 @@ export const PreviewColumns = (bookPlatForm: TASK_CREATE.BookPlatFormProps[], bo
             dataIndex: 'groupSendMsg',
             dataIndex: 'groupSendMsg',
             key: 'groupSendMsg',
             key: 'groupSendMsg',
             width: 140,
             width: 140,
+            render(value) {
+                return value ? value : '--'
+            },
         },
         },
     ]
     ]
 
 

+ 4 - 1
src/pages/weComTask/page/groupChat/taskList/details.tsx

@@ -225,7 +225,10 @@ const Details: React.FC<Props> = ({ data, bookPlatForm, bookList, visible, onClo
                     dataIndex: 'groupSendMsg',
                     dataIndex: 'groupSendMsg',
                     key: 'groupSendMsg',
                     key: 'groupSendMsg',
                     width: 140,
                     width: 140,
-                    ellipsis: true
+                    ellipsis: true,
+                    render(value) {
+                        return value ? value : '--'
+                    },
                 },
                 },
                 {
                 {
                     title: '创建人',
                     title: '创建人',

+ 1 - 1
src/pages/weComTask/page/groupChatSend/official/create/components/SelectMpCorp/index.tsx

@@ -136,7 +136,7 @@ const SelectMpCorp: React.FC<Props> = ({ corpList, mpList, group, visible, onClo
             </div>
             </div>
             <div className={style.right}>
             <div className={style.right}>
                 <Space style={{ marginBottom: 10 }} align="center" size={10}>
                 <Space style={{ marginBottom: 10 }} align="center" size={10}>
-                    <Title level={5} style={{ margin: 0 }}>主体</Title>
+                    <Title level={5} style={{ margin: 0 }}>群聊的主体</Title>
                     <Select
                     <Select
                         showSearch
                         showSearch
                         style={{ width: 200 }}
                         style={{ width: 200 }}