diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html index 648db42e..e23720cb 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html @@ -144,8 +144,8 @@
- - + +
@@ -338,13 +338,27 @@ function importList(){ $('#uploadInput').click() } - document.getElementById('uploadInput').addEventListener('change', function(event) { + function downloadTem(){ + $.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); + } + $.modal.closeLoading(); + }) + + } document.getElementById('uploadInput').addEventListener('change', function(event) { const file = event.target.files[0]; let data=new FormData() data.append('file',file) - data.append('deliveryId',$('#bootstrap-table').attr('deliveryid')) + data.append('orderId',$('#bootstrap-table').attr('deliveryid')) + var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 - xhr.open('POST',prefix+'/importData', true); // 设置请求类型和URL + xhr.open('POST',prefix+'/list/importData', true); // 设置请求类型和URL // 当请求完成时执行的回调函数 xhr.onload = function (res) { let data=JSON.parse(res.currentTarget.response) 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 7cb4c27c..481ce03e 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -138,6 +138,10 @@

合同清单列表

+ + + +
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/order.html b/ruoyi-admin/src/main/resources/templates/manage/order/order.html index 61b8cb45..8cacacb7 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/order.html @@ -107,10 +107,10 @@ field: 'orderDate', title: '合同签定日期' }, - { - field: 'status', - title: '合同状态' - }, + // { + // field: 'status', + // title: '合同状态' + // }, { title: '操作', align: 'center',