From 036dcdcec6235d82b008f5c736d27a0d1f90d4a2 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 14 十一月 2023 14:58:42 +0800
Subject: [PATCH] 优化
---
guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/controller/SalesOrderController.java | 11 +++
guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js | 3
/dev/null | 35 -----------
guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/distributeDetails.js | 66 ++++++++++++++++++++++
guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder.js | 1
guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/distributeDetails.html | 13 ++++
guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js | 23 +++++--
guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/salesOrder.html | 17 +++++
8 files changed, 122 insertions(+), 47 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/controller/SalesOrderController.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/controller/SalesOrderController.java
index f711390..da7cec0 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/controller/SalesOrderController.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/modular/zsx/pm/salesOrder/controller/SalesOrderController.java
@@ -107,6 +107,17 @@
}
/**
+ * 涓嬪彂璇︽儏椤甸潰
+ *
+ * @author ruimin
+ * @Date 2023-08-26
+ */
+ @RequestMapping("/distributeDetails")
+ public String distributeDetails() {
+ return PREFIX + "/bulletBox/distributeDetails.html";
+ }
+
+ /**
* 鏂板鎺ュ彛
*
* @author ruimin
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/distributeDetails.js b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/distributeDetails.js
new file mode 100644
index 0000000..4b39b55
--- /dev/null
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/distributeDetails.js
@@ -0,0 +1,66 @@
+
+layui.use(['table'], function () {
+ var $ = layui.jquery;
+ var table = layui.table;
+
+ /**
+ * 鐗╂枡淇℃伅绠＄悊
+ */
+ var MaterialInfo = {
+ tableId: "materialInfoTable"
+ };
+
+ var salesOrderCode = parent.salesOrderCode;
+ console.log(salesOrderCode)
+
+ $('#serch').click(function(){
+ var queryData = {};
+ queryData['salesOrderCode'] = salesOrderCode;
+ table.reload(MaterialInfo.tableId, {
+ where: queryData, page: {curr: 1}
+ });
+ });
+ /**
+ * 缂烘枡鎶ヨ鍒濆鍖栬〃鏍肩殑鍒�
+ */
+ MaterialInfo.initColumn = function () {
+ return [[
+ {field: 'id', hide: true, title: '涓婚敭id'},
+ {field: 'salesOrderCode', sort: true, title: '璁㈠崟缂栧彿',width: 160},
+ {field: 'productCode', sort: true, title: '浜у搧缂栧彿',width: 160},
+ {field: 'productName', sort: true, title: '浜у搧鍚嶇О',width: 160},
+ {field: 'lineCode', sort: true, title: '浜х嚎缂栫爜',width: 120},
+ {field: 'planNumber', sort: true, title: '璁″垝鏁伴噺',width: 120},
+ {field: 'customerNo', sort: true, title: '瀹㈡埛缂栧彿',width: 120},
+ {field: 'cargoNo', sort: true, title: '璐у彿',width: 160},
+ {field: 'planStartTime', sort: true, title: '璁″垝寮�濮嬫椂闂�',width: 160},
+ {field: 'planEndTime', sort: true, title: '璁″垝缁撴潫鏃堕棿',width: 160},
+ {field: 'deliveryTime', sort: true, title: '浜よ揣鏃堕棿',width: 160},
+ {field: 'createUser', sort: true, title: '鍒涘缓鐢ㄦ埛',width: 160},
+ {field: 'createTime', sort: true, title: '鍒涘缓鏃堕棿',width: 160},
+ ]];
+ };
+
+ table = $.extend(table, {config: {checkName: 'checked'}});
+
+ var queryData = {};
+ queryData['salesOrderCode'] = salesOrderCode;
+ var tableResult = table.render({
+ elem: '#' + MaterialInfo.tableId,
+ url: Feng.ctxPath + '/salesOrderChild/list',
+ page: true,
+ where:queryData,
+ cellMinWidth: 80,
+ cols: MaterialInfo.initColumn()
+ });
+ $('#reset').click(function(){
+ clearType();
+ Msg = "";
+ window.localStorage.clear();
+ });
+
+ function clearType(){
+ parent.materialType="";
+ }
+
+});
\ No newline at end of file
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js
deleted file mode 100644
index 19695d5..0000000
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/bulletBox/productListing.js
+++ /dev/null
@@ -1,76 +0,0 @@
-
-layui.use(['table'], function () {
- var $ = layui.jquery;
- var table = layui.table;
-
- /**
- * 鐗╂枡淇℃伅绠＄悊
- */
- var MaterialInfo = {
- tableId: "materialInfoTable"
- };
-
- var materialType = parent.materialType;
-
- $('#serch').click(function(){
- var queryData = {};
- queryData['typeZ'] = materialType;
- queryData['materialName'] = $("#materialName").val();
- queryData['materialCode'] = $("#materialCode").val();
- table.reload(MaterialInfo.tableId, {
- where: queryData, page: {curr: 1}
- });
- });
- /**
- * 缂烘枡鎶ヨ鍒濆鍖栬〃鏍肩殑鍒�
- */
- MaterialInfo.initColumn = function () {
- return [[
- {type: 'radio'},
- {field: 'id', hide: true, title: '涓婚敭id'},
- {field: 'materialCode', sort: true, title: '浜у搧缂栧彿'},
- {field: 'materialName', sort: true, title: '浜у搧鍚嶇О'},
- {field: 'typeL', sort: true, title: '绫诲瀷'},
- ]];
- };
-
- table = $.extend(table, {config: {checkName: 'checked'}});
-
- var queryData = {};
- queryData['typeL'] = materialType;
- var tableResult = table.render({
- elem: '#' + MaterialInfo.tableId,
- url: Feng.ctxPath + '/materialInfo/list',
- page: true,
- where:queryData,
- cellMinWidth: 80,
- cols: MaterialInfo.initColumn()
- });
- let Msg='';
- table.on('row(materialInfoTable)',function (data) {
- Msg = data.data;
- })
- $('#btnSubmit').click(function(){
- clearType();
- if (Msg !=='' ){
- // 鍒ゆ柇鏄惁鐐瑰嚮鐨勬槸纭畾
- var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
- window.localStorage.setItem('message',JSON.stringify(Msg));
- parent.layer.close(index);
- }
- else {
- Feng.error("璇烽�夋嫨涓�鏉℃暟鎹�!")
- }
- });
-
- $('#reset').click(function(){
- clearType();
- Msg = "";
- window.localStorage.clear();
- });
-
- function clearType(){
- parent.materialType="";
- }
-
-});
\ No newline at end of file
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js
index aa93dd7..4e2c8cc 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/salesOrder/salesOrder.js
@@ -20,7 +20,7 @@
return [[
{type: 'checkbox'},
{field: 'id', hide: true, title: '涓婚敭id'},
- {field: 'salesOrderCode', sort: true, title: '璁㈠崟缂栧彿',width: 160},
+ {field: 'salesOrderCode', sort: true, title: '璁㈠崟缂栧彿',width: 160, templet: '#scoreTpl'},
{field: 'customerNo', sort: true, title: '瀹㈡埛缂栧彿',width: 120},
{field: 'cargoNo', sort: true, title: '璐у彿',width: 120},
{field: 'productCode', sort: true, title: '浜у搧缂栧彿',width: 160},
@@ -113,12 +113,6 @@
Feng.error("宸叉媶鍒嗕笅鍙戣鍗曠姝㈤噸澶嶆媶鍒�");
return;
}
- // if (checkRows.data.state !== "1") {
- // Feng.error("宸叉媶鍒嗕笅鍙戣鍗曠姝㈤噸澶嶆媶鍒�");
- // return;
- // }
- // window.location.href = Feng.ctxPath + '/salesOrder/split?id=' + checkRows.data[0].id
-
});
/**
@@ -135,6 +129,18 @@
*/
SalesOrder.jumpEditPage = function (data) {
window.location.href = Feng.ctxPath + '/salesOrder/edit?id=' + data.id
+ };
+
+ SalesOrder.distributeDetails = function (data) {
+ layer.open({
+ type: 2,
+ area: ['1000px', '600px'],
+ title: '鎷嗗垎璇︽儏',
+ content: Feng.ctxPath + '/salesOrder/distributeDetails',
+ success: function (layero, index) {
+ window.salesOrderCode = data;
+ },
+ });
};
/**
@@ -154,7 +160,6 @@
*/
SalesOrder.distribute = function (data) {
layer.alert(data);
-
};
/**
@@ -233,6 +238,8 @@
SalesOrder.jumpEditPage(data);
} else if (layEvent === 'delete') {
SalesOrder.onDeleteItem(data);
+ } else if (layEvent === 'clickScore') {
+ SalesOrder.distributeDetails(data.salesOrderCode);
}
});
});
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js
index 19695d5..bf447f7 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/bulletBox/productListing.js
@@ -11,10 +11,11 @@
};
var materialType = parent.materialType;
+ console.log(materialType)
$('#serch').click(function(){
var queryData = {};
- queryData['typeZ'] = materialType;
+ queryData['typeL'] = materialType;
queryData['materialName'] = $("#materialName").val();
queryData['materialCode'] = $("#materialCode").val();
table.reload(MaterialInfo.tableId, {
diff --git a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder.js b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder.js
index 32aac30..92e0034 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/pm/workOrder/workOrder.js
@@ -45,7 +45,6 @@
{field: 'updateUser', sort: true, title: '鏇存敼鐢ㄦ埛',width: 120},
{field: 'updateTime', sort: true, title: '鏇存敼鏃堕棿',width: 160},
{field: 'remark', sort: true, title: '澶囨敞',width: 160},
- // {fixed: 'right',width: 125, minWidth: 125, align: 'center', toolbar: '#tableBar', title: '鎿嶄綔'}
]];
};
diff --git a/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/distributeDetails.html b/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/distributeDetails.html
new file mode 100644
index 0000000..bbc1809
--- /dev/null
+++ b/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/distributeDetails.html
@@ -0,0 +1,13 @@
+@layout("/common/_form.html",{js:["/assets/modular/pm/salesOrder/bulletBox/distributeDetails.js"]}){
+ <div class="layui-fluid" style="padding-bottom: 75px;">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <table class="layui-table" id="materialInfoTable" lay-filter="materialInfoTable"></table>
+ </div>
+ </div>
+ </div>
+
+<div class="form-group-bottom text-center">
+ <button type="reset" id="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog"> 鍏抽棴 </button>
+</div>
+@}
\ No newline at end of file
diff --git a/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html b/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html
deleted file mode 100644
index 5bb1c8f..0000000
--- a/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/bulletBox/productListing.html
+++ /dev/null
@@ -1,35 +0,0 @@
-@layout("/common/_form.html",{js:["/assets/modular/pm/workOrder/bulletBox/productListing.js"]}){
- <div class="layui-fluid" style="padding-bottom: 75px;">
- <div class="layui-card">
- <div class="layui-card-body">
- <div class="layui-form-item layui-row">
- <input id= "id" name="id" type="hidden"/>
- <input id= "materialType" name="materialType" type="hidden"/>
- <div class="layui-inline layui-col-md4">
- <label class="layui-form-label">鐗╂枡缂栧彿<span style="color: red;">*</span></label>
- <div class="layui-input-block">
- <input id="materialCode" name="materialCode" placeholder="璇疯緭鍏ヤ骇鍝佺紪鍙�" type="text" class="layui-input"/>
- </div>
- </div>
- <div class="layui-inline layui-col-md4">
- <label class="layui-form-label">鐗╂枡鍚嶇О<span style="color: red;">*</span></label>
- <div class="layui-input-block">
- <input id="materialName" name="materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" type="text" class="layui-input"/>
- </div>
- </div>
- <div class="layui-inline layui-col-md-offset3">
- <button class="layui-btn" id="serch">鎼滅储</button>
- </div>
- </div>
- <table class="layui-table" id="materialInfoTable" lay-filter="materialInfoTable"></table>
- </div>
- </div>
- </div>
-
-<div class="form-group-bottom text-center">
- <button class="layui-btn" id="btnSubmit"> 鎻愪氦 </button>
- <button type="reset" id="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog"> 鍏抽棴 </button>
-</div>
-
-
-@}
\ No newline at end of file
diff --git a/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/salesOrder.html b/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/salesOrder.html
index 2d13773..093fef1 100644
--- a/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/salesOrder.html
+++ b/guns-vip-main/src/main/webapp/pages/modular/pm/salesOrder/salesOrder.html
@@ -84,8 +84,21 @@
</div>
</div>
+<!--<script type="text/html" id="tableBar">-->
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
+<!-- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">鍒犻櫎</a>-->
+<!--</script>-->
<script type="text/html" id="tableBar">
- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">鍒犻櫎</a>
+ {{# if(d.state == 1){ }}
+ <button class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</button>
+ <button class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete">鍒犻櫎</button>
+ {{# } else { }}
+ <button class="layui-btn layui-btn-primary layui-btn-xs" disabled="true" lay-event="edit">淇敼</button>
+ <button class="layui-btn layui-btn-danger layui-btn-xs" disabled="true" lay-event="delete">鍒犻櫎</button>
+ {{# } }}
+</script>
+
+<script type="text/html" id="scoreTpl">
+ <div lay-event="clickScore" style="color: #01AAED;">{{ d.salesOrderCode }}</div>
</script>
@}
\ No newline at end of file
--
Gitblit v1.9.3