ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-18 03:15:33 +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

95
app/ticket/view/admin/workflow/case/audit.html Normal file
View File

@@ -0,0 +1,95 @@
<form id="saveForm" action="index.php?app=ticket&ctl=admin_workflow_case&act=do_audit" method="post">
<input type="hidden" name="id" value="<{$data.id}>">
<div class="tableform">
<div class="division">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<th valign="middle" style="height:35px; line-height:35px;"><{t}>审批节点：<{/t}></th>
<td valign="middle" style="height:35px; line-height:35px; font-weight: bold; color: red;"><{$currentNode.node_name}></td>
</tr>
<tr>
<th valign="middle" style="height:35px; line-height:35px;"><{t}>来源单号：<{/t}></th>
<td valign="middle">
<input autocomplete="off" class="x-input " type="text" name="original_bn" value="<{$data.original_bn}>" id="class_bn" readonly="readonly" style="border:0px;">
</td>
</tr>
<tr>
<th height="35"><{t}>审批状态：<{/t}></th>
<td style="vertical-align:middle;">
<input type="radio" name="status" value="approved" <{if $data.status == 'approve'}>checked="checked"<{/if}> />
<label for="type1">同意</label>
<input type="radio" name="status" value="rejected" <{if $data.status == 'rejected'}>checked="checked"<{/if}> />
<label for="type2">拒绝</label>
</td>
</tr>
<tr>
<th height="35"><{t}>审批意见：<{/t}></th>
<td>
<textarea name="remark" id="remark" rows="12" vtype="required" style="width:400px !important; height:65px;"><{$data.remark}></textarea>
</td>
</tr>
<tr>
<th><{t}>赠品明细：<{/t}></th>
<td>
<div class="clear division">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="gridlist">
<thead>
<tr>
<th style="width:230px; height:26px;">赠品编码</th>
<th style="width:330px;">赠品名称</th>
<th style="width:120px;">申请数量</th>
</tr>
</thead>
<tbody>
<{foreach from=$addGiftList item=item}>
<tr>
<td style="width:230px; height:30px;"><{$item.bn}></td>
<td><input autocomplete="off" class="x-input " type="text" name="gift_bns[]" value="<{$item.name}>" readonly="readonly" style="border:0px; width:300px;"></td>
<td><{$item.quantity}></td>
</tr>
<{/foreach}>
</tbody>
</table>
</div>
</td>
</tr>
<tr>
<th>&nbsp;</th>
<td>&nbsp;</td>
</tr>
<tr>
<th>&nbsp;</th>
<td>&nbsp;</td>
</tr>
<tr>
<th>&nbsp;</th>
<td>&nbsp;</td>
</tr>
</table>
</div>
<div class="table-action">
<{button type="submit" id="btn-save" label="审 批"}>
<{button type='button' label='关 闭' isCloseDialogBtn="true"}>
</div>
</div>
</form>
<script>
$('saveForm').store('target',{
onRequest:function(){
$('btn-save').set('disabled', 'true');
},
onComplete:function(jsontext){
var json = Json.evaluate(jsontext);
if (typeof(json.error) != 'undefined'){
$('btn-save').set('disabled', '');
}else{
$('btn-save').set('disabled', 'true');
if($('saveForm').getParent('.dialog')){
$('saveForm').getParent('.dialog').retrieve('instance').close();
}
}
}
});
</script>

113
app/ticket/view/admin/workflow/case/detail.html Normal file
View File

@@ -0,0 +1,113 @@
<{capture name="header"}>
<link href="../app/ome/statics/ome.css" rel="stylesheet" type="text/css">
<{/capture}>
<div class="tableform" id="caseinfo">
<h4>基本信息</h4>
<div class="division">
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<th>审批号：</th>
<td><{$data.case_bn}></td>
<th>审批标题：</th>
<td><{$data.title}></td>
<th>创建时间：</th>
<td><{$data.at_time}></td>
</tr>
<tr>
<th>来源ID：</th>
<td><{$data.original_id}></td>
<th>来源单号：</th>
<td><{$data.original_bn}></td>
<th>更新时间：</th>
<td><{$data.up_time}></td>
</tr>
<tr>
<th>订单号：</th>
<td><{$data.original_bn}></td>
<th>业务单号：</th>
<td><{$data.bill_bn}></td>
<th>业务类型：</th>
<td><{$data.bill_type}></td>
</tr>
<tr>
<th>审批场景类型：</th>
<td>
<{if $data.scene_type == 'add_gift'}>加赠<{/if}>
</td>
<th>审核状态：</th>
<td>
<{if $data.status == 'pending'}>待审批<{/if}>
<{if $data.status == 'processing'}>审批中<{/if}>
<{if $data.status == 'approved'}>同意<{/if}>
<{if $data.status == 'rejected'}>拒绝<{/if}>
<{if $data.status == 'cancelled'}>取消<{/if}>
</td>
<th>流程模板ID：</th>
<td><{$data.template_id}></td>
</tr>
<tr>
<th>提交人ID：</th>
<td><{$data.submitter_id}></td>
<th>提交人姓名：</th>
<td><{$data.submitter_name}></td>
<th>当前节点ID：</th>
<td><{$data.current_node_id}></td>
</tr>
<tr>
<th>开始时间：</th>
<td><{$data.start_time}></td>
<th>结束时间：</th>
<td><{$data.end_time}></td>
<th>审批人类型：</th>
<td>
<{if $data.assignee_type == 'user'}>用户<{/if}>
<{if $data.assignee_type == 'role'}>角色<{/if}>
<{if $data.assignee_type == 'dept'}>部门<{/if}>
</td>
</tr>
<tr>
<th>审批人ID：</th>
<td><{$data.assignee_id}></td>
<th>审批人姓名：</th>
<td><{$data.assignee_name}></td>
<th></th>
<td></td>
</tr>
</table>
</div>
<{if $data.items_context}>
<h4>订单赠品明细列表</h4>
<div class="goods-spec-cell" id='goods-spec-product'>
<{if $data.items_list && is_array($data.items_list) && count($data.items_list) > 0}>
<table class="gridlist">
<thead>
<tr>
<th style="text-align: left; font-weight: bold;">商品名称</th>
<th style="text-align: left;; font-weight: bold;">商品编码</th>
<th style="text-align: left;; font-weight: bold;">规格</th>
<th style="text-align: left;; font-weight: bold;">数量</th>
<th style="text-align: left;; font-weight: bold;">单价</th>
<th style="text-align: left;; font-weight: bold;">小计</th>
</tr>
</thead>
<tbody>
<{foreach from=$data.items_list item=item}>
<tr>
<td><{$item.name|default:'-'}></td>
<td><{$item.bn|default:'-'}></td>
<td><{$item.spec_info|default:'-'}></td>
<td><{$item.quantity|default:'0'}></td>
<td><{$item.price|default:'0.00'}></td>
<td><{$item.amount|default:'0.00'}></td>
</tr>
<{/foreach}>
</tbody>
</table>
<{else}>
<p class="text-muted">暂无商品明细数据</p>
<{/if}>
</div>
<{/if}>
</div>