From f3a9a3ad429d86028c884e3476dc0badcd8da966 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 21 六月 2025 15:13:18 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/SOSetting/ExportNoticeAddFrom.html | 86 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 42 deletions(-)
diff --git a/HTML/views/SOSetting/ExportNoticeAddFrom.html b/HTML/views/SOSetting/ExportNoticeAddFrom.html
index 95df954..a77c389 100644
--- a/HTML/views/SOSetting/ExportNoticeAddFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeAddFrom.html
@@ -20,14 +20,7 @@
<body>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" style="padding: 20px 0 0 0;">
<div class="layui-form-item" style="margin-bottom: 0px;">
- <!-- <div class="layui-inline">
- <label class="layui-form-label">鍑哄簱浠撳簱</label>
- <div class="layui-input-inline">
- <select name="WarehouseId" id="WarehouseId" lay-filter="WarehouseId" lay-verify="required" lay-search>
- <option value=""></option>
- </select>
- </div>
- </div> -->
+
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
<div class="layui-input-inline">
@@ -38,9 +31,16 @@
<option value="1">棰嗘枡鍑哄簱</option>
<option value="2">鎶芥鍑哄簱</option>
<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
- <option value="5">涓棿鍝佸嚭搴�</option>
- <!-- <option value="7">鍏朵粬鍑哄簱</option> -->
- <option value="9">閲囪喘閫�璐у嚭搴�</option>
+ <option value="7">鍏朵粬鍑哄簱</option>
+ <option value="9">鐢熶骇棰嗘枡鍑哄簱</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍑哄簱浠撳簱</label>
+ <div class="layui-input-inline">
+ <select name="WarehouseId" id="WarehouseId" lay-filter="WarehouseId" lay-verify="required" lay-search>
+ <option value=""></option>
</select>
</div>
</div>
@@ -104,7 +104,7 @@
table = layui.table,
layer = layui.layer;
- // getWareHouseList();
+ getWareHouseList();
getCustomerList();
getLogisticsInfoList();
@@ -248,13 +248,13 @@
var $ = layui.$;
var active = {
add: function() {
- // if ($("#WarehouseId").val()== "") {
- // layer.msg("璇烽�夋嫨浠撳簱锛�", {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // },function() {});
- // return;
- // }
+ if ($("#WarehouseId").val()== "") {
+ layer.msg("璇烽�夋嫨浠撳簱锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ },function() {});
+ return;
+ }
if ($("#Type").val()== "") {
layer.msg("璇烽�夋嫨鍗曟嵁绫诲瀷锛�", {
icon: 2,
@@ -273,10 +273,12 @@
return;
}
}
+ console.log($("#WarehouseId").val());
+
layer.open({
type: 2,
title: '閫夋嫨鐗╁搧淇℃伅',
- content: 'ExportSelectSkuFrom.html?Type='+$("#Type").val()+'&OwnerNo='+$("#CustomerNo").val(),
+ content: 'ExportSelectSkuFrom.html?houseId='+$("#WarehouseId").val()+'&Type='+$("#Type").val()+'&OwnerNo='+$("#CustomerNo").val(),
maxmin: true,
area: ['950px', '90%'],
fixed: false,
@@ -349,7 +351,7 @@
}
}
var DataList = [];
- console.log(infoOptions.data);
+
for (var i in infoOptions.data) {
console.log(infoOptions.data[i].ExQty);
if (infoOptions.data[i].ExQty == "") {
@@ -415,7 +417,7 @@
var param = {
Type: data.field.Type,
CustomerNo: data.field.CustomerNo,
-
+ WareHouseNo:data.field.WarehouseId,
LogisticsId: parseInt(data.field.LogisticsId),
Detail: DataList
}
@@ -453,27 +455,27 @@
TypeValue=value;
}
});
- //鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
- // function getWareHouseList(){
- // sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+ //鑾峰彇浠撳簱淇℃伅
+ function getWareHouseList(){
+ sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
- // if (res.code == 0) { //鎴愬姛
- // $("#WarehouseId").empty();
- // // $("#WarehouseId").append('<option value =""></option>');
- // for (var i = 0; i < res.data.length; i++) {
- // $("#WarehouseId").append('<option value =' + res.data[i].WareHouseNo + '>' +
- // res.data[i].WareHouseName + '</option>');
- // }
- // $("#WarehouseId option[value='W01']").attr("selected", "selected")
- // form.render('select');
- // } else { //涓嶆垚鍔�
- // layer.msg(res.msg, {
- // icon: 2,
- // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- // }, function() {});
- // }
- // });
- // }
+ if (res.code == 0) { //鎴愬姛
+ $("#WarehouseId").empty();
+ $("#WarehouseId").append('<option value =""></option>');
+ for (var i = 0; i < res.data.length; i++) {
+ $("#WarehouseId").append('<option value =' + res.data[i].WareHouseNo + '>' +
+ res.data[i].WareHouseName + '</option>');
+ }
+ //$("#WarehouseId option[value='W01']").attr("selected", "selected")
+ form.render('select');
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function() {});
+ }
+ });
+ }
//鑾峰彇瀹㈡埛涓嬫媺妗嗕俊鎭�
function getCustomerList() {
sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {
--
Gitblit v1.8.0