From d70d14b77ab4a9e2ca0c6d3e2280b992bbd53c72 Mon Sep 17 00:00:00 2001
From: liukewei <huamar123>
Date: Mon, 15 Jan 2024 09:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E8=B7=9F=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ehsDocTransfer/domain/EhsDocTransfer.java |  3 ++
 .../mapper/ehs/EhsDocTransferMapper.xml       |  7 +++--
 .../resources/mapper/system/SysUserMapper.xml |  2 +-
 ruoyi-ui/src/views/ehs/ehsDocument/index.vue  | 28 ++++++++++++++++---
 .../src/views/ehs/ehsEnterprise/index.vue     |  4 +--
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/ehsDocTransfer/domain/EhsDocTransfer.java b/ruoyi-system/src/main/java/com/ruoyi/ehsDocTransfer/domain/EhsDocTransfer.java
index 2c71d6b..251b6a1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/ehsDocTransfer/domain/EhsDocTransfer.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/ehsDocTransfer/domain/EhsDocTransfer.java
@@ -70,4 +70,7 @@ public class EhsDocTransfer extends BaseEntity {
     @Excel(name = "公文名称")
     private String documentName;
 
+    //@Excel(name = "公文名称")
+    private String transferDept;//流转情况
+
 }
diff --git a/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml b/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml
index 0201c9d..b9adfbd 100644
--- a/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/ehs/EhsDocTransferMapper.xml
@@ -12,7 +12,7 @@
             <result property="docTransferStatus"    column="doc_transfer_status"    />
             <result property="documentId"    column="document_id"    />
             <result property="documentName"    column="document_name"    />
-
+        <result property="transferDept"    column="transfer_dept"    />
             <result property="createBy"    column="create_by"    />
             <result property="createTime"    column="create_time"    />
             <result property="updateBy"    column="update_by"    />
@@ -24,7 +24,9 @@
     </resultMap>
 
     <sql id="selectEhsDocTransferVo">
-        select id, transfer_user_id, transfer_name, transfer_time, doc_transfer_status, document_id, document_name, create_by, create_time, update_by, update_time, remark, dept_id, create_user_id, update_user_id from ehs_doc_transfer
+        select id, transfer_user_id, transfer_name, transfer_time, doc_transfer_status,
+        document_id, document_name, create_by, create_time, update_by, update_time,
+        remark, dept_id, create_user_id, update_user_id,transfer_dept from ehs_doc_transfer
     </sql>
 
 
@@ -38,6 +40,7 @@
                         <if test="documentId != null "> and document_id = #{documentId}</if>
                         <if test="documentName != null and documentName != ''"> and document_name = #{documentName}</if>
         </where>
+        order by transfer_time desc
     </select>
 
     <select id="selectEhsDocTransferById" parameterType="Long" resultMap="EhsDocTransferResult">
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 7058c7f..78b977d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
 		</if>
-		order by order_num
+		order by u.order_num
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
diff --git a/ruoyi-ui/src/views/ehs/ehsDocument/index.vue b/ruoyi-ui/src/views/ehs/ehsDocument/index.vue
index 1b0cc91..16f2622 100644
--- a/ruoyi-ui/src/views/ehs/ehsDocument/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsDocument/index.vue
@@ -129,7 +129,7 @@
           <span>{{ parseTime(scope.row.receiveTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="收存情况" align="center" prop="remark" />
       <el-table-column
         label="操作"
         align="center"
@@ -227,7 +227,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
+        <el-form-item label="收存情况" prop="remark">
           <el-input
             v-model="form.remark"
             type="textarea"
@@ -278,6 +278,11 @@
             <span v-else>归还</span>
           </template>
         </el-table-column>
+        <el-table-column label="流转情况" align="center" prop="transferDept">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.transfer_dept" :value="scope.row.transferDept"/>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
         v-show="totalDetail>0"
@@ -321,6 +326,16 @@
             >
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="流转情况" prop="transferDept">
+            <el-select v-model="form.transferDept" multiple collapse-tags placeholder="请选择流转情况"  >
+              <el-option
+                v-for="dict in dict.type.transfer_dept"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
       </el-form>
 
@@ -352,10 +367,9 @@ import {
 } from "@/api/ehs/ehsDocTransfer";
 import { parseTime } from "../../../utils/ruoyi";
 import dict from "@/utils/dict";
-
 export default {
   name: "EhsDocument",
-  dicts: ["doc_type", "doc_transfer_status"],
+  dicts: ["doc_type", "doc_transfer_status","transfer_dept"],
   data() {
     return {
       // 遮罩层
@@ -455,6 +469,7 @@ export default {
         deptId: null,
         createUserId: null,
         updateUserId: null,
+        transferDept: null,
       };
       this.resetForm("form");
     },
@@ -547,6 +562,11 @@ export default {
     submitLendForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          console.log(this.form)
+          if(this.form.transferDept!=null){
+            this.form.transferDept = this.form.transferDept.join();
+          }
+
           lendEhsDoc(this.form).then((response) => {
             this.$modal.msgSuccess("借出成功");
             this.open2 = false;
diff --git a/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue b/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue
index efe1a47..1c1677f 100644
--- a/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue
+++ b/ruoyi-ui/src/views/ehs/ehsEnterprise/index.vue
@@ -265,8 +265,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="行政区域" prop="areaId">
-              <el-select v-model="form.areaId" placeholder="请选择行政区域">
+            <el-form-item label="企业地址" prop="areaId">
+              <el-select v-model="form.areaId" placeholder="请选择企业地址">
                 <el-option
                   v-for="dict in dict.type.area_id"
                   :key="dict.value"