浏览代码

下拉模糊查询修改

MFMF 3 年之前
父节点
当前提交
7aa95a8f74
共有 3 个文件被更改,包括 31 次插入10 次删除
  1. 2 5
      src/components/DictManager/addDict.js
  2. 18 3
      src/components/HospitalSet/addHospset.js
  3. 11 2
      src/components/HospitalSet/index.js

+ 2 - 5
src/components/DictManager/addDict.js

@@ -149,14 +149,11 @@ function AddDict(props) {
         </Form.Item>
         <Form.Item
           name="status"
-		  valuePropName={initialValues.status?"checked":""}
+		  valuePropName={initialValues.status=="启用"?"checked":""}
           label="当前状态"
           rules={[{ required: true, message: '请选择状态' }]}
         >
-         
-		    <Switch/>
-            
-
+		<Switch/>
         </Form.Item>
         
           <Form.Item wrapperCol={{ offset: 8, span: 16 }}>

+ 18 - 3
src/components/HospitalSet/addHospset.js

@@ -24,6 +24,7 @@ function AddHospset(props) {
   const initialValues = formData;
 
   const onFinish = values => {
+	values.status ? values.status=1:values.status=0
     let params = values
     if (type == 3) {
 	  params.id=initialValues.id
@@ -57,8 +58,12 @@ function AddHospset(props) {
   function getHospitalNames(val){
   	  xPost(api.getHospitalNames,{hospitalName:val}).then((res) => {
   	    if (res.data.code === 200) {
+  	      const arr =[]
   	      const data = res.data.data;
-  	      setHospsetidList(data)
+  	      data.forEach(function(e){
+  	    	  arr.push(e.hospitalName)
+  	      })
+  	      setHospsetidList(arr)
   	    }
   	  })
   }
@@ -87,7 +92,10 @@ function AddHospset(props) {
           name="hospitalName"
           label="所属组织"
           rules={[
-            
+			{
+              required: true,
+              message: '请选择所属组织',
+            },
           ]}
         >
           <Select
@@ -169,7 +177,14 @@ function AddHospset(props) {
 		      <TextArea placeholder="50个字以内" rows={4} />
 		    }
         </Form.Item>
-        
+        <Form.Item
+          name="status"
+          valuePropName={initialValues.status=="启用"?"checked":""}
+          label="当前状态"
+          rules={[{ required: true, message: '请选择状态' }]}
+        >
+        <Switch/>
+        </Form.Item>
           <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
             <Space size="middle">
               <Button htmlType="button" onClick={e => cancel()}>

+ 11 - 2
src/components/HospitalSet/index.js

@@ -71,14 +71,21 @@ function HospitalSet() {
   function getHospitalNames(val){
   	  xPost(api.getHospitalNames,{hospitalName:val}).then((res) => {
   	    if (res.data.code === 200) {
+		  const arr =[]
   	      const data = res.data.data;
-  	      setHospsetidList(data)
+  	      data.forEach(function(e){
+			  arr.push(e.hospitalName)
+		  })
+		  setHospsetidList(arr)
   	    }
   	  })
   }
    function onSearch(value) {
 	  getHospitalNames(value)
    }
+   function onFocus() {
+   	  getHospitalNames("")
+   }
 
    
   
@@ -152,7 +159,8 @@ function HospitalSet() {
     { title: '参数名', dataIndex: 'name', key: 'index' },
     { title: '参数值', dataIndex: 'val', key: 'index' },
     { title: '参数说明', dataIndex: 'code', key: 'index' },
-    { title: '参数描述', dataIndex: 'remark', key: 'status'},
+    { title: '参数描述', dataIndex: 'remark', key: 'index'},
+	{ title: '状态', dataIndex: 'status', key: 'index'},
     {
       title: '操作', dataIndex: 'key', render: (text, record) => (
         <Space size="middle">
@@ -181,6 +189,7 @@ function HospitalSet() {
                   showSearch
                       optionFilterProp="children"
 					  onSearch={onSearch}
+					  onFocus={onFocus}
 					  placeholder="全部"
                 >
                 {HospsetidList.map((item) => {