Skip to content
GitLab
Commit 06ad056f authored by 乾坤平台's avatar 乾坤平台 Committed by 季圣华
Browse files

!25 修复库存判断不准确的问题 

Merge pull request !25 from 乾坤平台/master
parents 86e7b3e7 01905d2a
Show whitespace changes
Inline Side-by-side
erp_web/js/pages/financial/financial_base.js
View file @ 06ad056f
......@@ -611,7 +611,6 @@
//增加
function addAccountHead(){
$("#clientIp").val(clientIp);
$('#accountHeadFM').form('clear');
var thisDateTime = getNowFormatDateTime(); //当前时间
$("#BillTime").val(thisDateTime);
......@@ -643,7 +642,6 @@
//编辑信息
function editAccountHead(accountHeadTotalInfo){
var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
$("#clientIp").val(clientIp);
$("#BillNo").val(accountHeadInfo[1]);
$("#BillTime").val(accountHeadInfo[2]);
$("#Remark").val(accountHeadInfo[3]);
......
erp_web/js/pages/materials/in_out.js
View file @ 06ad056f
......@@ -1523,7 +1523,6 @@
//新增信息
function addDepotHead(){
$("#clientIp").val(clientIp);
$('#depotHeadFM').form('clear');
var thisDateTime = getNowFormatDateTime(); //当前时间
$("#OperTime").val(thisDateTime);
......@@ -1625,7 +1624,6 @@
return;
}
var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
$("#clientIp").val(clientIp);
if(listSubType==="礼品销售"){
$("#GiftId").combobox('setValue',depotHeadInfo[1]);
}
......
erp_web/pages/financial/advance_in.html
View file @ 06ad056f
......@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:100px;"></td>
</tr>
......@@ -97,7 +97,6 @@
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
......
erp_web/pages/financial/giro.html
View file @ 06ad056f
......@@ -64,12 +64,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px">
......
erp_web/pages/financial/item_in.html
View file @ 06ad056f
......@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:100px;"></td>
</tr>
......
erp_web/pages/financial/item_out.html
View file @ 06ad056f
......@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:100px;"></td>
</tr>
......
erp_web/pages/financial/money_in.html
View file @ 06ad056f
......@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:100px;"></td>
</tr>
......
erp_web/pages/financial/money_out.html
View file @ 06ad056f
......@@ -67,12 +67,12 @@
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
class="txt Wdate" style="width:140px;"/>
class="txt Wdate" style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:100px;"></td>
</tr>
......
erp_web/pages/manage/functions.html
View file @ 06ad056f
......@@ -105,7 +105,6 @@
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
......
erp_web/pages/materials/allocation_out_list.html
View file @ 06ad056f
......@@ -65,12 +65,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width:140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width:140px;" readonly/>
</td>
<td style="width:80px;"></td>
<td style="padding:5px;width:170px;"></td>
......
erp_web/pages/materials/assemble_list.html
View file @ 06ad056f
......@@ -16,11 +16,6 @@
<script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script>
<script src="/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head>
<body>
<!-- 查询 -->
......@@ -70,12 +65,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width:140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width:140px;" readonly/>
</td>
<td style="width:80px;"></td>
<td style="padding:5px;width:170px;"></td>
......@@ -96,7 +91,6 @@
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
......
erp_web/pages/materials/disassemble_list.html
View file @ 06ad056f
......@@ -70,12 +70,12 @@
<td style="padding:5px;width:170px;">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width:140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width:140px;" readonly/>
</td>
<td style="width:80px;"></td>
<td style="padding:5px;width:170px;"></td>
......
erp_web/pages/materials/gift_out_list.html
View file @ 06ad056f
......@@ -65,12 +65,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td></td>
<td></td>
......@@ -91,7 +91,6 @@
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
......
erp_web/pages/materials/gift_recharge_list.html
View file @ 06ad056f
......@@ -65,12 +65,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width: 140px;"/>
style="width: 140px;" readonly/>
</td>
<td style="width:70px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td></td>
<td></td>
......
erp_web/pages/materials/other_in_list.html
View file @ 06ad056f
......@@ -75,12 +75,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px">
......@@ -100,7 +100,6 @@
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
......
erp_web/pages/materials/other_out_list.html
View file @ 06ad056f
......@@ -69,12 +69,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px">
......@@ -94,7 +94,6 @@
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
......
erp_web/pages/materials/purchase_back_list.html
View file @ 06ad056f
......@@ -75,12 +75,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px">
......
erp_web/pages/materials/purchase_in_list.html
View file @ 06ad056f
......@@ -75,12 +75,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/>
style="width:140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px">
......
erp_web/pages/materials/retail_back_list.html
View file @ 06ad056f
......@@ -69,12 +69,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width: 140px;"/>
style="width: 140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px;width:150px;"></td>
......
erp_web/pages/materials/retail_out_list.html
View file @ 06ad056f
......@@ -69,12 +69,12 @@
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width: 140px;"/>
style="width: 140px;" readonly/>
</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/>
data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td>
<td style="width:70px;">付款类型：</td>
<td style="padding:5px;width:150px;">
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment