From 40671eb79c1805f661fd0e12061dd1b406af9b15 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 17:10:58 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss

---
 fzzy-igdss-web/src/main/resources/templates/work/flow-his.html                        |    6 
 fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml                        |    2 
 fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js                  |   95 +++++++++++++++
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml                   |  109 +++++++++---------
 fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java |    8 +
 fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java               |    2 
 fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js              |  101 ++++++++++++++++
 fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java              |    2 
 8 files changed, 267 insertions(+), 58 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index dcc468f..cfa1be9 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -99,14 +99,13 @@
         <Property name="label">瀹屾垚鏁伴噺</Property>
         <Property name="displayFormat">#0.0 KG</Property>
       </PropertyDef>
-      <PropertyDef name="auditStatus">
+      <PropertyDef name="auditUser">
         <Property></Property>
-        <Property name="label">瀹℃牳鐘舵��</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerStatusType&quot;).getResult()}</Property>
-          <Property name="keyProperty">dictValue</Property>
-          <Property name="valueProperty">dictLabel</Property>
-        </Property>
+        <Property name="label">瀹℃牳浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="auditDate">
+        <Property name="dataType">DateTime</Property>
+        <Property name="label">瀹℃壒鏃堕棿</Property>
       </PropertyDef>
       <PropertyDef name="completeStatus">
         <Property></Property>
@@ -161,6 +160,30 @@
           <Property name="valueProperty">name</Property>
         </Property>
         <Property name="visible">true</Property>
+      </PropertyDef>
+      <PropertyDef name="auditStatus">
+        <Property></Property>
+        <Property name="label">瀹℃牳鐘舵��</Property>
+        <Property name="mapping">
+          <Property name="mapValues">
+            <Collection>
+              <Entity>
+                <Property name="name">鐩戠瀹℃牳</Property>
+                <Property name="code">10</Property>
+              </Entity>
+              <Entity>
+                <Property name="name">閾惰瀹℃牳</Property>
+                <Property name="code">20</Property>
+              </Entity>
+              <Entity>
+                <Property name="name">宸插鏍�</Property>
+                <Property name="code">30</Property>
+              </Entity>
+            </Collection>
+          </Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
       </PropertyDef>
     </DataType>
   </Model>
@@ -299,7 +322,6 @@
           <Property name="iconClass">fa fa-refresh</Property>
           <Property name="width">100</Property>
           <Property name="tip">瀹屾垚閲忛粯璁ょ粺璁″埌鏄ㄥぉ锛屾煡鐪嬪疄鏃跺畬鎴愰噺璇风偣鍑烩�滃疄鏃舵牳绠椻�濇寜閽�</Property>
-          <Property name="ignored">true</Property>
         </ToolBarButton>
         <ToolBarButton layoutConstraint="left">
           <ClientEvent name="onClick">&#xD;
@@ -315,20 +337,6 @@
           <Property name="exClassName">btn2</Property>
           <Property name="width">120</Property>
           <Property name="iconClass">fa fa-print</Property>
-        </ToolBarButton>
-        <Separator/>
-        <ToolBarButton layoutConstraint="left">
-          <ClientEvent name="onClick">var select = view.get(&quot;#dataGridMain&quot;).get(&quot;selection&quot;);&#xD;
-if(select){&#xD;
-	view.get(&quot;#iFrameFlowHis&quot;).set(&quot;path&quot;,&quot;/work/flow-his2?businessId=&quot;+select.get(&quot;id&quot;));&#xD;
-	view.get(&quot;#dialogHis&quot;).show();&#xD;
-}else{&#xD;
-	$notify(&quot;璇烽�夋嫨闇�瑕佹煡鐪嬬殑鏁版嵁鈥︹��&quot;);&#xD;
-}</ClientEvent>
-          <Property name="caption">瀹℃壒璁板綍</Property>
-          <Property name="exClassName">btn4</Property>
-          <Property name="iconClass">fa fa-th-list</Property>
-          <Property name="width">120</Property>
         </ToolBarButton>
         <Fill/>
       </ToolBar>
@@ -384,10 +392,11 @@
           <Property name="align">center</Property>
           <Property name="width">100</Property>
         </DataColumn>
-        <DataColumn name="auditStatus">
-          <Property name="property">auditStatus</Property>
-          <Property name="width">100</Property>
+        <DataColumn>
+          <Property name="property">updateBy</Property>
           <Property name="align">center</Property>
+          <Property name="name">updateBy</Property>
+          <Property name="width">120</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">createTime</Property>
@@ -412,10 +421,7 @@
       <Property name="iconClass">fa fa-tasks</Property>
       <Buttons>
         <Button id="btnOk">
-          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-data.set('unitName',data.getText('deptId'));&#xD;
-&#xD;
-view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
+          <ClientEvent name="onClick">view.get(&quot;#updateSave&quot;).execute(function(result){&#xD;
 	if(result.code != '200'){&#xD;
 		$alert(result.message);&#xD;
 		return;&#xD;
@@ -479,7 +485,6 @@
               <Property name="property">type</Property>
               <Property name="trigger">autoMappingDropDown1</Property>
               <Property name="editorType">RadioGroup</Property>
-              <Property name="showHint">false</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement id="formItemBank">
@@ -510,13 +515,7 @@
               <Property name="trigger">defaultYearDropDown</Property>
               <Editor/>
             </AutoFormElement>
-            <AutoFormElement>
-              <Property name="name">createTime</Property>
-              <Property name="property">createTime</Property>
-              <Property name="readOnly">true</Property>
-              <Editor/>
-            </AutoFormElement>
-            <AutoFormElement>
+            <AutoFormElement layoutConstraint="colSpan:2">
               <Property name="name">customerName</Property>
               <Property name="property">customerName</Property>
               <Editor/>
@@ -528,6 +527,11 @@
               <Editor/>
             </AutoFormElement>
             <AutoFormElement>
+              <Property name="name">unitName</Property>
+              <Property name="property">unitName</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
               <Property name="name">createBy</Property>
               <Property name="property">createBy</Property>
               <Editor/>
@@ -535,7 +539,6 @@
             <AutoFormElement>
               <Property name="name">createTime</Property>
               <Property name="property">createTime</Property>
-              <Property name="readOnly">true</Property>
               <Editor/>
             </AutoFormElement>
             <AutoFormElement layoutConstraint="colSpan:3">
@@ -578,10 +581,21 @@
               <Property name="readOnly">true</Property>
               <Editor/>
             </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">auditUser</Property>
+              <Property name="property">auditUser</Property>
+              <Property name="readOnly">true</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">auditDate</Property>
+              <Property name="property">auditDate</Property>
+              <Property name="readOnly">true</Property>
+              <Editor/>
+            </AutoFormElement>
             <HtmlContainer layoutConstraint="colSpan:3">
-              <Property name="content">1.鍏ュ簱閫氱煡鍗曚綔涓哄叆搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�&lt;br>&#xD;
-2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��&lt;br>&#xD;
-3.鍗曟嵁绫诲瀷=璐ㄦ娂鐩戠閫氱煡鍗曪紝鍗曟嵁蹇呴』濉啓鐩戠潱閾惰銆�</Property>
+              <Property name="content">1.鍑哄簱閫氱煡鍗曚綔涓哄嚭搴撲綔涓氱殑鍓嶇疆鏉′欢锛屽繀椤婚厤缃紝鍚﹀垯鏃犳硶杩涜鍏ュ簱浣滀笟銆�&lt;br>&#xD;
+                2.鍗曟嵁绫诲瀷=搴撳尯閫氱煡鍗曪紝琛ㄧず搴撳尯鑷繁浣滀笟涓氬姟锛屼笉鍙楃洃绠＄鐞嗐��</Property>
               <Property name="exClassName">h-tip</Property>
               <Property name="contentOverflow">hidden</Property>
             </HtmlContainer>
@@ -632,18 +646,5 @@
     <AjaxAction id="recalculate">
       <Property name="service">inoutNoticePR#updateSumNoticeOut</Property>
     </AjaxAction>
-    <Dialog id="dialogHis">
-      <Property name="width">80%</Property>
-      <Property name="height">80%</Property>
-      <Property name="iconClass">fa fa-th-list</Property>
-      <Property name="caption">瀹℃壒璁板綍</Property>
-      <Buttons/>
-      <Children>
-        <IFrame id="iFrameFlowHis">
-          <Property name="path">/work/flow-his?businessId=1</Property>
-        </IFrame>
-      </Children>
-      <Tools/>
-    </Dialog>
   </View>
 </ViewConfig>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
index f1db648..139eed1 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrder.view.xml
@@ -484,7 +484,7 @@
               <DataColumn>
                 <ClientEvent name="onRenderCell">renderCell1(arg,self);</ClientEvent>
                 <Property name="caption">鎿嶄綔</Property>
-                <Property name="width">80</Property>
+                <Property name="width">160</Property>
                 <Property name="align">center</Property>
                 <Editor/>
               </DataColumn>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
index 257f8ca..9001e05 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/EventInfoController.java
@@ -66,7 +66,7 @@
         //璁惧鏁版嵁
         model.addAttribute("cameraList", commonManager.listCameraData());
         //搴撳尯鏁版嵁
-        model.addAttribute("deptList", commonManager.listDeptData(null));
+        model.addAttribute("deptList", commonManager.listDeptData(defaultCompany));
         //涓氬姟绫诲瀷鏁版嵁
         List<Map<String, String>> bizTypeList = new ArrayList<>();
         for (WarnType type : WarnType.values()) {
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
index a3d2368..55e9c3d 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/security/SnapRecordController.java
@@ -59,7 +59,7 @@
         //璁惧鏁版嵁
         model.addAttribute("cameraList", commonManager.listCameraData());
         //搴撳尯鏁版嵁
-        model.addAttribute("deptList", commonManager.listDeptData(null));
+        model.addAttribute("deptList", commonManager.listDeptData(defaultCompany));
         //鍏徃鏁版嵁
         model.addAttribute("companyList", companies);
         //榛樿鏌ヨ鍏徃鏁版嵁
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
index 021df88..f055c6f 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/sys/controller/system/SysDeptNewController.java
@@ -1,6 +1,7 @@
 package com.fzzy.sys.controller.system;
 
 import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.domain.Dept;
 import com.fzzy.igds.service.CoreCompanyService;
 import com.fzzy.igds.service.CoreDeptService;
 import com.ruoyi.common.annotation.Log;
@@ -52,6 +53,13 @@
         return deptList;
     }
 
+    @PostMapping("/getDeptByUserType")
+    @ResponseBody
+    public List<Dept> getDeptByUserType(@RequestBody String parentId) {
+        List<Dept> deptByUserType = coreDeptService.getDeptByUserType(parentId);
+        return deptByUserType;
+    }
+
     /**
      * 鏂板閮ㄩ棬
      */
diff --git a/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js b/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
index de824b8..029e3cd 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/eventInfo/eventInfo.js
@@ -1,6 +1,41 @@
 var layer;
 var laypage;
 
+// 鐩戝惉鏀跺偍鍏徃 Select2 鍙樺寲
+$(document).ready(function() {
+    // 鐩戝惉鏀跺偍鍏徃涓嬫媺妗嗗彉鍖�
+    $('select[name="key"]').on('change', function() {
+        var selectedParentId = $(this).val();
+        if(selectedParentId) {
+            getSelectData(selectedParentId);
+        } else {
+            // 濡傛灉娓呯┖浜嗘敹鍌ㄥ叕鍙搁�夋嫨锛屼篃娓呯┖搴撳尯閫夐」
+            var $deptSelect = $('select[name="deptId"]');
+            $deptSelect.empty()
+                .append('<option value="">鎵�鏈�</option>')
+                .select2({
+                    placeholder: "璇烽�夋嫨搴撳尯",
+                    allowClear: true,
+                    width: 'resolve'
+                });
+        }
+    });
+
+    // 鍦ㄧ偣鍑诲簱鍖轰笅鎷夋鏃讹紝浠呴獙璇佽�屼笉鍙戣捣鏂拌姹�
+    $('select[name="deptId"]').on('select2:opening', function(e) {
+        var selectedParentId = $('select[name="key"]').val();
+        if(!selectedParentId) {
+            e.preventDefault();
+            layer.msg('璇峰厛閫夋嫨鏀跺偍鍏徃');
+            return false;
+        }
+
+        // 涓嶅湪姝ゅ鍙戣捣璇锋眰锛屼緷璧� change 浜嬩欢鏃剁殑棰勫姞杞�
+        return true;
+    });
+});
+
+
 $(function () {
     // 鍒濆鍖栧垎椤�
     layui.use(['laypage', 'layer'], function () {
@@ -15,6 +50,72 @@
     initImagePreview();
 });
 
+
+
+
+// 淇敼 getSelectData 鍑芥暟锛屾敮鎸� Select2 鐨勬暟鎹牸寮�
+function getSelectData(parentId) {
+    if(!parentId) {
+        return layer.msg('璇烽�夋嫨鏀跺偍鍏徃');
+    }
+
+    $.ajax({
+        url: "../../system/dept-new/getDeptByUserType",
+        type: 'POST',
+        dataType: "json",
+        contentType: "application/json;charset=UTF-8",
+        data: parentId,
+        success: function (response) {
+            if (response) {
+                deptList = response;
+                // 閲嶆柊鍒濆鍖� Select2 鎴栨洿鏂伴�夐」
+                updateDeptSelect2Options(deptList);
+            } else {
+                layer.msg(response.msg || '鏁版嵁鍔犺浇澶辫触');
+            }
+        },
+        error: function (xhr, status, error) {
+            layer.msg('鏁版嵁鍔犺浇澶辫触');
+        }
+    });
+}
+
+// 鏇存柊 Select2 涓嬫媺妗嗛�夐」
+function updateDeptSelect2Options(deptList) {
+    var $deptSelect = $('select[name="deptId"]');
+
+    // 淇濆瓨褰撳墠閫変腑鐨勫��
+    var currentVal = $deptSelect.val();
+
+    // 娓呯┖鐜版湁閫夐」
+    $deptSelect.empty();
+
+    // 娣诲姞"鎵�鏈�"閫夐」
+    $deptSelect.append('<option value="">鎵�鏈�</option>');
+
+    // 娣诲姞鍔ㄦ�佹暟鎹�夐」
+    if(deptList && deptList.length > 0) {
+        deptList.forEach(function(dept) {
+            $deptSelect.append('<option value="' + dept.id + '">' + dept.kqmc + '</option>');
+        });
+    }
+
+    // 閲嶆柊鍒濆鍖� Select2
+    $deptSelect.select2({
+        placeholder: "璇烽�夋嫨搴撳尯",
+        allowClear: true,
+        width: 'resolve'
+    });
+
+    // 鎭㈠涔嬪墠鐨勯�夋嫨
+    if(currentVal) {
+        $deptSelect.val(currentVal).trigger('change');
+    }
+}
+
+
+
+
 /**
  * 鍒濆鍖栧垎椤电粍浠�
  */
diff --git a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
index a06b09a..25cf58b 100644
--- a/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
+++ b/fzzy-igdss-web/src/main/resources/static/security/snap/snapRecord.js
@@ -1,6 +1,40 @@
 var layer;
 var laypage;
 
+// 鐩戝惉鏀跺偍鍏徃 Select2 鍙樺寲
+$(document).ready(function() {
+    // 鐩戝惉鏀跺偍鍏徃涓嬫媺妗嗗彉鍖�
+    $('select[name="key"]').on('change', function() {
+        var selectedParentId = $(this).val();
+        if(selectedParentId) {
+            getSelectData(selectedParentId);
+        } else {
+            // 濡傛灉娓呯┖浜嗘敹鍌ㄥ叕鍙搁�夋嫨锛屼篃娓呯┖搴撳尯閫夐」
+            var $deptSelect = $('select[name="deptId"]');
+            $deptSelect.empty()
+                .append('<option value="">鎵�鏈�</option>')
+                .select2({
+                    placeholder: "璇烽�夋嫨搴撳尯",
+                    allowClear: true,
+                    width: 'resolve'
+                });
+        }
+    });
+
+    // 鍦ㄧ偣鍑诲簱鍖轰笅鎷夋鏃讹紝浠呴獙璇佽�屼笉鍙戣捣鏂拌姹�
+    $('select[name="deptId"]').on('select2:opening', function(e) {
+        var selectedParentId = $('select[name="key"]').val();
+        if(!selectedParentId) {
+            e.preventDefault();
+            layer.msg('璇峰厛閫夋嫨鏀跺偍鍏徃');
+            return false;
+        }
+
+        // 涓嶅湪姝ゅ鍙戣捣璇锋眰锛屼緷璧� change 浜嬩欢鏃剁殑棰勫姞杞�
+        return true;
+    });
+});
+
 $(function () {
     // 鍒濆鍖栧垎椤�
     layui.use(['laypage', 'layer'], function () {
@@ -15,6 +49,67 @@
     initImagePreview();
 });
 
+
+// 淇敼 getSelectData 鍑芥暟锛屾敮鎸� Select2 鐨勬暟鎹牸寮�
+function getSelectData(parentId) {
+    if(!parentId) {
+        return layer.msg('璇烽�夋嫨鏀跺偍鍏徃');
+    }
+
+    $.ajax({
+        url: "../../system/dept-new/getDeptByUserType",
+        type: 'POST',
+        dataType: "json",
+        contentType: "application/json;charset=UTF-8",
+        data: parentId,
+        success: function (response) {
+            if (response) {
+                deptList = response;
+                // 閲嶆柊鍒濆鍖� Select2 鎴栨洿鏂伴�夐」
+                updateDeptSelect2Options(deptList);
+            } else {
+                layer.msg(response.msg || '鏁版嵁鍔犺浇澶辫触');
+            }
+        },
+        error: function (xhr, status, error) {
+            layer.msg('鏁版嵁鍔犺浇澶辫触');
+        }
+    });
+}
+
+// 鏇存柊 Select2 涓嬫媺妗嗛�夐」
+function updateDeptSelect2Options(deptList) {
+    var $deptSelect = $('select[name="deptId"]');
+
+    // 淇濆瓨褰撳墠閫変腑鐨勫��
+    var currentVal = $deptSelect.val();
+
+    // 娓呯┖鐜版湁閫夐」
+    $deptSelect.empty();
+
+    // 娣诲姞"鎵�鏈�"閫夐」
+    $deptSelect.append('<option value="">鎵�鏈�</option>');
+
+    // 娣诲姞鍔ㄦ�佹暟鎹�夐」
+    if(deptList && deptList.length > 0) {
+        deptList.forEach(function(dept) {
+            $deptSelect.append('<option value="' + dept.id + '">' + dept.kqmc + '</option>');
+        });
+    }
+
+    // 閲嶆柊鍒濆鍖� Select2
+    $deptSelect.select2({
+        placeholder: "璇烽�夋嫨搴撳尯",
+        allowClear: true,
+        width: 'resolve'
+    });
+
+    // 鎭㈠涔嬪墠鐨勯�夋嫨
+    if(currentVal) {
+        $deptSelect.val(currentVal).trigger('change');
+    }
+}
+
 /**
  * 鍒濆鍖栧垎椤电粍浠�
  */
diff --git a/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html b/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
index 0403f6b..0aa99e2 100644
--- a/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
+++ b/fzzy-igdss-web/src/main/resources/templates/work/flow-his.html
@@ -298,7 +298,11 @@
                 htm += ' 瀹℃壒鍔ㄤ綔锛�'+item.action;
                 htm += ' 缁忓姙浜猴細'+item.assigneeName;
                 htm += '</div>';
-                htm += '<div class="status-change">' + item.remark + '</div>';
+                if(item.remark){
+                    htm += '<div class="status-change">' + item.remark + '</div>';
+                }else{
+                    htm += '<div class="status-change">' + '' + '</div>';
+                }
                 htm += '<div class="time-info">' + item.createTime + '</div>';
                 htm += '</div></div>';
             }

--
Gitblit v1.9.3