代码同步

src/baseComponents/EditBaseComponent/index.js

@@ -648,7 +648,6 @@ params【字段属性】=值
 
           const rulesMethod = [];
           if (isRequire) {
-            debugger
             if (!errVerifyMsg) {
               switch (col.controlType) {
                 case 25: errVerifyMsg = "请上传" + label

src/components/CustomPages/BS/BS042ShowPrint.js

@@ -286,6 +286,7 @@ class BS042ShowPrint extends React.Component {
                             <tr className={styles.PrintFormLightTh}>
                                 {/* <td>名称</td> */}
                                 <td>检查问题</td>
+                                <td>检查问题描述</td>
                                 <td style={{ minWidth: '80px' }}>隐患等级</td>
                                 <td>整改建议与措施</td>
                                 <td style={{ minWidth: '110px' }}>隐患地点</td>
@@ -302,7 +303,8 @@ class BS042ShowPrint extends React.Component {
                                 return <tr>
                                     {/* <td>{item.NAME}</td> */}
                                     {/* <td>{((item.ISBACK != null && item.ISBACK) ? "(返)" : "") + item.Nav_Question.DESCREPTION}</td> */}
-                                    <td>{((item.ISBACK != null && item.ISBACK) ? "(返)" : "") + item.DESCREPTION}</td>
+                                    <td>{((item.ISBACK != null && item.ISBACK) ? "(返)" : "") + item.CHECKCONTENT}</td>
+                                    <td>{item.DEMAND}</td>
                                     <td>{this.props.app.enums.BSQuestionLevelEnum.enums[item.QUESTION_LEVEL]}</td>
                                     <td>{item.DEMAND}</td>
                                     <td>{item.ADDRESS}</td>

src/components/CustomPages/BS/BS072ShowPrint.js

@@ -58,7 +58,7 @@ class BS072ShowPrint extends React.Component {
         this.props.dispatch({
             type: 'app/getDataByPost',
             payload: json,
-            url: 'BS/RiskSubmitContent/Get',
+            url: 'BS/BSRiskSubmitContent/GetDevlp',
             onComplete: (ret) => {
                 if (ret) {
                     this.setState({
@@ -88,6 +88,8 @@ class BS072ShowPrint extends React.Component {
                             <Descriptions.Item label="检查区域">{data.Nav_RiskArea.NAME}</Descriptions.Item>
                             <Descriptions.Item label="隐患地点">{data.ADDRESS}</Descriptions.Item>
                             <Descriptions.Item label="问题点描述">{data.DESCRIBE}</Descriptions.Item>
+                            <Descriptions.Item label="上报人">{data.CREATE_NAME}</Descriptions.Item>
+                            <Descriptions.Item label="检查时间">{data.CREATE_TIME}</Descriptions.Item>
                             <Descriptions.Item label="附件">{showFiles(data.Nav_Files, config.picServerHost)}</Descriptions.Item>
                         </Descriptions>
                     </div> : null