Merge branch 'dev' of http://192.168.2.236:10080/zhouna/ai-admin into dev

src/components/BlockLossManage/index.js

@@ -111,7 +111,7 @@ function BlockLossManage() {
         if (value.startDate > value.endDate) {
             message.warning('开始时间不能大于结束时间');
             return
-        } else if(getDaysBetween(value.startDate, value.endDate)>365){
+        } else if (getDaysBetween(value.startDate, value.endDate) > 364) {
             message.warning('开始时间与结束时间相差不能超过一年');
             return
         }

src/components/FieldProblem/editProblem.js

@@ -206,7 +206,7 @@ function EditBlock(props) {
                         name="status"
                         label="状态"
                     >
-                        <span>{initialValues.isSolved == 1 ? "已解决" : "未解决"}</span>
+                        <span>{initialValues.isSolved == 1 ? "已处理" : "未处理"}</span>
 
                     </Form.Item>
                 </Col>

src/components/FieldProblem/index.js

@@ -124,7 +124,7 @@ function FieldProblem() {
         if (value.behospitalStartDate > value.behospitalEndDate) {
             message.warning('开始时间不能大于结束时间');
             return
-        } else if(getDaysBetween(value.behospitalStartDate, value.behospitalEndDate)>365){
+        } else if (getDaysBetween(value.behospitalStartDate, value.behospitalEndDate) > 364) {
             message.warning('开始时间与结束时间相差不能超过一年');
             return
         }

src/components/FieldRules/addRules.js

@@ -323,7 +323,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={(value, option) => tablechange(i, value, option, 1)} onSearch={cnameSearch} style={{ width: 160 }} placeholder="请选择">
+                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option, 1)} onSearch={cnameSearch} style={{ width: 160 }} placeholder="请选择" disabled={type ==2}>
                                                     {tableList.map((item) => {
                                                         return (
                                                             <Option value={item.tableCname} val={item.tableEname} key={item.index}>{item.tableCname}</Option>
@@ -332,7 +332,7 @@ function ContentForm(props) {
                                                 </Select>
                                             </Form.Item>
                                             <Form.Item label="表名称（英文）" rules={[{ required: true }]} name={['columnList', i, 'tableEname']} labelAlign="right">
-                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option, 2)} onSearch={enameSearch} style={{ width: 160 }} placeholder="请选择" >
+                                                <Select allowClear showSearch onChange={(value, option) => tablechange(i, value, option, 2)} onSearch={enameSearch} style={{ width: 160 }} placeholder="请选择" disabled={type ==2}>
                                                     {tableList.map((item) => {
                                                         return (
                                                             <Option value={item.tableEname} val={item.tableCname} key={item.index}>{item.tableEname}</Option>
@@ -343,7 +343,7 @@ function ContentForm(props) {
                                         </div>
                                         <div className='item-box'>
                                             <Form.Item label="字段名称（中文）" rules={[{ required: true }]} style={{ width: '50%' }} name={['columnList', i, 'columnCname']} labelAlign="right">
-                                                <Select allowClear showSearch onChange={(value, option) => colchange(i, value, option, 1)} onSearch={colmeSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i]}>
+                                                <Select allowClear showSearch onChange={(value, option) => colchange(i, value, option, 1)} onSearch={colmeSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i] || type == 2}>
                                                     {colList[i].map((item) => {
                                                         return (
                                                             <Option value={item.columnCname} val={item.columnEname} key={item.id} index={i}>{item.columnCname}</Option>
@@ -352,7 +352,7 @@ function ContentForm(props) {
                                                 </Select>
                                             </Form.Item>
                                             <Form.Item label="字段名称（英文）" rules={[{ required: true }]} name={['columnList', i, 'columnEname']} labelAlign="right">
-                                                <Select allowClear showSearch onChange={(value, option) => colchange(i, value, option, 2)} onSearch={coleneSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i]}>
+                                                <Select allowClear showSearch onChange={(value, option) => colchange(i, value, option, 2)} onSearch={coleneSearch} style={{ width: 160 }} placeholder="请选择" disabled={disable[i] || type == 2}>
                                                     {colList[i].map((item) => {
                                                         return (
                                                             <Option value={item.columnEname} val={item.columnCname} key={item.id} index={i}>{item.columnEname}</Option>
@@ -365,7 +365,7 @@ function ContentForm(props) {
                                             </Form.Item>
                                         </div>
                                     </div>
-                                    <img onClick={() => modifyData(i)} src={i == 0 ? add : del} />
+                                    <img onClick={() => modifyData(i)} src={i == 0 ? add : del} hidden={type == 2} />
                                 </div>
 
                             )