|
@@ -172,6 +173,75 @@
var productPrefix = ctx + "inventory/info";
var deliveryPrefix = ctx + "inventory/delivery";
const showReturnFlag = [[${deliveryList}]] && [[${deliveryList.size()}]]>0;
+
+ let productSnData = [];
+ let productSnOptions = {
+ id: 'bootstrap-table',
+ url: productPrefix + "/list",
+ modalName: "出库单",
+
+ onCheck: (row, $ele) => {
+ updateTotal()
+ },
+ onUncheck: (row, $ele) => {
+ if (productSnData.length > 0) {
+ $('#bootstrap-table').bootstrapTable('checkAll');
+ $.modal.msgError("导入数据不允许取消勾选")
+ return
+ }
+ updateTotal()
+ },
+ onCheckAll: (rowsAfter, rowsBefore) => {
+ updateTotal()
+ },
+ onUncheckAll: (rowsAfter, rowsBefore) => {
+ if (productSnData.length > 0) {
+ $('#bootstrap-table').bootstrapTable('checkAll');
+ $.modal.msgError("导入数据不允许取消勾选")
+ return
+ }
+ updateTotal()
+ },
+ onLoadSuccess: (data) => {
+ $('#bootstrap-table').bootstrapTable('checkAll');
+ },
+ showSearch: false,
+ showRefresh: false,
+ showToggle: false,
+ showColumns: false,
+ rememberSelected: true,
+ formId: "query-product-sn",
+ columns: [{
+ field: 'state',
+ checkbox: true
+ },
+ {
+ field: 'id',
+ title: '',
+ visible: false
+ },
+ {
+ field: 'productSn',
+ title: 'SN码'
+ },
+ {
+ field: 'productCode',
+ title: '产品编码'
+ },
+ {
+ field: 'model',
+ title: '产品型号'
+ },
+ {
+ field: 'productDesc',
+ title: '描述'
+ },
+ {
+ field: 'warehouseName',
+ title: '仓库'
+ }]
+ };
+
$("#form-outer-edit").validate({
focusCleanup: true
});
@@ -197,6 +267,7 @@
let data = new FormData()
data.append('file', file)
data.append('productCode', $('[name="productCode"]').val())
+ data.append('quantity', Number($('#deliveryQuantity').val()))
var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
xhr.open('POST', prefix + '/importData', true); // 设置请求类型和URL
// 当请求完成时执行的回调函数
@@ -204,7 +275,17 @@
let data = JSON.parse(res.currentTarget.response)
if (data.code === 0) {
$.modal.msgSuccess('上传成功');
- $.table.search('query-product-sn', 'bootstrap-table')
+ productSnData = data.data;
+ $.table.refreshOptions($.extend(productSnOptions, {
+ url: '',
+ data: productSnData,
+ pagination: false
+ }), 'bootstrap-table')
+ setTimeout(() => {
+ $('#bootstrap-table').bootstrapTable('checkAll');
+ }, 200);
+ $('#bootstrap-table').before(`已选:${productSnData.length}(台)
`);
+ // $.table.search('query-product-sn', 'bootstrap-table')
} else {
top.layer.alert(data.msg || '导入失败', {
icon: 2,
@@ -272,61 +353,10 @@
}
}
- function initProductSnTable() {
- var options = {
- id: 'bootstrap-table',
- url: productPrefix + "/list",
- modalName: "出库单",
- onCheck: (row, $ele) => {
- updateTotal()
- },
- onUncheck: (row, $ele) => {
- updateTotal()
- },
- onCheckAll: (rowsAfter, rowsBefore) => {
- updateTotal()
- },
- onUncheckAll: (rowsAfter, rowsBefore) => {
- updateTotal()
- },
- showSearch: false,
- showRefresh: false,
- showToggle: false,
- showColumns: false,
- rememberSelected: true,
- formId: "query-product-sn",
- columns: [{
- field: 'state',
- checkbox: true
- },
- {
- field: 'id',
- title: '',
- visible: false
- },
- {
- field: 'productSn',
- title: 'SN码'
- },
- {
- field: 'productCode',
- title: '产品编码'
- },
- {
- field: 'model',
- title: '产品型号'
- },
- {
- field: 'productDesc',
- title: '描述'
- },
- {
- field: 'warehouseName',
- title: '仓库'
- }]
- };
- $.table.init(options);
+ function initProductSnTable() {
+
+ $.table.init(productSnOptions);
$('#bootstrap-table').before('已选:0(台)
');
}
@@ -335,7 +365,7 @@
if ($tableCount.length > 0) {
// 延迟100毫秒，等待表格渲染完成
setTimeout(function () {
- $tableCount.text($.table.selectColumns("productSn").length);
+ $tableCount.text(productSnData.length > 0 ? productSnData.length : $.table.selectColumns("productSn").length);
}, 100)
}
}
@@ -398,7 +428,7 @@
formatter: function (value, row, index) {
var actions = [];
let disabled = Number(row.quantity) <= Number(row.deliveryGenerateQuantity) + Number(row.deliveryConfirmQuantity)
- actions.push(`发货`);
+ actions.push(`发货`);
return actions.join('');
}
}]
@@ -412,12 +442,18 @@
let width = 1000, height = 700
parent.$('.layui-layer-btn').css('display', 'none')
parent.$('.layui-layer-setwin').css('display', 'none')
+ $('#deliveryQuantity').val(quantity)
$('[name="warehouseId"]').val(warehouseId)
$('[name="productCode"]').val(productCode)
$('[name="inventoryStatus"]').val(0)
$('#query-product-sn [name="outerCode"]').val('')
- $.table.search('query-product-sn', 'bootstrap-table')
-
+ productSnData = []
+ $.table.refreshOptions($.extend(productSnOptions, {
+ url: productPrefix + "/list",
+ pagination: true,
+ pageSize: quantity
+ }), 'bootstrap-table')
+ $('#bootstrap-table').before('已选:0(台)
');
$('#table-select-count').text(0);
let index = layer.open({
id: 'generate_delivery',
@@ -432,15 +468,25 @@
$.modal.msgError('物流单号必填')
return;
}
- var arrays = $.table.selectColumns("productSn");
- if (arrays.length != quantity) {
- $.modal.msgError(`产品选中数量应与发货数量一致,应发货数量为[${quantity}]`)
- return
+ let arrays = []
+ if (productSnData.length <= 0) {
+ arrays = $.table.selectColumns("productSn");
+ if (arrays.length != quantity) {
+ $.modal.msgError(`产品选中数量应与发货数量一致,应发货数量为[${quantity}]`)
+ return
+ }
+ } else {
+ if (productSnData.length != quantity) {
+ $.modal.msgError(`产品选中数量应与发货数量一致,应发货数量为[${quantity}]`)
+ return
+ }
}
+
//保存数据
let data = {
productSnList: arrays,
logisticsCode: $('#logisticsCode').val(),
+ productCode: productCode,
quantity: quantity,
warehouseId: warehouseId,
logisticsCompany: $('#logisticsCompany').val(),
@@ -448,6 +494,7 @@
deliveryTime: $('#deliveryTime').val(),
deliveryTimeType: $('#deliveryTimeType').val(),
outerCode: $('[name="outerCode"]').val(),
+ productSnDataList: productSnData,
}
var config = {
url: deliveryPrefix + "/add",
@@ -460,18 +507,22 @@
$.modal.disable();
},
success: function (result) {
+ if (result.code != 0) {
+ $.modal.closeLoading();
+ $.modal.enable();
+ $.modal.msgError(result.msg)
+ return
+ }
if (typeof callback == "function") {
callback(result);
}
refreshTable()
$.modal.closeLoading();
$.modal.enable();
+ layer.close(index);
}
};
$.ajax(config)
-
- layer.close(index);
-
},
end: function () {
parent.$('.layui-layer-btn').css('display', '')
diff --git a/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html
index 02d15485..96d0a8e9 100644
--- a/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html
+++ b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html
@@ -129,7 +129,7 @@
actions.push('编辑 ');
} else {
actions.push('退回 ');
- actions.push('确认接收');
+ actions.push('确认接收');
}
return actions.join('');
}
@@ -140,11 +140,11 @@
function received(id) {
- $.modal.confirm("确认要确认接收吗？", function () {
+ // $.modal.confirm("确认要确认接收吗？", function () {
$.operate.post(prefix + "/status", {"id": id, "outerStatus": '3'},()=>{
// $.table.refresh()
});
- })
+ // })
}
function refundable(id,orderCode) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
index 40efa9d7..363c198f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -9,9 +9,9 @@