From c32c0611a92f428cf0d2da76eff110ac065f664c Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 27 十月 2025 10:39:05 +0800
Subject: [PATCH] #1
---
src/main/webapp/static/js/mat/mat.js | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 107 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index f1e0dc5..840d810 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,11 +5,14 @@
var cols = [
{type: 'checkbox'}
,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
+ ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺',hide:true}
+ ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺',hide:true}
+ ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)',hide:true}
];
cols.push.apply(cols, matCols);
cols.push(
{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
- )
+ )
return cols;
}
@@ -234,6 +237,9 @@
case 'edit':
showEditModel(data)
break;
+ case 'editBarcode':
+ showEditModelBarcode(data)
+ break;
}
});
@@ -255,6 +261,7 @@
}
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(editSubmit)', function (data) {
+ console.log(data)
data.field.tagId = insXmSel.getValue('valueStr');
if (isEmpty(data.field.tagId)) {
layer.msg('鍒嗙被涓嶈兘涓虹┖', {icon: 2});
@@ -284,6 +291,72 @@
// 娓叉煋涓嬫媺鏍�
var insXmSel = xmSelect.render({
el: '#tagSel',
+ 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] : [],
@@ -388,6 +461,10 @@
function importExcel() {
$("#importExcel").trigger("click");
}
+// 绠�鍥句笂浼�
+function importImage() {
+ $("#importImage").trigger("click");
+}
function upload(obj){
if(!obj.files) {
return;
@@ -417,6 +494,35 @@
$("#importExcel").val("");
});
}
+function uploadImage(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭鍚屾 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/saveImage";
+ var form = new FormData();
+ form.append("files", file);
+ xhr = new XMLHttpRequest();
+ xhr.open("post", url, true); //post鏂瑰紡锛寀rl涓烘湇鍔″櫒璇锋眰鍦板潃锛宼rue 璇ュ弬鏁拌瀹氳姹傛槸鍚﹀紓姝ュ鐞嗐��
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete; //璇锋眰瀹屾垚
+ xhr.onerror = uploadFailed; //璇锋眰澶辫触
+ xhr.onloadend = function () { // // 涓婁紶瀹屾垚閲嶇疆鏂囦欢娴�
+ layer.closeAll('loading');
+ $("#importImage").val("");
+ };
+ // xhr.upload.onprogress = progressFunction;//銆愪笂浼犺繘搴﹁皟鐢ㄦ柟娉曞疄鐜般��
+ xhr.upload.onloadstart = function(){//涓婁紶寮�濮嬫墽琛屾柟娉�
+ ot = new Date().getTime(); //璁剧疆涓婁紶寮�濮嬫椂闂�
+ oloaded = 0;//璁剧疆涓婁紶寮�濮嬫椂锛屼互涓婁紶鐨勬枃浠跺ぇ灏忎负0
+ };
+ xhr.send(form);
+ }, function(index){
+ $("#importImage").val("");
+ });
+}
function uploadComplete(evt) {
var res = JSON.parse(evt.target.responseText);
if(res.code === 200) {
--
Gitblit v1.9.1