root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[fix] 

品质管理 退换货单
修改添加退换货单页面，修改表格定义，修改回调函数，新增插入表格新行函数，修改页面提交函数；
修改入库后退货确认供应商页面，新增是否退货供应商下拉框，修改提交函数，修改表格定义，添加供应商ID和名称下拉框初始化、监听函数；
修改入库前、后退换货品质报告显示效果；
修改入库前退换货确认供应商页面，新增下拉框，修改表格初始化方法及定义，供应商信息在子表中显示；
修改物料选择页面，去除单选限制，新增搜索栏；
修改新增退换货品质报告页面，去除行内编辑样式；
修改入库前、后退换货详情页面，修改表格字段；
修改退换货列表页面，添加列居中样式；
dev
王晓迪 2 months ago
parent
d16fc89e29
commit
7ff1af2c44
10 changed files with 467 additions and 283 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 95
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
  2. 250
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterNoConfirmSupplier.html
  3. 20
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
  4. 142
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html
  5. 88
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html
  6. 35
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
  7. 10
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
  8. 14
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
  9. 11
      ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
  10. 49
      ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/refundsExchangesOutWarehouse.html

95
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/add.html
View File

@ -3,6 +3,7 @@
<head>
<th:block th:include="include :: header('新增品质管理退换货单')" />
<th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: bootstrap-editable-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -85,15 +86,32 @@
// ...其他字段
};
});
var hasNull = false;
var hasReportNull = false;
materialDataList.forEach(function (material){
var key = 'unqualifiedDataList' + material.materialNo;
var dataString = sessionStorage.getItem(key);
if(dataString === ''|| dataString === null || dataString === undefined){
hasReportNull = true;
}
if(dataString){
var refundsExchangesUnqualifieds = JSON.parse(dataString);
material.refundsExchangesUnqualifieds = refundsExchangesUnqualifieds;
};
if(material.refundsExchangesNum === ''||material.refundsExchangesNum === null
|| material.refundsExchangesNum === undefined){
hasNull = true;
}
})
});
if(hasReportNull){
$.modal.msgError("存在品质报告为空，请检查！");
return;
}
if(hasNull){
$.modal.msgError("退换货数不能为空！");
return;
}
// 将全局变量 refundsExchangesCode 添加到要提交的数据中
const combinedData = Object.assign({}, refundsExchangesData, {
refundsExchangesDetails: materialDataList,
@ -125,9 +143,7 @@
showToggle: false,
showColumns: false,
pagination: false, // 设置不分页
columns: [{
checkbox: true
},
columns: [
{
title: '退换货单号',
field: 'refundsExchangesCode',
@ -137,9 +153,11 @@
{
title: '料号',
field: 'materialNo',
align: 'center',
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
formatter: function(value, row, index) {
return $.table.imageView(value);
@ -147,29 +165,41 @@
},
{
title: '物料名称',
align: 'center',
field: 'materialName',
},
{
title: '物料类型',
align: 'center',
field: 'materialType',
visible: false,
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
title: '型号',
align: 'center',
field: 'materialModel',
},
{
title: '描述',
align: 'center',
field: 'materialDescribe',
},
{
title: '品牌',
align: 'center',
field: 'materialBrand',
},
{
title: '单位',
align: 'center',
field: 'materialUnit',
},
{
title: '物料加工方式',
title: '加工方式',
align: 'center',
field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
@ -187,7 +217,23 @@
},
{
title: '退换数',
align: 'center',
field: 'refundsExchangesNum',
formatter: function(value, row, index) {
if(value == null || value == undefined){
return '';
}
return value;
},
editable: {
type: 'text',
validate: function (v,row) {
if (!v) return '数量不能为空';
if (isNaN(v)) return '数量必须是数字';
var actualOutOrderSum = parseInt(v);
if (actualOutOrderSum <= 0) return '数量必须是正整数';
}
}
},
{
title: '是否含品质报告数据',
@ -221,17 +267,35 @@
function doSubmit(index, layero,uniqueId){
console.log(uniqueId);
var iframeWin = window[layero.find('iframe')[0]['name']];
var rowData = iframeWin.$('#bootstrap-materialSelect-table').bootstrapTable('getSelections')[0];
console.log("rowData: "+rowData);
$("#bootstrap-table").bootstrapTable('insertRow', {
index:1,
row: {
var rowData = iframeWin.$('#bootstrap-materialSelect-table').bootstrapTable('getSelections');
//判断是否重复
var data = $("#bootstrap-table").bootstrapTable('getData');
var rows = data.length;
if(rows>0){
for(var i=0;i<rows;i++){
for(var j=0;j<rowData.length;j++){
if(data[i].materialNo===rowData[j].materialNo){
$.modal.alertError("不能选择已添加过的相同物料");
rowData.split(j,1);
break;
}
}
};
}
for(i=0;i<rowData.length;i++){
insertTable(rowData[i]);
}
layer.close(index);
}
function insertTable(rowData){
var newRow = {
materialNo:rowData.materialNo,
materialPhotourl:rowData.materialPhotourl,
materialName: rowData.materialName,
materialType: rowData.materialType,
materialModel: rowData.materialModel,
materialDescribe: rowData.describe,
materialBrand: rowData.brand,
materialUnit: rowData.unit,
@ -239,9 +303,8 @@
makeTotal:rowData.makeTotal,
refundsExchangesNum: '',
hasQualifiedReport: 0,
}
})
layer.close(index);
};
$("#bootstrap-table").bootstrapTable('append', newRow);
}
// 逻辑删除前端的一行数据
@ -317,7 +380,7 @@
refundsExchangesNum: refundsExchangesNum,
hasQualifiedReport: '1'
};
updateRowByMaterialNo(materialNo,newData);
// updateRowByMaterialNo(materialNo,newData);
layer.close(index);
}

250
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterNoConfirmSupplier.html
View File

@ -11,7 +11,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">退换货单号：</label>
<div class="col-sm-8">
<input name="refundsExchangesCode" th:field="*{refundsExchangesCode}" class="form-control" type="text" disabled>
<input name="refundsExchangesCode" th:field="*{refundsExchangesCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
@ -25,7 +25,15 @@
<div class="form-group">
<label class="col-sm-3 control-label">品质备注：</label>
<div class="col-sm-8">
<input name="qualityRemark" th:field="*{qualityRemark}" class="form-control" type="text" disabled>
<input name="qualityRemark" th:field="*{qualityRemark}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">是否退回供应商：</label>
<div class="col-sm-8">
<select name="isReturnedToSupplier" id="isReturnedToSupplier" class="form-control m-b" th:with="type=${@dict.getType('yes_or_no')}" required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
</form>
@ -48,6 +56,8 @@
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var supplier = [];
var supplierCodeList = [];
var supplierNameList = [];
var $table = $("#bootstrap-table");
var prefix = ctx + "quality/refundsExchanges";
@ -58,17 +68,17 @@
// 新增提交
function submitHandler() {
$("input[name='refundsExchangesCode']").removeAttr("disabled");
$("input[name='qualityRemark']").removeAttr("disabled");
var isReturnedToSupplier = $("#isReturnedToSupplier").val();
if(isReturnedToSupplier === ''||isReturnedToSupplier === null||isReturnedToSupplier === undefined){
$.modal.msgError("请选择是否退回供应商");
return;
}
const afterNoConfirmSupplierData = $("#form-afterNoConfirmSupplier-edit").serializeArray().reduce((obj, item) => {
obj[item.name] = item.value;
return obj;
}, {});
// 获取bootstrap-table的数据，这里假设你使用bootstrap-table的API获取所有数据
var table = $('#bootstrap-table').bootstrapTable('getData');
// 将表数据转换成与afterNoConfirmSupplierData格式一致的数组
var materialDataList = table.map(function(item) {
// 根据实际字段名调整
return {
@ -79,6 +89,8 @@
"materialType": item.materialType,
"materialUnit": item.materialUnit,
"materialBrand": item.materialBrand,
"materialModel": item.materialModel,
"materialProcessMethod": item.materialProcessMethod,
"materialDescribe": item.materialDescribe,
"makeTotal":item.makeTotal,
"qualityHasqualifiedNum":item.qualityHasqualifiedNum,
@ -93,8 +105,18 @@
};
});
// 合并表单数据和表格数据
//const combinedData = Object.assign({}, ...afterNoConfirmSupplierData.map(item => ({ [item.name]: item.value })), ...materialData);
if(isReturnedToSupplier === "1"){
var supplierNull = false;
materialDataList.forEach(function (data){
if(data.supplierCode === ''|| data.supplierCode === null ||data.supplierCode === undefined){
supplierNull = true;
}
});
if(supplierNull){
$.modal.msgError("存在供应商信息为空，请选择");
return;
}
}
const combinedData = Object.assign({}, afterNoConfirmSupplierData, { refundsExchangesDetails: materialDataList });
console.log(combinedData)
@ -116,9 +138,7 @@
pagination: false, // 设置不分页
queryParams: queryParams,
modalName: "选择物料",
columns: [{
checkbox: true
},
columns: [
{
title: '退换货详情Id',
field: 'refundsExchangesDetailId',
@ -131,10 +151,12 @@
},
{
title: '料号',
field: 'materialNo'
field: 'materialNo',
align: 'center',
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
formatter: function(value, row, index) {
return $.table.imageView(value);
@ -142,49 +164,45 @@
},
{
title: '物料名称',
align: 'center',
field: 'materialName'
},
// {
// title: '物料类型',
// align: 'center',
// field: 'materialType',
// formatter: function(value, row, index) {
// return $.table.selectCategoryLabel(materialTypeDatas, value);
// }
// },
{
title: '物料类型',
field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
title: '描述',
align: 'center',
field: 'materialDescribe',
},
{
title: '物料描述',
field: 'materialDescribe',
title: '型号',
align: 'center',
field: 'materialModel',
},
{
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);
}
},
{
title: '订单数',
field: 'makeTotal',
visible: false
},
{
title: '品质已合格数',
field: 'qualityHasqualifiedNum',
visible: false
},
{
title: '本次到货数',
field: 'thisArrivedNum',
visible: false
},
{
title: '品质报告',
align: 'center',
@ -196,33 +214,40 @@
},
{
title: '品质不合格数',
align: 'center',
field: 'qualityUnqualifiedNum',
},
{title: '选择供应商ID',field: 'supplierCode',
{
title: '供应商ID',field: 'supplierCode',
align: 'center',
formatter:function (value, row, index) {
return supplierCodeAsyncFormatter(value,row,index);
return supplierCodeFormatter(value,row,index);
}
},
{title: '选择供应商名称',field: 'supplierName',
{title: '供应商名称',field: 'supplierName',
formatter:function(value, row, index){
return getSupplierNameType(value,row,index)
return supplierNameFormatter(value,row,index);
}
},
{
title: '退货联系人',
field: 'customerContact',
align: 'center',
},
{
title: '联系人电话',
field: 'contactNumber',
align: 'center',
},
{
title: '退货地址',
field: 'supplierAddress',
align: 'center',
}
]
};
$.table.init(options);
loadSupplierCodes();
})
function queryParams(params) {
@ -235,93 +260,110 @@
}
// 自定义供应商代码列的格式化函数，异步获取供应商代码
function supplierCodeAsyncFormatter(value, row, index) {
var selectHtml = '<select class="form-control supplier-code" onchange="supplierCodeChange(this, ' + index + ')">';
// 先不填充，等待ajax获取数据
selectHtml += '</select>';
loadSupplierCodes(selectHtml, index); // 异步加载供应商代码
return selectHtml;
}
// 加载供应商代码的函数
function loadSupplierCodes(selectHtml, index) {
function loadSupplierCodes() {
$.ajax({
url: ctx + 'system/supplier/getSupplierCodes', // 获取所有供应商代码
url: ctx + 'system/supplier/matchSupplierList', // 获取所有供应商代码
type: 'POST',
dataType: 'json',
success: function (codes) {
var selectElement = $('.supplier-code:eq(' + index + ')');
codes.forEach(function (code) {
selectElement.append('<option value="' + code.supplierCode + '">' + code.supplierCode + '</option>');
success: function (result) {
var supplierList = result.data;
supplierList.forEach(function (data){
supplierCodeList.push(data.supplierCode);
supplierNameList.push(data.supplierName);
});
supplier = codes;
// 设置默认值（如果存在）
var rowData = $table.bootstrapTable('getData')[index];
if (rowData && rowData.supplierCode) {
selectElement.val(rowData.supplierCode);
}
}
});
}
// 列中获取成本类型的下拉改变数据
function supplierCodeChange(selectElement, rowIndex) {
var newSupplierCode = $(selectElement).val();
var tableData = $table.bootstrapTable('getData');
var newRow = tableData[rowIndex];
newRow.supplierCode = newSupplierCode;
supplier.forEach(function (index){
if(index.supplierCode === newSupplierCode){
newRow.supplierName = index.supplierName;
newRow.customerContact = index.customerContact;
newRow.contactNumber = index.contactNumber;
newRow.supplierAddress = index.customerAddress;
}
//自定义供应商编号的初始化函数
function supplierCodeFormatter(value, row, index){
var selectHtml = `<select class="form-control" style="width: 120px;" onchange="onSupplierCodeChange(this, ${index})">`;
selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>';
supplierCodeList.forEach(function (child) {
selectHtml += '<option value="' + child + '"' + (value === child ? ' selected' : '') + '>' + child + '</option>';
});
// getSupplierNameType(newRow.supplierCode,newRow,rowIndex);
$table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
selectHtml += '</select>';
return selectHtml;
}
function getSupplierNameType(value, row, index) {
var selectHtml = '<select class="form-control" onchange="onSupplierNameChange(this, ' + index + ')">';
// 假设此函数根据供应商ID返回设备列表
var supplierNames = [];
function onSupplierCodeChange(selectElement, rowIndex) {
var supplierCodeValue = $(selectElement).val();
if (supplierCodeValue) {
$.ajax({
url: ctx + 'system/supplier/getSupplierName',
type: 'post',
data: {supplierCode: row.supplierCode},
async: false,
success: function (result) {
console.log(result);
supplierNames = result;
url: ctx + 'system/supplier/getSelectSupplier',
method: 'GET',
dataType: 'json',
data:{supplierCode: supplierCodeValue},
success: function(response) {
if (response.data) {
var newData = response.data;
var newRowData = {
supplierCode : supplierCodeValue,
supplierName : newData.supplierName,
customerContact : newData.customerContact,
contactNumber : newData.contactNumber,
supplierAddress : newData.customerAddress,
};
$('#bootstrap-table').bootstrapTable('updateRow', {
index: rowIndex, // 使用传递进来的索引
row: newRowData
});
} else {
console.error('后端请求数据为空');
}
},
error: function(xhr, status, error) {
console.error('请求出错:', status, ", ", error);
}
});
if (supplierNames) {
supplierNames.forEach(function (child) {
selectHtml += '<option value="' + child.supplierCode + '"' + (value === child.supplierCode ? ' selected' : '') + '>' + child.supplierName + '</option>';
}
}
//自定义供应商名称的初始化函数
function supplierNameFormatter(value, row, index){
var selectHtml = `<select class="form-control" style="width: 120px;" onchange="onSupplierNameChange(this, ${index})">`;
selectHtml += '<option value=""' + (value === undefined || value === '' ? ' selected' : '') + '>所有</option>';
supplierNameList.forEach(function (child) {
selectHtml += '<option value="' + child + '"' + (value === child ? ' selected' : '') + '>' + child + '</option>';
});
selectHtml += '</select>';
return selectHtml;
}
}
// 供应商名称改变时的处理函数
function onSupplierNameChange(selectElement, rowIndex) {
var newSupplierName = $(selectElement).val();
var tableData = $table.bootstrapTable('getData');
var newRow = tableData[rowIndex]; // 获取当前行数据
newRow.supplierName = newSupplierName;
supplier.forEach(function (index){
if(index.supplierName === newSupplierName){
newRow.customerContact = index.customerContact;
newRow.contactNumber = index.contactNumber;
newRow.supplierAddress = index.customerAddress;
var supplierNameValue = $(selectElement).val();
console.log(supplierNameValue);
if (supplierNameValue) {
$.ajax({
url: ctx + 'system/supplier/getSelectSupplier',
method: 'GET',
dataType: 'json',
data:{supplierName: supplierNameValue},
success: function(response) {
console.log(response);
if (response.data) {
var newData = response.data;
var newRowData = {
supplierName : supplierNameValue,
supplierCode : newData.supplierCode,
customerContact : newData.customerContact,
contactNumber : newData.contactNumber,
supplierAddress : newData.customerAddress,
};
$('#bootstrap-table').bootstrapTable('updateRow', {
index: rowIndex, // 使用传递进来的索引
row: newRowData
});
} else {
console.error('后端请求数据为空');
}
},
error: function(xhr, status, error) {
console.error('请求出错:', status, ", ", error);
}
});
// 更新行数据
$table.bootstrapTable('updateRow', {index: rowIndex, row: newRow});
}
}
function qualityReport(materialNo, refundsExchangesCode) {

20
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/afterQualityReportDetail.html
View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改品质管理退换货报告')" />
<th:block th:include="include :: header('品质管理退换货报告')" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
@ -26,8 +26,8 @@
</div>
<!--其他字段-->
<div class="form-group">
<label class="col-sm-3 control-label">交付质检时间：</label>
<div class="form-group" style="padding-top: 20px;">
<label class="col-sm-3 control-label">检验完成时间：</label>
<div class="col-sm-8">
<div class="input-group date">
<input name="inspectionTime" th:value="${#dates.format(qualityRefundsExchangesDetail.inspectionTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
@ -35,10 +35,10 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 20px;">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8">
<input name="remark" th:field="*{remark}" class="form-control" type="text">
<textarea name="remark" th:text="*{remark}" class="form-control" type="text"></textarea>
</div>
</div>
</form>
@ -115,11 +115,11 @@
title: '报告',
field: 'unqualifiedReportUrl',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" >报告</a> ');
return actions.join('');
}
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" >报告</a> ');
// return actions.join('');
// }
},
]
};

142
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeHasConfirmSupplier.html
View File

@ -3,22 +3,7 @@
<head>
<th:block th:include="include :: header('入库前退货-采购-确认供应商-已有供应商')" />
<th:block th:include="include :: datetimepicker-css" />
<style>
.supplier-value {
display: flex;
align-items: center;
justify-content: space-between;
}
.supplier-value span {
margin-right: 10px;
}
.info-separator::after {
content: "-";
margin: 0 5px;
}
</style>
<th:block th:include="include :: bootstrap-editable-css" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -27,7 +12,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">退换货单号：</label>
<div class="col-sm-8">
<input name="refundsExchangesCode" th:field="*{refundsExchangesCode}" class="form-control" type="text" disabled>
<input name="refundsExchangesCode" id="refundsExchangesCode" th:field="*{refundsExchangesCode}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
@ -44,12 +29,20 @@
</select>
</div>
</div>
<div class="container">
<!--物料相关-->
<div class="row">
<div class="col-sm-12" id="tablesContainer">
<!-- 表格将在这里动态生成 -->
<div class="form-group">
<label class="col-sm-3 control-label is-required">是否退回供应商：</label>
<div class="col-sm-8">
<select name="isReturnedToSupplier" id="isReturnedToSupplier" class="form-control m-b" th:with="type=${@dict.getType('yes_or_no')}" required>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</div>
</div>
<!--物料信息-->
<div class="row" style="padding-left: 40px;">
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table>
</div>
</div>
</form>
@ -75,6 +68,12 @@
var refundsExchangesId = $("input[name='refundsExchangesId']").val();
var qualityRefundsExchanges = {
refundsExchangesId: refundsExchangesId,
isReturnedToSupplier: $("#isReturnedToSupplier").val(),
}
if(qualityRefundsExchanges.isReturnedToSupplier === '' || qualityRefundsExchanges.isReturnedToSupplier === null
|| qualityRefundsExchanges.isReturnedToSupplier === undefined){
$.modal.msgError("请选择是否退回给供应商");
return;
}
$.operate.saveJson(prefix + "/beforeHasConfirmSupplier",JSON.stringify(qualityRefundsExchanges));
}
@ -82,50 +81,26 @@
$(function() {
// 假设refundsExchangesCode已经定义或者可以通过某种方式获取到
var refundsExchangesCode = [[${qualityRefundsExchanges.refundsExchangesCode}]]; // 这里需要实际赋值，比如从前端某个地方读取
$.getJSON(prefix + "/detailListGroupedBySupplier?refundsExchangesCode=" + refundsExchangesCode, function(data) {
for (var supplierCode in data) {
if (data.hasOwnProperty(supplierCode)) {
var supplierData = data[supplierCode];
createTableForSupplier(supplierCode, supplierData);
}
}
});
});
function createTableForSupplier(supplierCode, supplierData) {
var tableId = 'bootstrap-table-' + supplierCode.replace(/[^a-z0-9]/gi, '_').toLowerCase();
var $tableWrapper = $('<div class="table-responsive mt-3"></div>');
// 确保supplierData至少有一条记录，并从中提取供应商详细信息
var supplierInfo = supplierData.length > 0 ? supplierData[0] : {}; // 默认为空对象，以防数据不存在
// 构建含有额外供应商信息的标题字符串
var headerTitle ='供应商'+'</br>'+supplierCode + ' - ' + (supplierInfo.supplierName || 'N/A') +
' </br> ' + (supplierInfo.customerContact || 'N/A') +
' - ' + (supplierInfo.contactNumber || 'N/A') +
' - ' + (supplierInfo.supplierAddress || 'N/A');
var $header = $('<h4>' + headerTitle + '</h4>');
var $table = $('<table id="' + tableId + '" class="table table-striped table-bordered"></table>');
$table.bootstrapTable({
data: supplierData,
columns: [{
checkbox: true
},
var options = {
modalName: "物料信息",
url: prefix + "/getMaterialListByRefundsExchangesCode",
queryParams:
{
title: '供应商ID',
field: 'supplierCode',
visible: false
refundsExchangesCode: $("#refundsExchangesCode").val(),
},
showSearch: false,
showRefresh: false,
showToggle: false,
showColumns: false,
pagination: false, // 设置不分页
columns: [
{
title: '料号',
align: 'center',
field: 'materialNo'
}, {
title: '物料名称',
align: 'center',
field: 'materialName'
},
{
@ -137,23 +112,27 @@
}
},
{
title: '物料图片地址',
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,14 +151,39 @@
},
{
title: '品质不合格数',
align: 'center',
field: 'qualityUnqualifiedNum',
}]
},
{
title: '供应商ID',
align: 'center',
field: 'supplierCode',
},
{
title: '供应商名称',
align: 'center',
field: 'supplierName',
},
{
title: '联系人',
align: 'center',
field: 'customerContact',
},
{
title: '联系人电话',
align: 'center',
field: 'contactNumber',
},
{
title: '联系人地址',
align: 'center',
field: 'supplierAddress',
},
],
};
$.table.init(options);
});
$tableWrapper.append($header).append($table);
$('#tablesContainer').append($tableWrapper);
}
/*品质报告*/
function qualityReport(materialNo, refundsExchangesCode) {

88
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/beforeQualityReportDetail.html
View File

@ -26,47 +26,47 @@
<input name="materialName" th:field="*{materialName}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">订单数：</label>
<div class="col-sm-6">
<input name="makeTotal" th:field="*{makeTotal}" class="form-control" type="text" disabled>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">品质已合格数：</label>
<div class="col-sm-6">
<input name="qualityHasqualifiedNum" th:field="*{qualityHasqualifiedNum}" class="form-control" type="text" disabled>
</div>
</div>
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">订单数：</label>-->
<!-- <div class="col-sm-6">-->
<!-- <input name="makeTotal" th:field="*{makeTotal}" class="form-control" type="text" disabled>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="form-group">-->
<!-- <label class="col-sm-3 control-label">品质已合格数：</label>-->
<!-- <div class="col-sm-6">-->
<!-- <input name="qualityHasqualifiedNum" th:field="*{qualityHasqualifiedNum}" class="form-control" type="text" disabled>-->
<!-- </div>-->
<!-- </div>-->
<div class="container">
<!--合格数-->
<div class="col-sm-12">
<h3>合格数</h3>
<div class="row">
<div class="form-group col-sm-6">
<label class="control-label">ok允收数：</label>
<input name="okAcceptedNum" th:field="*{okAcceptedNum}" class="form-control" type="text" disabled>
</div>
<div class="form-group col-sm-6 d-flex flex-column align-items-start">
<label class="control-label">ok报告：</label>
<input name="okReportUrl" th:field="*{okReportUrl}" class="form-control" type="text" disabled>
<!-- <div class="col-sm-12">-->
<!-- <h3>合格数</h3>-->
<!-- <div class="row">-->
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="control-label">ok允收数：</label>-->
<!-- <input name="okAcceptedNum" th:field="*{okAcceptedNum}" class="form-control" type="text" disabled>-->
<!-- </div>-->
<!-- <div class="form-group col-sm-6 d-flex flex-column align-items-start">-->
<!-- <label class="control-label">ok报告：</label>-->
<!-- <input name="okReportUrl" th:field="*{okReportUrl}" class="form-control" type="text" disabled>-->
<!-- <a class= 'btn btn-success btn-xs' href='javascript:void(0)' >报告</a>-->
</div>
</div>
<div class="row">
<div class="form-group col-sm-6">
<label class="control-label">特采/让步数</label>
<input name="specialConcessionsNum" th:field="*{specialConcessionsNum}" class="form-control" type="text" disabled>
</div>
<div class="form-group col-sm-6">
<label class="control-label">特采报告：</label>
<input name="specialReportUrl" th:field="*{specialReportUrl}" class="form-control" type="text" disabled>
<!-- <a class= 'btn btn-success btn-xs' href='javascript:void(0)' >报告</a>-->
</div>
</div>
</div>
<!--&lt;!&ndash; <a class= 'btn btn-success btn-xs' href='javascript:void(0)' >报告</a>&ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row">-->
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="control-label">特采/让步数</label>-->
<!-- <input name="specialConcessionsNum" th:field="*{specialConcessionsNum}" class="form-control" type="text" disabled>-->
<!-- </div>-->
<!-- <div class="form-group col-sm-6">-->
<!-- <label class="control-label">特采报告：</label>-->
<!-- <input name="specialReportUrl" th:field="*{specialReportUrl}" class="form-control" type="text" disabled>-->
<!--&lt;!&ndash; <a class= 'btn btn-success btn-xs' href='javascript:void(0)' >报告</a>&ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!--不合格数-->
<div class="col-sm-12">
<div class="row">
@ -84,7 +84,7 @@
</div>
<!--其他字段-->
<div class="form-group">
<div class="form-group" style="padding-top: 20px;">
<label class="col-sm-4 control-label">检验完成时间：</label>
<div class="col-sm-8">
<div class="input-group date">
@ -93,7 +93,7 @@
</div>
</div>
</div>
<div class="form-group">
<div class="form-group" style="padding-top: 20px;">
<label class="col-sm-4 control-label">备注：</label>
<div class="col-sm-8">
<textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea>
@ -165,11 +165,11 @@
title: '报告',
field: 'unqualifiedReportUrl',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" >报告</a> ');
return actions.join('');
}
// formatter: function(value, row, index) {
// var actions = [];
// actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" >报告</a> ');
// return actions.join('');
// }
},
]
};

35
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/materialSelect.html
View File

@ -6,6 +6,27 @@
<body class="gray-bg">
<div class="container-div">
<div class="row">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>料号：</label>
<input type="text" name="materialNo"/>
</li>
<li>
<label>物料名称：</label>
<input type="text" name="materialName"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="col-sm-12 select-table table-striped">
<table id="bootstrap-materialSelect-table"></table>
</div>
@ -25,7 +46,6 @@
var options = {
id: 'bootstrap-materialSelect-table',
clickToSelect: true, // 点击选中行
singleSelect: true, // 单选
showSearch: false,
showRefresh: false,
showToggle: false,
@ -39,9 +59,11 @@
{
title: '料号',
field: 'materialNo',
align: 'center',
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
formatter: function(value, row, index) {
return $.table.imageView(value);
@ -50,28 +72,39 @@
},
{
title: '物料名称',
align: 'center',
field: 'materialName',
},
{
title: '类型',
align: 'center',
field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
title: '型号',
align: 'center',
field: 'materialModel',
},
{
title: '描述',
align: 'center',
field: 'describe',
},
{
title: '品牌',
align: 'center',
field: 'brand',
},
{
title: '单位',
align: 'center',
field: 'unit',
},
{ title: '加工方式',
align: 'center',
field: 'processMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);

10
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/qualityOrderReport.html
View File

@ -2,6 +2,7 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改品质管理退换货报告')" />
<th:block th:include="include :: bootstrap-editable-css" />
<th:block th:include="include :: datetimepicker-css" />
</head>
<body class="white-bg">
@ -170,7 +171,6 @@
align: 'center',
editable:{
type: 'text',
mode:'inline',
validate: function (v) {
if (!v) return '数量不能为空';
if (isNaN(v)) return '数量必须是数字';
@ -183,11 +183,9 @@
title: '报告',
field: 'unqualifiedReportUrl',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" ><i class="fa fa-plus"></i>上传</a> ');
return actions.join('');
}
editable: {
type: 'text', // 表示该列可以被编辑为文本
},
},
{
title: '操作',

14
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/refundsExchanges.html
View File

@ -117,9 +117,11 @@
{
title: '退换货单号',
field: 'refundsExchangesCode',
align: 'center',
},
{
title: '退换货状态',
align: 'center',
field: 'refundsExchangesStatus',
formatter: function(value, row, index) {
return $.table.selectDictLabel(refundsExchangesStatusDatas, value);
@ -127,6 +129,7 @@
},
{
title: '仓库状态',
align: 'center',
field: 'qualityWarehouseStatus',
formatter: function(value, row, index) {
return $.table.selectDictLabel(qualityWarehouseStatusDatas, value);
@ -134,6 +137,7 @@
},
{
title: '采购状态',
align: 'center',
field: 'qualityPurchaseStatus',
formatter: function(value, row, index) {
return $.table.selectDictLabel(qualityPurchaseStatusDatas, value);
@ -141,10 +145,12 @@
},
{
title: '关联单号',
align: 'center',
field: 'relatedOrderCode',
},
{
title: '退货节点',
align: 'center',
field: 'qualityReturnNode',
formatter: function(value, row, index) {
return $.table.selectDictLabel(qualityReturnNodeDatas, value);
@ -152,6 +158,7 @@
},
{
title: '物料合计',
align: 'center',
field: 'materialTotal',
footerFormatter: function (value) {
var sum = 0;
@ -163,6 +170,7 @@
},
{
title: '数量合计',
align: 'center',
field: 'numTotal',
footerFormatter: function (value) {
var sum = 0;
@ -179,18 +187,22 @@
},
{
title: '录入人',
align: 'center',
field: 'createBy',
},
{
title: '录入时间',
align: 'center',
field: 'createTime',
},
{
title: '更新人',
align: 'center',
field: 'updateBy',
},
{
title: '上次更新时间',
align: 'center',
field: 'updateTime',
},
{
@ -211,7 +223,7 @@
actions.push('<a class=" ' + returnAfterStorageDetailFlag + '" href="javascript:void(0)" onclick="returnAfterStorageDetail(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>详情</a> ');
}
/*入库前退换货-确认供应商-已有供应商*/
if (row.qualityReturnNode == 0 && row.qualityPurchaseStatus == 0 && row.qualityWarehouseStatus == 1){
if (row.qualityReturnNode == 0 && row.qualityPurchaseStatus == 0 ){
actions.push('<a class=" ' + beforeHasConfirmSupplierFlag + '" href="javascript:void(0)" onclick="beforeHasConfirmSupplier(\'' + row.refundsExchangesId + '\')"><i class="fa fa-edit"></i>确认供应商</a> ');
}
/*入库前退换货-确认收货-已有供应商*/

11
ruoyi-admin/src/main/resources/templates/quality/refundsExchanges/returnAfterStorageDetail.html
View File

@ -119,9 +119,7 @@
showToggle: false,
showColumns: false,
pagination: false, // 设置不分页
columns: [{
checkbox: true
},
columns: [
{
title: '退换货单号',
field: 'refundsExchangesCode',
@ -130,10 +128,12 @@
{
title: '料号',
align: 'center',
field: 'materialNo',
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
},
{
@ -149,6 +149,11 @@
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
title: '物料型号',
field: 'materialModel',
align: 'center',
},
{
title: '描述',
field: 'materialDescribe',

49
ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/refundsExchangesOutWarehouse.html
View File

@ -3,12 +3,11 @@
<head>
<th:block th:include="include :: header('退换货-出库')" />
<th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: bootstrap-editable-css" />
<style>
.supplier-value span {
margin-right: 10px;
}
</style>
</head>
<body class="white-bg">
@ -18,7 +17,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">出库单号：</label>
<div class="col-sm-8">
<input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" disabled>
<input name="outOrderCode" th:field="*{outOrderCode}" class="form-control" type="text" readonly>
</div>
</div>
<div class="form-group">
@ -142,9 +141,7 @@
$table.bootstrapTable({
data: supplierData,
columns: [{
checkbox: true
},
columns: [
{
title: '出库单详情ID',
field: 'outOrderDetailId',
@ -159,58 +156,88 @@
{
title: '料号',
field: 'materialNo',
align: 'center',
},
{
title: '图片',
align: 'center',
field: 'materialPhotourl',
},
{
title: '物料名称',
align: 'center',
field: 'materialName',
},
{
title: '物料类型',
align: 'center',
field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
},
{
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);
}
},
{
title: '订单数量',
field: 'makeNum',
},
// {
// title: '订单数量',
// field: 'makeNum',
// },
{
title: '已出库数',
align: 'center',
field: 'hasOutOrderSum',
},
{
title: '申请出库数',
align: 'center',
field: 'applyOutOrderSum',
},
{
title: '实际出库数',
align: 'center',
field: 'actualOutOrderSum',
editable:true
formatter: function(value, row, index) {
if(value == null || value == undefined){
return '';
}
return value;
},
editable: {
type: 'text',
validate: function (v,row) {
if (!v) return '数量不能为空';
if (isNaN(v)) return '数量必须是数字';
var actualOutOrderSum = parseInt(v);
if (actualOutOrderSum < 0) return '数量必须是正整数';
}
}
},
]
});

Write Preview
Loading…
Cancel
Save