Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe_web

src/components/CustomPages/SK/SK002CheckList.js

@@ -76,7 +76,27 @@ class SK002CheckList extends React.Component {
                 dataIndex: "DEPARTMENT_TYPE",
                 key: "DEPARTMENT_TYPE",
                 render: (text, record, index) => {
+                  if(record.DEPARTMENT_TYPE.includes('_'))
+                  {
+                    let departTypeLists=[]
+                    let departTypes=record.DEPARTMENT_TYPE.split('_')
+                    if(departTypes.length>0)
+                    {
+                      for(let i=0;i<departTypes.length;i++)
+                      {
+                        if(departTypes[i])
+                        {
+                          let type=this.props.app.enums.SKDepartmentTypeEnum.enums[departTypes[i]]
+                          departTypeLists.push("  "+type)
+                        }
+                      }
+                    }
+                    return <label>{departTypeLists}</label>
+                  }
+                   else
+                   {
                     return <label>{this.props.app.enums.SKDepartmentTypeEnum.enums[record.DEPARTMENT_TYPE]}</label>
+                   }
                   }
               },
             ],
@@ -221,7 +241,7 @@ class SK002CheckList extends React.Component {
             <div>
                 <h1 style={{ textAlign: 'center', margin: '15px' }}>基础库</h1>
             <br></br>
-            <Row style={{width:"1250px",margin:"auto"}}>
+            <Row style={{width:"100%",margin:"auto"}}>
           <Col span={5}>
           <Form.Item
                   label={'生产单元'}
@@ -250,12 +270,12 @@ class SK002CheckList extends React.Component {
           <Col span={1} style={{ marginLeft: "20px" }}><Button type='primary' onClick={() => this.loadData2()}>查询</Button></Col>
           </Row>
           <br></br>
-          <div style={{ width:"1250px",margin:"auto",alignContent:"left"}}>
+          <div style={{ width:"100%",margin:"auto",alignContent:"left"}}>
                 <Button type='primary' onClick={() => this.closeTasks()} icon="export">导入</Button>
             </div>
             <br></br>
               {this.state.dataList?
-               <Table style={{ width:"1250px",margin:"auto",alignContent:"center",backgroundColor:"white"}}
+               <Table style={{ width:"100%",margin:"auto",alignContent:"center",backgroundColor:"white"}}
                dataSource={this.state.dataList}
                columns={this.state.columns}
                rowSelection={rowSelection}

src/files/edit/SK004.js

@@ -539,19 +539,19 @@ export default {
         {
           let temp3={
             ID: guid(),
-            DEPARTMENT_TYPE:3,
+            DEPARTMENT_TYPE:5,
           }
           let temp={
             ID: guid(),
-            DEPARTMENT_TYPE:0,
+            DEPARTMENT_TYPE:10,
           }
           let temp1={
             ID: guid(),
-            DEPARTMENT_TYPE:1,
+            DEPARTMENT_TYPE:15,
           }
           let temp2={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp3);
           departs.push(temp);
@@ -562,15 +562,15 @@ export default {
         {
           let temp={
             ID: guid(),
-            DEPARTMENT_TYPE:0,
+            DEPARTMENT_TYPE:10,
           }
           let temp1={
             ID: guid(),
-            DEPARTMENT_TYPE:1,
+            DEPARTMENT_TYPE:15,
           }
           let temp2={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp);
           departs.push(temp1);
@@ -580,11 +580,11 @@ export default {
         {
           let temp1={
             ID: guid(),
-            DEPARTMENT_TYPE:1,
+            DEPARTMENT_TYPE:15,
           }
           let temp2={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp1);
           departs.push(temp2);
@@ -593,12 +593,12 @@ export default {
         {
           let temp={
             ID: guid(),
-            DEPARTMENT_TYPE:2,
+            DEPARTMENT_TYPE:20,
           }
           departs.push(temp);
         }
       }
-      stateData.Nav_Departs = departs
+      // stateData.Nav_Departs = departs
       if(login.tempAddData.Nav_Details)
       {
         let details=[]
@@ -658,6 +658,11 @@ export default {
     if(stateData)
     {
       let temps=[]
+    if(!stateData.PRODUCTION_UNIT_ID)
+    {
+        message.error("请先选择生产单元！");
+        return;
+    }
     if(!stateData.Nav_Departs)
     {
         message.error("请先填写管控层级！");