From be554d9e52799a0ee14c98b0959d07ab3847c8e6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 十月 2025 15:24:27 +0800
Subject: [PATCH] 联调
---
src/main/webapp/static/js/mat/mat.js | 130 +++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index a7c3636..68492d2 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -315,71 +315,71 @@
});
}
- // /* 鏄剧ず琛ㄥ崟寮圭獥 */
- // function showEditModelBarcode(mData) {
- // admin.open({
- // type: 1,
- // area: '600px',
- // title: '缁戝畾鍟嗗搧',
- // content: $('#editDialogBarcode').html(),
- // success: function (layero, dIndex) {
- // // 鍥炴樉琛ㄥ崟鏁版嵁
- // form.val('detail', mData);
- // // 琛ㄥ崟鎻愪氦浜嬩欢
- // form.on('submit(editSubmit)', function (data) {
- // console.log(data)
- // data.field.tagId = insXmSel.getValue('valueStr');
- // if (isEmpty(data.field.tagId)) {
- // layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
- // return false;
- // }
- // var loadIndex = layer.load(2);
- // $.ajax({
- // url: baseUrl+"/mat/barcode/auth",
- // headers: {'token': localStorage.getItem('token')},
- // data: data.field,
- // method: 'POST',
- // success: function (res) {
- // layer.close(loadIndex);
- // if (res.code === 200){
- // layer.close(dIndex);
- // layer.msg(res.msg, {icon: 1});
- // $(".layui-laypage-btn")[0].click();
- // } else if (res.code === 403){
- // top.location.href = baseUrl+"/";
- // }else {
- // layer.msg(res.msg, {icon: 2});
- // }
- // }
- // })
- // return false;
- // });
- // // 娓叉煋涓嬫媺鏍�
- // var insXmSel = xmSelect.render({
- // el: '#tagSelBarcode',
- // height: '250px',
- // data: insTb.options.data,
- // initValue: mData ? [mData.tagId] : [],
- // model: {label: {type: 'text'}},
- // prop: {
- // name: 'name',
- // value: 'id'
- // },
- // radio: true,
- // clickClose: true,
- // tree: {
- // show: true,
- // indent: 15,
- // strict: false,
- // expandedKeys: true
- // }
- // });
- // // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
- // $(layero).children('.layui-layer-content').css('overflow', 'visible');
- // layui.form.render('select');
- // }
- // });
- // }
+ /* 鏄剧ず琛ㄥ崟寮圭獥 */
+ function showEditModelBarcode(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: '缁戝畾鍟嗗搧',
+ content: $('#editDialogBarcode').html(),
+ success: function (layero, dIndex) {
+ // 鍥炴樉琛ㄥ崟鏁版嵁
+ form.val('detail', mData);
+ // 琛ㄥ崟鎻愪氦浜嬩欢
+ form.on('submit(editSubmit)', function (data) {
+ console.log(data)
+ data.field.tagId = insXmSel.getValue('valueStr');
+ if (isEmpty(data.field.tagId)) {
+ layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
+ return false;
+ }
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/mat/barcode/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ $(".layui-laypage-btn")[0].click();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ // 娓叉煋涓嬫媺鏍�
+ var insXmSel = xmSelect.render({
+ el: '#tagSelBarcode',
+ height: '250px',
+ data: insTb.options.data,
+ initValue: mData ? [mData.tagId] : [],
+ model: {label: {type: 'text'}},
+ prop: {
+ name: 'name',
+ value: 'id'
+ },
+ radio: true,
+ clickClose: true,
+ tree: {
+ show: true,
+ indent: 15,
+ strict: false,
+ expandedKeys: true
+ }
+ });
+ // 寮圭獥涓嶅嚭鐜版粴鍔ㄦ潯
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
// 妯℃澘閫夋嫨
form.on('radio(selectTemplateRadio)', function (data) {
--
Gitblit v1.9.1