Merge branch 'dev' into test

src/components/DataManager/index.js

@@ -95,7 +95,7 @@ function DataManager() {
       if (res.data.code === 200) {
         getDataAuthPage();
         setMsvisible(false);
-        message.success("删除成功");
+        message.success("操作成功");
       } else {
         message.warning(res.data.msg || '操作失败');
       }

src/components/DiagManager/index.js

@@ -74,7 +74,7 @@ function DiagManager() {
       if (res.data.code === 200) {
         getDiseasePage();
         setDiagid("");
-        message.success("删除成功");
+        message.success("操作成功");
       } else {
         message.warning(res.data.msg || '操作失败');
       }

src/components/DrugManager/index.js

@@ -81,7 +81,7 @@ function DrugManager() {
       if (res.data.code === 200) {
         getDrugPage();
         setDrugid([])
-        message.success("删除成功");
+        message.success("操作成功");
       } else {
         message.warning(res.data.msg || '操作失败');
       }

src/components/FieldRules/addRules.js

@@ -113,10 +113,24 @@ function ContentForm(props) {
         })
     }
     //表选择
-    function tablechange(value, options) {
-        colList[options.key] = list[options.key].getColumnNameDTOList
-        seDisable(false)
-        setColList([...colList])
+    function tablechange(i, value, options) {
+        console.log(value);
+        const formData = form.getFieldsValue();
+        if (value) {
+            colList[i] = list[options.key].getColumnNameDTOList
+            seDisable(false)
+            setColList([...colList])
+        }else{
+            colList[i] = []
+            setColList([...colList])
+            seDisable(true)
+        }
+        let columnList = formData.columnList;
+        columnList[i].columnCname = undefined
+        columnList[i].columnEname = undefined
+        form.setFieldsValue({
+            columnList: columnList
+        });
     }
     function colchange(value, options) {
         const formData = form.getFieldsValue();
@@ -205,7 +219,6 @@ function ContentForm(props) {
                 arr.push(it.tit)
             }
         });
-        console.log(arr);
         formData.standardValueList = arr
         if (type == 1) {
             url = api.addColumnVerify
@@ -264,7 +277,7 @@ function ContentForm(props) {
                                     <div className='item'>
                                         <div className='item-box'>
                                             <Form.Item label="表名称（中文）" rules={[{ required: true }]} style={{ width: '50%' }} name={['columnList', i, 'tableCname']} labelAlign="right" >
-                                                <Select allowClear showSearch onChange={tablechange} onSearch={cnameSearch} style={{ width: 160 }} placeholder="请选择">
+                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option)} onSearch={cnameSearch} style={{ width: 160 }} placeholder="请选择">
                                                     {tableList.map((item) => {
                                                         return (
                                                             <Option value={item.tableCname} key={item.index}>{item.tableCname}</Option>
@@ -273,7 +286,7 @@ function ContentForm(props) {
                                                 </Select>
                                             </Form.Item>
                                             <Form.Item label="表名称（英文）" rules={[{ required: true }]} name={['columnList', i, 'tableEname']} labelAlign="right">
-                                                <Select allowClear showSearch onChange={tablechange} onSearch={enameSearch} style={{ width: 160 }} placeholder="请选择" >
+                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option)} onSearch={enameSearch} style={{ width: 160 }} placeholder="请选择" >
                                                     {tableList.map((item) => {
                                                         return (
                                                             <Option value={item.tableEname} key={item.index}>{item.tableEname}</Option>
@@ -352,7 +365,7 @@ function ContentForm(props) {
                     <TextArea
                         autoSize={{ minRows: 3, maxRows: 5 }}
                         placeholder="请输入"
-                        
+
                     />
                 </Form.Item>
             </Form>

src/components/FieldRules/index.js

@@ -113,9 +113,9 @@ function FieldRules() {
             if (res.data.code === 200) {
                 //刷新列表
                 getColumnVerifyPage()
-                message.success(res.data.msg);
+                message.success(res.data.message);
             } else {
-                message.warning(res.data.msg || '操作失败，请重试~');
+                message.warning(res.data.message || '操作失败，请重试~');
             }
         });
         showDelModal(false);

src/components/MsgManage/index.js

@@ -62,7 +62,7 @@ function MsgManage() {
             if (code === 200) {
                 getTableData();     //刷新列表
                 setDelVisible(false);
-                message.success(res.data.msg || '删除成功')
+                message.success(res.data.msg || '操作成功')
             } else {
                 message.warning(res.data.msg || '删除失败，请重试')
             }

src/components/RegularManage/index.js

@@ -58,7 +58,11 @@ function RegularManage() {
     }
     //删除记录
     function delRegularById() {
-        post(api.delRegularById, { ids: selectedRowKeys }).then((res) => {
+        let arr = []
+        selectedRowKeys.forEach(it => {
+            arr.push(it.split('-')[0])
+        });
+        post(api.delRegularById, { ids: arr }).then((res) => {
             if (res.data.code === 200) {
                 //刷新列表
                 getRegularPage()

src/components/SurgeryManager/index.js

@@ -81,7 +81,7 @@ function SurgManager() {
       if (res.data.code === 200) {
         getOperationPage();
         setSurgid([])
-        message.success("删除成功");
+        message.success("操作成功");
       } else {
         message.warning(res.data.msg || '操作失败');
       }