From dd09d869994a4eca50a6df80b34c9d444a99fb2d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 十月 2022 13:55:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 8 ++
src/main/webapp/static/js/order/out.js | 138 +++++++++++++--------------------------------
src/main/webapp/views/order/out.html | 12 ++++
3 files changed, 60 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 5dfcafa..56d69fa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -38,6 +38,8 @@
private DocTypeService docTypeService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private MatService matService;
@Override
public Order selectByNo(String orderNo) {
@@ -190,6 +192,12 @@
}
}
+ for (OrderMergeVo vo : result) {
+ Mat mat = matService.selectByMatnr(vo.getMatnr());
+ assert mat != null;
+ vo.setMaktx(mat.getMaktx());
+ vo.setSpecs(mat.getSpecs());
+ }
return result;
}
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 5a6ac6e..e65c027 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -147,6 +147,7 @@
,moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
,content: $('#pakoutPreviewBox').html()
,success: function(layero, index){
+ console.log(res.data)
stoPreTabIdx = table.render({
elem: '#stoPreTab',
data: res.data,
@@ -357,112 +358,53 @@
},
success: function (res) {
layer.close(loadIndex);
+ var mergeTabCache;
if (res.code === 200){
- admin.open({
- type: 1,
- title: '璁㈠崟鍚堝苟 銆� 鏁伴噺锛�' + orderIds.length + " 銆�",
- content: $('#mergeDialog').html(),
- area: '900px',
- success: function (layero, dIndex) {
- $('#newOrderNo').val(res.data.newOrderNo);
- // 娓叉煋瀹㈡埛鍒楄〃
- let cstmrVal = xmSelect.render({
- el: '#cstmrSelect',
- radio: true,
- clickClose: true,
- filterable: true,
- create: function(val, arr){
- if(arr.length === 0){
- return {
- name: val,
- value: val
- }
- }
- },
- model: {
- icon: 'hidden',
- label: {
- type: 'text',
- }
- },
- data: res.data.cstmrs
- })
- // 娓叉煋鏄庣粏
- let xxDataList = res.data.orderDetls;
- let tbOptions = {
- elem: '#mergeTable',
- headers: {token: localStorage.getItem('token')},
- data: xxDataList,
- limit: 9999,
- height: '350px;',
+ layer.open({
+ type: 1
+ , title: false
+ , closeBtn: false
+ , offset: '50px'
+ , area: ['1200px', '700px']
+ , shade: 0.5
+ , shadeClose: false
+ , btn: ['纭畾', '鍙栨秷']
+ , btnAlign: 'c'
+ , moveType: 1 //鎷栨嫿妯″紡锛�0鎴栬��1
+ , content: $('#mergeDialog').html()
+ , success: function (layero, index) {
+ console.log(res.data);
+ orderMergeTabIdx = table.render({
+ elem: '#orderMergeTab',
+ data: res.data,
+ height: 520,
+ page: false,
+ limit: Number.MAX_VALUE,
cellMinWidth: 100,
cols: [[
- {type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', minWidth: 170},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О'},
- {field: 'batch', title: '鎵瑰彿'},
- {field: 'anfme', title: '鏁伴噺', minWidth: 80, width: 80},
- {field: 'unitPrice', title: '鍗曚环(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 120, width: 120, fixed: 'right'},
- // {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80}
+ {type: 'checkbox'},
+ {field: 'matnr', title: '鍟嗗搧缂栫爜', align: 'center', width: 350},
+ {field: 'maktx', title: '鍟嗗搧鍚嶇О', align: 'center'},
+ {field: 'specs', title: '瑙勬牸', align: 'center'},
+ {field: 'batch', title: '鎵瑰彿', align: 'center'},
+ {field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
]],
done: function (res) {
- $(layero).find('.layui-table-view').css('margin', '0');
+ $('.layui-table-body.layui-table-main').css("overflow", "auto");
+ mergeTabCache = tableData = table.cache.orderMergeTab;
}
- };
- let insMergeTb = table.render(tbOptions);
- // 浠锋牸淇敼
- table.on('edit(mergeTable)', function (obj) {
- let unitPrice = Number(obj.value);
- if (isNaN(unitPrice)) {
- layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
- } else {
- if (unitPrice > 0) {
- for (let i=0;i<xxDataList.length;i++){
- if (xxDataList[i]["matnr"] === obj.data.matnr && xxDataList[i]["batch"] === obj.data.batch){
- xxDataList[i]["unitPrice"] = unitPrice;
- break;
- }
- }
- } else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
- }
- }
- insMergeTb.reload({data: xxDataList});
});
- // 鍚堝苟琛ㄥ崟鎻愪氦浜嬩欢
- form.on('submit(mergeSubmit)', function (data) {
- let nList = admin.util.deepClone(xxDataList);
- data.field.cstmr = cstmrVal.getValue()[0] ? cstmrVal.getValue()[0].name : null;
- layer.load(2);
- $.ajax({
- url: baseUrl+"/delivery/merge/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- oldOrderIds: orderIds,
- orderNo: data.field.newOrderNo,
- cstmr: data.field.cstmr,
- orderDetls: nList
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- success: function (res) {
- layer.closeAll('loading');
- if (res.code === 200){
- layer.close(dIndex);
- $(".layui-laypage-btn")[0].click();
- layer.msg(res.msg, {icon: 1});
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2});
- }
- }
- })
- return false;
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
}
- });
+ , yes: function (index, layero) {
+ //鎸夐挳銆愮‘瀹氥�戠殑鍥炶皟
+
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愬彇娑堛�戠殑鍥炶皟
+ layer.close(index)
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ }
+ })
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 1048a7d..ba96968 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -168,6 +168,18 @@
</div>
</script>
+<!-- 鍚堝苟琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="mergeDialog">
+ <div style="padding: 25px; line-height: 22px; background-color: #1E9FFF; color: #fff; font-weight: 300;">
+ <span style="font-size: large; font-weight: bold">鍚堝苟鍑哄簱</span>
+ </div>
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 10px">
+ <table id="orderMergeTab" lay-filter="orderMergeTab"></table>
+ </div>
+ </div>
+</script>
+
<script type="text/html" id="tbBasicTbStaNos">
<div class="ew-select-fixed">
<select class="order-sta-select" lay-filter="tbBasicTbStaNos">
--
Gitblit v1.9.1