默认内容

This commit is contained in:
syruan 2025-03-24 15:50:54 +08:00
parent ef83dd30bb
commit 097e31fa60
16 changed files with 38 additions and 66 deletions

View File

@ -34,7 +34,7 @@
"target": "_self" "target": "_self"
}, },
{ {
"title": "机具公司发货", "title": "发货统计",
"href": "page/demandPlan/delivery_list.html", "href": "page/demandPlan/delivery_list.html",
"icon": "fa fa-tachometer", "icon": "fa fa-tachometer",
"target": "_self" "target": "_self"

View File

@ -171,7 +171,7 @@
errorFn(xhr, status, error) errorFn(xhr, status, error)
}, null); }, null);
} else { } else {
// console.log('走的自己登录'); console.log('走的自己登录');
// login(miniAdmin); // login(miniAdmin);
window.location = 'page/401.html'; window.location = 'page/401.html';
} }

View File

@ -22,7 +22,9 @@ function setParams(obj) {
// 获取sessionStorage中的数据并转换为对象 // 获取sessionStorage中的数据并转换为对象
var user = JSON.parse(sessionStorage.getItem('us')); var user = JSON.parse(sessionStorage.getItem('us'));
// 设置元素值 // 设置元素值
$('#projectPart').val(user.username); if (user != null && user.username != null) {
$('#projectPart').val(user.username);
}
laydate.render({ laydate.render({
elem: '#needTime' elem: '#needTime'
}); });

View File

@ -160,8 +160,8 @@ function initTable() {
}, },
{ {
field: "backDate", field: "backDate",
width: '10%', width: '15%',
title: "退还日期", title: "预计使用时间",
unresize: true, unresize: true,
align: "center", align: "center",
sort:true, sort:true,
@ -169,7 +169,7 @@ function initTable() {
}, },
{ {
field: "remarks", field: "remarks",
width: '15%', width: '10%',
title: "备注", title: "备注",
unresize: true, unresize: true,
align: "center", align: "center",

View File

@ -141,9 +141,9 @@ function submitApply(data) {
if (parseInt(list[i].needNum) === 0) { if (parseInt(list[i].needNum) === 0) {
return layer.msg('机具明细,第' + (i + 1) + '行,未填写需用量', { icon: 7 }); return layer.msg('机具明细,第' + (i + 1) + '行,未填写需用量', { icon: 7 });
} }
if (parseInt(list[i].times) === 0) { // if (parseInt(list[i].times) === 0) {
return layer.msg('机具明细,第' + (i + 1) + '行,未填写需用天数', { icon: 7 }); // return layer.msg('机具明细,第' + (i + 1) + '行,未填写需用天数', { icon: 7 });
} // }
} }
data.field.id = objParam.id; data.field.id = objParam.id;
data.field.jsonData = JSON.stringify(list); data.field.jsonData = JSON.stringify(list);

View File

@ -232,7 +232,7 @@ function setFormInput(value, type) {
if (type === 1) { // 需用量 if (type === 1) { // 需用量
html += '<input class="layui-input" name="needNum" onblur="checkValue(this,1,\'需用量\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">'; 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" name="times" onblur="checkValue(this,2,\'预计使用时间\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
} else if (type === 3) { // 备注 } else if (type === 3) { // 备注
html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="60" lay-affix="clear"></input>'; html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="60" lay-affix="clear"></input>';
} }

View File

@ -156,7 +156,7 @@ function initTable() {
{ {
field: "times", field: "times",
width: '15%', width: '15%',
title: "<span style='color:red'> * </span>需用天数", title: "<span style='color:red'> * </span>预计使用时间",
unresize: true, unresize: true,
align: "center", align: "center",
edit: 'text', edit: 'text',

View File

@ -177,7 +177,7 @@ function initTable() {
}, },
{ {
field: "status", field: "status",
title: "进度", title: "发货进度",
width: '13%', width: '13%',
unresize: true, unresize: true,
align: "center", align: "center",
@ -333,7 +333,7 @@ function exportExcel() {
// 打印 // 打印
function print() { function print() {
Print('#table-box', { Print('#layuimini-container', {
onStart: function () { onStart: function () {
console.log('onStart', new Date()) console.log('onStart', new Date())
}, },

View File

@ -32,7 +32,7 @@ function getShipmentBatch(list) {
if (list && list.length > 0) { if (list && list.length > 0) {
dataList.push({ name: '全部', id: '' }) dataList.push({ name: '全部', id: '' })
$.each(list, function (index, item) { $.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' }) dataList.push({ name: '待发货', id: '0' })
} else { } else {

View File

@ -5,22 +5,6 @@ layui.use(["form", "table"], function () {
form = layui.form; form = layui.form;
table = layui.table; table = layui.table;
element = layui.element; 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(); element.render();
initTable(); initTable();
getStatistics(); getStatistics();
@ -45,25 +29,7 @@ function getStatistics() {
$('#fhNum').html(obj.fhNum); $('#fhNum').html(obj.fhNum);
$('#overNum').html(obj.overNum); $('#overNum').html(obj.overNum);
$('#noPlanNum').html(obj.noPlanNum); $('#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", field: "progress",
width: '19.85%', width: '19.85%',
title: "进度", title: "发货进度",
unresize: true, unresize: true,
align: "center", align: "center",
templet: schedule, templet: schedule,
@ -215,7 +181,7 @@ function initTable() {
templet: function (d) { templet: function (d) {
let html = ""; let html = "";
html += "<a onclick='deliveryDetail(" + JSON.stringify(d) + ")'>详情</a>"; 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; return html;
}, },
}, },
@ -276,6 +242,9 @@ function schedule(d) {
d.progress = parseFloat(d.progress); d.progress = parseFloat(d.progress);
d.filter == undefined ? (d.filter = d.LAY_NUM) : d.filter; d.filter == undefined ? (d.filter = d.LAY_NUM) : d.filter;
d.progress == undefined ? (d.progress = 100) : d.progress; d.progress == undefined ? (d.progress = 100) : d.progress;
if (d.needNum === 0) {
d.progress = 100;
}
var color = "layui-bg-orange"; var color = "layui-bg-orange";
if (d.progress < 100) { if (d.progress < 100) {
color = "layui-bg-orange"; color = "layui-bg-orange";

View File

@ -3,7 +3,7 @@ const fileUrl = 'http://127.0.0.1:21995/statics'; // 文件路径
const signFileUrl = '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 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 fileUrl = 'http://192.168.0.14:21999/statics'; // 文件路径
const viewFileUrl = 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器预览文件 const viewFileUrl = 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器预览文件

View File

@ -20,7 +20,7 @@
<label class="layui-form-label required" style="width: 100px !important;">领料人</label> <label class="layui-form-label required" style="width: 100px !important;">领料人</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input class="layui-input" name="projectPart" id="projectPart" autocomplete="off" <input class="layui-input" name="projectPart" id="projectPart" autocomplete="off"
lay-verify="required" maxlength="50" disabled="true"> lay-verify="required" maxlength="50">
</div> </div>
</div> </div>
<!-- 配件类型选项 --> <!-- 配件类型选项 -->

View File

@ -113,8 +113,8 @@
<th style="width: 15%" class="center">物机名称</th> <th style="width: 15%" class="center">物机名称</th>
<th style="width: 10%" class="center">规格</th> <th style="width: 10%" 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: 12%" class="center"><span style="color: red;">*</span>需用量</th>
<th style="width: 15%" 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> <th style="width: 15%" class="center">备注</th>
</tr> </tr>
</thead> </thead>

View File

@ -43,13 +43,12 @@
lay-verify="required" maxlength="50" lay-affix="clear"> lay-verify="required" maxlength="50" lay-affix="clear">
</div> </div>
</div> </div>
<div class="layui-inline"> <!-- <div class="layui-inline">-->
<label class="layui-form-label required" style="width: 110px !important;">施工地点</label> <!-- <label class="layui-form-label required" style="width: 110px !important;">施工地点</label>-->
<div class="layui-input-inline layui-input-wrap"> <!-- <div class="layui-input-inline layui-input-wrap">-->
<input class="layui-input" name="projectContent" id="projectContent" autocomplete="off" <!-- <input class="layui-input" name="projectContent" id="projectContent" autocomplete="off" maxlength="50" lay-affix="clear">-->
lay-verify="required" maxlength="50" lay-affix="clear"> <!-- </div>-->
</div> <!-- </div>-->
</div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required" style="width: 100px !important;">计划说明</label> <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: 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"><span style="color: red;">*</span>预计使用时间</th>
<th style="width: 15%" class="center">备注</th> <th style="width: 15%" class="center">备注</th>
</tr> </tr>
</thead> </thead>

View File

@ -48,8 +48,8 @@
class="layui-icon layui-icon-refresh"></i> 重 置</button> class="layui-icon layui-icon-refresh"></i> 重 置</button>
<button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i <button class="layui-btn layui-btn-primary" onclick="exportExcel()"><i
class="layui-icon layui-icon-download-circle"></i> 下 载</button> class="layui-icon layui-icon-download-circle"></i> 下 载</button>
<!-- <button class="layui-btn layui-btn-primary" onclick="print()"><i <!-- <button class="layui-btn layui-btn-primary" onclick="print()"><i-->
class="layui-icon layui-icon-print"></i> 打 印</button> --> <!-- class="layui-icon layui-icon-print"></i> 打 印</button>-->
</div> </div>
</div> </div>
</form> </form>
@ -66,5 +66,5 @@
<script src="../../../js/Print.js" charset="utf-8"></script> <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="../../../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/demandPlan/child/delivery_all_list.js" charset="utf-8"></script>
<script src="../../../js/Print.js" charset="utf-8"></script>
</html> </html>

View File

@ -27,6 +27,7 @@
<p>计划数量</p> <p>计划数量</p>
<p style="color: #409EFF;" id="planNum">0</p> <p style="color: #409EFF;" id="planNum">0</p>
</div> </div>
<button style="text-align: right" class="layui-btn layui-btn-primary" onclick="print()">打印</button>
</div> </div>
<div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab"> <div class="layui-tab layui-tab-brief" id="layui-tab-brief" lay-filter="demo-filter-tab">
<ul class="layui-tab-title"> <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="../../../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/demandPlan/child/delivery_detail_list.js" charset="utf-8"></script>
<script src="../../../js/openIframe.js" charset="utf-8"></script> <script src="../../../js/openIframe.js" charset="utf-8"></script>
</html> </html>