莫凡 vor 3 Jahren
Ursprung
Commit
670a8225b2
2 geänderte Dateien mit 15 neuen und 27 gelöschten Zeilen
  1. 14 26
      src/components/DiagManager/addDiag.js
  2. 1 1
      src/components/DrugManager/index.js

+ 14 - 26
src/components/DiagManager/addDiag.js

@@ -90,25 +90,25 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
   //关闭新增/编辑弹窗
   //关闭新增/编辑弹窗
   function saveCancel(){
   function saveCancel(){
     //有未保存修改时弹窗提醒
     //有未保存修改时弹窗提醒
-	const newFormData = form.getFieldsValue();
-    const isChange = newFormData.hisName!==formData.hisName||newFormData.conceptId!==formData.conceptId;//form.isFieldsTouched(['hisName','conceptId']);
-    if(isChange){
-	  setUnsaved(true);
-	}else{
+	// const newFormData = form.getFieldsValue();
+ //    const isChange = newFormData.hisName!==formData.hisName||newFormData.conceptId!==formData.conceptId;//form.isFieldsTouched(['hisName','conceptId']);
+ //    if(isChange){
+	//   setUnsaved(true);
+	// }else{
 	  cancel();
 	  cancel();
 	  form.resetFields();	//清空表单值
 	  form.resetFields();	//清空表单值
-	}
+	// }
   }
   }
   //不保存当前修改,退出弹窗
   //不保存当前修改,退出弹窗
-  function unsavedOk() {
-	setUnsaved(false);
-	cancel();	//关闭新增/修改弹窗
-	form.resetFields();	//清空表单值
-  }
+ //  function unsavedOk() {
+	// setUnsaved(false);
+	// cancel();	//关闭新增/修改弹窗
+	// form.resetFields();	//清空表单值
+ //  }
   //未保存提醒弹窗关闭
   //未保存提醒弹窗关闭
-  function unsavedCancel() {
-	setUnsaved(false)
-  }
+ //  function unsavedCancel() {
+	// setUnsaved(false)
+ //  }
   return (
   return (
 	  <Modal
 	  <Modal
 		  title={title}
 		  title={title}
@@ -195,18 +195,6 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
 		</div>
 		</div>
 		<p className='linked-term'>已关联标准术语:{(formData||{}).uniqueName}</p>
 		<p className='linked-term'>已关联标准术语:{(formData||{}).uniqueName}</p>
 	  </Form>
 	  </Form>
-		<Modal
-			maskClosable={false}
-			title="提示"
-			okText='确定'
-			cancelText='关闭'
-			width={400}
-			visible={unsaved}
-			onOk={unsavedOk}
-			onCancel={unsavedCancel}
-		>
-		  <p>当前数据未保存 是否确认关闭?</p>
-		</Modal>
 	  </Modal>
 	  </Modal>
   );
   );
 }
 }

+ 1 - 1
src/components/DrugManager/index.js

@@ -40,7 +40,7 @@ function DrugManager() {
 	setVisible(true);
 	setVisible(true);
 	setTitle(name);
 	setTitle(name);
 	setFlag(flag1)
 	setFlag(flag1)
-	if (flag === 1) {
+	if (flag1 === 1) {
 	  setFormData({
 	  setFormData({
 		status: 1
 		status: 1
 	  })
 	  })