Jelajahi Sumber

订单中产品信息查询继续修改

klzhangweiya 3 tahun lalu
induk
melakukan
c7a89cafad

+ 2 - 0
src_0nline/ShwasherSys/ShwasherSys.Web/Controllers/OrderInfoController.cs

@@ -54,6 +54,7 @@ namespace ShwasherSys.Controllers
             ViewBag.ViewPriceRole = SettingManager.GetSettingValue(ShwasherSettingNames.CanShowOrderItemPrice);
             ViewBag.EmergencyLevel = StatesAppService.GetSelectLists("OrderItems", "EmergencyLevel");
             ViewBag.OrderSaleType = StatesAppService.GetSelectLists("OrderHeader", "SaleType");
+            ViewBag.StoreHouses = QueryAppService.QueryStoreHouseSelect(2);
 			return View();
         }
         [AbpMvcAuthorize(PermissionNames.PagesOrderInfoOrderMg), AuditLog("订单管理页面")]
@@ -68,6 +69,7 @@ namespace ShwasherSys.Controllers
             ViewBag.ToCNYCurreny = await QueryAppService.QueryCurrencyRate("", "CNY");
             ViewBag.EmergencyLevel = StatesAppService.GetSelectLists("OrderItems", "EmergencyLevel");
             ViewBag.ProductionOrderStatus = StatesAppService.GetSelectLists("ProductionOrders", "ProductionOrderStatus");
+            ViewBag.StoreHouses = QueryAppService.QueryStoreHouseSelect(2);
 			return View();
         }
         [AbpMvcAuthorize(PermissionNames.PagesOrderInfoOrderStatusMgPrint), AuditLog("订单打印页面")]

+ 1 - 0
src_0nline/ShwasherSys/ShwasherSys.Web/ShwasherSys.Web.csproj

@@ -2297,6 +2297,7 @@
     <Content Include="Views\OrderInfo\OrderSendWarn.cshtml" />
     <Content Include="Views\ProductInfo\Standards - 复制.cshtml" />
     <Content Include="Views\ProductInfo\Standards - 复制%282%29.cshtml" />
+    <Content Include="Views\OrderInfo\_searchInfoByProductNo.cshtml" />
     <!--<Content Include="Scripts\bootstrap.min.js.map" />
     <Content Include="Scripts\bootstrap.js.map" />
     <Content Include="Scripts\bootstrap.bundle.min.js.map" />

+ 338 - 430
src_0nline/ShwasherSys/ShwasherSys.Web/Views/OrderInfo/OrderMg.cshtml

@@ -28,7 +28,7 @@
 		{
 			if (loCurrency.Id == "CNY")
 			{
-				strCurrencies += "<option  value=\""+ loCurrency.Id+ "\"  selected=\"selected\">" + loCurrency.CurrencyName+ "</option>";
+				strCurrencies += "<option  value=\"" + loCurrency.Id + "\"  selected=\"selected\">" + loCurrency.CurrencyName + "</option>";
 			}
 			else
 			{
@@ -48,65 +48,22 @@ new SearchItem("stockNo", "客户订单号"),
 new SearchItem("orderStatusId", "状态",FiledType.I,ExpType.Equal).SetSearchItem(OrderStatusList),
 new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("query_employee_modal","SearchForm") ,
 }, false);
-	var tableProductionOrder = new TableViewModel("/api/services/app/Query/QueryProductionOrderDtoByProNo", null, null, "tableProductionOrder")
-		.SetFields(new List<FieldItem>()
-		{
-			new FieldItem("productionOrderNo", "排产单号"),
-			new FieldItem("partNo", "零件号"),
-			new FieldItem("semiProductName", "名称"),
-			new FieldItem("model", "规格"),
-			new FieldItem("quantity", "排产数量(千件)"),
-			new FieldItem("productionOrderStatus","生产状态",formatter:"ProductionOrderStatusFormatter"),
-			new FieldItem("material", "材质"),
-			new FieldItem("surfaceColor", "表色"),
-			new FieldItem("rigidity", "硬度"),
-			new FieldItem("semiProductNo", "半成品编码"),
-		}).SetPageArray(10);
-	var tableProductStore = new TableViewModel("/api/services/app/Query/QueryViewCurrentProductStoreHouseByProNo", null, null, "tableProductStore")
-		.SetFields(new List<FieldItem>()
-		{
-			new FieldItem("productionOrderNo", "排产单号"),
-			new FieldItem("productNo", "成品编码"),
-			new FieldItem("productName", "名称"),
-			new FieldItem("model", "规格"),
-			new FieldItem("quantity", "当前库存数量(千件)"),
-			new FieldItem("freezeQuantity", "被冻结数量"),
-			new FieldItem("actualQuantity", "可用数量"),
-			new FieldItem("storeLocationNo","库位"),
-			new FieldItem("material", "材质"),
-			new FieldItem("surfaceColor", "表色"),
-			new FieldItem("rigidity", "硬度"),
-
-		}).SetPageArray(10);
-	var tableSemiStore = new TableViewModel("/api/services/app/Query/QueryViewCurrentSemiStoreHouseByProNo", null, null, "tableSemiStore")
-		.SetFields(new List<FieldItem>()
-		{
-			new FieldItem("productionOrderNo", "排产单号"),
-			new FieldItem("semiProductNo", "半成品编码"),
-			new FieldItem("semiProductName", "半成品名称"),
-			new FieldItem("model", "规格"),
-			new FieldItem("actualQuantity", "当前库存数量(千件)"),
-			new FieldItem("freezeQuantity", "被冻结数量"),
-			new FieldItem("canUserQuantity", "可用数量","CanUserQuantityFormatte"),
-			new FieldItem("storeLocationNo","库位"),
-			new FieldItem("material", "材质"),
-			new FieldItem("surfaceColor", "表色"),
-			new FieldItem("rigidity", "硬度"),
-			new FieldItem("partNo", "零件号"),
-		}).SetPageArray(10);
+	
 }
 @section css{
-    <link href="~/Content/Plugins/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />
-    <link href="~/Views/OrderInfo/css/OrderMg.css" rel="stylesheet" />
-    <style>
-        .store-query > strong {
-            width: 70px;
-            text-align: right;
-        }
-        #storeQuantity, #orderQuantity {
-            padding: 0 5px;
-            color: red;
-        }
+	<link href="~/Content/Plugins/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />
+	<link href="~/Views/OrderInfo/css/OrderMg.css" rel="stylesheet" />
+	<style>
+		.store-query > strong {
+			width: 70px;
+			text-align: right;
+		}
+
+		#storeQuantity, #orderQuantity {
+			padding: 0 5px;
+			color: red;
+		}
+
 		.store_box {
 			position: absolute;
 			z-index: 10001;
@@ -117,13 +74,15 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 			padding: 5px;
 			font-family: "iconfont" !important;
 		}
+
 			.store_box:before {
 				content: "\e616";
 				position: absolute;
 				top: -12px;
 				left: 3px;
-                color: rgba(209, 220, 249, .9);
+				color: rgba(209, 220, 249, .9);
 			}
+
 			.store_box .close {
 				position: absolute;
 				width: 20px;
@@ -138,86 +97,85 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 				align-items: center;
 			}
 
-        .tool-rc-group {
-            border: 0px solid #ba63d3;
-            float: left;
-            margin: 0 5px;
-            padding-right: 5px;
-            border-radius: 5px;
-        }
-	
-    </style>
+		.tool-rc-group {
+			border: 0px solid #ba63d3;
+			float: left;
+			margin: 0 5px;
+			padding-right: 5px;
+			border-radius: 5px;
+		}
+	</style>
 }
 
 <div class="table-box mr-4  iwb-bootstrap-table">
 
-    @Html.Action("ToolMenu", "Layout", new { pageName = ViewBag.ActiveMenu, searchForm })
-    <table id="table"
-           data-url="/api/services/app/OrderHeaders/GetAll"
-           data-striped="true" data-id-field="id" data-unique-id="id"
-           data-method="post"
-           data-side-pagination="server"
-           data-content-type="application/x-www-form-urlencoded; charset=UTF-8"
-           data-cache="false"
-           data-pagination="true" data-page-size="30" data-page-number="1" data-page-list="[30,50,100,200]" data-pagination-detail-h-align="right" data-pagination-h-align="left"
-           data-query-params="QueryParams"
-           data-response-handler="ResponseHandler"
-           data-click-to-select="true"
-           data-single-select="true"
-           data-show-jumpto="true">
-        <thead>
-            <tr class="row" id="header">
-                <th data-field="state" data-checkbox="true"></th>
-                <th data-align="center" data-field="id">流水号</th>
-                <th data-align="center" data-field="orderStatusName">订单状态</th>
-                <th data-align="center" data-field="isLock" data-formatter="IsLockFormatter">是否删除</th>
-                <th data-align="center" data-field="customerId">客户编号</th>
-                <th data-align="center" data-field="orderDate" data-formatter="DateFormatter">订单日期</th>
-                <th data-align="center" data-field="linkName">联系人</th>
-                <th data-align="center" data-field="telephone">电话</th>
-                <th data-align="center" data-field="saleManName">业务员</th>
-                <th data-align="center" data-field="saleTypeName">外销/内销</th>
-                @*<th data-align="center" data-formatter="ActionsFormatter"></th>*@
-
-            </tr>
-        </thead>
-    </table>
+	@Html.Action("ToolMenu", "Layout", new { pageName = ViewBag.ActiveMenu, searchForm })
+	<table id="table"
+		   data-url="/api/services/app/OrderHeaders/GetAll"
+		   data-striped="true" data-id-field="id" data-unique-id="id"
+		   data-method="post"
+		   data-side-pagination="server"
+		   data-content-type="application/x-www-form-urlencoded; charset=UTF-8"
+		   data-cache="false"
+		   data-pagination="true" data-page-size="30" data-page-number="1" data-page-list="[30,50,100,200]" data-pagination-detail-h-align="right" data-pagination-h-align="left"
+		   data-query-params="QueryParams"
+		   data-response-handler="ResponseHandler"
+		   data-click-to-select="true"
+		   data-single-select="true"
+		   data-show-jumpto="true">
+		<thead>
+			<tr class="row" id="header">
+				<th data-field="state" data-checkbox="true"></th>
+				<th data-align="center" data-field="id">流水号</th>
+				<th data-align="center" data-field="orderStatusName">订单状态</th>
+				<th data-align="center" data-field="isLock" data-formatter="IsLockFormatter">是否删除</th>
+				<th data-align="center" data-field="customerId">客户编号</th>
+				<th data-align="center" data-field="orderDate" data-formatter="DateFormatter">订单日期</th>
+				<th data-align="center" data-field="linkName">联系人</th>
+				<th data-align="center" data-field="telephone">电话</th>
+				<th data-align="center" data-field="saleManName">业务员</th>
+				<th data-align="center" data-field="saleTypeName">外销/内销</th>
+				@*<th data-align="center" data-formatter="ActionsFormatter"></th>*@
+
+			</tr>
+		</thead>
+	</table>
 </div>
 <div class="table-box mr-4  iwb-bootstrap-table" id="orderItemInfo" style="display: none;">
-    <div class="btn-toolbar row" role="toolbar" aria-label="Toolbar with button groups">
-        <div class="col-sm-12 col-lg-12 pull-left" style="padding: 0">
-            <div class="btn-group btn-group-sm" id="Tool1" role="group" aria-label="First group">
-                @if (PermissionChecker.IsGranted(PermissionNames.PagesOrderInfoOrderMgCreateOrderItem))
-                {
-                    <button type="button" class="btn btn-default btnOrderTool" data-type="_btnCreate" data-url="/api/services/app/OrderItems/Create" onclick="CreateItem()">
-                        <i class="iconfont icon-add">添加订单明细</i>
-                    </button>
-                }
-                @if (PermissionChecker.IsGranted(PermissionNames.PagesOrderInfoOrderMgUpdateOrderItem))
-                {
-                    <button type="button" class="btn btn-default btnOrderTool" data-type="btnUpdate" data-url="/api/services/app/OrderItems/Update" onclick="UpdateItem()">
-                        <i class="iconfont icon-edit">修改订单明细</i>
-                    </button>
-                }
-                @if (PermissionChecker.IsGranted(PermissionNames.PagesOrderInfoOrderMgDeleteOrderItem))
-                {
-                    <button type="button" class="btn btn-default btnOrderTool" data-type="btnDelete" data-url="/api/services/app/OrderItems/Delete" onclick="DeleteItem()">
-                        <i class="iconfont icon-delete">删除订单明细</i>
-                    </button>
-                }
+	<div class="btn-toolbar row" role="toolbar" aria-label="Toolbar with button groups">
+		<div class="col-sm-12 col-lg-12 pull-left" style="padding: 0">
+			<div class="btn-group btn-group-sm" id="Tool1" role="group" aria-label="First group">
+				@if (PermissionChecker.IsGranted(PermissionNames.PagesOrderInfoOrderMgCreateOrderItem))
+				{
+					<button type="button" class="btn btn-default btnOrderTool" data-type="_btnCreate" data-url="/api/services/app/OrderItems/Create" onclick="CreateItem()">
+						<i class="iconfont icon-add">添加订单明细</i>
+					</button>
+				}
+				@if (PermissionChecker.IsGranted(PermissionNames.PagesOrderInfoOrderMgUpdateOrderItem))
+				{
+					<button type="button" class="btn btn-default btnOrderTool" data-type="btnUpdate" data-url="/api/services/app/OrderItems/Update" onclick="UpdateItem()">
+						<i class="iconfont icon-edit">修改订单明细</i>
+					</button>
+				}
+				@if (PermissionChecker.IsGranted(PermissionNames.PagesOrderInfoOrderMgDeleteOrderItem))
+				{
+					<button type="button" class="btn btn-default btnOrderTool" data-type="btnDelete" data-url="/api/services/app/OrderItems/Delete" onclick="DeleteItem()">
+						<i class="iconfont icon-delete">删除订单明细</i>
+					</button>
+				}
 
-            </div>
-        </div>
-    </div>
-    <table id="tableOrderItem"
-           data-url="/api/services/app/OrderItems/GetAll"
-           data-id-field="id" data-unique-id="id"
-           data-striped="true" data-click-to-select="true" data-single-select="true"
-           data-method="post" data-side-pagination="server" data-content-type="application/x-www-form-urlencoded; charset=UTF-8"
-           data-cache="false" data-pagination="true" data-page-size="10" data-page-number="1" data-page-list="[10,30,50,100]"
-           data-pagination-h-align="left" data-pagination-detail-h-align="right"
-           data-query-params="QueryItemParams" data-response-handler="ResponseHandler"  data-show-jumpto="true">
-        <thead>
+			</div>
+		</div>
+	</div>
+	<table id="tableOrderItem"
+		   data-url="/api/services/app/OrderItems/GetAll"
+		   data-id-field="id" data-unique-id="id"
+		   data-striped="true" data-click-to-select="true" data-single-select="true"
+		   data-method="post" data-side-pagination="server" data-content-type="application/x-www-form-urlencoded; charset=UTF-8"
+		   data-cache="false" data-pagination="true" data-page-size="10" data-page-number="1" data-page-list="[10,30,50,100]"
+		   data-pagination-h-align="left" data-pagination-detail-h-align="right"
+		   data-query-params="QueryItemParams" data-response-handler="ResponseHandler" data-show-jumpto="true">
+		<thead>
 			<tr class="row">
 				<th data-field="state" data-checkbox="true"></th>
 				<th data-align="center" data-field="id">明细流水号</th>
@@ -236,327 +194,277 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 				}
 				<th data-align="center" data-field="sendDate" data-formatter="DateFormatter">送货时间</th>
 			</tr>
-        </thead>
-    </table>
+		</thead>
+	</table>
 </div>
 
 @section modal{
-    <section>
-        <!--Main Modal-->
-        <div class="modal fade" id="modal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
-            <div class="modal-dialog  modal-dialog-centered" role="document" style="width: 600px">
-                <div class="modal-content">
-                    @Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("订单"))
-                    @{
-                        var inputs = new List<InputViewModel>
-                                                {
-                                                    new InputViewModel("customerId",hide:true),
-                                                    new InputViewModel("saleMan",hide:true),
-                                                    new InputViewModel("saleManId",hide:true),
-                                                    new InputViewModel("id",displayName:"流水号"),
-                                                    new InputViewModel("stockNo",displayName:"客户订单号"),
-                                                    new InputViewModel("orderStatusId",InputTypes.List, displayName:"订单状态").SetSelectOptions(OrderStatusList),
-                                                    new InputViewModel("orderDate", displayName:"订单日期").SetNotRequired(),
-                                                    new InputViewModel("customerName",displayName:"客户名称").SetSearchIcon("query_customer_modal","modal"),
-                                                    new InputViewModel("saleType",InputTypes.List, displayName: "外销/内销").SetSelectOptions(OrderSaleTypeList),
-                                                    new InputViewModel("customerSendId",InputTypes.List, displayName: "送货地址名称").SetEvents("onchange=ChangeCustomerSend()"),
-                                                    new InputViewModel("linkName", displayName: "联系人"),
-                                                    new InputViewModel("fax", displayName: "传真").SetNotRequired(),
-                                                    new InputViewModel("telephone", displayName: "电话").SetNotRequired(),
-                                                    new InputViewModel("sendAdress",displayName:"送货地址"),
-                                                    
-                                                    new InputViewModel("saleManName",displayName:"销售人员").SetSearchIcon("query_employee_modal")
-                                                };
-                        //var specials = new List<SpecialInputModel>();
-                    }
-                    @Html.Partial("Modals/_ModalBody", new ModalBodyViewModel(inputs))
-                    @Html.Partial("Modals/_ModalFooter", "0")
-
-                </div>
-            </div>
-        </div>
-    </section>
-    <section>
-        @*@Html.Hidden("isForSearch", "0");*@
-        @Html.Partial("Modals/Query/_Customer", "customerId|KeyWords-4")
-        @Html.Partial("Modals/Query/_Employee", "saleMan|KeyWords-7,saleManName|KeyWords-saleManName-7,saleManId")
-    </section>
-    <section>
-        <!--Main Modal-->
-        <div class="modal fade" id="modal_OrderItemEdit" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
-            <div class="modal-dialog  modal-dialog-centered" role="document">
-                <div class="modal-content" style="width: 680px;">
-                    @Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("订单明细"))
-                    <div class="modal-body container-fluid" style="padding: 0; padding-top: 15px;">
-                        <form class="pr-3 pl-3 form-horizontal" style="padding: 0 10px" id="formItem">
-                            <input type="hidden" name="id" />
-                            <input type="hidden" id="orderNo" name="orderNo" />
-                            <input type="hidden" id="orderItemStatusId" name="orderItemStatusId" />
-                            <input type="hidden" id="orderUnitId" name="orderUnitId" />
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label iwb-label-required" for="productNo">产品编号</label>
-                                <div class="col-md-5">
-                                    <div class="input-group">
-                                        <select class="form-control" Required id="productNo" name="productNo" placeholder="请输入..." value="" style="width: 100%;" type="text" onchange="RefreshProductInfo()">
-                                            @*@Html.Raw(ViewBag.CustomerDefaultProducts)*@
-                                        </select>
-                                        <div class="input-group-addon" onclick="ShowModal('query_Product_modal');">
-                                            <i class="iconfont icon-search"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-md-1" style="padding: 0 0">
-				<button type="button" class="btn btn-info btn-flat" style="height: 30px; width: 40px;" onclick="showSelectProductDialog()"><i class="iconfont icon-search"></i></button>
-			</div>
-                                <div class="col-md-4" style="padding: 0 5px;margin-top: -6px;">
-                                    <span class="store-query"> <strong>库存量:</strong><span id="storeQuantity">0</span><span>千件</span></span>
-                                    <br>
-                                    <span class="store-query"><strong>被定量:</strong><span id="orderQuantity">0</span><span>千件</span></span>
-                                    <br>
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label" for="sendDate">送货时间</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="sendDate" name="sendDate" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-                                <label class="iwb-label col-md-2 control-label" for="IsStandard">标准件</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" style="width: 100%" id="IsStandard" disabled="disabled" name="IsStandard" placeholder="请输入..." value="" type="text">
-
-                                </div>
-
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label iwb-label-required" for="price">货币类型</label>
-                                <div class="col-md-4">
-                                    <select class="form-control" style="width: 100%" id="currencyId" name="currencyId" placeholder="请输入..." value="" onchange="RefreshCurrency()" type="text">
-                                        @Html.Raw(@strCurrencies);
-                                    </select>
-
-                                </div>
-                                <label class="iwb-label col-md-2 control-label iwb-label-required" for="toCnyRate">当前汇率</label>
-                                <div class="col-md-4">
-                                    <input class="form-control required number" Required style="width: 100%" id="toCnyRate" name="toCnyRate" placeholder="请输入..." min="0" value="" type="text">
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label iwb-label-required" for="price">含税价格</label>
-                                <div class="col-md-4">
-                                    <input class="form-control required number" Required style="width: 100%" id="price" name="price" placeholder="请输入..." value="" min="0" type="text">
-
-                                </div>
-                                <label class="iwb-label col-md-2 control-label iwb-label-required" for="quantity">数量</label>
-                                <div class="col-md-4">
-                                    <input class="form-control required number" Required style="width: 100%" id="quantity" name="quantity" placeholder="请输入..." min="0" value="" type="text">
-
-                                </div>
-                            </div>
-                            <div class="form-group-sm row" id="noTaxDiv">
-                                <label class="iwb-label col-md-2 control-label iwb-label-required" for="price">不含税价格</label>
-                                <div class="col-md-4">
-                                    <input class="form-control required number" Required style="width: 100%" id="afterTaxPrice" name="afterTaxPrice" placeholder="请输入..." value="" min="0" type="text">
-
-                                </div>
-                                <div class="col-md-4" style="padding: 6px 25px;">
-                                    <span class="store-query"> <strong>当前税率:</strong><span id="currentTaxRate">@ViewBag.TagRate</span><span>%</span></span>
-                                    <br>
-
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-								<label class="iwb-label col-md-2 control-label" for="logisticsFee">运费(含税)</label>
-                                <div class="col-md-4">
-                                    <input class="form-control number" id="logisticsFee"  name="logisticsFee" placeholder="请输入..." value="0" min="0" style="" type="number">
-                                </div>
-								<label class="iwb-label col-md-2 control-label " for="moldFee">模具费(含税)</label>
-                                <div class="col-md-4">
-                                    <input class="form-control number" id="moldFee" name="moldFee" placeholder="请输入..." value="0" style="" min="0" type="number">
+	<section>
+		<!--Main Modal-->
+		<div class="modal fade" id="modal" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+			<div class="modal-dialog  modal-dialog-centered" role="document" style="width: 600px">
+				<div class="modal-content">
+					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("订单"))
+					@{
+						var inputs = new List<InputViewModel>
+																{
+													new InputViewModel("customerId",hide:true),
+													new InputViewModel("saleMan",hide:true),
+													new InputViewModel("saleManId",hide:true),
+													new InputViewModel("id",displayName:"流水号"),
+													new InputViewModel("stockNo",displayName:"客户订单号"),
+													new InputViewModel("orderStatusId",InputTypes.List, displayName:"订单状态").SetSelectOptions(OrderStatusList),
+													new InputViewModel("orderDate", displayName:"订单日期").SetNotRequired(),
+													new InputViewModel("customerName",displayName:"客户名称").SetSearchIcon("query_customer_modal","modal"),
+													new InputViewModel("saleType",InputTypes.List, displayName: "外销/内销").SetSelectOptions(OrderSaleTypeList),
+													new InputViewModel("customerSendId",InputTypes.List, displayName: "送货地址名称").SetEvents("onchange=ChangeCustomerSend()"),
+													new InputViewModel("linkName", displayName: "联系人"),
+													new InputViewModel("fax", displayName: "传真").SetNotRequired(),
+													new InputViewModel("telephone", displayName: "电话").SetNotRequired(),
+													new InputViewModel("sendAdress",displayName:"送货地址"),
+
+													new InputViewModel("saleManName",displayName:"销售人员").SetSearchIcon("query_employee_modal")
+												};
+						//var specials = new List<SpecialInputModel>();
+					}
+					@Html.Partial("Modals/_ModalBody", new ModalBodyViewModel(inputs))
+					@Html.Partial("Modals/_ModalFooter", "0")
 
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-								<label class="iwb-label col-md-2 control-label" for="logisticsFee">运费(不含税)</label>
-                                <div class="col-md-4">
-                                    <input class="form-control number" id="logisticsFeeAfterTax"  name="logisticsFeeAfterTax" placeholder="请输入..." value="0" min="0" style="" type="number">
-                                </div>
-								<label class="iwb-label col-md-2 control-label " for="moldFee">模具费(不含税)</label>
-                                <div class="col-md-4">
-                                    <input class="form-control number" id="moldFeeAfterTax" name="moldFeeAfterTax" placeholder="请输入..." value="0" style="" min="0" type="number">
-
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label" for="isReport">检验报告</label>
-                                <div class="col-md-4">
-                                    <select class="form-control" style="width: 100%" id="isReport" name="isReport" placeholder="请输入..." value="" style="" type="text">
-                                        <option value="Y" selected="selected">是</option>
-                                        <option value="N">否</option>
-                                    </select>
-                                </div>
-                                <label class="iwb-label col-md-2 control-label" for="isPartSend">部分送货</label>
-                                <div class="col-md-4">
-                                    <select class="form-control" style="width: 100%" id="isPartSend" name="isPartSend" placeholder="请输入..." value="" style="" type="text">
-                                        <option value="Y" selected="selected">是</option>
-                                        <option value="N">否</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label" for="Material">材质</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="Material" name="Material" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-                                <label class="iwb-label col-md-2 control-label" for="Model">规格</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="Model" name="Model" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-
-
-                            </div>
-                            <div class="form-group-sm row">
-
-                                <label class="iwb-label col-md-2 control-label" for="SurfaceColor">表色</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="SurfaceColor" name="surfaceColor" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-                                <label class="iwb-label col-md-2 control-label" for="Rigidity">硬度</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="Rigidity" name="Rigidity" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label" for="ProductName">产品名称</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="ProductName" name="ProductName" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-                                <label class="iwb-label col-md-2 control-label" for="partNo">零件号</label>
-                                <div class="col-md-4">
-                                    <div class="input-group">
-                                        <input class="form-control" id="partNo" name="partNo" placeholder="请输入..." value="" style="" type="text">
-                                        <div class="input-group-addon" onclick="f_QueryProductByPartNo();" title="通过零件号查询对应的产品">
-                                            <i class="iconfont icon-search"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label" for="wareHouse">送货仓库</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="wareHouse" name="wareHouse" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-                                <label class="iwb-label col-md-2 control-label iwb-label-required" for="emergencyLevel">紧急程度</label>
-                                <div class="col-md-4">
-
-                                    @*<input class="form-control" id="emergencyLevel" name="emergencyLevel" placeholder="请输入..." value="" style="" type="text">*@
-                                    @Html.DropDownList("emergencyLevel", emergencyLevelList, htmlAttributes: new { @class = "form-control Required", placeholder = "请选择", style = "width: 100%" })
-                                </div>
-                            </div>
-                            <div class="form-group-sm row">
-                                <label class="iwb-label col-md-2 control-label" for="wareHouse">客户标准名称</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="standardName" name="standardName" placeholder="请输入..." value="" style="" type="text">
-                                </div>
-                                <label class="iwb-label col-md-2 control-label " for="orderItemDesc">描述</label>
-                                <div class="col-md-4">
-                                    <input class="form-control" id="orderItemDesc" name="orderItemDesc" placeholder="请输入..." value="" style="" type="text">
-
-                                </div>
-                            </div>
-                            @*<div class="form-group-sm row">
-			<label class="iwb-label col-md-2 control-label " for="orderItemDesc">描述</label>
-			<div class="col-md-10">
-				<textarea class="form-control" id="orderItemDesc" name="orderItemDesc" placeholder="请输入..." value="" style=""></textarea>
+				</div>
 			</div>
+		</div>
+	</section>
+	<section>
+		@*@Html.Hidden("isForSearch", "0");*@
+		@Html.Partial("Modals/Query/_Customer", "customerId|KeyWords-4")
+		@Html.Partial("Modals/Query/_Employee", "saleMan|KeyWords-7,saleManName|KeyWords-saleManName-7,saleManId")
+	</section>
+	<section>
+		<!--Main Modal-->
+		<div class="modal fade" id="modal_OrderItemEdit" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+			<div class="modal-dialog  modal-dialog-centered" role="document">
+				<div class="modal-content" style="width: 680px;">
+					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("订单明细"))
+					<div class="modal-body container-fluid" style="padding: 0; padding-top: 15px;">
+						<form class="pr-3 pl-3 form-horizontal" style="padding: 0 10px" id="formItem">
+							<input type="hidden" name="id" />
+							<input type="hidden" id="orderNo" name="orderNo" />
+							<input type="hidden" id="orderItemStatusId" name="orderItemStatusId" />
+							<input type="hidden" id="orderUnitId" name="orderUnitId" />
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label iwb-label-required" for="productNo">产品编号</label>
+								<div class="col-md-5">
+									<div class="input-group">
+										<select class="form-control" Required id="productNo" name="productNo" placeholder="请输入..." value="" style="width: 100%;" type="text" onchange="RefreshProductInfo()">
+											@*@Html.Raw(ViewBag.CustomerDefaultProducts)*@
+										</select>
+										<div class="input-group-addon" onclick="ShowModal('query_Product_modal');">
+											<i class="iconfont icon-search"></i>
+										</div>
+									</div>
+								</div>
+								<div class="col-md-1" style="padding: 0 0">
+									<button type="button" class="btn btn-info btn-flat" style="height: 30px; width: 40px;" onclick="showSelectProductDialog()"><i class="iconfont icon-search"></i></button>
+								</div>
+								<div class="col-md-4" style="padding: 0 5px;margin-top: -6px;">
+									<span class="store-query"> <strong>库存量:</strong><span id="storeQuantity">0</span><span>千件</span></span>
+									<br>
+									<span class="store-query"><strong>被定量:</strong><span id="orderQuantity">0</span><span>千件</span></span>
+									<br>
+								</div>
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label" for="sendDate">送货时间</label>
+								<div class="col-md-4">
+									<input class="form-control" id="sendDate" name="sendDate" placeholder="请输入..." value="" style="" type="text">
+								</div>
+								<label class="iwb-label col-md-2 control-label" for="IsStandard">标准件</label>
+								<div class="col-md-4">
+									<input class="form-control" style="width: 100%" id="IsStandard" disabled="disabled" name="IsStandard" placeholder="请输入..." value="" type="text">
+
+								</div>
+
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label iwb-label-required" for="price">货币类型</label>
+								<div class="col-md-4">
+									<select class="form-control" style="width: 100%" id="currencyId" name="currencyId" placeholder="请输入..." value="" onchange="RefreshCurrency()" type="text">
+										@Html.Raw(@strCurrencies);
+									</select>
 
-		</div>*@
-                        </form>
-                    </div>
+								</div>
+								<label class="iwb-label col-md-2 control-label iwb-label-required" for="toCnyRate">当前汇率</label>
+								<div class="col-md-4">
+									<input class="form-control required number" Required style="width: 100%" id="toCnyRate" name="toCnyRate" placeholder="请输入..." min="0" value="" type="text">
+								</div>
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label iwb-label-required" for="price">含税价格</label>
+								<div class="col-md-4">
+									<input class="form-control required number" Required style="width: 100%" id="price" name="price" placeholder="请输入..." value="" min="0" type="text">
 
-                    @Html.Partial("Modals/_ModalFooter", "0")
+								</div>
+								<label class="iwb-label col-md-2 control-label iwb-label-required" for="quantity">数量</label>
+								<div class="col-md-4">
+									<input class="form-control required number" Required style="width: 100%" id="quantity" name="quantity" placeholder="请输入..." min="0" value="" type="text">
 
-                </div>
-            </div>
-        </div>
-        @Html.Partial("Modals/Query/_Product01", "productNo")
+								</div>
+							</div>
+							<div class="form-group-sm row" id="noTaxDiv">
+								<label class="iwb-label col-md-2 control-label iwb-label-required" for="price">不含税价格</label>
+								<div class="col-md-4">
+									<input class="form-control required number" Required style="width: 100%" id="afterTaxPrice" name="afterTaxPrice" placeholder="请输入..." value="" min="0" type="text">
 
+								</div>
+								<div class="col-md-4" style="padding: 6px 25px;">
+									<span class="store-query"> <strong>当前税率:</strong><span id="currentTaxRate">@ViewBag.TagRate</span><span>%</span></span>
+									<br>
 
+								</div>
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label" for="logisticsFee">运费(含税)</label>
+								<div class="col-md-4">
+									<input class="form-control number" id="logisticsFee" name="logisticsFee" placeholder="请输入..." value="0" min="0" style="" type="number">
+								</div>
+								<label class="iwb-label col-md-2 control-label " for="moldFee">模具费(含税)</label>
+								<div class="col-md-4">
+									<input class="form-control number" id="moldFee" name="moldFee" placeholder="请输入..." value="0" style="" min="0" type="number">
 
-    </section>
-    <div class="store_box">
-        <div class="close" onclick="f_closeStore_box(this)"><i class="iconfont icon-close"></i></div>
-        <table class="table table-striped">
-            <tbody>
-            <tr>
-                <th style="width: 150px">批次号</th>
-                <th style="width: 150px">库位</th>
-                <th style="width: 150px">库存(千件)</th>
-                <th style="width: 150px">可用数量(千件)</th>
-            </tr>
+								</div>
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label" for="logisticsFee">运费(不含税)</label>
+								<div class="col-md-4">
+									<input class="form-control number" id="logisticsFeeAfterTax" name="logisticsFeeAfterTax" placeholder="请输入..." value="0" min="0" style="" type="number">
+								</div>
+								<label class="iwb-label col-md-2 control-label " for="moldFee">模具费(不含税)</label>
+								<div class="col-md-4">
+									<input class="form-control number" id="moldFeeAfterTax" name="moldFeeAfterTax" placeholder="请输入..." value="0" style="" min="0" type="number">
 
-            </tbody>
-        </table>
-    </div>
-    
-	<section>
-		<div class="modal fade" id="modal_queryProductionStore" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
-			<div class="modal-dialog  modal-dialog-centered" role="document">
-				<div class="modal-content" style="width: 880px;">
-					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("产品生产库存查询",""))
-					<div class="modal-body container-fluid" style="padding: 0; padding-top: 15px; min-height: 600px;">
-						<form class="pr-3 pl-3 form-horizontal" style="padding: 0 10px" >
-							
+								</div>
+							</div>
 							<div class="form-group-sm row">
-								
-								<div class="col-md-12">
-									<div class="tool-rc-group">
-										
-									</div> 
-                                     
+								<label class="iwb-label col-md-2 control-label" for="isReport">检验报告</label>
+								<div class="col-md-4">
+									<select class="form-control" style="width: 100%" id="isReport" name="isReport" placeholder="请输入..." value="" style="" type="text">
+										<option value="Y" selected="selected">是</option>
+										<option value="N">否</option>
+									</select>
+								</div>
+								<label class="iwb-label col-md-2 control-label" for="isPartSend">部分送货</label>
+								<div class="col-md-4">
+									<select class="form-control" style="width: 100%" id="isPartSend" name="isPartSend" placeholder="请输入..." value="" style="" type="text">
+										<option value="Y" selected="selected">是</option>
+										<option value="N">否</option>
+									</select>
 								</div>
-								
 							</div>
 							<div class="form-group-sm row">
-								<div class="col-xs-12" style="padding: 0 5px;">
-									<div class="nav-tabs-custom" style="margin-bottom: 5px;">
-										<ul class="nav nav-tabs">
-											<li class="active"><a href="#productionOrder_tab" data-toggle="tab">排产单</a></li>
-											<li><a href="#finishStore_tab" data-toggle="tab">成品库存</a></li>
-											<li><a href="#semiStore_tab" data-toggle="tab">半成品库存</a></li>
-										</ul>
-										<div class="tab-content form-box">
-											<div class="tab-pane active" id="productionOrder_tab" style="width: 100%;">
-                                                @Html.Partial("New/Table/_Table", tableProductionOrder)
-											</div>
-                                            <div class="tab-pane" id="finishStore_tab" style="width: 100%; height: 70px;">
-                                                @Html.Partial("New/Table/_Table", tableProductStore)
-                                            </div>
-											<div class="tab-pane" id="semiStore_tab" style="width: 100%; height: 70px;">
-                                                @Html.Partial("New/Table/_Table", tableSemiStore)
-											</div>
+								<label class="iwb-label col-md-2 control-label" for="Material">材质</label>
+								<div class="col-md-4">
+									<input class="form-control" id="Material" name="Material" placeholder="请输入..." value="" style="" type="text">
+								</div>
+								<label class="iwb-label col-md-2 control-label" for="Model">规格</label>
+								<div class="col-md-4">
+									<input class="form-control" id="Model" name="Model" placeholder="请输入..." value="" style="" type="text">
+								</div>
+
+
+							</div>
+							<div class="form-group-sm row">
+
+								<label class="iwb-label col-md-2 control-label" for="SurfaceColor">表色</label>
+								<div class="col-md-4">
+									<input class="form-control" id="SurfaceColor" name="surfaceColor" placeholder="请输入..." value="" style="" type="text">
+								</div>
+								<label class="iwb-label col-md-2 control-label" for="Rigidity">硬度</label>
+								<div class="col-md-4">
+									<input class="form-control" id="Rigidity" name="Rigidity" placeholder="请输入..." value="" style="" type="text">
+								</div>
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label" for="ProductName">产品名称</label>
+								<div class="col-md-4">
+									<input class="form-control" id="ProductName" name="ProductName" placeholder="请输入..." value="" style="" type="text">
+								</div>
+								<label class="iwb-label col-md-2 control-label" for="partNo">零件号</label>
+								<div class="col-md-4">
+									<div class="input-group">
+										<input class="form-control" id="partNo" name="partNo" placeholder="请输入..." value="" style="" type="text">
+										<div class="input-group-addon" onclick="f_QueryProductByPartNo();" title="通过零件号查询对应的产品">
+											<i class="iconfont icon-search"></i>
 										</div>
 									</div>
 								</div>
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label" for="wareHouse">送货仓库</label>
+								<div class="col-md-4">
+									<input class="form-control" id="wareHouse" name="wareHouse" placeholder="请输入..." value="" style="" type="text">
+								</div>
+								<label class="iwb-label col-md-2 control-label iwb-label-required" for="emergencyLevel">紧急程度</label>
+								<div class="col-md-4">
+
+									@*<input class="form-control" id="emergencyLevel" name="emergencyLevel" placeholder="请输入..." value="" style="" type="text">*@
+									@Html.DropDownList("emergencyLevel", emergencyLevelList, htmlAttributes: new { @class = "form-control Required", placeholder = "请选择", style = "width: 100%" })
+								</div>
+							</div>
+							<div class="form-group-sm row">
+								<label class="iwb-label col-md-2 control-label" for="wareHouse">客户标准名称</label>
+								<div class="col-md-4">
+									<input class="form-control" id="standardName" name="standardName" placeholder="请输入..." value="" style="" type="text">
+								</div>
+								<label class="iwb-label col-md-2 control-label " for="orderItemDesc">描述</label>
+								<div class="col-md-4">
+									<input class="form-control" id="orderItemDesc" name="orderItemDesc" placeholder="请输入..." value="" style="" type="text">
 
+								</div>
 							</div>
-							
+							@*<div class="form-group-sm row">
+									<label class="iwb-label col-md-2 control-label " for="orderItemDesc">描述</label>
+									<div class="col-md-10">
+										<textarea class="form-control" id="orderItemDesc" name="orderItemDesc" placeholder="请输入..." value="" style=""></textarea>
+									</div>
+
+								</div>*@
 						</form>
 					</div>
 
-					@*@Html.Partial("Modals/_ModalFooter", "0")*@
+					@Html.Partial("Modals/_ModalFooter", "0")
 
 				</div>
 			</div>
 		</div>
+		@Html.Partial("Modals/Query/_Product01", "productNo")
+        @Html.Partial("_searchInfoByProductNo")
+
+
 	</section>
+	<div class="store_box">
+		<div class="close" onclick="f_closeStore_box(this)"><i class="iconfont icon-close"></i></div>
+		<table class="table table-striped">
+			<tbody>
+				<tr>
+					<th style="width: 150px">批次号</th>
+					<th style="width: 150px">库位</th>
+					<th style="width: 150px">库存(千件)</th>
+					<th style="width: 150px">可用数量(千件)</th>
+				</tr>
+
+			</tbody>
+		</table>
+	</div>
+
+
 }
 
 @section scripts
 {
-    <script src="~/Content/Plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
-    <script src="~/Content/Plugins/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"></script>
-    <script src="~/Views/OrderInfo/js/OrderMg.js"></script>
-    <script type="text/javascript">
+	<script src="~/Content/Plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+	<script src="~/Content/Plugins/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"></script>
+	@*<script src="~/Views/OrderInfo/js/OrderMg.js"></script>*@
+	<script type="text/javascript">
         //cId  cStockNo cOrderStatusId cCustomerId cStartDate cEndDate
         var loToCNYCurrenyRate = [];
 
@@ -668,7 +576,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
                 function() {
                     //var p = $(this).val();
                     //var rate = $("#currentTaxRate").text();
-               
+
                     //SaveAjax({
                     //    url: window.appUrl + `Query/CalcTaxPrice?type=${1}&input=${p}&rate=${rate}`,
                     //    isValidate: false,
@@ -730,7 +638,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
             } else {
                 abp.message.warn('价格不能为空!');
             }
-        
+
         }
         function RefreshCurrency() {
             var currency = $("#currencyId").val();
@@ -1248,18 +1156,18 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 			}
 			return str;
         }
-       
-    </script>
-   
+
+	</script>
+
 
 }
 
 <section style="display: none">
-    <select id="hid-type">
-        <option value=""></option>
-    </select>
+	<select id="hid-type">
+		<option value=""></option>
+	</select>
 
-    @Html.DropDownList("hid-emergencyLevel", emergencyLevelList);
-    @Html.DropDownList("hide-ProductionOrderStatus", productionOrderStatus)
+	@Html.DropDownList("hid-emergencyLevel", emergencyLevelList);
+	@Html.DropDownList("hide-ProductionOrderStatus", productionOrderStatus)
 
 </section>

+ 17 - 108
src_0nline/ShwasherSys/ShwasherSys.Web/Views/OrderInfo/OrderStatusMg.cshtml

@@ -20,7 +20,7 @@
 	string startDate = DateTime.Now.AddMonths(-3).ToString("yyyy-MM-dd");
 	string endDate = DateTime.Now.AddDays(7).ToString("yyyy-MM-dd");
 	List<SelectListItem> OrderSaleTypeList = ViewBag.OrderSaleType;
-
+	
 
 	var searchForm = new SearchFormViewModal(new List<SearchItem>()
 {
@@ -34,52 +34,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 		   new SearchItem("saleType", "销售类型",FiledType.Inull,ExpType.Equal).SetSearchItem(OrderSaleTypeList),
 }, false);
 
-	var tableProductionOrder = new TableViewModel("/api/services/app/Query/QueryProductionOrderDtoByProNo", null, null, "tableProductionOrder")
-		.SetFields(new List<FieldItem>()
-		{
-			new FieldItem("productionOrderNo", "排产单号"),
-			new FieldItem("partNo", "零件号"),
-			new FieldItem("semiProductName", "名称"),
-			new FieldItem("model", "规格"),
-			new FieldItem("quantity", "排产数量(千件)"),
-			new FieldItem("productionOrderStatus","生产状态",formatter:"ProductionOrderStatusFormatter"),
-			new FieldItem("material", "材质"),
-			new FieldItem("surfaceColor", "表色"),
-			new FieldItem("rigidity", "硬度"),
-			new FieldItem("semiProductNo", "半成品编码"),
-				}).SetPageArray(10);
-	var tableProductStore = new TableViewModel("/api/services/app/Query/QueryViewCurrentProductStoreHouseByProNo", null, null, "tableProductStore")
-		.SetFields(new List<FieldItem>()
-		{
-			new FieldItem("productionOrderNo", "排产单号"),
-			new FieldItem("productNo", "成品编码"),
-			new FieldItem("productName", "名称"),
-			new FieldItem("model", "规格"),
-			new FieldItem("quantity", "当前库存数量(千件)"),
-			new FieldItem("freezeQuantity", "被冻结数量"),
-			new FieldItem("actualQuantity", "可用数量"),
-			new FieldItem("storeLocationNo","库位"),
-			new FieldItem("material", "材质"),
-			new FieldItem("surfaceColor", "表色"),
-			new FieldItem("rigidity", "硬度"),
-
-				}).SetPageArray(10);
-	var tableSemiStore = new TableViewModel("/api/services/app/Query/QueryViewCurrentSemiStoreHouseByProNo", null, null, "tableSemiStore")
-		.SetFields(new List<FieldItem>()
-		{
-			new FieldItem("productionOrderNo", "排产单号"),
-			new FieldItem("semiProductNo", "半成品编码"),
-			new FieldItem("semiProductName", "半成品名称"),
-			new FieldItem("model", "规格"),
-			new FieldItem("actualQuantity", "当前库存数量(千件)"),
-			new FieldItem("freezeQuantity", "被冻结数量"),
-			new FieldItem("canUserQuantity", "可用数量","CanUserQuantityFormatte"),
-			new FieldItem("storeLocationNo","库位"),
-			new FieldItem("material", "材质"),
-			new FieldItem("surfaceColor", "表色"),
-			new FieldItem("rigidity", "硬度"),
-			new FieldItem("partNo", "零件号"),
-				}).SetPageArray(10);
+	
 
 }
 @section css{
@@ -383,7 +338,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("价格变更", ""))
 					@{
 						var inputs = new List<InputViewModel>
-														{
+																{
 							new InputViewModel("orderItemNo",displayName:"订单明细编号",name:"orderItemNo").SetDisabled(),
 							new InputViewModel("oldPrice",displayName:"原价格",@class:"number",other:"min=0.001").SetReadOnly(),
 							new InputViewModel("newPrice", displayName:"修改的价格",@class:"number",other:"min=0.001"),
@@ -404,7 +359,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("税后价格变更", ""))
 					@{
 						var inputs5 = new List<InputViewModel>
-														{
+																{
 							new InputViewModel("orderItemNo5",displayName:"订单明细编号",name:"orderItemNo").SetDisabled(),
 							new InputViewModel("oldPrice2",displayName:"原税后价格",@class:"number",name:"oldPrice",other:"min=0").SetReadOnly().SetNotRequired(),
 							new InputViewModel("newAfterTaxPrice", displayName:"修改的价格",@class:"number",other:"min=0"),
@@ -425,7 +380,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("数量变更", ""))
 					@{
 						var inputs2 = new List<InputViewModel>
-														{
+																{
 							new InputViewModel("orderItemNo2",displayName:"订单明细编号",name:"orderItemNo").SetDisabled(),
 							new InputViewModel("oldQuantity",displayName:"原数量",@class:"number",other:"min=0.001").SetReadOnly(),
 							new InputViewModel("newQuantity", displayName:"修改的数量",@class:"number",other:"min=0.001"),
@@ -446,7 +401,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("发货日期变更", ""))
 					@{
 						var inputs3 = new List<InputViewModel>
-														{
+																{
 							new InputViewModel("orderItemNo3",displayName:"订单明细编号",name:"orderItemNo").SetDisabled(),
 							new InputViewModel("oldSendDate",displayName:"原发货日期",@class:"date").SetDisabled(),
 							new InputViewModel("newSendDate", displayName:"修改日期",@class:"date"),
@@ -468,7 +423,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("订单明细状态变更", ""))
 					@{
 						var inputs4 = new List<InputViewModel>
-														{
+																{
 							new InputViewModel("orderItemStatusId",InputTypes.List,"变更状态").SetSelectOptions(OrderItemStatusList)
 						};
 					}
@@ -484,7 +439,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 					@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("货物配齐状态变更", ""))
 					@{
 						var inputs6 = new List<InputViewModel>
-														{
+																{
 							new InputViewModel("storeCompleteStateId",InputTypes.List,"货物配齐状态").SetSelectOptions(new List<SelectListItem>(){new SelectListItem(){Text = "到齐",Value = "1"},new SelectListItem(){ Text = "未到齐", Value = "0" },new SelectListItem(){ Text = "货物已齐,待改包", Value = "2" } })
 						};
 					}
@@ -515,61 +470,11 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 		@Html.Partial("Modals/Query/_Product", "productId")
 		@Html.Partial("Modals/Query/_Employee", "saleMan|KeyWords-7,saleManName|KeyWords-saleManName-7,saleManId")
 
-		<section>
-			<div class="modal fade" id="modal_queryProductionStore" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
-				<div class="modal-dialog  modal-dialog-centered" role="document">
-					<div class="modal-content" style="width: 880px;">
-						@Html.Partial("Modals/_ModalHeader", new ModalHeaderViewModel("产品生产库存查询", ""))
-						<div class="modal-body container-fluid" style="padding: 0; padding-top: 15px; min-height: 600px;">
-							<form class="pr-3 pl-3 form-horizontal" style="padding: 0 10px">
-
-								<div class="form-group-sm row">
-
-									<div class="col-md-12">
-										<div class="tool-rc-group">
-
-										</div>
-
-									</div>
-
-								</div>
-								<div class="form-group-sm row">
-									<div class="col-xs-12" style="padding: 0 5px;">
-										<div class="nav-tabs-custom" style="margin-bottom: 5px;">
-											<ul class="nav nav-tabs">
-												<li class="active"><a href="#productionOrder_tab" data-toggle="tab">排产单</a></li>
-												<li><a href="#finishStore_tab" data-toggle="tab">成品库存</a></li>
-												<li><a href="#semiStore_tab" data-toggle="tab">半成品库存</a></li>
-											</ul>
-											<div class="tab-content form-box">
-												<div class="tab-pane active" id="productionOrder_tab" style="width: 100%;">
-													@Html.Partial("New/Table/_Table", tableProductionOrder)
-												</div>
-												<div class="tab-pane" id="finishStore_tab" style="width: 100%; height: 70px;">
-													@Html.Partial("New/Table/_Table", tableProductStore)
-												</div>
-												<div class="tab-pane" id="semiStore_tab" style="width: 100%; height: 70px;">
-													@Html.Partial("New/Table/_Table", tableSemiStore)
-												</div>
-											</div>
-										</div>
-									</div>
-
-								</div>
-
-							</form>
-						</div>
-
-						@*@Html.Partial("Modals/_ModalFooter", "0")*@
-
-					</div>
-				</div>
-			</div>
-		</section>
+	
 	</section>
 
 }
-
+@Html.Partial("_searchInfoByProductNo")
 @section scripts
 {
 	<script src="~/Content/Plugins/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
@@ -577,7 +482,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 	<script src="~/Content/Plugins/bootstrap-table-fixd-columns/bootstrap-table-fixed-columns.js"></script>
 	<script src="http://apps.bdimg.com/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
 	<script src="~/Views/OrderInfo/js/OrderStatusMg.js"></script>
-	<script src="~/Views/OrderInfo/js/OrderMg.js"></script>
+	@*<script src="~/Views/OrderInfo/js/OrderMg.js"></script>*@
 	<script type="text/javascript">
         var customerNo;
         var datePickerOpt = {
@@ -1682,7 +1587,7 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 			result += `<span class="label label-success" style="text-decoration:underline;margin-left:2px;" onclick="showSelectProductDialog('${r.productNo}')">产品查询</span>`;
             return result;
         }
-        
+
 
         function IsLockFormatter(v, r) {
 
@@ -1693,6 +1598,10 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
                 return '<span class="label label-success">-</span>';
             }
         }
+		//function StoreHouseIdFormatter(v,r) {
+  //          var name = $("#hide-StoreHouses option[value='" + v + "']").text();
+  //          return '<span class="label label-primary">' + name + '</span>';
+  //      }
 	</script>
 
 	<script>
@@ -1769,5 +1678,5 @@ new SearchItem("saleMan", "业务员",showField:"saleManName").SetSearchIcon("qu
 	</select>
 
 	@Html.DropDownList("hid-emergencyLevel", emergencyLevelList);
-
+	@*@Html.DropDownList("hide-StoreHouses", storeHouses)*@
 </section>

+ 111 - 0
src_0nline/ShwasherSys/ShwasherSys.Web/Views/OrderInfo/_searchInfoByProductNo.cshtml

@@ -0,0 +1,111 @@
+@using ShwasherSys.Views.Shared.New.Table
+@{
+	List<SelectListItem> storeHouses = ViewBag.StoreHouses;
+	var tableProductionOrder = new TableViewModel("/api/services/app/Query/QueryProductionOrderDtoByProNo", null, null, "tableProductionOrder")
+		.SetFields(new List<FieldItem>()
+		{
+			new FieldItem("productionOrderNo", "排产单号"),
+			new FieldItem("partNo", "零件号"),
+			new FieldItem("semiProductName", "名称"),
+			new FieldItem("model", "规格"),
+			new FieldItem("quantity", "排产数量(千件)"),
+			new FieldItem("productionOrderStatus","生产状态",formatter:"ProductionOrderStatusFormatter"),
+			new FieldItem("material", "材质"),
+			new FieldItem("surfaceColor", "表色"),
+			new FieldItem("rigidity", "硬度"),
+			new FieldItem("semiProductNo", "半成品编码"),
+				}).SetPageArray(10);
+	var tableProductStore = new TableViewModel("/api/services/app/Query/QueryViewCurrentProductStoreHouseByProNo", null, null, "tableProductStore")
+		.SetFields(new List<FieldItem>()
+		{
+			new FieldItem("productionOrderNo", "排产单号"),
+			new FieldItem("productNo", "成品编码"),
+			new FieldItem("productName", "名称"),
+			new FieldItem("model", "规格"),
+			new FieldItem("quantity", "当前库存数量(千件)"),
+			new FieldItem("freezeQuantity", "被冻结数量"),
+			new FieldItem("actualQuantity", "可用数量"),
+			new FieldItem("storeLocationNo","库位"),
+			new FieldItem("material", "材质"),
+			new FieldItem("surfaceColor", "表色"),
+			new FieldItem("rigidity", "硬度"),
+
+				}).SetPageArray(10);
+	var tableSemiStore = new TableViewModel("/api/services/app/Query/QueryViewCurrentSemiStoreHouseByProNo", null, null, "tableSemiStore")
+		.SetFields(new List<FieldItem>()
+		{
+			new FieldItem("productionOrderNo", "排产单号"),
+			new FieldItem("semiProductNo", "半成品编码"),
+			new FieldItem("semiProductName", "半成品名称"),
+			new FieldItem("model", "规格"),
+			new FieldItem("actualQuantity", "当前库存数量(千件)"),
+			new FieldItem("storeHouseId", "仓库",formatter:"StoreHouseIdFormatter"),
+			new FieldItem("freezeQuantity", "被冻结数量"),
+			new FieldItem("storeLocationNo","库位"),
+			new FieldItem("material", "材质"),
+			new FieldItem("surfaceColor", "表色"),
+			new FieldItem("rigidity", "硬度"),
+			new FieldItem("partNo", "零件号"),
+				}).SetPageArray(10);
+}
+<section>
+    <div class="modal fade" id="modal_queryProductionStore" role="dialog" tabindex="-1" aria-labelledby="ModalLabel" aria-hidden="true">
+        <div class="modal-dialog  modal-dialog-centered" role="document">
+            <div class="modal-content" style="width: 880px;">
+                @Html.Partial("Modals/_ModalHeader", new ShwasherSys.Models.Modal.ModalHeaderViewModel("产品生产库存查询", ""))
+                <div class="modal-body container-fluid" style="padding: 0; padding-top: 15px; min-height: 600px;">
+                    <form class="pr-3 pl-3 form-horizontal" style="padding: 0 10px">
+
+                        <div class="form-group-sm row">
+
+                            <div class="col-md-12">
+                                <div class="tool-rc-group">
+
+                                </div>
+
+                            </div>
+
+                        </div>
+                        <div class="form-group-sm row">
+                            <div class="col-xs-12" style="padding: 0 5px;">
+                                <div class="nav-tabs-custom" style="margin-bottom: 5px;">
+                                    <ul class="nav nav-tabs">
+                                        <li class="active"><a href="#productionOrder_tab" data-toggle="tab">排产单</a></li>
+                                        <li><a href="#finishStore_tab" data-toggle="tab">成品库存</a></li>
+                                        <li><a href="#semiStore_tab" data-toggle="tab">半成品库存</a></li>
+                                    </ul>
+                                    <div class="tab-content form-box">
+                                        <div class="tab-pane active" id="productionOrder_tab" style="width: 100%;">
+                                            @Html.Partial("New/Table/_Table", tableProductionOrder)
+                                        </div>
+                                        <div class="tab-pane" id="finishStore_tab" style="width: 100%; height: 70px;">
+                                            @Html.Partial("New/Table/_Table", tableProductStore)
+                                        </div>
+                                        <div class="tab-pane" id="semiStore_tab" style="width: 100%; height: 70px;">
+                                            @Html.Partial("New/Table/_Table", tableSemiStore)
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+
+                    </form>
+                </div>
+
+                @*@Html.Partial("Modals/_ModalFooter", "0")*@
+
+            </div>
+        </div>
+    </div>
+</section>
+<script src="~/Views/OrderInfo/js/OrderMg.js"></script>
+<script>
+    function StoreHouseIdFormatter(v,r) {
+        var name = $("#hide-StoreHouses option[value='" + v + "']").text();
+        return '<span class="label label-primary">' + name + '</span>';
+    }
+</script>
+<section style="display: none">
+    @Html.DropDownList("hide-StoreHouses", storeHouses)
+</section>