purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加订单转采购和销售的功能

Browse Source
This commit is contained in:
季圣华
2019-03-10 20:06:11 +08:00
parent 49df4bad73
commit 2195b8bf25
18 changed files with 3596 additions and 3359 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
erp_web/pages/materials/bill_detail.html
View File

@@ -173,8 +173,10 @@
<td style="padding:5px;width:140px;">
<span class="NumberShow"></span>
</td>
<td style="width:70px;"></td>
<td style="padding:5px;width:140px;"></td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -222,10 +224,8 @@
<td style="padding:5px">
<span class="OtherMoneyShow"></span>
</td>
<td>结算天数：</td>
<td style="padding:5px">
<span class="AccountDayShow"></span>
</td>
<td></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td>
</tr>
</table>
@@ -312,18 +312,18 @@
<td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span>
</td>
<td style="width:70px;">单据编号：</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span class="NumberShow"></span>
</td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -371,9 +371,9 @@
<td style="padding:5px">
<span class="OtherMoneyShow"></span>
</td>
<td>结算天数：</td>
<td>销售人员：</td>
<td style="padding:5px">
<span class="AccountDayShow"></span>
<span class="SalesmanShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -388,10 +388,6 @@
<td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span>
@@ -400,6 +396,8 @@
<td style="padding:5px;width:140px;">
<span class="NumberShow"></span>
</td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -447,8 +445,9 @@
<td style="padding:5px">
<span class="OtherMoneyShow"></span>
</td>
<td></td>
<td>销售人员：</td>
<td style="padding:5px">
<span class="SalesmanShow"></span>
</td>
<td style="width:100px;"></td>
</tr>

19
erp_web/pages/materials/purchase_in_list.html
View File

@@ -82,8 +82,9 @@
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -135,10 +136,8 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td>
<td>结算天数：</td>
<td></td>
<td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-validatebox"
data-options="validType:'length[1,3]'" style="width:120px;"/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -167,8 +166,10 @@
<td style="padding:5px;width:140px;">
<span id="NumberShow"></span>
</td>
<td style="width:70px;"></td>
<td style="padding:5px;width:140px;"></td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:140px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -216,10 +217,8 @@
<td style="padding:5px">
<span id="OtherMoneyShow"></span>
</td>
<td>结算天数：</td>
<td style="padding:5px">
<span id="AccountDayShow"></span>
</td>
<td></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td>
</tr>
</table>

18
erp_web/pages/materials/sale_back_list.html
View File

@@ -65,10 +65,6 @@
<td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;"/>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime"
@@ -80,6 +76,8 @@
<input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td>
<td style="width:70px;"></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -130,8 +128,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td>
<td></td>
<td>销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -151,10 +150,6 @@
<td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span>
@@ -163,6 +158,8 @@
<td style="padding:5px;width:140px;">
<span id="NumberShow"></span>
</td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -210,8 +207,9 @@
<td style="padding:5px">
<span id="OtherMoneyShow"></span>
</td>
<td></td>
<td>销售人员：</td>
<td style="padding:5px">
<span id="SalesmanShow"></span>
</td>
<td style="width:100px;"></td>
</tr>

24
erp_web/pages/materials/sale_orders_list.html
View File

@@ -65,21 +65,21 @@
<td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="width:70px;">单据日期：</td>
<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;" readonly/>
</td>
<td style="width:70px;">单据编号：</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: 150px;" readonly/>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -110,18 +110,18 @@
<td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span>
</td>
<td style="width:70px;">单据编号：</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span id="NumberShow"></span>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>

33
erp_web/pages/materials/sale_out_list.html
View File

@@ -65,21 +65,21 @@
<td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="width:70px;">单据日期：</td>
<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;" readonly/>
</td>
<td style="width:70px;">单据编号：</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: 150px;" readonly/>
</td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -130,10 +130,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td>
<td>结算天数：</td>
<td>销售人员：</td>
<td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-numberbox"
data-options="validType:'length[1,3]'" style="width:120px;"/>
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -153,18 +152,18 @@
<td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span>
</td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span>
</td>
<td style="width:70px;">单据编号：</td>
<td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;">
<span id="NumberShow"></span>
</td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
<tr>
@@ -212,9 +211,9 @@
<td style="padding:5px">
<span id="OtherMoneyShow"></span>
</td>
<td>结算天数：</td>
<td>销售人员：</td>
<td style="padding:5px">
<span id="AccountDayShow"></span>
<span id="SalesmanShow"></span>
</td>
<td style="width:100px;"></td>
</tr>