From fc78243ddb0bc3998fe1b06e4b8e118092b46f6b Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 24 Jun 2024 09:33:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B5=84=E4=BA=A7=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TdPropertyChangeListController.java       |  66 +++++++
 .../propertychange/changeproperty.html        |  16 +-
 .../propertychange/list/property.html         | 166 ++++++++++++++++++
 3 files changed, 244 insertions(+), 4 deletions(-)
 create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java
new file mode 100644
index 0000000..ae9c460
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java
@@ -0,0 +1,66 @@
+package com.ruoyi.web.controller.system.property;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.TdPropertyManager;
+import com.ruoyi.system.service.ITdPropertyInfoService;
+import com.ruoyi.system.service.ITdPropertyManagerService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * packageName com.ruoyi.web.controller.system.property
+ *
+ * @author wangxy
+ * @version JDK 8
+ * @className TdPropertyChangeListController
+ * @date 2024/6/24
+ * @description TODO
+ */
+@Controller
+@RequestMapping("/system/change/list")
+public class TdPropertyChangeListController extends BaseController {
+
+    private String prefix = "system/property/propertychange/list";
+
+    @Autowired
+    private ITdPropertyManagerService tdPropertyManagerService;
+
+    @RequiresPermissions("system:change:view")
+    @GetMapping()
+    public String property()
+    {
+        return prefix + "/property";
+    }
+
+    /**
+     * 查询资产登记列表
+     */
+    @RequiresPermissions("system:change:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(TdPropertyManager tdPropertyManager)
+    {
+        startPage();
+        List<TdPropertyManager> list = tdPropertyManagerService.selectTdPropertyManagerList(tdPropertyManager);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 添加资产条目
+     */
+    @RequiresPermissions("system:change:detail")
+    @GetMapping("/detail/{useId}")
+    public String detail(@PathVariable("useId") String useId, ModelMap mmap)
+    {
+        mmap.put("useId",useId);
+        return "system/property/propertychange/changeproperty";
+    }
+}
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
index f2dc872..6d43cfc 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
@@ -32,7 +32,9 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-
+            <a class="btn btn-danger" onclick="closeItem()">
+                <i class="fa fa-reply-all"></i> 关闭
+            </a>
         </div>
         <div class="col-sm-12 select-table table-striped">
             <table id="bootstrap-table"></table>
@@ -50,11 +52,9 @@
     $(function() {
         var options = {
             url: prefix + "/list",
-            createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{id}",
             destoryUrl: prefix + "/destory/{id}",
-            removeUrl: prefix + "/remove",
-            exportUrl: prefix + "/export",
+            queryParams: queryParams,
             modalName: "设备登记",
             columns: [{
                 checkbox: true
@@ -95,6 +95,14 @@
         };
         $.table.init(options);
     });
+
+
+    function queryParams(params) {
+        var search = $.table.queryParams(params);
+        search.useId = [[${useId}]];
+        return search;
+    }
+
     function destory(id) {
         var url = prefix + '/destory/' + id;
         $.modal.open("销毁资产", url);
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
new file mode 100644
index 0000000..4a80273
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('资产登记列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div" id="app">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>单位名称：</label>
+                                <input type="text" name="frameworkId"/>
+                            </li>
+                            <li>
+                                <label>资产编号：</label>
+                                <input type="text" name="useId"/>
+                            </li>
+                            <li>
+                                <label>所属市州：</label>
+                                <select id="City" name="part" @change="getAreaList()" v-model="City">
+                                    <option value="">---请选择---</option>
+                                    <option v-for="option in CityList" :value="option.id" :key="option.id">
+                                        {{ option.name }}
+                                    </option>
+                                </select>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var listFlag = [[${@permission.hasPermi('system:change:detail')}]];
+        var prefix = ctx + "system/change/list";
+        let datas = []
+        $.ajax({
+            url: ctx + "system/area/getAllList",
+            type: 'GET',
+            data:{parentId:''} ,
+            success:((res)=>{
+                datas = res.data
+            }) ,
+        });
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "资产登记",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'useId',
+                    title: '资产编号'
+                },
+                {
+                    field: 'part',
+                    title: '所属市州',
+                    formatter: function(value, row, index) {
+                        return getCity(datas, value)
+                    }
+                },
+                {
+                    field: 'areaId',
+                    title: '所属区县',
+                    formatter: function(value, row, index) {
+                        return getCity(datas, value)
+                    }
+                },
+                {
+                    field: 'useDepart',
+                    title: '使用部门'
+                },
+                {
+                    field: 'userName',
+                    title: '使用人员'
+                },
+                {
+                    field: 'recoverName',
+                    title: '登记人员'
+                },
+                {
+                    field: 'recoverDate',
+                    title: '配发日期'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.useId + '\')"><i class="fa fa-list-ul"></i>变更</a> ');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+        var app = new Vue({
+            el: '#app',
+            data: {
+                CityList: [],
+                AreaList:[],
+                City:'',
+                Area:'',
+                params:{
+                    parentId:'',
+                }
+            },
+            mounted(){
+                // 初始化地市列表
+                this.getCityList();
+                if (this.City){
+                    this.getAreaList()
+                }
+            },
+            methods:{
+                getCityList(){
+                    $.ajax({
+                        url: ctx + "system/area/getSysAreaList",
+                        type: 'GET',
+                        data:this.params ,
+                        success:((res)=>{
+                            this.CityList = res.data
+                        }) ,
+                    });
+                },
+                getAreaList(){
+                    this.params.parentId = this.City
+                    $.ajax({
+                        url: ctx + "system/area/getSysAreaList",
+                        type: 'GET',
+                        data:this.params,
+                        success:((res)=>{
+                            this.AreaList = res.data
+                        }) ,
+                    });
+                }
+            }
+        })
+        /*资产列表-详细*/
+        function detail(useId) {
+            var url = prefix + '/detail/' + useId;
+            $.modal.openTab("资产列表数据", url);
+        }
+    </script>
+</body>
+</html>