ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-14 09:45:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. 【新增】售后单售后原因类型支持搜索

Browse Source 
2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app/ome/view/admin/system/setting/tab_order.html
View File

@@ -174,6 +174,18 @@
1、当实际订单可合并条数 大于 当前设置的合并条数时，系统审单时只会按当前“设置条数”合并生成一张发货单，剩余未合并的订单，需要再次触发审单才会审核生成发货单</font></span>
</div>
<div class="form-field">
<span class="form-field-label"><em class='c-red'>*</em>支持手工合单：</span>
<div class="form-radios">
<input id="ome_combine_manual_merge_on" name="set[ome.combine.manual.merge]" <{if $setData['ome_combine_manual_merge'] == 'On'}>checked<{/if}> type="radio" value="On">
<label for="ome_combine_manual_merge_on">开启</label>
<input id="ome_combine_manual_merge_off" name="set[ome.combine.manual.merge]" <{if $setData['ome_combine_manual_merge'] != 'On'}>checked<{/if}> type="radio" value="Off">
<label for="ome_combine_manual_merge_off" >关闭</label>
</div>
<span class="form-remark" style="color: red"> <font color="red">&nbsp;&nbsp;*默认是关闭，不允许手工合单订单。</font></span>
</div>
<div class="form-field">
<span class="form-field-label">物流探查是否开启：</span>
<div class="form-radios">
@@ -226,6 +238,17 @@
<label for="ome_order_presale_combine_off" >否</label>
</div>
</div>
<div class="form-field">
<span class="form-field-label">预售订单是否开启hold单：</span>
<div class="form-radios">
<input id="ome_order_presale_hold_on" name="set[ome.order.presale.hold]" <{if $setData.ome_order_presale_hold != 'false'}>checked<{/if}> type="radio" value="true">
<label for="ome_order_presale_hold_on">是</label>
<input id="ome_order_presale_hold_off" name="set[ome.order.presale.hold]" <{if $setData.ome_order_presale_hold == 'false'}>checked<{/if}> type="radio" value="false">
<label for="ome_order_presale_hold_off" >否</label>
</div>
</div>
<div class="form-field">
<span class="form-field-label">货到付款订单签收后是否自动完成付款：</span>
<div class="form-radios">
@@ -255,6 +278,16 @@
</div>
<span class="form-remark">支持抖音、拼多多</span>
</div>
<div class="form-field">
<span class="form-field-label">获取实付是否开启：</span>
<div class="form-radios">
<input id="ome_order_get_payment_on" name="set[ome.order.get.payment]" <{if $setData['ome_order_get_payment'] == 'true'}>checked<{else}><{/if}> type="radio" value="true">
<label for="ome_order_get_payment_on">开启</label>
<input id="ome_order_get_payment_off" name="set[ome.order.get.payment]" <{if $setData['ome_order_get_payment'] == 'true'}><{else}>checked<{/if}> type="radio" value="false">
<label for="ome_order_get_payment_off" >关闭</label>
</div>
<span class="form-remark">开启后，系统将获取订单的实际支付金额(天猫淘宝订单)</span>
</div>
</div>
</div>
<div class="form-layout-block">
@@ -280,6 +313,22 @@
</div>
<span class="nt form-remark" style="color:red">*注：针对会员昵称、会员姓名、会员手机、会员电话、收货人姓名、收货人手机、收货人电话加密</span>
</div>
<div class="form-field">
<span class="form-field-label">报备外呼主叫号码组：</span>
<textarea
id="reservation_call_mobile_group"
name="set[ome.call.mobile.group]"
class="form-input"
rows="10"
cols="50"
placeholder="请输入手机号，每行一个，最多80个"
style="width: 400px; min-height: 150px;"
oninput="checkMobileGroup(this)"
><{if $setData.ome_call_mobile_group}><{$setData.ome_call_mobile_group}><{/if}></textarea>
<div id="mobile_group_count" style="margin-top: 5px; color: #666; font-size: 12px;">已输入：0 个手机号（最多80个）</div>
<span class="nt form-remark" style="color:red">*注：最多可添加80个手机号，每行只填写一个手机号，多个手机号使用回车换行符。</span>
</div>
</div>
</div>
<script>
@@ -330,4 +379,40 @@ function cnautoset(value){
$$('.cn_autohtml').setStyle('display','none');
}
}
// 检查报备外呼主叫号码组
function checkMobileGroup(textarea) {
var value = textarea.value;
var lines = value.split('\n');
var validMobiles = [];
var mobilePattern = /^1[3-9]\d{9}$/; // 手机号正则：11位，1开头，第二位3-9
for (var i = 0; i < lines.length; i++) {
var line = lines[i].trim();
if (line) {
if (mobilePattern.test(line)) {
validMobiles.push(line);
}
}
}
var count = validMobiles.length;
var countDiv = document.getElementById('mobile_group_count');
if (count > 80) {
countDiv.innerHTML = '<span style="color: red;">已输入：' + count + ' 个手机号（超过限制80个，请删除多余号码）</span>';
countDiv.style.color = 'red';
} else {
countDiv.innerHTML = '已输入：' + count + ' 个手机号（最多80个）';
countDiv.style.color = '#666';
}
}
// 页面加载时初始化统计
window.addEvent('domready', function() {
var textarea = document.getElementById('reservation_call_mobile_group');
if (textarea) {
checkMobileGroup(textarea);
}
});
</script>

2
app/ome/view/admin/system/setting/tab_other.html
View File

@@ -114,7 +114,7 @@
<input id="ome_delivery_retry_push_off" name="set[ome.delivery.retry_push]" <{if $setData['ome_delivery_retry_push'] != 'on'}>checked<{/if}> type="radio" value="off">
<label for="ome_delivery_retry_push_off" >关闭</label>
</div>
<span class="form-remark">启用&nbsp;&nbsp;只针对【京东云交易】无货时,每3小时自动重试推送【商品无货】的发货单</span>
<span class="form-remark">启用：系统每小时会自动重试请求WMS超时的发货单</span>
</div>
</div>
</div>