Merge branch 'dev' into test

src/components/BlockLossManage/index.js

@@ -144,8 +144,16 @@ function BlockLossManage() {
     const columns = [
         { title: '序号', dataIndex: 'index', render: (text, record, index) => (current - 1) * params.size + index + 1 },
         { title: '住院序号', dataIndex: 'behospitalCode', key: 'behospitalCode' },
-        { title: '文书编号', dataIndex: 'recId', key: 'recId' },
-        { title: '文书标题', dataIndex: 'recTitle', key: 'recTitle' },
+        {
+            title: '文书编号', dataIndex: 'recId', key: 'recId', render: (text, record) => {
+                return record.recId || '-';
+            }
+        },
+        {
+            title: '文书标题', dataIndex: 'recTitle', key: 'recTitle', render: (text, record) => {
+                return record.recTitle || '-';
+            }
+        },
         {
             title: '丢失原因', dataIndex: 'lossCause', key: 'lossCause', render: (text, record) => {
                 return record.lossCause ? record.lossCause.length > 15 ? <span title={record.lossCause}>{record.lossCause.substring(0, 15) + '...'}</span> : record.lossCause : '-';
@@ -223,7 +231,6 @@ function BlockLossManage() {
                             <Form.Item label="丢失类型" name="lossType">
                                 <Select
                                     placeholder="请选择"
-                                    allowClear
                                 >
                                     <Option value="" key={3}>全部</Option>
                                     <Option value="0" key={0}>文书丢失</Option>
@@ -236,7 +243,6 @@ function BlockLossManage() {
                             <Form.Item label="丢失途径" name="lossWay">
                                 <Select
                                     placeholder="请选择"
-                                    allowClear
                                 >
                                     <Option value="" key={2}>全部</Option>
                                     <Option value="0" key={0}>外部丢失</Option>
@@ -248,7 +254,6 @@ function BlockLossManage() {
                             <Form.Item label="核查结果" name="isAudited">
                                 <Select
                                     placeholder="请选择"
-                                    allowClear
                                 >
                                     <Option value="" key={3}>全部</Option>
                                     <Option value="0" key={0}>核查未通过</Option>
@@ -261,7 +266,6 @@ function BlockLossManage() {
                             <Form.Item label="状态" name="status">
                                 <Select
                                     placeholder="请选择"
-                                    allowClear
                                 >
                                     <Option value="" key={3}>全部</Option>
                                     <Option value="0" key={0}>已丢失</Option>

src/components/DiagManager/addDiag.js

@@ -90,25 +90,25 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
   //关闭新增/编辑弹窗
   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();
 	  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 (
 	  <Modal
 		  title={title}
@@ -195,18 +195,6 @@ function AddDiag({formData,matchChange,visible,cancel,onOk,title,termSType,termT
 		</div>
 		<p className='linked-term'>已关联标准术语：{(formData||{}).uniqueName}</p>
 	  </Form>
-		<Modal
-			maskClosable={false}
-			title="提示"
-			okText='确定'
-			cancelText='关闭'
-			width={400}
-			visible={unsaved}
-			onOk={unsavedOk}
-			onCancel={unsavedCancel}
-		>
-		  <p>当前数据未保存 是否确认关闭?</p>
-		</Modal>
 	  </Modal>
   );
 }

src/components/DrugManager/index.js

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