From 5fa3c13b13f100525b3e076cad3742b202afb284 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 四月 2021 09:53:48 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/webapp/static/js/pakStore/pakStore.js | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 55db1b3..66f396f 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -6,7 +6,10 @@
{fixed: 'left', field: 'count', title: '鏁伴噺(蹇呭～)', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
];
cols.push.apply(cols, matCols);
- cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ cols.push(
+ {field: 'memo', title:'澶囨敞', align: 'center'},
+ {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ )
return cols;
}
@@ -89,6 +92,7 @@
// 鐩戝惉琛屽伐鍏蜂簨浠�
table.on('tool(chooseData)', function(obj){
var data = obj.data;
+
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
@@ -102,6 +106,36 @@
// 瑕嗙洊render鏂规硶鐨刣one
}});
break;
+ case 'memo':
+ var memoLayer = layer.open({
+ type: 2,
+ title: '澶囨敞',
+ maxmin: true,
+ area: ['400px', '215px'],
+ shadeClose: false,
+ content: 'matMemo.html',
+ btn: ['淇濆瓨', '鍙栨秷'],
+ style: 'text-algin: center',
+ yes: function(index, layero){
+ var memo = layer.getChildFrame('body', index).find("#memo")[0].value;
+ matCodeData.map(function (item) {
+ if (item.matNo === data.matNo) {
+ item.memo = memo;
+ }
+ });
+ // 閲嶇疆琛ㄦ牸鏁版嵁
+ tableIns.reload({data: matCodeData,done:function (res) {
+ limit();
+ getInBound();
+ layer.close(memoLayer);
+ }});
+ },
+ success: function(layero, index){
+ var iframeWin = window[layero.find('iframe')[0]['name']];//寰楀埌iframe椤电殑绐楀彛瀵硅薄
+ iframeWin.setMatMemo(data.memo);
+ }
+ });
+ break;
}
});
--
Gitblit v1.9.1