From b4d4aa34f057ea33dc81031cf569e43215f10485 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 十月 2022 15:14:57 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/out.js | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index c397e8b..a870dbe 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -413,8 +413,8 @@
success: function (res) {
layer.close(loadIndex);
if (res.code === 200){
- console.log(res.data)
- // pakoutPreviewMergeDialog(res.data)
+ layer.close(index)
+ pakoutPreviewMergeDialog(res.data)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
@@ -453,7 +453,7 @@
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
,content: $('#pakoutPreviewMergeBox').html()
,success: function(layero, index){
- stoPreTabIdx = table.render({
+ stoPreTabMergeIdx = table.render({
elem: '#stoPreTabMerge',
data: data,
height: 520,
@@ -462,8 +462,8 @@
cellMinWidth: 100,
cols: [[
// {type: 'checkbox', merge: ['orderNo']},
- {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
+ {field: 'specs', title: '瑙勬牸', align: 'center'},
{field: 'batch', title: '搴忓垪鐮�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
@@ -479,10 +479,10 @@
// 淇敼鍑哄簱绔�
form.on('select(tbBasicTbStaNos)', function (obj) {
let index = obj.othis.parents('tr').attr("data-index");
- let data = tableCache[index];
- for (let i = 0; i<tableCache.length; i++) {
- if (tableCache[i].locNo === data.locNo) {
- tableCache[i]['staNo'] = Number(obj.elem.value);
+ let data = mergeTabCache[index];
+ for (let i = 0; i<mergeTabCache.length; i++) {
+ if (mergeTabCache[i].locNo === data.locNo) {
+ mergeTabCache[i]['staNo'] = Number(obj.elem.value);
}
}
obj.othis.children().find("input").css("color", "blue");
@@ -496,8 +496,8 @@
function modifySta() {
// 鍑哄簱绔欏彇浜ら泦
let staBatchSelectVal = [];
- for(let i = 0; i<tableCache.length; i++) {
- let staNos = tableCache[i].staNos;
+ for(let i = 0; i<mergeTabCache.length; i++) {
+ let staNos = mergeTabCache[i].staNos;
if (staNos !== null) {
if (staBatchSelectVal.length === 0) {
staBatchSelectVal = staNos;
@@ -529,17 +529,18 @@
let loadIdx = layer.load(2);
let batchSta = Number(obj.field.batchSta);
let arr = [];
- for (let i = 0; i<tableCache.length; i++) {
- tableCache[i]['staNo'] = batchSta;
+ for (let i = 0; i<mergeTabCache.length; i++) {
+ mergeTabCache[i]['staNo'] = batchSta;
arr.push(i);
}
- stoPreTabIdx.reload({data: tableCache});
+ console.log(mergeTabCache)
+ stoPreTabMergeIdx.reload({data: mergeTabCache});
arr.forEach(item => {
- $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
+ $('div[lay-id=stoPreTabMerge] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
});
layui.form.render('select');
arr.forEach(item => {
- $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .layui-select-title').find("input").css("color", "blue");
+ $('div[lay-id=stoPreTabMerge] tr[data-index="' + item + '"] .layui-select-title').find("input").css("color", "blue");
});
layer.close(loadIdx); layer.close(ddIndex);
return false;
--
Gitblit v1.9.1