diff --git a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
index a7695515..b8332235 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
@@ -9,18 +9,16 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-compantFixedAssets-add">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">料号：</label>
+                <label class="col-sm-3 control-label is-required">料号：</label>
                 <div class="col-sm-8">
-                    <select id="compant_materialCode" name="materialCode" class="form-control m-b" >
-                        <option value=""></option>
+                    <select required id="compant_materialCode" name="materialCode" class="form-control select2-selection--multiple" placeholder="请选择">
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">物料名称：</label>
+                <label class="col-sm-3 control-label is-required">物料名称：</label>
                 <div class="col-sm-8">
-                    <input type="text"  name="materialName" class="form-control m-b" readonly />
-
+                    <input type="text" required name="materialName" class="form-control m-b" readonly />
                 </div>
             </div>
             <div class="form-group">
@@ -50,25 +48,19 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">设备状态：</label>
                 <div class="col-sm-8">
-                    <select name="equipStatus" class="form-control m-b" />
-                        <option value="">所有</option>
+                    <select name="equipStatus" class="form-control m-b select2-selection--multiple" th:with="type=${@dict.getType('equipStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">计量单位：</label>
+                <label class="col-sm-3 control-label">单位：</label>
                 <div class="col-sm-8">
-                    <select name="equipUnit" class="form-control m-b" th:with="type=${@dict.getType('ck_liangci')}">
+                    <select name="equipUnit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">设备类别：</label>
-                <div class="col-sm-8">
-                    <input type="text" name="equipCategory" class="form-control" />
-                </div>
-            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">出厂编号：</label>
                 <div class="col-sm-8">
@@ -99,19 +91,19 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">所在部门：</label>
                 <div class="col-sm-8">
-                    <select name="department" class="form-control m-b">
+                    <select id="department" name="department" class="form-control m-b">
                         <option value="">所有</option>
                     </select>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">设备厂家名称：</label>
+                <label class="col-sm-3 control-label">供应商/品牌：</label>
                 <div class="col-sm-8">
                     <input name="equipManufacturerName" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">设备使用日期：</label>
+                <label class="col-sm-3 control-label">领用日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <input name="equipUsageDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
@@ -120,16 +112,16 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">折旧年数：</label>
+                <label class="col-sm-3 control-label">折旧月数：</label>
                 <div class="col-sm-8">
                     <input name="depreciationYears" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">年折旧率：</label>
+                <label class="col-sm-3 control-label">月折旧率：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
-                        <input name="annualDepreciationRate" th:field="*{depreciationYears}" class="form-control" type="text">
+                        <input name="annualDepreciationRate" class="form-control" type="text">
                         <span class="input-group-addon">%</span>
                     </div>
                 </div>
@@ -152,6 +144,12 @@
                     <input name="esponsiblePerson" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="description" class="form-control"></textarea>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">备注：</label>
                 <div class="col-sm-8">
@@ -167,46 +165,73 @@
         var prefix = ctx + "financial/compantFixedAssets"
         $("#form-compantFixedAssets-add").validate({focusCleanup: true});
         //获取物料料号，物料名称
-        $(function(){
+        $(function() {
+            getSelections();
             $("#compant_materialCode").select2({
                 theme: "bootstrap",
                 allowClear: true,
-                placeholder: "请选择物料",
-                ajax:{
-                    type: "post",
-                    url:ctx + "erp/material/getMaterialSelList",
-                    dataType:"json",
-                    delay:250,
-                    cache:true,
+                placeholder: "请选择一个料号",
+                ajax: {
+                    type: "get",
+                    url: ctx + "erp/material/getMaterialAllList",
+                    dataType: "json",
+                    delay: 250,
+                    timeout: 10000, // 设置超时时间为10秒
+                    cache: true,
                     processResults: function (res, params) {
-                        var resultList = res.data;
                         var options = [];
-                        for(let i in resultList){
-                            var option = resultList[i];
-                            option.id = resultList[i]["materialNo"];
-                            option.text = resultList[i]["materialNo"];
-                            option.title = resultList[i]["materialName"];
-                            options.push(option);
+                        if (res.code == 0) {
+                            var resultList = res.data;
+                            console.log(resultList);
+                            for (var i = 0, len = resultList.length; i < len; i++) {
+                                var option = resultList[i];
+                                option.id = resultList[i]["materialNo"];
+                                option.text = resultList[i]["materialNo"];
+                                options.push(option);
+                            }
+                            return {
+                                results: options
+                            }
                         }
-                        return {results: options,pagination: {}};
+                        ;
+                        return {
+                            results: []
+                        };
+                    },
+                    escapeMarkup: function (markup) {
+                        return markup;
                     },
-                    escapeMarkup: function (markup) { return markup; },
-                    // minimumInputLength: 1
+                    minimumInputLength: 1,
                 }
             });
-        });
-
-        $("#compant_materialCode").on('select2:select', function (e){
-            var dataObj = e.params.data;
-            console.log(dataObj);
-            $("input[name='materialName']").val(dataObj.materialName).trigger('change');
+            $('#compant_materialCode').on('select2:select', function (e) {
+                var data = e.params.data;
+                $("input[name='materialName']").val(data.materialName);
+            });
         });
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-compantFixedAssets-add').serialize());
             }
         }
+        function getSelections(){
+            $.ajax({
+                url: ctx + "system/dept/selectDeptList",
+                type: "get",
+                dataType: "json",
+                success: function (result) {
+                    var deptDatas = result.data;
+                    console.log(deptDatas);
+                    deptDatas.forEach(function (dept){
+                        $('#department').append($('<option>', {
+                            value: dept.deptName,
+                            text: dept.deptName
+                        }));
+                    })
+                }
+            });
 
+        }
         $("input[name='equipProductionDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",
diff --git a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/detail.html b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/detail.html
new file mode 100644
index 00000000..13c5ac48
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/detail.html
@@ -0,0 +1,240 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改公司固定资产')" />
+    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: select2-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-CompantFixedAssets-edit" th:object="${financialCompantFixedAssets}">
+        <input name="compantFixedAssetsId" th:field="*{compantFixedAssetsId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">料号：</label>
+            <div class="col-sm-8">
+                <input readonly id="compant_materialCode" th:field="*{materialCode}" name="materialCode" class="form-control"/>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">物料名称：</label>
+            <div class="col-sm-8">
+                <input type="text" name="materialName" th:field="*{materialName}" class="form-control m-b" readonly />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">设备编号：</label>
+            <div class="col-sm-8">
+                <input readonly type="text" name="equipCode" th:field="*{equipCode}" class="form-control m-b"/>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">设备名称：</label>
+            <div class="col-sm-8">
+                <input readonly type="text" name="equipName" th:field="*{materialCode}" class="form-control m-b"/>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">设备型号：</label>
+            <div class="col-sm-8">
+                <input readonly type="text" th:field="*{equipModel}" name="equipModel" class="form-control m-b" />
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">设备重量：</label>
+            <div class="col-sm-8">
+                <input readonly name="equipWeight" th:field="*{equipWeight}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">设备状态：</label>
+            <div class="col-sm-8">
+                <select disabled name="equipStatus" th:field="*{equipStatus}" class="form-control m-b select2-selection--multiple" th:with="type=${@dict.getType('equipStatus')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">单位：</label>
+            <div class="col-sm-8">
+                <select disabled name="equipUnit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
+                    <option th:field="*{equipUnit}" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">设备类别：</label>
+            <div class="col-sm-8">
+                <input readonly name="equipCategory" th:field="*{equipCategory}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">出厂编号：</label>
+            <div class="col-sm-8">
+                <input readonly name="factoryCode" th:field="*{factoryCode}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">设备价格：</label>
+            <div class="col-sm-8">
+                <input readonly name="equipPrice" th:field="*{equipPrice}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">厂家代码：</label>
+            <div class="col-sm-8">
+                <input readonly name="manufacturerCode" th:field="*{manufacturerCode}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">设备生产日期：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input disabled name="equipProductionDate" th:value="${#dates.format(financialCompantFixedAssets.equipProductionDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">所在部门：</label>
+            <div class="col-sm-8">
+                <input readonly name="department" th:field="*{department}" class="form-control m-b">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">供应商/品牌：</label>
+            <div class="col-sm-8">
+                <input readonly name="equipManufacturerName" th:field="*{equipManufacturerName}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">领用日期：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input disabled name="equipUsageDate" th:value="${#dates.format(financialCompantFixedAssets.equipUsageDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">折旧月数：</label>
+            <div class="col-sm-8">
+                <input readonly name="depreciationYears" th:field="*{depreciationYears}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">月折旧率：</label>
+            <div class="col-sm-8">
+                <input readonly name="annualDepreciationRate" th:field="*{annualDepreciationRate}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">设备存放位置：</label>
+            <div class="col-sm-8">
+                <input readonly name="equipStorageLocation" th:field="*{equipStorageLocation}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">完成工序：</label>
+            <div class="col-sm-8">
+                <input readonly name="completeTheProcess" th:field="*{completeTheProcess}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">负责人：</label>
+            <div class="col-sm-8">
+                <input readonly name="esponsiblePerson" th:field="*{esponsiblePerson}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <textarea readonly name="remark" class="form-control">[[*{remark}]]</textarea>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include :: select2-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "financial/compantFixedAssets";
+    var financialCompantFixedAssets = [[${financialCompantFixedAssets}]];
+    $("#form-CompantFixedAssets-edit").validate({focusCleanup: true});
+    $(function(){
+        var materialNo = financialCompantFixedAssets.materialCode;
+        $("#compant_materialCode").select2({
+            theme: "bootstrap",
+            allowClear: true,
+            placeholder: "请选择一个料号",
+            ajax: {
+                type: "get",
+                url: ctx + "erp/material/getMaterialAllList",
+                dataType: "json",
+                delay: 250,
+                timeout: 10000, // 设置超时时间为10秒
+                cache: true,
+                processResults: function (res, params) {
+                    var options = [];
+                    if (res.code == 0) {
+                        var resultList = res.data;
+                        console.log(resultList);
+                        for (var i = 0, len = resultList.length; i < len; i++) {
+                            var option = resultList[i];
+                            option.id = resultList[i]["materialNo"];
+                            option.text = resultList[i]["materialNo"];
+                            options.push(option);
+                        }
+                        return {
+                            results: options
+                        }
+                    }
+                    ;
+                    return {
+                        results: []
+                    };
+                },
+                escapeMarkup: function (markup) {
+                    return markup;
+                },
+                minimumInputLength: 1,
+            }
+        });
+        getSelections();
+    });
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-CompantFixedAssets-edit').serialize());
+        }
+    }
+    function getSelections(){
+        $.ajax({
+            url: ctx + "system/dept/selectDeptList",
+            type: "get",
+            dataType: "json",
+            success: function (result) {
+                var deptDatas = result.data;
+                console.log(deptDatas);
+                deptDatas.forEach(function (dept){
+                    $('#department').append($('<option>', {
+                        value: dept.deptName,
+                        text: dept.deptName
+                    }));
+                })
+            }
+        });
+
+    }
+    $("input[name='equipProductionDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+    $("input[name='equipUsageDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/edit.html b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/edit.html
index 4d2eabfb..f04e820d 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/edit.html
@@ -3,48 +3,40 @@
 <head>
     <th:block th:include="include :: header('修改公司固定资产')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: select2-css" />
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-CompantFixedAssets-edit" th:object="${financialCompantFixedAssets}">
             <input name="compantFixedAssetsId" th:field="*{compantFixedAssetsId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">料号：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">料号：</label>
                 <div class="col-sm-8">
-                    <select name="materialCode" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <input readonly id="compant_materialCode" th:field="*{materialCode}" name="materialCode" class="form-control"/>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">物料名称：</label>
                 <div class="col-sm-8">
-                    <select name="materialName" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <input type="text" name="materialName" th:field="*{materialName}" class="form-control m-b" readonly />
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">设备编号：</label>
                 <div class="col-sm-8">
-                    <input type="text" name="equipCode" class="form-control m-b" required/>
+                    <input type="text" name="equipCode" th:field="*{equipCode}" class="form-control m-b" required/>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">设备名称：</label>
                 <div class="col-sm-8">
-                    <input type="text" name="equipName" class="form-control m-b" required/>
+                    <input type="text" name="equipName" th:field="*{equipName}" class="form-control m-b" required/>
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">设备型号：</label>
                 <div class="col-sm-8">
-                    <select name="equipModel" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <input type="text" th:field="*{equipModel}" name="equipModel" class="form-control m-b" />
                 </div>
             </div>
             <div class="form-group">    
@@ -56,25 +48,17 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">设备状态：</label>
                 <div class="col-sm-8">
-                    <div class="radio-box">
-                        <input type="radio" name="equipStatus" value="">
-                        <label th:for="equipStatus" th:text="未知"></label>
-                    </div>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">计量单位：</label>
-                <div class="col-sm-8">
-                    <select name="equipUnit" class="form-control m-b" th:with="type=${@dict.getType('ck_liangci')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{equipUnit}"></option>
+                    <select name="equipStatus" th:field="*{equipStatus}" class="form-control m-b select2-selection--multiple" th:with="type=${@dict.getType('equipStatus')}">
+                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">设备类别：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">单位：</label>
                 <div class="col-sm-8">
-                    <input name="equipCategory" th:field="*{equipCategory}" class="form-control" type="text">
+                    <select name="equipUnit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
+                        <option th:field="*{equipUnit}" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                    </select>
                 </div>
             </div>
             <div class="form-group">    
@@ -104,23 +88,22 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">所在部门：</label>
                 <div class="col-sm-8">
-                    <select name="department" class="form-control m-b">
+                    <select id="department" th:field="*{department}" name="department" class="form-control m-b">
                         <option value="">所有</option>
                     </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">设备厂家名称：</label>
+                <label class="col-sm-3 control-label">供应商/品牌：</label>
                 <div class="col-sm-8">
                     <input name="equipManufacturerName" th:field="*{equipManufacturerName}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">设备使用日期：</label>
+                <label class="col-sm-3 control-label">领用日期：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
                         <input name="equipUsageDate" th:value="${#dates.format(financialCompantFixedAssets.equipUsageDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
@@ -129,13 +112,13 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">折旧年数：</label>
+                <label class="col-sm-3 control-label">折旧月数：</label>
                 <div class="col-sm-8">
                     <input name="depreciationYears" th:field="*{depreciationYears}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">年折旧率：</label>
+                <label class="col-sm-3 control-label">月折旧率：</label>
                 <div class="col-sm-8">
                     <input name="annualDepreciationRate" th:field="*{annualDepreciationRate}" class="form-control" type="text">
                 </div>
@@ -158,6 +141,12 @@
                     <input name="esponsiblePerson" th:field="*{esponsiblePerson}" class="form-control" type="text">
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">描述：</label>
+                <div class="col-sm-8">
+                    <textarea name="description" class="form-control">[[*{description}]]</textarea>
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">备注：</label>
                 <div class="col-sm-8">
@@ -168,62 +157,74 @@
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
+    <th:block th:include="include :: select2-js" />
     <script th:inline="javascript">
-        var prefix = ctx + "financial/CompantFixedAssets";
+        var prefix = ctx + "financial/compantFixedAssets";
+        var financialCompantFixedAssets = [[${financialCompantFixedAssets}]];
         $("#form-CompantFixedAssets-edit").validate({focusCleanup: true});
         $(function(){
-            $.ajax({
-                url: ctx + "erp/material/getMaterialSelList",
-                type: "POST",
-                dataType: 'json',
-                delay: 250,
-                success: function (res, params) {
-                    if (res.data.length > 0) {
-                        var usertData = res.data;
-                        for (let i in usertData) {
-                            $("#form-CompantFixedAssets-edit select[name='materialCode']").append(
-                                "<option value='" + usertData[i].materialNo + "'>" + usertData[i].materialNo + "</option>");
-                        }
-                    } else {
-                        $.modal.msgError(res.msg);
-                    }
-                },
-            });
-            $.ajax({
-                url: ctx + "erp/material/getMaterialSelList",
-                type: "POST",
-                dataType: 'json',
-                delay: 250,
-                success: function (res, params) {
-                    if (res.data.length > 0) {
-                        var usertData = res.data;
-                        for (let i in usertData) {
-                            $("#form-CompantFixedAssets-edit select[name='materialName']").append(
-                                "<option value='" + usertData[i].materialName + "'>" + usertData[i].materialName + "</option>");
+            getSelections();
+            var materialNo = financialCompantFixedAssets.materialCode;
+            $("#compant_materialCode").select2({
+                theme: "bootstrap",
+                allowClear: true,
+                placeholder: "请选择一个料号",
+                ajax: {
+                    type: "get",
+                    url: ctx + "erp/material/getMaterialAllList",
+                    dataType: "json",
+                    delay: 250,
+                    timeout: 10000, // 设置超时时间为10秒
+                    cache: true,
+                    processResults: function (res, params) {
+                        var options = [];
+                        if (res.code == 0) {
+                            var resultList = res.data;
+                            console.log(resultList);
+                            for (var i = 0, len = resultList.length; i < len; i++) {
+                                var option = resultList[i];
+                                option.id = resultList[i]["materialNo"];
+                                option.text = resultList[i]["materialNo"];
+                                options.push(option);
+                            }
+                            return {
+                                results: options
+                            }
                         }
-                    } else {
-                        $.modal.msgError(res.msg);
-                    }
+                        ;
+                        return {
+                            results: []
+                        };
+                    },
+                    escapeMarkup: function (markup) {
+                        return markup;
+                    },
+                    minimumInputLength: 1,
                 }
             });
         });
-
-        $("#form-CompantFixedAssets-edit select[materialCode]").on('select2:select', function (e){
-            var data = e.params.data;
-            $("#form-CompantFixedAssets-edit input[name='materialCode']").val(data.materialNo);
-            $("#form-CompantFixedAssets-edit input[name='materialName']").val(data.materialName);
-        });
-        $("#form-CompantFixedAssets-edit select[materialName]").on('select2:select', function (e){
-            var data =  e.params.data;
-            $("input[name='materialCode']").val(data.materialNo);
-            $("input[name='materialName']").val(data.materialName);
-        });
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/edit", $('#form-CompantFixedAssets-edit').serialize());
             }
         }
+        function getSelections(){
+            $.ajax({
+                url: ctx + "system/dept/selectDeptList",
+                type: "get",
+                dataType: "json",
+                success: function (result) {
+                    var deptDatas = result.data;
+                    deptDatas.forEach(function (dept){
+                        $('#department').append($('<option>', {
+                            value: dept.deptName,
+                            text: dept.deptName
+                        }));
+                    })
+                }
+            });
 
+        }
         $("input[name='equipProductionDate']").datetimepicker({
             format: "yyyy-mm-dd",
             minView: "month",