From cbaaed63fd94310d46f10a781c6e5ec9b7b1ca09 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Fri, 31 May 2024 18:04:26 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=9B=BA=E5=AE=9A=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=88=97=E6=A0=B7=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financial/compantFixedAssets/add.html     | 101 ++++++++++--------
 .../purchaseStorage/purchaseStorage.html      |   2 +
 2 files changed, 61 insertions(+), 42 deletions(-)
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 db328d7e..81fe1b13 100644
--- a/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
+++ b/ruoyi-admin/src/main/resources/templates/financial/compantFixedAssets/add.html
@@ -7,11 +7,11 @@
 </head>
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-CompantFixedAssets-add">
+        <form class="form-horizontal m" id="form-compantFixedAssets-add">
             <div class="form-group">    
                 <label class="col-sm-3 control-label">料号：</label>
                 <div class="col-sm-8">
-                    <select name="materialCode" class="form-control m-b" >
+                    <select id="compant_materialCode" name="materialCode" class="form-control m-b" >
                         <option value=""></option>
                     </select>
                 </div>
@@ -19,7 +19,7 @@
             <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" >
+                    <select id="compant_materialName" name="materialName" class="form-control m-b" >
                         <option value=""></option>
                     </select>
                 </div>
@@ -163,58 +163,75 @@
     <th:block th:include="include :: select2-js" />
     <script th:inline="javascript">
         var prefix = ctx + "financial/compantFixedAssets"
-        $("#form-CompantFixedAssets-add").validate({focusCleanup: true});
+        $("#form-compantFixedAssets-add").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-add select[name='materialCode']").append(
-                                "<option value='" + usertData[i].materialNo + "'>" + usertData[i].materialNo + "</option>");
+            $("#compant_materialCode").select2({
+                theme: "bootstrap",
+                allowClear: true,
+                placeholder: "请选择物料",
+                ajax:{
+                    type: "post",
+                    url:ctx + "erp/material/getMaterialSelList",
+                    dataType:"json",
+                    delay:250,
+                    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);
                         }
-                    } else {
-                        $.modal.msgError(res.msg);
-                    }
-                },
+                        return {results: options,pagination: {}};
+                    },
+                    escapeMarkup: function (markup) { return markup; },
+                    // minimumInputLength: 1
+                }
             });
-            $.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-add select[name='materialName']").append(
-                                "<option value='" + usertData[i].materialName + "'>" + usertData[i].materialName + "</option>");
+            $("#compant_materialName").select2({
+                theme: "bootstrap",
+                allowClear: true,
+                placeholder: "请选择物料",
+                ajax:{
+                    type: "post",
+                    url:ctx + "erp/material/getMaterialSelList",
+                    dataType:"json",
+                    delay:250,
+                    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]["materialName"];
+                            option.text = resultList[i]["materialName"];
+                            option.title = resultList[i]["materialNo"];
+                            options.push(option);
                         }
-                    } else {
-                        $.modal.msgError(res.msg);
-                    }
+                        return {results: options, pagination: {}};
+                    },escapeMarkup: function (markup) { return markup; },
                 }
             });
         });
 
-        $("#form-CompantFixedAssets-add select[materialCode]").on('select2:select', function (e){
-            var data = e.params.data;
-            $("#form-CompantFixedAssets-add input[name='materialCode']").val(data.materialNo);
-            $("#form-CompantFixedAssets-add input[name='materialName']").val(data.materialName);
+        $("#compant_materialCode").on('select2:select', function (e){
+            var dataObj = e.params.data;
+            console.log(dataObj);
+            $("#compant_materialName").val(dataObj.materialName).trigger('change');
         });
-        $("#form-CompantFixedAssets-add select[materialName]").on('select2:select', function (e){
-            var data =  e.params.data;
-            $("input[name='materialCode']").val(data.materialNo);
-            $("input[name='materialName']").val(data.materialName);
+
+        $("#compant_materialName").on('select2:select', function (e){
+            var dataObj = e.params.data;
+            console.log(dataObj);
+            $("#compant_materialCode").val(dataObj.materialNo).trigger('change');
         });
         function submitHandler() {
             if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-CompantFixedAssets-add').serialize());
+                $.operate.save(prefix + "/add", $('#form-compantFixedAssets-add').serialize());
             }
         }
 
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
index 301fc13e..81598d9c 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseStorage/purchaseStorage.html
@@ -90,6 +90,8 @@
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "采购入库通知单",
+                fixedColumns: true, // 启用冻结列
+                fixedRightNumber: 1, // 冻结右列个数
                 columns: [
                     {checkbox: true},
                     {title: '采购入库单id',field: 'purchaseStorageId',visible: false},
