Browse Source

[fix]

品质管理 品质单
修改各品质单开始品质和详情页面表格布局,去除图片输入框,新增上传附件按钮;子表表格内报告改为不良描述;
新增检验完成时间自动获取赋值语句;
修改品质单列表页面,修改跳转页面方式为全屏打开;
修改品质报告单详情页面表单结构;
dev
王晓迪 1 month ago
parent
commit
71c343c6ec
  1. 8
      ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html
  2. 88
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/iqcStartingQuality.html
  3. 27
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/iqcStartingQualityDetail.html
  4. 69
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html
  5. 70
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOutStartingQuality.html
  6. 2
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOutStartingQualityDetail.html
  7. 68
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQuality.html
  8. 23
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQualityDetail.html
  9. 14
      ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html
  10. 48
      ruoyi-admin/src/main/resources/templates/quality/qualityReport/detail.html
  11. 25
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnBeforeStorageDetail.html
  12. 4
      ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html
  13. 81
      ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html
  14. 6
      ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQualityDetail.html

8
ruoyi-admin/src/main/resources/templates/quality/iqcQualityOrder/iqcQualityOrder.html

@ -216,24 +216,24 @@
//来料品质
function iqcStartingQuality(qualityOrderId){
var url = ctx +'quality/qualityOrder/startingQuality/' + qualityOrderId;
$.modal.open("进行来料品质",url);
$.modal.openFull("进行来料品质",url);
}
//委外品质
function makeOutStartingQuality(qualityOrderId){
var url = ctx +'quality/qualityOrder/makeOutStartingQuality/' + qualityOrderId;
$.modal.open("进行委外入库品质",url);
$.modal.openFull("进行委外入库品质",url);
}
//采购品质详情
function iqcStartingQualityDetail(qualityOrderId){
var url = ctx +'quality/qualityOrder/startingQualityDetail/' + qualityOrderId;
$.modal.open("品质单详情",url);
$.modal.openFull("品质单详情",url);
}
//委外品质详情
function makeOutStartingQualityDetail(qualityOrderId){
var url = ctx +'quality/qualityOrder/makeStartingQualityDetail/' + qualityOrderId;
$.modal.open("品质单详情",url);
$.modal.openFull("品质单详情",url);
}
// 导出

88
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/iqcStartingQuality.html

@ -68,7 +68,7 @@
</div>
</div>
</div>
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<!--物料相关-->
<div class="row">
<div class="col-sm-12" id="tablesContainer">
@ -77,45 +77,45 @@
</div>
</div>
<div class="container">
<h3 style="color: blue;">品质报告:</h3>
<div class="col-xs-11">
<h3 style="color: blue;margin-left: 130px;">品质报告:</h3>
<div class="col-sm-12">
<h3>合格数</h3>
<div class="row">
<h3 style="margin-left: 130px;">合格数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">ok允收数:</label>
<div class="col-sm-8">
<input id="okAcceptedNum" name="okAcceptedNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">ok报告图片:</label>
<div class="col-sm-8">
<input name="okReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">ok报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="okReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="row">
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">特采/让步数:</label>
<div class="col-sm-8">
<input id="specialConcessionsNum" name="specialConcessionsNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">特采报告图片:</label>
<div class="col-sm-8">
<input name="specialReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">特采报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="specialReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<!--不合格数-->
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 align-items-center">
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良数</span>
<div class="row">
<h3 style="margin-left: 130px;">不良数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">不良数:</label>
<div class="col-sm-8">
@ -134,13 +134,16 @@
</div>
</div>
</div>
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 d-flex align-items-center">
<a class="btn btn-success ml-auto" onclick="addUnqualified()">
<i class="fa fa-plus"></i> 添加不良分类
</a>
<a class="btn btn-success ml-auto" onclick="uploadReport()">
<i class="fa fa-plus"></i> 上传附件
</a>
</div>
</div>
<div class="row">
@ -236,33 +239,45 @@
}, {
title: '物料名称',
align: 'center',
field: 'materialName'
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
},
{
title: '物料类型',
align: 'center',
field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
title: '图片',
field: 'materialPhotourl',
field: 'materialModel',
align: 'center',
title: '型号',
},
{
title: '描述',
align: 'center',
field: 'materialDescribe',
},
{
title: '品牌',
align: 'center',
field: 'materialBrand',
},
{
title: '单位',
align: 'center',
field: 'materialUnit',
},
{
title: '加工方式',
align: 'center',
field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
@ -270,19 +285,23 @@
},
{
title: '检验数',
align: 'center',
field: 'checkNum',
},
{
title: '合格数',
align: 'center',
field: 'qualityQualifiedNum',
},
{
title: '不良数',
align: 'center',
field: 'qualityUnqualifiedNum',
},
{
title: '待审核数',
align: 'center',
field: 'pendingReviewNum',
},
]
@ -308,13 +327,19 @@
visible: false
},
{title: '不良分类',field: 'processBadClassification',
{
title: '不良分类',
field: 'processBadClassification',
align: 'center',
formatter:function (value, row, index) {
return processBadClassificationFormatter(value,row,index);
}
},
{title: '不良等级',field: 'processBadGrade',
{
title: '不良等级',
field: 'processBadGrade',
align: 'center',
formatter:function (value, row, index) {
return processBadGradeFormatter(value,row,index);
}
@ -322,6 +347,7 @@
{
title: '数量',
field: 'processBadNum',
align: 'center',
editable:{
type: 'text',
validate: function (v) {
@ -333,7 +359,8 @@
}
},
{
title: '报告',
title: '不良描述',
align: 'center',
field: 'unqualifiedReportUrl',
editable: {
type: 'text', // 表示该列可以被编辑为文本
@ -351,6 +378,15 @@
]
};
$.table.init(unqualifiedOption);
// 设置日期选择器的值
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
var yyyy = today.getFullYear();
var formattedDate = yyyy + '-' + mm + '-' + dd;
$("input[name='checkoutCompletionTime']").val(formattedDate);
});
//添加不合格分类

27
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/iqcStartingQualityDetail.html

@ -67,7 +67,7 @@
</div>
</div>
</div>
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<!--物料相关-->
<div class="row">
<div class="col-sm-12" id="tablesContainer">
@ -77,7 +77,7 @@
</div>
<!--品质报告单-->
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<h4>品质报告单:</h4>
<div class="row">
<div class="col-sm-12 table-striped" id="reportTable">
@ -152,35 +152,48 @@
align: 'center',
field: 'materialNo',
}, {
},
{
title: '物料名称',
align: 'center',
field: 'materialName'
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
},
{
title: '物料类型',
align: 'center',
field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
title: '图片',
field: 'materialPhotourl',
title: '型号',
align: 'center',
field: 'materialModel',
},
{
title: '描述',
align: 'center',
field: 'materialDescribe',
},
{
title: '品牌',
align: 'center',
field: 'materialBrand',
},
{
title: '单位',
align: 'center',
field: 'materialUnit',
},
{
title: '加工方式',
align: 'center',
field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
@ -188,19 +201,23 @@
},
{
title: '检验数',
align: 'center',
field: 'checkNum',
},
{
title: '合格数',
align: 'center',
field: 'qualityQualifiedNum',
},
{
title: '不良数',
align: 'center',
field: 'qualityUnqualifiedNum',
},
{
title: '待审核数',
align: 'center',
field: 'pendingReviewNum',
},
]

69
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOtherStartingQuality.html

@ -64,7 +64,7 @@
</div>
<!--物料信息-->
<div class="container" >
<div class="col-xs-11" style="margin-left: 100px;" >
<div class="row">
<div class="col-sm-12" id="materialTable" style="height: 100px;padding-left: 50px;">
<table id="bootstrap-material-table"></table>
@ -72,45 +72,45 @@
</div>
</div>
<div class="container">
<h3 style="color: blue;">品质报告:</h3>
<div class="col-xs-11">
<h3 style="color: blue;margin-left: 130px;">品质报告:</h3>
<div class="col-sm-12">
<h3>合格数</h3>
<div class="row">
<h3 style="margin-left: 130px;">合格数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">ok允收数:</label>
<div class="col-sm-8">
<input id="okAcceptedNum" name="okAcceptedNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">ok报告图片:</label>
<div class="col-sm-8">
<input name="okReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">ok报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="okReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="row">
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">特采/让步数:</label>
<div class="col-sm-8">
<input id="specialConcessionsNum" name="specialConcessionsNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">特采报告图片:</label>
<div class="col-sm-8">
<input name="specialReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">特采报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="specialReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<!--不合格数-->
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 align-items-center">
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良数</span>
<div class="row">
<h3 style="margin-left: 130px;">不良数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">不良数:</label>
<div class="col-sm-8">
@ -129,17 +129,20 @@
</div>
</div>
</div>
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 d-flex align-items-center">
<a class="btn btn-success ml-auto" onclick="addUnqualified()">
<i class="fa fa-plus"></i> 添加不良分类
</a>
<a class="btn btn-success ml-auto" onclick="uploadReport()">
<i class="fa fa-plus"></i> 上传附件
</a>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<div class="table table-striped table-bordered">
<table id="bootstrap-unqualified-table"></table>
</div>
</div>
@ -299,19 +302,26 @@
visible: false
},
{title: '不良分类',field: 'processBadClassification',
{
title: '不良分类',
align: 'center',
field: 'processBadClassification',
formatter:function (value, row, index) {
return processBadClassificationFormatter(value,row,index);
}
},
{title: '不良等级',field: 'processBadGrade',
{
title: '不良等级',
align: 'center',
field: 'processBadGrade',
formatter:function (value, row, index) {
return processBadGradeFormatter(value,row,index);
}
},
{
title: '数量',
align: 'center',
field: 'processBadNum',
editable:{
type: 'text',
@ -324,7 +334,8 @@
}
},
{
title: '报告',
title: '不良描述',
align: 'center',
field: 'unqualifiedReportUrl',
editable: {
type: 'text', // 表示该列可以被编辑为文本
@ -344,6 +355,14 @@
$.table.init(unqualifiedOption);
//移除表格上方toolbar(去除空白)
$(".fixed-table-toolbar").remove();
// 设置日期选择器的值
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
var yyyy = today.getFullYear();
var formattedDate = yyyy + '-' + mm + '-' + dd;
$("input[name='checkoutCompletionTime']").val(formattedDate);
})

70
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOutStartingQuality.html

@ -64,7 +64,7 @@
</div>
<!--物料信息-->
<div class="container" >
<div class="col-xs-11" style="margin-left: 100px;" >
<div class="row">
<div class="col-sm-12" id="materialTable" style="height: 100px;padding-left: 50px;">
<table id="bootstrap-material-table"></table>
@ -72,45 +72,45 @@
</div>
</div>
<div class="container">
<h3 style="color: blue;">品质报告:</h3>
<div class="col-xs-11">
<h3 style="color: blue;margin-left: 130px;">品质报告:</h3>
<div class="col-sm-12">
<h3>合格数</h3>
<div class="row">
<h3 style="margin-left: 130px;">合格数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">ok允收数:</label>
<div class="col-sm-8">
<input id="okAcceptedNum" name="okAcceptedNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">ok报告图片:</label>
<div class="col-sm-8">
<input name="okReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">ok报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="okReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="row">
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">特采/让步数:</label>
<div class="col-sm-8">
<input id="specialConcessionsNum" name="specialConcessionsNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">特采报告图片:</label>
<div class="col-sm-8">
<input name="specialReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">特采报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="specialReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<!--不合格数-->
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 align-items-center">
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良数</span>
<div class="row">
<h3 style="margin-left: 130px;">不良数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">不良数:</label>
<div class="col-sm-8">
@ -129,17 +129,20 @@
</div>
</div>
</div>
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 d-flex align-items-center">
<a class="btn btn-success ml-auto" onclick="addUnqualified()">
<i class="fa fa-plus"></i> 添加不良分类
</a>
<a class="btn btn-success ml-auto" onclick="uploadReport()">
<i class="fa fa-plus"></i> 上传附件
</a>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<div class="table table-striped table-bordered">
<table id="bootstrap-unqualified-table"></table>
</div>
</div>
@ -299,19 +302,26 @@
visible: false
},
{title: '不良分类',field: 'processBadClassification',
{
title: '不良分类',
align: 'center',
field: 'processBadClassification',
formatter:function (value, row, index) {
return processBadClassificationFormatter(value,row,index);
}
},
{title: '不良等级',field: 'processBadGrade',
{
title: '不良等级',
align: 'center',
field: 'processBadGrade',
formatter:function (value, row, index) {
return processBadGradeFormatter(value,row,index);
}
},
{
title: '数量',
align: 'center',
field: 'processBadNum',
editable:{
type: 'text',
@ -324,7 +334,8 @@
}
},
{
title: '报告',
title: '不良描述',
align: 'center',
field: 'unqualifiedReportUrl',
editable: {
type: 'text', // 表示该列可以被编辑为文本
@ -345,6 +356,15 @@
//移除表格上方toolbar(去除空白)
$(".fixed-table-toolbar").remove();
// 设置日期选择器的值
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
var yyyy = today.getFullYear();
var formattedDate = yyyy + '-' + mm + '-' + dd;
$("input[name='checkoutCompletionTime']").val(formattedDate);
})
function queryParams(params) {

2
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeOutStartingQualityDetail.html

@ -53,7 +53,7 @@
</div>
</form>
<!--物料信息-->
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<div class="row">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>

68
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQuality.html

@ -60,7 +60,7 @@
</div>
<!--物料信息-->
<div class="container" >
<div class="col-xs-11" style="margin-left: 100px;">
<div class="row">
<div class="col-sm-12" style="height: 100px;padding-left: 50px;">
<table id="bootstrap-material-table"></table>
@ -68,45 +68,45 @@
</div>
</div>
<div class="container">
<h3 style="color: blue;">品质报告:</h3>
<div class="col-sm-12">
<h3>合格数</h3>
<div class="row">
<div class="col-xs-11">
<h3 style="color: blue;margin-left: 130px;">品质报告:</h3>
<div class="col-sm-12">
<h3 style="margin-left: 130px;">合格数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">ok允收数:</label>
<div class="col-sm-8">
<input id="okAcceptedNum" name="okAcceptedNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">ok报告图片:</label>
<div class="col-sm-8">
<input name="okReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">ok报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="okReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="row">
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">特采/让步数:</label>
<div class="col-sm-8">
<input id="specialConcessionsNum" name="specialConcessionsNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">特采报告图片:</label>
<div class="col-sm-8">
<input name="specialReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">特采报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="specialReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<!--不合格数-->
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 align-items-center">
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良数</span>
<div class="row">
<h3 style="margin-left: 130px;">不良数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">不良数:</label>
<div class="col-sm-8">
@ -126,12 +126,12 @@
</div>
</div>
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<a class="btn btn-success ml-auto" onclick="addShippingDevice()">
<i class="fa fa-plus"></i> 添加出货设备
</a>
</div>
<div class="container" id="shippingDevice">
<div class="col-xs-11" style="margin-left: 100px;" id="shippingDevice">
</div>
@ -275,6 +275,14 @@
//移除表格上方toolbar(去除空白)
$(".fixed-table-toolbar").remove();
// 设置日期选择器的值
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
var yyyy = today.getFullYear();
var formattedDate = yyyy + '-' + mm + '-' + dd;
$("input[name='checkoutCompletionTime']").val(formattedDate);
})
function initEquipTable(tableId){
@ -378,19 +386,26 @@
visible: false
},
{title: '不良分类',field: 'processBadClassification',
{
title: '不良分类',
align: 'center',
field: 'processBadClassification',
formatter:function (value, row, index) {
return processBadClassificationFormatter(value,row,index,tableId);
}
},
{title: '不良等级',field: 'processBadGrade',
{
title: '不良等级',
align: 'center',
field: 'processBadGrade',
formatter:function (value, row, index) {
return processBadGradeFormatter(value,row,index,tableId);
}
},
{
title: '数量',
align: 'center',
field: 'processBadNum',
editable:{
type: 'text',
@ -403,7 +418,8 @@
}
},
{
title: '报告',
title: '不良描述',
align: 'center',
field: 'unqualifiedReportUrl',
editable: {
type: 'text', // 表示该列可以被编辑为文本

23
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/makeStartingQualityDetail.html

@ -59,7 +59,7 @@
</div>
</form>
<!--物料信息-->
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<div class="row">
<div class="col-sm-12 table-striped">
<table id="bootstrap-table"></table>
@ -68,7 +68,7 @@
</div>
<!--物料信息-->
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<h4>品质报告单:</h4>
<div class="row">
<div class="col-sm-12 table-striped" id="reportTable">
@ -122,14 +122,17 @@
},
{
title: '料号',
align: 'center',
field: 'materialNo'
},
{
title: '物料名称',
align: 'center',
field: 'materialName'
},
{
title: '物料类型',
align: 'center',
field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
@ -137,26 +140,32 @@
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
},
{
title: '型号',
align: 'center',
field: 'materialModel',
},
{
title: '描述',
align: 'center',
field: 'materialDescribe',
},
{
title: '品牌',
align: 'center',
field: 'materialBrand',
},
{
title: '单位',
align: 'center',
field: 'materialUnit',
},
{
title: '加工方式',
align: 'center',
field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
@ -164,18 +173,22 @@
},
{
title: '生产订单数',
align: 'center',
field: 'makeTotal',
},
{
title: '检验数',
align: 'center',
field: 'checkNum',
},
{
title: '品质合格数',
align: 'center',
field: 'qualityQualifiedNum',
},
{
title: '品质不合格数',
align: 'center',
field: 'qualityUnqualifiedNum',
}]
};
@ -197,10 +210,12 @@
columns: [
{
title: '品质报告单号',
align: 'center',
field: 'qualityOrderReportCode',
},
{
title: '审核状态',
align: 'center',
field: 'auditStatus',
formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value);
@ -208,18 +223,22 @@
},
{
title: '合格数',
align: 'center',
field: 'qualityHasqualifiedNum'
},
{
title: '不良数',
align: 'center',
field: 'processBadNum',
},
{
title: '创建人',
align: 'center',
field: 'createBy',
},
{
title: '创建时间',
align: 'center',
field: 'createTime',
},
]

14
ruoyi-admin/src/main/resources/templates/quality/qualityOrder/qualityOrder.html

@ -211,45 +211,45 @@
//品质
function startingQuality(qualityOrderId){
var url = ctx +'quality/qualityOrder/startingQuality/' + qualityOrderId;
$.modal.open("进行品质",url)
$.modal.openFull("进行品质",url);
}
//详情
function detail(qualityOrderId){
var url = ctx +'quality/qualityOrder/startingQualityDetail/' + qualityOrderId;
$.modal.open("品质单详情",url)
$.modal.openFull("品质单详情",url)
}
//委外加工单品质
function makeOutStartingQuality(qualityOrderId){
var url = ctx +'quality/qualityOrder/makeOutStartingQuality/' + qualityOrderId;
$.modal.open("进行品质",url)
$.modal.openFull("进行品质",url)
}
//委外加工单品质详情
function makeOutStartingQualityDetail(qualityOrderId){
var url = ctx +'quality/qualityOrder/makeOutStartingQualityDetail/' + qualityOrderId;
$.modal.open("品质详情",url)
$.modal.openFull("品质详情",url)
}
//生产入库成品品质
function makeStartingQuality(qualityOrderId){
var url = ctx +'quality/qualityOrder/makeStartingQuality/' + qualityOrderId;
$.modal.open("进行成品品质",url)
$.modal.openFull("进行成品品质",url)
}
//生产入库半成品、其他品质
function makeOtherStartingQuality(qualityOrderId){
var url = ctx +'quality/qualityOrder/makeOtherStartingQuality/' + qualityOrderId;
$.modal.open("进行半成品、其他物料品质",url)
$.modal.openFull("进行半成品、其他物料品质",url)
}
//生产入库品质详情
function makeStartingQualityDetail(qualityOrderId){
var url = ctx +'quality/qualityOrder/makeStartingQualityDetail/' + qualityOrderId;
$.modal.open("生产入库品质详情",url)
$.modal.openFull("生产入库品质详情",url)
}
// 导出

48
ruoyi-admin/src/main/resources/templates/quality/qualityReport/detail.html

@ -60,53 +60,53 @@
</div>
<!--物料信息-->
<div class="container" >
<div class="col-xs-11" style="margin-left: 100px;">
<div class="row">
<div class="col-sm-12" style="height: 100px;padding-left: 50px;">
<div class="col-sm-12" style="height: 100px;">
<table id="bootstrap-material-table"></table>
</div>
</div>
</div>
<div class="container">
<h3 style="color: blue;">品质报告:</h3>
<div class="col-xs-11">
<h3 style="color: blue;margin-left: 130px;">品质报告:</h3>
<div class="col-sm-12">
<h3>合格数</h3>
<div class="row">
<h3 style="margin-left: 130px;">合格数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">ok允收数:</label>
<div class="col-sm-8">
<input readonly id="okAcceptedNum" name="okAcceptedNum" class="form-control" th:field="*{okAcceptedNum}" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">ok报告图片:</label>
<div class="col-sm-8">
<input readonly name="okReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">ok报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input readonly name="okReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="row">
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">特采/让步数:</label>
<div class="col-sm-8">
<input readonly id="specialConcessionsNum" name="specialConcessionsNum" th:field="*{specialConcessionsNum}" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">特采报告图片:</label>
<div class="col-sm-8">
<input readonly name="specialReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">特采报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input readonly name="specialReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<!--不合格数-->
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 align-items-center">
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良数</span>
<div class="row">
<h3 style="margin-left: 130px;">不良数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">不良数:</label>
<div class="col-sm-8">
@ -126,7 +126,7 @@
</div>
</div>
<div class="container" id="shippingDevice">
<div class="col-xs-11" style="margin-left: 100px;" id="shippingDevice">
</div>
</div>
@ -333,7 +333,7 @@
},
{
title: '报告',
title: '不良描述',
align: 'center',
field: 'unqualifiedReportUrl',
},
@ -467,7 +467,7 @@
},
{
title: '报告',
title: '不良描述',
align: 'center',
field: 'unqualifiedReportUrl',
},

25
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnBeforeStorageDetail.html

@ -123,9 +123,12 @@
},
{
title: '料号',
align: 'center',
field: 'materialNo'
}, {
},
{
title: '物料名称',
align: 'center',
field: 'materialName'
},
{
@ -137,23 +140,32 @@
}
},
{
title: '物料图片',
title: '物料型号',
align: 'center',
field: 'materialModel'
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
},
{
title: '物料描述',
title: '描述',
align: 'center',
field: 'materialDescribe',
},
{
title: '物料品牌',
title: '品牌',
align: 'center',
field: 'materialBrand',
},
{
title: '物料单位',
title: '单位',
align: 'center',
field: 'materialUnit',
},
{
title: '物料加工方式',
title: '加工方式',
field: 'materialProcessMethod',
align: 'center',
formatter: function(value, row, index) {
@ -172,6 +184,7 @@
},
{
title: '品质不合格数',
align: 'center',
field: 'qualityUnqualifiedNum',
}]
});

4
ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnQualityOrder.html

@ -210,13 +210,13 @@
//退料品质
function returnStartingQuality(qualityOrderId){
var url = ctx +'quality/returnQualityOrder/returnStartingQuality/' + qualityOrderId;
$.modal.open("进行退料品质",url);
$.modal.openFull("进行退料品质",url);
}
//退料品质详情
function returnStartingQualityDetail(qualityOrderId){
var url = ctx +'quality/returnQualityOrder/returnStartingQualityDetail/' + qualityOrderId;
$.modal.open("品质单详情",url);
$.modal.openFull("品质单详情",url);
}
// 导出

81
ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQuality.html

@ -64,7 +64,7 @@
</div>
<!--物料信息-->
<div class="container" >
<div class="col-xs-11" style="margin-left: 100px;" >
<div class="row">
<div class="col-sm-12" id="materialTable" style="height: 100px;padding-left: 50px;">
<table id="bootstrap-material-table"></table>
@ -72,45 +72,45 @@
</div>
</div>
<div class="container">
<h3 style="color: blue;">品质报告:</h3>
<div class="col-xs-11">
<h3 style="color: blue;margin-left: 130px;">品质报告:</h3>
<div class="col-sm-12">
<h3>合格数</h3>
<div class="row">
<h3 style="margin-left: 130px;">合格数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">ok允收数:</label>
<div class="col-sm-8">
<input id="okAcceptedNum" name="okAcceptedNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">ok报告图片:</label>
<div class="col-sm-8">
<input name="okReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">ok报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="okReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="row">
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">特采/让步数:</label>
<div class="col-sm-8">
<input id="specialConcessionsNum" name="specialConcessionsNum" class="form-control" type="number" value="0" required>
</div>
</div>
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label">特采报告图片:</label>
<div class="col-sm-8">
<input name="specialReportUrl" class="form-control" type="text">
</div>
</div>
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="col-sm-4 control-label">特采报告图片:</label>-->
<!-- <div class="col-sm-8">-->
<!-- <input name="specialReportUrl" class="form-control" type="text">-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<!--不合格数-->
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 align-items-center">
<span style="font-weight: bold; font-family: Arial, sans-serif; font-size: 15px;padding-left: 0px;">不良数</span>
<div class="row">
<h3 style="margin-left: 130px;">不良数</h3>
<div class="row" style="margin-left: 50px;">
<div class="form-group col-sm-6">
<label class="col-sm-4 control-label is-required">不良数:</label>
<div class="col-sm-8">
@ -129,17 +129,20 @@
</div>
</div>
</div>
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12 d-flex align-items-center">
<a class="btn btn-success ml-auto" onclick="addUnqualified()">
<i class="fa fa-plus"></i> 添加不良分类
</a>
<a class="btn btn-success ml-auto" onclick="uploadReport()">
<i class="fa fa-plus"></i> 上传附件
</a>
</div>
</div>
<div class="row">
<div class="col-sm-12 select-table table-striped">
<div class="table table-striped table-bordered">
<table id="bootstrap-unqualified-table"></table>
</div>
</div>
@ -186,6 +189,13 @@
autoclose: true
});
$("input[name='checkoutCompletionTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
//物料信息展示列表
$(function() {
sessionStorage.clear();
@ -299,19 +309,26 @@
visible: false
},
{title: '不良分类',field: 'processBadClassification',
{
title: '不良分类',
field: 'processBadClassification',
align: 'center',
formatter:function (value, row, index) {
return processBadClassificationFormatter(value,row,index);
}
},
{title: '不良等级',field: 'processBadGrade',
{
title: '不良等级',
field: 'processBadGrade',
align: 'center',
formatter:function (value, row, index) {
return processBadGradeFormatter(value,row,index);
}
},
{
title: '数量',
align: 'center',
field: 'processBadNum',
editable:{
type: 'text',
@ -324,7 +341,8 @@
}
},
{
title: '报告',
title: '不良描述',
align: 'center',
field: 'unqualifiedReportUrl',
editable: {
type: 'text', // 表示该列可以被编辑为文本
@ -345,6 +363,14 @@
//移除表格上方toolbar(去除空白)
$(".fixed-table-toolbar").remove();
// 设置日期选择器的值
var today = new Date();
var dd = String(today.getDate()).padStart(2, '0');
var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
var yyyy = today.getFullYear();
var formattedDate = yyyy + '-' + mm + '-' + dd;
$("input[name='checkoutCompletionTime']").val(formattedDate);
})
function queryParams(params) {
@ -354,11 +380,6 @@
};
return curParams;
}
$("input[name='checkoutCompletionTime']").datetimepicker({
format: "yyyy-mm-dd",
minView: "month",
autoclose: true
});
//添加不合格分类
function addUnqualified() {

6
ruoyi-admin/src/main/resources/templates/quality/returnQualityOrder/returnStartingQualityDetail.html

@ -59,7 +59,7 @@
</div>
</form>
<!--物料信息-->
<div class="container">
<div class="col-xs-11" style="margin-left: 100px;">
<div class="row">
<div class="col-sm-12 table-striped">
<table id="bootstrap-table"></table>
@ -68,8 +68,8 @@
</div>
<!--物料信息-->
<div class="container">
<h4>品质报告单:</h4>
<div class="col-xs-11" style="margin-left: 100px;">
<h4 style="margin-top: 10px;">品质报告单:</h4>
<div class="row">
<div class="col-sm-12 table-striped" id="reportTable">
<table id="bootstrap-report-table"></table>

Loading…
Cancel
Save