From 097e31fa602807dbd089df673122a5b51638e41c Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Mon, 24 Mar 2025 15:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/init.json                                 |  2 +-
 index.html                                    |  2 +-
 js/accessory/child/accessory_apply_add.js     |  4 +-
 js/demandPlan/child/apply_plan_detail.js      |  6 +--
 js/demandPlan/child/apply_plan_edit_form.js   |  6 +--
 js/demandPlan/child/apply_plan_form.js        |  2 +-
 js/demandPlan/child/choose_tool_type_list.js  |  2 +-
 js/demandPlan/child/delivery_all_list.js      |  4 +-
 js/demandPlan/child/delivery_detail_list.js   |  2 +-
 js/demandPlan/delivery_list.js                | 43 +++----------------
 js/public.js                                  |  2 +-
 page/accessory/child/accessory_apply_add.html |  2 +-
 .../child/apply_plan_edit_form.html           |  4 +-
 page/demandPlan/child/apply_plan_form.html    | 15 +++----
 page/demandPlan/child/delivery_all_list.html  |  6 +--
 .../child/delivery_detail_list.html           |  2 +
 16 files changed, 38 insertions(+), 66 deletions(-)

diff --git a/api/init.json b/api/init.json
index 1dec006..da04910 100644
--- a/api/init.json
+++ b/api/init.json
@@ -34,7 +34,7 @@
               "target": "_self"
             },
             {
-              "title": "机具公司发货",
+              "title": "发货统计",
               "href": "page/demandPlan/delivery_list.html",
               "icon": "fa fa-tachometer",
               "target": "_self"
diff --git a/index.html b/index.html
index 3003e65..5d7fdaf 100644
--- a/index.html
+++ b/index.html
@@ -171,7 +171,7 @@
                     errorFn(xhr, status, error)
                 }, null);
             } else {
-                // console.log('走的自己登录');
+                console.log('走的自己登录');
                 // login(miniAdmin);
                 window.location = 'page/401.html';
             }
diff --git a/js/accessory/child/accessory_apply_add.js b/js/accessory/child/accessory_apply_add.js
index d3e5359..3097e48 100644
--- a/js/accessory/child/accessory_apply_add.js
+++ b/js/accessory/child/accessory_apply_add.js
@@ -22,7 +22,9 @@ function setParams(obj) {
         // 获取sessionStorage中的数据并转换为对象
         var user = JSON.parse(sessionStorage.getItem('us'));
         // 设置元素值
-        $('#projectPart').val(user.username);
+        if (user != null && user.username != null) {
+            $('#projectPart').val(user.username);
+        }
         laydate.render({
             elem: '#needTime'
         });
diff --git a/js/demandPlan/child/apply_plan_detail.js b/js/demandPlan/child/apply_plan_detail.js
index ba01ddd..621aeea 100644
--- a/js/demandPlan/child/apply_plan_detail.js
+++ b/js/demandPlan/child/apply_plan_detail.js
@@ -160,8 +160,8 @@ function initTable() {
                 },
                 {
                     field: "backDate",
-                    width: '10%',
-                    title: "退还日期",
+                    width: '15%',
+                    title: "预计使用时间",
                     unresize: true,
                     align: "center",
                     sort:true,
@@ -169,7 +169,7 @@ function initTable() {
                 },
                 {
                     field: "remarks",
-                    width: '15%',
+                    width: '10%',
                     title: "备注",
                     unresize: true,
                     align: "center",
diff --git a/js/demandPlan/child/apply_plan_edit_form.js b/js/demandPlan/child/apply_plan_edit_form.js
index 2cef8c2..ec4955b 100644
--- a/js/demandPlan/child/apply_plan_edit_form.js
+++ b/js/demandPlan/child/apply_plan_edit_form.js
@@ -141,9 +141,9 @@ function submitApply(data) {
         if (parseInt(list[i].needNum) === 0) {
             return layer.msg('机具明细，第' + (i + 1) + '行，未填写需用量', { icon: 7 });
         }
-        if (parseInt(list[i].times) === 0) {
-            return layer.msg('机具明细，第' + (i + 1) + '行，未填写需用天数', { icon: 7 });
-        }
+        // if (parseInt(list[i].times) === 0) {
+        //     return layer.msg('机具明细，第' + (i + 1) + '行，未填写需用天数', { icon: 7 });
+        // }
     }
     data.field.id = objParam.id;
     data.field.jsonData = JSON.stringify(list);
diff --git a/js/demandPlan/child/apply_plan_form.js b/js/demandPlan/child/apply_plan_form.js
index ab2986e..bc5d22c 100644
--- a/js/demandPlan/child/apply_plan_form.js
+++ b/js/demandPlan/child/apply_plan_form.js
@@ -232,7 +232,7 @@ function setFormInput(value, type) {
     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) { // 需用天数
-        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" name="times" onblur="checkValue(this,2,\'预计使用时间\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
     } else if (type === 3) { // 备注
         html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="60" lay-affix="clear"></input>';
     }
diff --git a/js/demandPlan/child/choose_tool_type_list.js b/js/demandPlan/child/choose_tool_type_list.js
index 6eb73dc..d35681d 100644
--- a/js/demandPlan/child/choose_tool_type_list.js
+++ b/js/demandPlan/child/choose_tool_type_list.js
@@ -156,7 +156,7 @@ function initTable() {
                 {
                     field: "times",
                     width: '15%',
-                    title: "<span style='color:red'> * </span>需用天数",
+                    title: "<span style='color:red'> * </span>预计使用时间",
                     unresize: true,
                     align: "center",
                     edit: 'text',
diff --git a/js/demandPlan/child/delivery_all_list.js b/js/demandPlan/child/delivery_all_list.js
index 12135ae..db173c1 100644
--- a/js/demandPlan/child/delivery_all_list.js
+++ b/js/demandPlan/child/delivery_all_list.js
@@ -177,7 +177,7 @@ function initTable() {
         },
         {
           field: "status",
-          title: "进度",
+          title: "发货进度",
           width: '13%',
           unresize: true,
           align: "center",
@@ -333,7 +333,7 @@ function exportExcel() {
 
 // 打印
 function print() {
-  Print('#table-box', {
+  Print('#layuimini-container', {
     onStart: function () {
       console.log('onStart', new Date())
     },
diff --git a/js/demandPlan/child/delivery_detail_list.js b/js/demandPlan/child/delivery_detail_list.js
index c3e1a0f..fd27ee1 100644
--- a/js/demandPlan/child/delivery_detail_list.js
+++ b/js/demandPlan/child/delivery_detail_list.js
@@ -32,7 +32,7 @@ function getShipmentBatch(list) {
     if (list && list.length > 0) {
         dataList.push({ name: '全部', id: '' })
         $.each(list, function (index, item) {
-            dataList.push({ name: '第' + numToChinese(index + 1) + '批', id: item.id, tiem: item.createDay })
+            dataList.push({ name: '领料单', id: item.id, tiem: item.createDay })
         });
         dataList.push({ name: '待发货', id: '0' })
     } else {
diff --git a/js/demandPlan/delivery_list.js b/js/demandPlan/delivery_list.js
index 7d8fc19..03ac36c 100644
--- a/js/demandPlan/delivery_list.js
+++ b/js/demandPlan/delivery_list.js
@@ -5,22 +5,6 @@ layui.use(["form", "table"], function () {
   form = layui.form;
   table = layui.table;
   element = layui.element;
-  // 动态插入进度条元素
-  /* $("#num-progress").after(`
-    <div class="layui-progress layui-bg-red" lay-filter="demo-filter-progress" style="margin-top:10%;">
-      <div class="layui-progress-bar " lay-percent="30%"></div>
-    </div>
-  `);
-  $("#num-progress2").after(`
-    <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-      <div class="layui-progress-bar layui-bg-red" lay-percent="30%"></div>
-    </div>
-  `);
-  $("#num-progress3").after(`
-    <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-      <div class="layui-progress-bar" lay-percent="30%"></div>
-    </div>
-  `); */
   element.render();
   initTable();
   getStatistics();
@@ -45,25 +29,7 @@ function getStatistics() {
     $('#fhNum').html(obj.fhNum);
     $('#overNum').html(obj.overNum);
     $('#noPlanNum').html(obj.noPlanNum);
-    /* $('#dfh').html(obj.dfh + '%');
-    $('#yfh').html(obj.yfh + '%');
-    let dfh = obj.dfh;
-    let yfh = obj.yfh;
-    $("#num-progress").after(`
-      <div class="layui-progress layui-bg-red" lay-filter="demo-filter-progress" style="margin-top:10%;">
-        <div class="layui-progress-bar " lay-percent="${yfh}%"></div>
-      </div>
-    `);
-    $("#num-progress2").after(`
-      <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-        <div class="layui-progress-bar layui-bg-red" lay-percent="${dfh}%"></div>
-      </div>
-    `);
-    $("#num-progress3").after(`
-      <div class="layui-progress" lay-filter="demo-filter-progress" style="margin-top:2%;">
-        <div class="layui-progress-bar" lay-percent="${yfh}%"></div>
-      </div>
-    `); */
+
   }
 }
 
@@ -202,7 +168,7 @@ function initTable() {
         {
           field: "progress",
           width: '19.85%',
-          title: "进度",
+          title: "发货进度",
           unresize: true,
           align: "center",
           templet: schedule,
@@ -215,7 +181,7 @@ function initTable() {
           templet: function (d) {
             let html = "";
             html += "<a onclick='deliveryDetail(" + JSON.stringify(d) + ")'>详情</a>";
-            html += "<div class='splitLine'>|</div><a onclick='sendGoods(" + JSON.stringify(d) + ")'>发货</a>";
+            // html += "<div class='splitLine'>|</div><a onclick='sendGoods(" + JSON.stringify(d) + ")'>发货</a>";
             return html;
           },
         },
@@ -276,6 +242,9 @@ function schedule(d) {
   d.progress = parseFloat(d.progress);
   d.filter == undefined ? (d.filter = d.LAY_NUM) : d.filter;
   d.progress == undefined ? (d.progress = 100) : d.progress;
+  if (d.needNum === 0) {
+    d.progress = 100;
+  }
   var color = "layui-bg-orange";
   if (d.progress < 100) {
     color = "layui-bg-orange";
diff --git a/js/public.js b/js/public.js
index dbce75a..c7158f4 100644
--- a/js/public.js
+++ b/js/public.js
@@ -3,7 +3,7 @@ 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 dataUrl = 'http://192.168.0.14:21999/'; // 数据请求路径
+const dataUrl = 'http://127.0.0.1:21521/'; // 数据请求路径
 const fileUrl = 'http://192.168.0.14:21999/statics'; // 文件路径
 const viewFileUrl = 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器预览文件
 
diff --git a/page/accessory/child/accessory_apply_add.html b/page/accessory/child/accessory_apply_add.html
index c850185..36aac4f 100644
--- a/page/accessory/child/accessory_apply_add.html
+++ b/page/accessory/child/accessory_apply_add.html
@@ -20,7 +20,7 @@
                     <label class="layui-form-label required" style="width: 100px !important;">领料人</label>
                     <div class="layui-input-inline">
                         <input class="layui-input" name="projectPart" id="projectPart" autocomplete="off"
-                               lay-verify="required" maxlength="50" disabled="true">
+                               lay-verify="required" maxlength="50">
                     </div>
                 </div>
                 <!-- 配件类型选项 -->
diff --git a/page/demandPlan/child/apply_plan_edit_form.html b/page/demandPlan/child/apply_plan_edit_form.html
index 24b6ec8..f20e5e4 100644
--- a/page/demandPlan/child/apply_plan_edit_form.html
+++ b/page/demandPlan/child/apply_plan_edit_form.html
@@ -113,8 +113,8 @@
                             <th style="width: 15%" class="center">物机名称</th>
                             <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"><span style="color: red;">*</span>需用天数</th>
+                            <th style="width: 12%" class="center"><span style="color: red;">*</span>需用量</th>
+                            <th style="width: 18%" class="center"><span style="color: red;">*</span>预计使用时间</th>
                             <th style="width: 15%" class="center">备注</th>
                         </tr>
                     </thead>
diff --git a/page/demandPlan/child/apply_plan_form.html b/page/demandPlan/child/apply_plan_form.html
index 50a35b2..5247354 100644
--- a/page/demandPlan/child/apply_plan_form.html
+++ b/page/demandPlan/child/apply_plan_form.html
@@ -43,13 +43,12 @@
                                 lay-verify="required" maxlength="50" lay-affix="clear">
                         </div>
                     </div>
-                    <div class="layui-inline">
-                        <label class="layui-form-label required" style="width: 110px !important;">施工地点</label>
-                        <div class="layui-input-inline layui-input-wrap">
-                            <input class="layui-input" name="projectContent" id="projectContent" autocomplete="off"
-                                lay-verify="required" maxlength="50" lay-affix="clear">
-                        </div>
-                    </div>
+<!--                    <div class="layui-inline">-->
+<!--                        <label class="layui-form-label required" style="width: 110px !important;">施工地点</label>-->
+<!--                        <div class="layui-input-inline layui-input-wrap">-->
+<!--                            <input class="layui-input" name="projectContent" id="projectContent" autocomplete="off" maxlength="50" lay-affix="clear">-->
+<!--                        </div>-->
+<!--                    </div>-->
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label required" style="width: 100px !important;">计划说明</label>
@@ -114,7 +113,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"><span style="color: red;">*</span>需用天数</th>
+                            <th style="width: 15%" class="center"><span style="color: red;">*</span>预计使用时间</th>
                             <th style="width: 15%" class="center">备注</th>
                         </tr>
                     </thead>
diff --git a/page/demandPlan/child/delivery_all_list.html b/page/demandPlan/child/delivery_all_list.html
index bc9fa7b..4e78bc9 100644
--- a/page/demandPlan/child/delivery_all_list.html
+++ b/page/demandPlan/child/delivery_all_list.html
@@ -48,8 +48,8 @@
                                         class="layui-icon layui-icon-refresh"></i> 重 置</button>
                                 <button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i
                                         class="layui-icon layui-icon-download-circle"></i> 下 载</button>
-                                <!-- <button class="layui-btn layui-btn-primary" onclick="print()"><i
-                                        class="layui-icon layui-icon-print"></i> 打 印</button> -->
+<!--                                <button class="layui-btn layui-btn-primary" onclick="print()"><i-->
+<!--                                        class="layui-icon layui-icon-print"></i> 打 印</button>-->
                             </div>
                         </div>
                     </form>
@@ -66,5 +66,5 @@
 <script src="../../../js/Print.js" charset="utf-8"></script>
 <script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
 <script src="../../../js/demandPlan/child/delivery_all_list.js" charset="utf-8"></script>
-
+<script src="../../../js/Print.js" charset="utf-8"></script>
 </html>
\ No newline at end of file
diff --git a/page/demandPlan/child/delivery_detail_list.html b/page/demandPlan/child/delivery_detail_list.html
index f1878c1..f25842d 100644
--- a/page/demandPlan/child/delivery_detail_list.html
+++ b/page/demandPlan/child/delivery_detail_list.html
@@ -27,6 +27,7 @@
                 <p>计划数量</p>
                 <p style="color: #409EFF;" id="planNum">0</p>
             </div>
+            <button style="text-align: right" class="layui-btn layui-btn-primary" onclick="print()">打印</button>
         </div>
         <div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab">
             <ul class="layui-tab-title">
@@ -43,4 +44,5 @@
 <script src="../../../lib/layui-v2.9.18/layui/layui.js" charset="utf-8"></script>
 <script src="../../../js/demandPlan/child/delivery_detail_list.js" charset="utf-8"></script>
 <script src="../../../js/openIframe.js" charset="utf-8"></script>
+
 </html>
\ No newline at end of file