-
@@ -114,9 +114,9 @@
@@ -255,7 +255,7 @@
title: '折扣',
width: 70,
formatter: function (value, row, index) {
- var html = $.common.sprintf("
", index, value);
+ var html = $.common.sprintf("
", index, value);
return html;
}
},
@@ -314,6 +314,7 @@
title: '选择客户',
width: "680",
url: url,
+ height:'600',
callBack: doSubmitCustomer
};
$.modal.openOptions(options);
@@ -325,6 +326,7 @@
title: '选择代表处',
width: "680",
url: url,
+ height:'600',
callBack: doSubmitAgent
};
$.modal.openOptions(options);
@@ -335,6 +337,7 @@
var options = {
title: '选择代理商',
width: "680",
+ height:'600',
url: url,
callBack: doSubmitPartner
};
@@ -384,18 +387,21 @@
}
function downloadTem() {
+ var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
+ xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL
+ // 当请求完成时执行的回调函数
$.modal.loading("正在下载，请稍候...");
- $.post(prefix + "/list/export", {}, function (result) {
- if (result.code == web_status.SUCCESS) {
- window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
- } else if (result.code == web_status.WARNING) {
- $.modal.alertWarning(result.msg)
- } else {
- $.modal.alertError(result.msg);
- }
+ xhr.onload = function (data) {
+ const url = window.URL.createObjectURL(data.currentTarget.response)
+ const a=document.createElement('a')
+ a.href= url
+ a.download='合同清单模板.xlsx'
+ document.append(a)
+ a.click()
+ a.remove()
$.modal.closeLoading();
- })
-
+ }
+ xhr.send();
}
document.getElementById('uploadInput').addEventListener('change', function (event) {
@@ -445,6 +451,9 @@
let res = Number((price * quantity * discount).toFixed(2))
$(ele).parent().parent().find('.amount').val(res)
}
+ $('[name="versionCode"]').on('focus',function (){
+ $(this).blur()
+ })
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index ab1d45ac..e1ed2577 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -107,7 +107,7 @@
-
@@ -119,8 +119,9 @@
@@ -206,6 +207,8 @@
title: '选择客户',
width: "680",
url: url,
+ height:'600',
+
callBack: doSubmitCustomer
};
$.modal.openOptions(options);
@@ -217,6 +220,8 @@
title: '选择代表处',
width: "680",
url: url,
+ height:'600',
+
callBack: doSubmitAgent
};
$.modal.openOptions(options);
@@ -228,6 +233,8 @@
title: '选择代理商',
width: "680",
url: url,
+ height:'600',
+
callBack: doSubmitPartner
};
$.modal.openOptions(options);
@@ -317,17 +324,21 @@
});
function downloadTem() {
+ var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象
+ xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL
+ // 当请求完成时执行的回调函数
$.modal.loading("正在下载，请稍候...");
- $.post(prefix + "/list/export", {}, function (result) {
- if (result.code == web_status.SUCCESS) {
- window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
- } else if (result.code == web_status.WARNING) {
- $.modal.alertWarning(result.msg)
- } else {
- $.modal.alertError(result.msg);
- }
+ xhr.onload = function (data) {
+ const url = window.URL.createObjectURL(data.currentTarget.response)
+ const a=document.createElement('a')
+ a.href= url
+ a.download='合同清单模板.xlsx'
+ document.append(a)
+ a.click()
+ a.remove()
$.modal.closeLoading();
- })
+ }
+ xhr.send();
}
@@ -411,7 +422,7 @@
align: 'center',
title: '折扣',
formatter: function (value, row, index) {
- var html = $.common.sprintf("
", index, value);
+ var html = $.common.sprintf("
", index, value);
return html;
}
},
@@ -444,6 +455,9 @@
$(this).blur()
})
}
+ $('[name="versionCode"]').on('focus',function (){
+ $(this).blur()
+ })