销售订单转出库单整改完成

erp/src/main/resources/template/js/purchaseorder/purchaseorderpurchase.js

@@ -158,8 +158,6 @@ layui.config({
 			var product = allChooseProduct["tr" + thisRowNum.toString()];
 			$.each(product.unitList, function(j, bean) {
 				if(thisRowValue == bean.id){//获取规格
-					//获取当前行数量
-					var rkNum = parseInt($("#rkNum" + thisRowNum).val());
 					$("#unitPrice" + thisRowNum).val(bean.estimatePurchasePrice.toFixed(2));//单价
 					return false;
 				}
@@ -174,6 +172,11 @@ layui.config({
 		calculatedTotalPrice();
 	});
 
+	// 仓库变化事件
+	form.on('select(depotId)', function(data) {
+		loadMaterialDepotStockByDepotId(data.value);
+	});
+
 	// 保存为草稿
 	form.on('submit(formAddBean)', function(data) {
 		if(winui.verifyForm(data.elem)) {

erp/src/main/resources/template/js/salesoutlet/salesoutletadd.js

@@ -92,8 +92,6 @@ layui.config({
 			var product = allChooseProduct["tr" + thisRowNum.toString()];
 			$.each(product.unitList, function(j, bean) {
 				if(thisRowValue == bean.id){//获取规格
-					//获取当前行数量
-					var rkNum = parseInt($("#rkNum" + thisRowNum).val());
 					$("#unitPrice" + thisRowNum).val(bean.salePrice.toFixed(2));//单价
 					return false;
 				}

erp/src/main/resources/template/tpl/purchaseorder/purchaseorderpurchase.html

@@ -31,7 +31,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">入库仓库<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <select id="depotId" name="depotId" lay-search="" win-verify="required">
+		            <select id="depotId" name="depotId" lay-search="" win-verify="required" lay-filter="depotId">
 		            	
 		            </select>
 		        </div>

erp/src/main/resources/template/tpl/salesorder/salesorderpurchase.html

@@ -31,7 +31,7 @@
 		    <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">出库仓库<i class="red">*</i></label>
 		        <div class="layui-input-block">
-		            <select id="depotId" name="depotId" lay-search="" win-verify="required">
+		            <select id="depotId" name="depotId" lay-search="" win-verify="required" lay-filter="depotId">
 		            	
 		            </select>
 		        </div>
@@ -161,10 +161,15 @@
 					</table>
 		        </div>
 		    </div>
+			<div id="dsFormShow">
+
+			</div>
 		    <div class="layui-form-item layui-col-xs12">
 		        <div class="layui-input-block">
-		            <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
-		            <button class="winui-btn" lay-submit lay-filter="formEditBean"><language showName="com.skyeye.save"></language></button>
+					<button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+					<button class="winui-btn" lay-submit lay-filter="formAddBean">保存为草稿</button>
+					<button class="winui-btn submitTypeIsOne" lay-submit lay-filter="formSubOneBean">提交审批</button>
+					<button class="winui-btn submitTypeIsTwo" lay-submit lay-filter="formSubTwoBean">提交</button>
 		        </div>
 		    </div>
 	    </form>