Merge branch 'dev' into test

src/api/request.js

@@ -138,6 +138,7 @@ const request = {
     addRegular:'/daqe-center/regularManage/addRegular',//新增正则
     upRegularById:'/daqe-center/regularManage/upRegularById',//修改正则
     delRegularById:'/daqe-center/regularManage/delRegularById',//删除正则
+    isRelation:'/daqe-center/regularManage/isRelation',//判断正则是否关联
     
 }
 

src/components/DiagManager/addDiag.js

@@ -84,7 +84,6 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
 	  }
 	  console.log(param)
 	  onOk(param)
-	  form.resetFields();
 	})
   }
   //关闭新增/编辑弹窗

src/components/DiagManager/index.js

@@ -43,7 +43,9 @@ function DiagManager() {
     setTitle(name);
     if (flag1 === 1) {
       setFormData({
-        status: 1
+        status: 1,
+		uniqueName:'',
+		hisName:''
       })
     }else if (flag1 === 3) {
       console.log(33,Diagrow)

src/components/DrugManager/index.js

@@ -43,7 +43,10 @@ function DrugManager() {
 	setFlag(flag1)
 	if (flag1 === 1) {
 	  setFormData({
-		status: 1
+		status: 1,
+		hisName:'',
+		uniqueName:'',
+		form:''
 	  })
 	}else if (flag1 === 3) {
 	  console.log(33,Drugrow)

src/components/RegularManage/index.js

@@ -50,6 +50,19 @@ function RegularManage() {
             }
         })
     }
+    //判断正则是否关联
+    function isRelation(param) {
+        post(api.isRelation, {
+            id: param.id,
+            name: param.name,
+            val: param.val,
+        }).then((res) => {
+            if (res.data.code === 200) {
+                const data = res.data.data;
+                setFlag(data ? 1 : 0)
+            }
+        })
+    }
     //删除弹窗确认
     function showDelModal(flag) {
         if (flag && !selectedRowKeys.length) {
@@ -74,7 +87,7 @@ function RegularManage() {
                 //避免pagenum变为0
                 params.current = pagenum < 1 ? 1 : pagenum;
                 setParams(params)
-                console.log(params.current );
+                console.log(params.current);
                 getRegularPage()
                 message.success(res.data.message);
             } else {
@@ -92,7 +105,7 @@ function RegularManage() {
         setRegularDetail(record)
         setFlag(0)
         if (type == 2) {
-            setFlag(record.relation)
+            isRelation(record)
         }
     }
     function cancel() {

src/components/SurgeryManager/index.js

@@ -43,7 +43,9 @@ function SurgManager() {
 	setTitle(name);console.log(flag)
 	if (flag1 === 1) {
 	  setFormData({
-		status: 1
+		status: 1,
+		uniqueName:'',
+		hisName:''
 	  })
 	}else if (flag1 === 3) {
 	  console.log(33,Surgrow)