From c270bcad17016f567a291995adffb6e9de714e6b Mon Sep 17 00:00:00 2001 From: wangjiuyun <1595161655@qq.com> Date: Thu, 5 Jun 2025 10:31:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/manage/delivery/delivery.html | 4 +- .../resources/templates/manage/order/add.html | 47 +++++++++----- .../resources/templates/project/info/add.html | 63 +++++++++++-------- 3 files changed, 73 insertions(+), 41 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html index c9193635..7a14fd66 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html +++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html @@ -27,7 +27,9 @@
  • - +
  • 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 6c9ea195..95af87c3 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html @@ -9,7 +9,8 @@ input[name="versionCode"]::-webkit-outer-spin-button { transform: scale(1.2); } - label[for="versionCode"]{ + + label[for="versionCode"] { margin-right: 20px; } @@ -56,7 +57,7 @@
    + +
    @@ -186,7 +190,7 @@ function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/add", $('#form-order-add').serialize()); - }else{ + } else { $.modal.alertWarning("请完善表单必填项"); } } @@ -299,7 +303,7 @@ left: '300px' }); - $('[name="versionCode"]').on('focus',function (){ + $('[name="versionCode"]').on('focus', function () { $(this).blur() }) }); @@ -330,7 +334,7 @@ title: '选择客户', width: "680", url: url, - height:'600', + height: '600', callBack: doSubmitCustomer }; $.modal.openOptions(options); @@ -342,7 +346,7 @@ title: '选择代表处', width: "680", url: url, - height:'600', + height: '600', callBack: doSubmitAgent }; $.modal.openOptions(options); @@ -353,13 +357,25 @@ var options = { title: '选择代理商', width: "680", - height:'600', + height: '600', url: url, callBack: doSubmitPartner }; $.modal.openOptions(options); } + function setCustomer() { + if (!$('#customerSet').attr('partnerName')) { + $.modal.alertWarning("请先选择代理商"); + return + } + $('[name="customerCode"]').attr('readonly', false).attr('required', false).val('').parent().parent().find('label').removeClass('is-required') + $(' [name="customerEmail"]').val(''); + $(' [name="customerName"]').val($('#customerSet').attr('partnerName')); + $(' [name="customerContact"]').val($('#customerSet').attr('contactPerson')); + $(' [name="customerPhone"]').val($('#customerSet').attr('contactPhone')); + } + function doSubmitCustomer(index, layero) { var rows = layero.find("iframe")[0].contentWindow.getSelections(); if (rows.length == 0) { @@ -394,7 +410,9 @@ } $('[name="orderPartnerCode"]').val(rows[0].partnerCode); $('[name="orderPartnerName"]').val(rows[0].partnerName); - + $('#customerSet').attr('partnerName', rows[0].partnerName); + $('#customerSet').attr('contactPerson', rows[0].contactPerson); + $('#customerSet').attr('contactPhone', rows[0].contactPhone); $.modal.close(index); } @@ -404,7 +422,7 @@ function downloadTem() { var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 - window.location.href =prefix + "/list/export" + window.location.href = prefix + "/list/export" $.modal.closeLoading(); // $.post(prefix + "/list/export", {}, function (result) { // if (result.code == web_status.SUCCESS) { @@ -467,13 +485,14 @@ let res = Number((price * quantity * discount).toFixed(2)) $(ele).parent().parent().find('.amount').val(res) } - function changeOrderType(){ - let orderType=$('[name="orderType"]').val() - if(orderType=='zq'){ + + function changeOrderType() { + let orderType = $('[name="orderType"]').val() + if (orderType == 'zq') { $('[name="orderPartnerName"]').removeAttr('required') $('[name="orderPartnerName"]').parent().parent().parent().find('label').removeClass('is-required') - }else{ - $('[name="orderPartnerName"]').attr('required',true) + } else { + $('[name="orderPartnerName"]').attr('required', true) $('[name="orderPartnerName"]').parent().parent().parent().find('label').addClass('is-required') } } diff --git a/ruoyi-admin/src/main/resources/templates/project/info/add.html b/ruoyi-admin/src/main/resources/templates/project/info/add.html index 23b281e9..4e679d1c 100644 --- a/ruoyi-admin/src/main/resources/templates/project/info/add.html +++ b/ruoyi-admin/src/main/resources/templates/project/info/add.html @@ -158,26 +158,26 @@ 预计金额（RMB）* 预计下单时间 - + 预计发货时间 + > 竞争对手
    - - - - - + + + + +
    - 其它： + 其它：
    @@ -204,14 +204,14 @@ 产品型号 描述 数量 - 目录单价(RMB) - 指导折扣 - 折扣 - 单价(RMB) - 总价(RMB) - 目录总价(RMB) - 备注 - 操作 + 目录单价(RMB) + 指导折扣 + 折扣 + 单价(RMB) + 总价(RMB) + 目录总价(RMB) + 备注 + 操作 @@ -284,12 +284,12 @@ var layerIndex = parent.layer.index parent.layer.full(layerIndex) - $("input[name='orderDate']").datetimepicker({ + $("input[name='estimatedOrderTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); - $("input[name='deliveryDate']").datetimepicker({ + $("input[name='estimatedDeliverTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true @@ -397,19 +397,19 @@ let length = $('#productTable tbody').find('tr').length let tr = $(` -${length + 1} +${length + 1} - - + + -删除 +删除 `) $('#productTable tbody').append(tr) @@ -418,13 +418,13 @@ } function addLog() { - let length = $('#productTable tbody').find('tr').length + let length = $('#workLog tbody').find('tr').length let tr = $(` ${length + 1} - - - + + + `) $('#workLog tbody').append(tr) @@ -439,6 +439,17 @@ let val = $(this).val() searchProduct(val, 'model', this) }) + $('#productTable .delRow').on('click', function () { + let ele=$(this) + $.modal.confirm('是否确认删除',function (){ + $(ele).parent().parent().remove() + $('#productTable tbody tr').each((index,item)=>{ + $(item).find('.indexBox').text(index+1) + }) + + }); + }) + } function searchProduct(val, type, ele) {