diff --git a/js/aq_demand_plan/child/apply_plan_detail.js b/js/aq_demand_plan/child/apply_plan_detail.js
index 0c6e6a7..021c959 100644
--- a/js/aq_demand_plan/child/apply_plan_detail.js
+++ b/js/aq_demand_plan/child/apply_plan_detail.js
@@ -184,7 +184,7 @@ function initTable() {
                 {
                     field: "backDate",
                     width: '10%',
-                    title: "退还日期",
+                    title: "预计使用时间",
                     unresize: true,
                     align: "center",
                     sort: true,
@@ -277,7 +277,7 @@ function setOperRecordInfo(list, obj) {
                 operData = '完结-审核确认通过，共耗时：' + item.hours + '小时' + minutes + '分钟  原因备注：' + remark + '';
             } else if (item.auditStatus === '3') {
                 operData = '驳回-给发起人' + creator + '，共间隔：' + item.hours + '小时' + minutes + '分钟  原因备注：' + remark + '';
-            } 
+            }
             html += '<div class="layui-timeline-item">' +
                 '<i class="layui-icon layui-timeline-axis"></i>' +
                 '<div class="layui-timeline-content layui-text">' +
@@ -400,4 +400,4 @@ function closePage() {
     let index = parent.layer.getFrameIndex(window.name); // 先得到当前 iframe层的索引
     window.parent.queryTable(1);
     parent.layer.close(index); // 再执行关闭
-}
\ No newline at end of file
+}
diff --git a/js/aq_demand_plan/child/apply_plan_edit_form.js b/js/aq_demand_plan/child/apply_plan_edit_form.js
index 194e49c..732cdf9 100644
--- a/js/aq_demand_plan/child/apply_plan_edit_form.js
+++ b/js/aq_demand_plan/child/apply_plan_edit_form.js
@@ -156,7 +156,7 @@ function submitApply(data) {
     console.error(detailIdArr2);
     let delDetailArr = getMinus(detailIdArr2, detailIdArr);
     console.error(delDetailArr);
-    
+
     if (delDetailArr && delDetailArr.length > 0) {
         data.field.delIds = delDetailArr;
     }
@@ -331,9 +331,9 @@ function setFormInput(value, type) {
     let html = '<form class="layui-form layuimini-form"><div class="layui-inline">';
     if (type === 1) { // 需用量
         html += '<input class="layui-input" name="needNum" onblur="checkValue(this,1,\'需用量\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
-    } else if (type === 2) { // 退还日期
+    } else if (type === 2) { // 预计使用时间
         // html += '<input class="layui-input" name="times" onblur="checkValue(this,2,\'需用天数\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
-        html += '<input class="layui-input refund-date" name="times" id="refundDate" value="' + setNullValue(value) + '" autocomplete="off">';
+        html += '<input class="layui-input refund-date" readonly name="times" id="refundDate" value="' + setNullValue(value) + '" autocomplete="off">';
     } else if (type === 3) { // 备注
         html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="60" lay-affix="clear"></input>';
     }
@@ -392,7 +392,7 @@ function delFitType() {
                 }
             }
         }
-        
+
         if (jjDataArr.length === 0) {
             $('#no_data_title').removeAttr('style');
             $('#search-info').css({ 'display': 'none' });
@@ -472,4 +472,4 @@ function closePage(type) {
         window.parent.reloadData();
     }
     parent.layer.close(index); // 再执行关闭
-}
\ No newline at end of file
+}
diff --git a/js/aq_demand_plan/child/choose_crane_type_list.js b/js/aq_demand_plan/child/choose_crane_type_list.js
index fc22989..f3e5630 100644
--- a/js/aq_demand_plan/child/choose_crane_type_list.js
+++ b/js/aq_demand_plan/child/choose_crane_type_list.js
@@ -1,5 +1,5 @@
 let objParam;
-let form, table, element, tableIns, layer, util;
+let form, table, element, tableIns, layer, util,laydate;
 let pageNum = 1;
 let quanju = new Array();//全局
 let huancun = new Array();//缓存
@@ -8,12 +8,13 @@ let cjList = [];
 let jjDetailArr = []; // 入库配件类型数据
 function setParams(obj) {
     objParam = JSON.parse(obj);
-    layui.use(["form", "table", 'element', 'layer', 'util'], function () {
+    layui.use(["form", "table", 'element', 'layer', 'util','laydate'], function () {
         form = layui.form;
         table = layui.table;
         element = layui.element;
         layer = layui.layer;
         util = layui.util;
+        laydate = layui.laydate;
 
         $("#saveZipButton").click(function(){
             importExcel();
@@ -159,12 +160,17 @@ function initTable() {
                 },
                 {
                     field: "times",
-                    width: '15%',
-                    title: "退还日期",
+                    width: "15%",
+                    title: "预计使用时间",
                     unresize: true,
                     align: "center",
-                    edit: 'text',
-                    style: 'outline: 1px solid #e6e6e6;outline-offset: -5px;',
+                    templet: (d) =>
+                        '<div class="layui-input-inline"><input type="text" class="layui-input date-picker" id="date_' +
+                        d.id +
+                        '" value="' +
+                        (d.times || "") +
+                        '" readonly></div>',
+                    style: "outline: 1px solid #e6e6e6;outline-offset: -5px;",
                 },
                 {
                     field: "remarks",
@@ -205,6 +211,21 @@ function initTable() {
                 $('.layui-table th[data-field="0"] input[type="checkbox"]').prop('checked', true);//data-field值默认为0，如果在分页部分自定义了属性名，则需要改成对应的属性名
                 $('.layui-table th[data-field="0"] input[type="checkbox"]').next().addClass('layui-form-checked');//data-field值默认为0，如果在分页部分自定义了属性名，则需要改成对应的属性名
             }
+
+            // 初始化日期选择器
+            res.data.forEach((item) => {
+                laydate.render({
+                    elem: "#date_" + item.id,
+                    done: (value) => {
+                        // 更新数据
+                        const data = {}
+                        data.id = item.id
+                        data.times = value
+                        item.times = data.times
+                        updateOrAddObject(item.id, item)
+                    },
+                })
+            })
         },
     });
     table.on('edit(currentTableId2)', function (obj) {
@@ -410,7 +431,7 @@ function updateTableWithImportedData(data) {
             const rowIndex = rowData.LAY_INDEX
             // 更新需用量单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="needNum"] .layui-table-cell`).text(importedItem.needNum || "")
-            // 更新退还日期单元格
+            // 更新预计使用时间单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="times"] .layui-table-cell`).text(importedItem.times || "")
             // 更新备注单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="remarks"] .layui-table-cell`).text(importedItem.remarks || "")
diff --git a/js/aq_demand_plan/child/choose_tool_type_list.js b/js/aq_demand_plan/child/choose_tool_type_list.js
index bfd4923..5d280f2 100644
--- a/js/aq_demand_plan/child/choose_tool_type_list.js
+++ b/js/aq_demand_plan/child/choose_tool_type_list.js
@@ -1,5 +1,5 @@
 let objParam;
-let form, table, element, tableIns, layer, util;
+let form, table, element, tableIns, layer, util,laydate;
 let pageNum = 1;
 let quanju = new Array();//全局
 let huancun = new Array();//缓存
@@ -8,12 +8,13 @@ let cjList = [];
 let jjDetailArr = []; // 入库配件类型数据
 function setParams(obj) {
     objParam = JSON.parse(obj);
-    layui.use(["form", "table", 'element', 'layer', 'util'], function () {
+    layui.use(["form", "table", 'element', 'layer', 'util','laydate'], function () {
         form = layui.form;
         table = layui.table;
         element = layui.element;
         layer = layui.layer;
         util = layui.util;
+        laydate = layui.laydate;
 
         $("#saveZipButton").click(function(){
             importExcel();
@@ -160,12 +161,17 @@ function initTable() {
                 },
                 {
                     field: "times",
-                    width: '15%',
-                    title: "<span style='color:red'> * </span>退还日期",
+                    width: "15%",
+                    title: "预计使用时间",
                     unresize: true,
                     align: "center",
-                    edit: 'text',
-                    style: 'outline: 1px solid #e6e6e6;outline-offset: -5px;',
+                    templet: (d) =>
+                        '<div class="layui-input-inline"><input type="text" class="layui-input date-picker" id="date_' +
+                        d.id +
+                        '" value="' +
+                        (d.times || "") +
+                        '" readonly></div>',
+                    style: "outline: 1px solid #e6e6e6;outline-offset: -5px;",
                 },
                 {
                     field: "remarks",
@@ -206,6 +212,21 @@ function initTable() {
                 $('.layui-table th[data-field="0"] input[type="checkbox"]').prop('checked', true);//data-field值默认为0，如果在分页部分自定义了属性名，则需要改成对应的属性名
                 $('.layui-table th[data-field="0"] input[type="checkbox"]').next().addClass('layui-form-checked');//data-field值默认为0，如果在分页部分自定义了属性名，则需要改成对应的属性名
             }
+
+            // 初始化日期选择器
+            res.data.forEach((item) => {
+                laydate.render({
+                    elem: "#date_" + item.id,
+                    done: (value) => {
+                        // 更新数据
+                        const data = {}
+                        data.id = item.id
+                        data.times = value
+                        item.times = data.times
+                        updateOrAddObject(item.id, item)
+                    },
+                })
+            })
         },
     });
     table.on('edit(currentTableId2)', function (obj) {
@@ -411,7 +432,7 @@ function updateTableWithImportedData(data) {
             const rowIndex = rowData.LAY_INDEX
             // 更新需用量单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="needNum"] .layui-table-cell`).text(importedItem.needNum || "")
-            // 更新退还日期单元格
+            // 更新预计使用时间单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="times"] .layui-table-cell`).text(importedItem.times || "")
             // 更新备注单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="remarks"] .layui-table-cell`).text(importedItem.remarks || "")
diff --git a/js/aq_demand_plan/child/choose_type_list.js b/js/aq_demand_plan/child/choose_type_list.js
index 9b6461b..95cc41f 100644
--- a/js/aq_demand_plan/child/choose_type_list.js
+++ b/js/aq_demand_plan/child/choose_type_list.js
@@ -1,5 +1,5 @@
 let objParam;
-let form, table, element, tableIns, layer, util;
+let form, table, element, tableIns, layer, util,laydate;
 let pageNum = 1;
 let quanju = new Array();//全局
 let huancun = new Array();//缓存
@@ -425,7 +425,7 @@ function updateTableWithImportedData(data) {
         const importedItem = data.find((item) => item.id === rowData.id)
         if (importedItem) {
             // 更新表格数据
-            rowData.needNum = importedItem.needNum
+            rowData.needNum = Number(importedItem.needNum)
             rowData.times = importedItem.times
             rowData.remarks = importedItem.remarks
             updated = true
@@ -433,8 +433,8 @@ function updateTableWithImportedData(data) {
             // 更新表格中对应单元格的显示
             const rowIndex = rowData.LAY_INDEX
             // 更新需用量单元格
-            $(`tr[data-index="${rowIndex}"] td[data-field="needNum"] .layui-table-cell`).text(importedItem.needNum || "")
-            // 更新退还日期单元格
+            $(`tr[data-index="${rowIndex}"] td[data-field="needNum"] .layui-table-cell`).text(Number(importedItem.needNum)  || "")
+            // 更新预计使用时间单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="times"] .layui-table-cell`).text(importedItem.times || "")
             // 更新备注单元格
             $(`tr[data-index="${rowIndex}"] td[data-field="remarks"] .layui-table-cell`).text(importedItem.remarks || "")
diff --git a/js/aq_demand_plan/child/send_out_pro_detail.js b/js/aq_demand_plan/child/send_out_pro_detail.js
index fdc2ab7..ed7410b 100644
--- a/js/aq_demand_plan/child/send_out_pro_detail.js
+++ b/js/aq_demand_plan/child/send_out_pro_detail.js
@@ -263,7 +263,7 @@ function initTable() {
             ],
         ],
         limits: [10, 15, 20, 25, 50, 100],
-        limit: 10,
+        limit: 20,
         page: true,
         done: function (res, curr, count) {
             pageNum = tableIns.config.page.curr;
diff --git a/js/public.js b/js/public.js
index 89fab0b..dcee8f3 100644
--- a/js/public.js
+++ b/js/public.js
@@ -1,18 +1,17 @@
-const dataUrl = 'http://localhost:21520/'; // 数据请求路径--安全工器具
-const dataUrlDevice = 'http://localhost:21521/'; // 数据请求路径-工器具
-const dataUrlCar = 'http://localhost:21522/'; // 数据请求路径-车辆
+// const dataUrl = 'http://localhost:21520/aqd_screen/'; // 数据请求路径--安全工器具
+// const dataUrlDevice = 'http://localhost:21521/'; // 数据请求路径-工器具
+// const dataUrlCar = 'http://localhost:21522/gz_car/'; // 数据请求路径-车辆
 // const dataUrl = 'http://192.168.0.50:21995/'; // 数据请求路径-亮
+// const fileUrl = 'http://127.0.0.1:21995/statics'; // 文件路径
+// const signFileUrl = 'http://127.0.0.1:21995/statics'; // 签名文件路径
+// const viewFileUrl = 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器预览文件
 
 
-const fileUrl = 'http://127.0.0.1:21995/statics'; // 文件路径
+const dataUrl = 'http://192.168.0.16:21520/gz-aqgqj/'; // 数据请求路径
+const fileUrl = 'http://192.168.0.16:21520/gz-aqgqj/statics'; // 文件路径
 const signFileUrl = 'http://127.0.0.1:21995/statics'; // 签名文件路径
 const viewFileUrl = 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器预览文件
 
-/* const dataUrl = 'http://192.168.0.14:21520/'; // 数据请求路径
-const fileUrl = 'http://192.168.0.14:21520/statics'; // 文件路径
-const signFileUrl = 'http://127.0.0.1:21995/statics'; // 签名文件路径
-const viewFileUrl = 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器预览文件 */
-
 /* 请求 */
 function ajaxRequest(url, type, data, async, beforeFn, successFn, errorFn, contentType) {
     $.ajax({
@@ -193,7 +192,7 @@ function getUrlParam(key) {
 // 预览文件
 function commonViewFile(params) {
     let path = fileUrl + params + '?auth=' + sessionStorage.getItem("gz-token");
-    // path = fileUrl + params 
+    // path = fileUrl + params
     console.log(path);
     let encodePath = encodeURIComponent(useBase64.encode64(path));
     window.open(viewFileUrl + encodePath + '&token=' + generateToken());
diff --git a/page/aq_demand_plan/child/apply_plan_edit_form.html b/page/aq_demand_plan/child/apply_plan_edit_form.html
index 252b47f..67bdcd6 100644
--- a/page/aq_demand_plan/child/apply_plan_edit_form.html
+++ b/page/aq_demand_plan/child/apply_plan_edit_form.html
@@ -114,7 +114,7 @@
                             <th style="width: 10%" class="center">规格</th>
                             <th style="width: 10%" class="center">单位</th>
                             <th style="width: 15%" class="center"><span style="color: red;">*</span>需用量</th>
-                            <th style="width: 15%" class="center">退还日期</th>
+                            <th style="width: 15%" class="center">预计使用时间</th>
                             <th style="width: 15%" class="center">备注</th>
                         </tr>
                     </thead>
@@ -134,4 +134,4 @@
 <script src="../../../js/aq_demand_plan/child/apply_plan_edit_form.js" charset="utf-8"></script>
 <script src="../../../js/openIframe.js" charset="utf-8"></script>
 
-</html>
\ No newline at end of file
+</html>