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

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

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

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

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

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

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

8. 【修复】基础物料分类管理问题

app/finance/view/monthed/gap_type.html

@@ -20,32 +20,76 @@
 		<table width="100%" cellpadding="0" cellspacing="0">
 			<tbody>
 				<tr>
-					<th>差异类型：</th>
+					<th><em class="c-red">*</em>差异类型：</th>
 					<td>
-            <{input type="text" name="gap_type"}>
+						<select name="gap_type" id="gap-type-select" vtype="required" data-tail-select>
+							<option value="">请选择差异类型</option>
+							<{foreach from=$gap_list item=gap}>
+							<option value="<{$gap.gap_name}>" <{if $saved_gap_type == $gap.gap_name}>selected<{/if}>><{$gap.gap_name}></option>
+							<{/foreach}>
+						</select>
 					</td>
 				</tr>
 			</tbody>
 		</table>
 	</div>
 </div>
-<div class="table-action">
-    <{button type="submit" label="确定"  class="btn-primary" }> &nbsp; &nbsp;
-    <{button label="关闭" class="btn-secondary" isCloseDialogBtn="true"}>
-</div>
 </form>
+
+<{area inject=".mainFoot"}>
+<div class="table-action">
+    <table width="100%" cellspacing="0" cellpadding="0">
+        <tbody>
+            <tr>
+                <td>
+                    <{button type="button" id="submit_btn" label="确定"  class="btn-primary" }> &nbsp; &nbsp;
+                    <{button type="button" id="close_btn" label="关闭" class="btn-secondary"}>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</div>
+<{/area}>
 <script type="text/javascript">
+// 初始化tail.select
+Ex_Loader("tail.select", function(){
+    tail.select('#gap-type-select', {
+        search: true,
+        width: 'auto',
+        height: 200,
+        searchMinLength: 0,
+        searchPlaceholder: '输入关键词搜索差异类型',
+        searchFocus: true,
+        searchMark: true,
+        searchMarkPlaceholder: '未找到匹配项'
+    });
+});
+
+// 绑定按钮事件
+$('submit_btn').addEvent('click', function(){
+    $('bill-gap-type-form').fireEvent('submit', {stop: $empty});
+});
+
+$('close_btn').addEvent('click', function(){
+    try{
+        var _dialogIns = this.getParent('.dialog').retrieve('instance');
+    }catch(e){}
+
+    if(_dialogIns){
+        _dialogIns.close();
+    }
+});
+
 $('bill-gap-type-form').store('target',{
     onRequest:function(){
-       $E('#bill-gap-type-form .btn-primary').set('disabled', 'true');
-       
+       $('submit_btn').setAttribute('disabled', 'disabled');
     },
     onComplete:function(jsontext){
        var json = Json.evaluate(jsontext);
        if (typeof(json.error) != 'undefined'){
-           $E('#bill-gap-type-form .btn-primary').set('disabled', '');
+           $('submit_btn').removeAttribute('disabled');
        }else{
-           $E('#bill-gap-type-form .btn-primary').set('disabled', 'true');
+           $('submit_btn').setAttribute('disabled', 'disabled');
 
            $('bill-gap-type-form').getParent('.dialog').retrieve('instance').close();
 
@@ -53,4 +97,4 @@ $('bill-gap-type-form').store('target',{
        }
     }
 });
-</script>
+</script>

app/finance/view/monthed/verificate_detail.html

@@ -153,6 +153,16 @@
                             是否强制核销：<input type="radio" name="is_verification" value="1"> 是 &nbsp;&nbsp; <input type="radio" name="is_verification" value="0" checked> 否 
                         </td>
                     </tr>
+                    <tr>
+                        <td >
+                            差异类型：<select name="gap_type" id="gap-type-select" data-tail-select>
+                                <option value="">请选择差异类型</option>
+                                <{foreach from=$gap_list item=gap}>
+                                <option value="<{$gap.gap_name}>" <{if $saved_gap_type == $gap.gap_name}>selected<{/if}>><{$gap.gap_name}></option>
+                                <{/foreach}>
+                            </select>
+                        </td>
+                    </tr>
                     <tr>
                         <td >
                             核销备注：<br>
@@ -162,7 +172,7 @@
                 </tbody>
             </table>
         </div>
-        <div align="center">
+        <div align="center" style="margin-top: 20px; padding: 10px;">
             <{button label="确认核销" class="btn btn-primary" id="btn-submit" onclick="do_submit();" }>
             <{button label="关闭" class="btn btn-primary" onclick="javascript:void(window.close());" }>
         </div>
@@ -264,6 +274,20 @@
 <div>
 <script>
 
+// 初始化tail.select
+Ex_Loader("tail.select", function(){
+    tail.select('#gap-type-select', {
+        search: true,
+        width: 'auto',
+        height: 200,
+        searchMinLength: 0,
+        searchPlaceholder: '输入关键词搜索差异类型',
+        searchFocus: true,
+        searchMark: true,
+        searchMarkPlaceholder: '未找到匹配项'
+    });
+});
+
 $$('input[name=ar_id[]]').addEvent('click',function(){
     if ($E('input[name=is_verification]:checked').value == '1') return false;
 });
@@ -279,6 +303,7 @@ function do_submit(){
    
     var is_verification = $$('input[name=is_verification]:checked').get('value');
     var verification_memo = $$('textarea[name=verification_memo]').get('value');
+    var gap_type = $$('select[name=gap_type]').get('value');
     var ar_sel = new Array();
     var bill_sel = new Array();
     $$('input[name=ar_id[]]').each(function(item){
@@ -298,14 +323,17 @@ function do_submit(){
     
     if(is_verification == '1')
     {
-        
         if(verification_memo == '')
         {
             MessageBox.error("填写核销备注!");
             return;
         }
-
         
+        if(gap_type == '')
+        {
+            MessageBox.error("强制核销时必须选择差异类型!");
+            return;
+        }
     }
     else
     {