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

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

View File

@@ -20,156 +20,141 @@
<form action="index.php?<{$env.server.QUERY_STRING}>" method="post" id="modifyForm">
<input type="hidden" name="supplier_id" value=<{$detail.supplier_id}> />
<div class="tableform">
<h3>基本信息</h3>
<div class="division">
<table width='100%' cellspacing="0" cellpadding="0">
<tr>
<td colspan="4"><h3>基本信息</h3></td>
</tr>
<tr>
<th>供应商编码:</th>
<td>
<input type="hidden" name="ini_bn" value="<{$detail.bn}>" />
<input type="text" name="bn" value="<{$detail.bn}>" vtype="required" /> <em class="c-red">*</em>
</td>
<th>供应商名称:</th>
<td>
<input type="hidden" value="<{$detail.name}>" name="ini_name" />
<input type="text" value="<{$detail.name}>" name="name" vtype="required" /> <em class="c-red">*</em></td>
</tr>
<tr>
<th>供应商快速索引:</th>
<td>
<{input type="text" name="brief" id="brief" value="{$detail.brief}" size='12' maxlength='20' }>
</td>
<th>公司名称:</th>
<td>
<{input type="text" name="company" id="company" value="{$detail.company}" maxlength='20' size='20' }>
</td>
<table width='100%' cellspacing="0" cellpadding="0">
<tr>
<th>供应商编码:</th>
<td>
<input type="hidden" name="ini_bn" value="<{$detail.bn}>" />
<input type="text" name="bn" value="<{$detail.bn}>" vtype="required" /> <em class="c-red">*</em>
</td>
<th>供应商名称:</th>
<td>
<input type="hidden" value="<{$detail.name}>" name="ini_name" />
<input type="text" value="<{$detail.name}>" name="name" vtype="required" /> <em class="c-red">*</em></td>
</tr>
<tr>
<th>供应商快速索引:</th>
<td>
<{input type="text" name="brief" id="brief" value="{$detail.brief}" size='12' maxlength='20' }>
</td>
<th>公司名称:</th>
<td>
<{input type="text" name="company" id="company" value="{$detail.company}" maxlength='20' size='20' }>
</td>
</tr>
<tr>
<th>所在地区:</th>
<td>
<{if $detail.area_defined and $detail.area<>'' }>
<{input id="area_defined" type="text" name="area" value="{$detail.area}" size="28" }>
<span id="area" style="display:none;">
<{input type='region' app='eccommon' name="area" value=""}>
</span>
<{button name="modify" id="modify" label="修改" }>
<{button name="cancel_modify" style="display:none" id="cancel_modify" label="取消" }>
</tr>
<{else}>
<{input type='region' app='eccommon' name="area" value="{$detail.area}" }>
<{/if}>
</td>
<th>街道地址:</th>
<td>
<{input type="text" name="addr" value="{$detail.addr}" size="30" }>
</td>
</tr>
<tr>
<th>邮编:</th>
<td><{input type="text" value="{$detail.zip}" name="zip" size="6" }></td>
<th>电话/手机:</th>
<td><{input type="text" value="{$detail.telphone}" name="telphone" size="12" }></td>
</tr>
<tr>
<th>信用等级:</th>
<td>
<select name="credit_lv">
<option value="">请选择</option>
<{foreach from=$credit_lev item=value key=keys }>
<option value="<{$keys}>" <{if $detail.credit_lv==$keys}> selected <{/if}> ><{$value}></option>
<{/foreach}>
</select>
</td>
<th>传真:</th>
<td><{input type="text" name="fax" value="{$detail.fax}" size="12" }></td>
</tr>
<tr>
<th>到货天数:</th>
<td>
<{input type="number" name="arrive_days" value="{$detail.arrive_days}" size='3' }> <span class="notice-inline"></span>
</td>
<th>采购员:</th>
<td>
<{input type="text" name="operator" value="{$detail.operator}" size="8" }>
</td>
</tr>
<tr>
<th>供应品牌:</th>
<td colspan="3">
<{foreach from=$brandlist item=brand}>
<input type="checkbox" name="brand[]" value="<{$brand.brand_id}>" <{if in_array($brand.brand_id, $brand_detail)}>checked<{/if}> ><{$brand.brand_name}>
<{/foreach}>
</td>
</tr>
<tr>
<th>备注:</th>
<td colspan="3"><{input type="textarea" name="memo" value="{$detail.memo}" rows="5" style="width:90%" }></td>
</tr>
</table>
</div>
<h3>联系人信息</h3>
<div class="division">
<table class="gridlist" cellpadding="0" cellspacing="0" style="width:100%">
<caption>
<{button label="添加联系人" id="add_lianximan" }>
</caption>
<thead>
<th style="width:20%">联系人</th>
<th style="width:20%">电话</th>
<th style="width:25%">E-mail</th>
<th style="width:20%">qq/旺旺</th>
<th style="width:5%">操作</th>
</thead>
<tbody id="lianximan">
<{foreach from=$detail.contacter item=items}>
<tr>
<th>所在地区:</th>
<td>
<{if $detail.area_defined and $detail.area<>'' }>
<{input id="area_defined" type="text" name="area" value="{$detail.area}" size="28" }>
<span id="area" style="display:none;">
<{input type='region' app='eccommon' name="area" value=""}>
</span>
<{button name="modify" id="modify" label="修改" }>
<{button name="cancel_modify" style="display:none" id="cancel_modify" label="取消" }>
<{else}>
<{input type='region' app='eccommon' name="area" value="{$detail.area}" }>
<{/if}>
</td>
<th>街道地址:</th>
<td>
<{input type="text" name="addr" value="{$detail.addr}" size="30" }>
</td>
<td><input type="text" size="15" name="lianxi_name[]" value="<{$items.name}>"></td>
<td><input type="text" size="15" name="lianxi_telphone[]" value="<{$items.telphone}>"></td>
<td><input type="text" size="15" name="lianxi_email[]" value="<{$items.email}>"></td>
<td><input type="text" size="15" name="lianxi_qqwangwang[]" value="<{$items.qqwangwang}>"></td>
<td><{img src="bundle/delecate.gif" app="desktop" class="pointer del"}></td>
</tr>
<{/foreach}>
</tbody>
</table>
</div>
<tr>
<th>邮编:</th>
<td><{input type="text" value="{$detail.zip}" name="zip" size="6" }></td>
<th>电话/手机:</th>
<td><{input type="text" value="{$detail.telphone}" name="telphone" size="12" }></td>
</tr>
<h3>财务信息</h3>
<div class="division">
<table cellspacing="0" cellpadding="0">
<tr>
<th>开户行:</th>
<td><{input type="text" name="bank" value="{$detail.bank}" size="32" }></td>
<th>银行帐号:</th>
<td>
<{input type="text" name="account" value="{$detail.account}" size="32" }>
</td>
</tr>
</table>
</div>
</div>
<tr>
<th>信用等级:</th>
<td>
<select name="credit_lv">
<option value="">请选择</option>
<{foreach from=$credit_lev item=value key=keys }>
<option value="<{$keys}>" <{if $detail.credit_lv==$keys}> selected <{/if}> ><{$value}></option>
<{/foreach}>
</select>
</td>
<th>传真:</th>
<td><{input type="text" name="fax" value="{$detail.fax}" size="12" }></td>
</tr>
<tr>
<th>到货天数:</th>
<td>
<{input type="number" name="arrive_days" value="{$detail.arrive_days}" size='3' }> <span class="notice-inline"></span>
</td>
<th>采购员:</th>
<td>
<{input type="text" name="operator" value="{$detail.operator}" size="8" }>
</td>
</tr>
<tr>
<th>供应品牌:</th>
<td colspan="3">
<{foreach from=$brandlist item=brand}>
<input type="checkbox" name="brand[]" value="<{$brand.brand_id}>" <{if in_array($brand.brand_id, $brand_detail)}>checked<{/if}> ><{$brand.brand_name}>
<{/foreach}>
</td>
</tr>
<tr>
<th>备注:</th>
<td colspan="3"><{input type="textarea" name="memo" value="{$detail.memo}" rows="5" style="width:90%" }></td>
</tr>
<tr>
<td colspan="4"><h3>联系人信息</h3></td>
</tr>
<tr>
<td colspan="4">
<table class="gridlist" cellpadding="0" cellspacing="0" style="width:100%">
<caption>
<{button label="添加联系人" id="add_lianximan" }>
</caption>
<thead>
<th style="width:20%">联系人</th>
<th style="width:20%">电话</th>
<th style="width:25%">E-mail</th>
<th style="width:20%">qq/旺旺</th>
<th style="width:5%">操作</th>
</thead>
<tbody id="lianximan">
<{foreach from=$detail.contacter item=items}>
<tr>
<td><input type="text" size="15" name="lianxi_name[]" value="<{$items.name}>"></td>
<td><input type="text" size="15" name="lianxi_telphone[]" value="<{$items.telphone}>"></td>
<td><input type="text" size="15" name="lianxi_email[]" value="<{$items.email}>"></td>
<td><input type="text" size="15" name="lianxi_qqwangwang[]" value="<{$items.qqwangwang}>"></td>
<td><{img src="bundle/delecate.gif" app="desktop" class="pointer del"}></div>
</tr>
<{/foreach}>
</tbody>
</table>
</td>
</tr>
<tr>
<td colspan="4"><h3>财务信息</h3></td>
</tr>
<tr>
<th>开户行:</th>
<td><{input type="text" name="bank" value="{$detail.bank}" size="32" }></td>
<th>银行帐号:</th>
<td>
<{input type="text" name="account" value="{$detail.account}" size="32" }>
</td>
</tr>
</table>
</div>
</div>
<div class="table-action">
<{input type="hidden" name="editSubmit" value="do" }>
<{button class="btn-primary" type="submit" id="modify" label="保存"}>
<{button class="btn-secondary" type="button" id="closeBut" label="取消"}>
</div>
<div class="table-action">
<{input type="hidden" name="editSubmit" value="do" }>
<{button class="btn-primary" type="submit" id="modify" label="保存"}>
<{button class="btn-secondary" type="button" id="closeBut" label="取消"}>
</div>
</form>
<script>
(function(){
@@ -196,17 +181,6 @@ $('modifyForm').store('target',{
$('closeBut').addEvent('click', function(event){
window.close();
});
//选择品牌
$('choice_brand').addEvent('click',function(){
var url = 'index.php?<{$env.server.QUERY_STRING|replace:"editsupplier":"choice_brand"}>&p[0]=';
new Dialog(url,{
title:'品牌选择',
width:550,
height:300,
modal:true,
resizeable:false
});
});
//删除联系人
function del(obj,type){
if (type==0) var parent = obj.getParent();
@@ -229,27 +203,6 @@ $('add_lianximan').addEvent('click', function(){
});
});
/*
$('add_lianximan').addEvent('click', function(){
var ul = new Element('ul').inject($('lianximan'));
var titleArr = new Array('联系人:','电话:','E-mail','qq/旺旺:');
var titleName = new Array('lianxi_name','lianxi_telphone','lianxi_email','lianxi_qqwangwang');
var k=0;
for (var i=1;i<=9;i++){
if (i==9){
var oLi = new Element('li').inject(ul);
new Element('input', {id:'delid[]',type:'button',value:'删除',events:{'click':function(){del(oLi,'0');}}}).inject(oLi);
}else{
if (i%2==0){
var oLi = new Element('li',{html:titleArr[k]}).inject(ul);
oLi.setStyle('float', 'left');
new Element('input', {name:titleName[k]+'[]', size:'16'}).inject(oLi);
k++;
}
}
}
});
*/
<{if $detail.area_defined}>
//修改
$("modify").addEvent('click',function(){