From 5f9e2686c2b3209f8bc77d63af1044202604f808 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Fri, 10 Oct 2025 16:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomPages/SK/SK002CheckList.js          | 43 +++++++++++--------
 src/files/edit/SK004.js                       | 11 +++--
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/components/CustomPages/SK/SK002CheckList.js b/src/components/CustomPages/SK/SK002CheckList.js
index cc218d0..3a839fe 100644
--- a/src/components/CustomPages/SK/SK002CheckList.js
+++ b/src/components/CustomPages/SK/SK002CheckList.js
@@ -13,6 +13,9 @@ class SK002CheckList extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
+          inputText:"",
+          productionId:null,
+          depart: {},
           selectedRowKeys:[],
           taskSelects: [],
             dataList: [],
@@ -96,6 +99,7 @@ class SK002CheckList extends React.Component {
     loadData = () => {
         let json = initFilter(this.props.login.OrgId);
         extendInclude(json, 'Nav_Details');
+        extendInclude(json, 'Nav_ProductionUnit');
         extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_Contents');
         extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailHiddens.Nav_Question');
         extendInclude(json, 'Nav_Details.Nav_DetailContents.Nav_DetailBasics.Nav_Law');
@@ -118,9 +122,9 @@ class SK002CheckList extends React.Component {
     loadData2()
     {
       let temp=this.state.data
-      if(this.state.inputText)
+      if(this.state.productionId)
       {
-        temp=temp.filter(t=>t.MineType ==this.state.inputText);
+        temp=temp.filter(t=>t.PRODUCTION_UNIT_ID ==this.state.productionId);
       }
       if(this.state.inputText2)
       {
@@ -176,11 +180,22 @@ class SK002CheckList extends React.Component {
           taskSelects:selectedRows
         });
       };
-      handleSearch=(value)=>{
+      // handleSearch=(value)=>{
+      //   this.setState({
+      //     inputText: value
+      //   })
+      // }
+       handleSearch = ({data, record}) => {
         this.setState({
-          inputText: value
+          depart: {
+            ...this.state.depart,
+            PRODUCTION_UNIT_ID: data[0],
+            Nav_ProductionUnit: { NAME: record?.NAME },
+          },
+          inputText: record?.NAME,
+          productionId: record?.ID 
         })
-      }
+      };
       handleSearch2=(e)=>{
         this.setState({
           inputText2: e.target.value
@@ -211,18 +226,12 @@ class SK002CheckList extends React.Component {
                   label={'生产单元'}
                   {...formItemLayout}
                 >
-                   <Select 
-                    style={{width:'180px'}}
-                    allowClear
-                    onChange={this.handleSearch}
-                    >
-                        <Option value="30">露天矿</Option>
-      <Option value="10">选矿厂</Option>
-      <Option value="20">尾矿库</Option>
-      <Option value="31">职能口</Option>
-      <Option value="32">非金属</Option>
-      <Option value="40">地下矿</Option>
-                    </Select>
+                   <DropDownPagination inputDataApi={'FM/UserProductionUnitSet/OrderPaged'} fieldName={'Nav_ProductionUnit.NAME'}
+                    data={this.state.depart} onSelect={this.handleSearch} onFilter={({ params }) => {
+                      params.OrderType = 1
+                    //   params.Keyword = this.state.inputText3
+                      params.OrgId =  this.props.login.OrgId
+                    }} />
                 </Form.Item>
            </Col>
           <Col span={5} style={{ marginLeft: "10px" }}> 
diff --git a/src/files/edit/SK004.js b/src/files/edit/SK004.js
index e9661a3..f55e92f 100644
--- a/src/files/edit/SK004.js
+++ b/src/files/edit/SK004.js
@@ -517,6 +517,8 @@ export default {
     if(login.tempAddData)
      {
       stateData.MineType = login.tempAddData.MineType
+      stateData.PRODUCTION_UNIT_ID = login.tempAddData.PRODUCTION_UNIT_ID
+      stateData.Nav_ProductionUnit = login.tempAddData.Nav_ProductionUnit
       stateData.RISK_NAME = login.tempAddData.RISK_NAME
       stateData.RISK_DESCRIPTION = login.tempAddData.RISK_DESCRIPTION
       stateData.TYPE_ID = login.tempAddData.TYPE_ID
@@ -600,13 +602,14 @@ export default {
       if(login.tempAddData.Nav_Details)
       {
         let details=[]
-        login.tempAddData.Nav_Details.map((item,k)=>{
+        login.tempAddData.Nav_Details.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((item,k)=>{
         let contents=[]
-        item.Nav_DetailContents && item.Nav_DetailContents.map((x,j)=>{
+        item.Nav_DetailContents && item.Nav_DetailContents.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((x,j)=>{
           let hiddens=[]
-          x.Nav_DetailHiddens && x.Nav_DetailHiddens.map((y,i)=>{
+          x.Nav_DetailHiddens && x.Nav_DetailHiddens.sort((m, n) => (m.NUM > n.NUM ? 1 : -1)).map((y,i)=>{
             let hidden={
               ID: guid(),
+              NUM:y.NUM,
               RECTIFICATION_MEASURES :y.RECTIFICATION_MEASURES,
               HIDDEN_LEVEL :y.HIDDEN_LEVEL,
               HIDDEN_DESCRIPTION :y.HIDDEN_DESCRIPTION,
@@ -626,6 +629,7 @@ export default {
           })
           let content={
             ID: guid(),
+            NUM:x.NUM,
             CHECK_STANDARD :x.CHECK_STANDARD,
             CHECK_CONTENTS_ID:x.CHECK_CONTENTS_ID,
             Nav_Contents:x.Nav_Contents,
@@ -636,6 +640,7 @@ export default {
         })
         let detail={
           ID: guid(),
+          NUM:item.NUM,
           MEASURES_NAME:item.MEASURES_NAME,
           Nav_DetailContents:contents
         }