Merge branch 'csc'

Demo

2024-03-07 ca13a7c8cb6cc1ef00cda9b085b1a7a14ce51a5b

 HTML/views/SOSetting/ExportNoticeAddFrom.html

@@ -32,7 +32,7 @@
               <label class="layui-form-label">单据类型</label>
               <div class="layui-input-inline">
                  <select name="Type" id="Type" lay-filter="Type" lay-verify="required" lay-search>
                     <option value=""></option>
                     <!-- <option value=""></option> -->
                     <!-- 24 -->
                     <option value="0">成品出库</option>
                     <option value="1">领料出库</option>
@@ -42,6 +42,7 @@
                     <option value="5">中间品出库</option>
                     <option value="6">代储出库</option>
                     <option value="7">其他出库</option>
                     <option value="8">寄存出库</option>
                     <!-- 09 -->
                     <!-- <option value="0">标准销售出库</option>
                     <option value="1">非标销售出库</option>
@@ -56,7 +57,7 @@
               </div>
            </div>
            <div class="layui-inline">
               <label class="layui-form-label">客户名称</label>
               <label class="layui-form-label" id="CustomerNamep">客户名称</label>
               <div class="layui-input-inline">
                  <select name="CustomerNo" id="CustomerNo" lay-search>
                     <option value=""></option>
@@ -125,6 +126,7 @@
            };

            var arr = []; 
            var TypeValue=$("#Type").val();
            function refreshTable(data) {
               //table.clear();
               
@@ -334,6 +336,19 @@
                  isrun = 0;
                  return;
               }
               var type= $("#Type").val();
               if(type=='6'){
                  var CustomerNo=$("#CustomerNo").val();
                  if(CustomerNo==''){
                     layer.msg("代储单据请选择货主！", {
                        icon: 2,
                        time: 2000 //2秒关闭（如果不配置，默认是3秒）
                     }, function () {

                     });
                     return;
                  }
               }
               var DataList = [];
               console.log(infoOptions.data);
               for (var i in infoOptions.data) {
@@ -429,19 +444,16 @@
             
            
            //下拉单据类型选中后事件
            // form.on('select(Type)', function(data) {
            //    // console.log(data.value);
            //    if (data.value == "0" || data.value == "1") { //销售出库
            //       $("#chengyunshang").removeClass("isNoShow"); 
            //       $("#chengyunshang").addClass("isShow"); 
            //       form.render('select'); 
            //    }else if(data.value == "2" ||data.value == "3"){//不合格出库
						
            //       $("#chengyunshang").removeClass("isShow"); 
            //       $("#chengyunshang").addClass("isNoShow"); 
            //       form.render('select'); 
            //    } 
            // });
            form.on('select(Type)', function(data) {
               var value = data.value;
               if(value!=TypeValue){
                  getCustomerList();
                  arr = [];
                  // 渲染Table
                  refreshTable(null);
                  TypeValue=value;
               }
            });
            //获取仓库下拉框信息
            // function getWareHouseList(){
            //    sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
@@ -470,9 +482,55 @@
                     $("#CustomerNo").empty();
                     $("#CustomerNo").append('<option value =""></option>');
                     for (var i = 0; i < res.data.length; i++) {
                        $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' + 
                           res.data[i].CustomerName + '</option>');
                     } 
                        var TypeNum = 0;
								
                        switch($("#Type").val())
                        {									
                           case "0": //成品出库
                              TypeNum = 0;
                              console.log(TypeNum)
                              break;
                           case "1": //领料出库
                           case "2": //抽检出库
                           case "3": //物料取样出库
                           case "4": //不合格品出库
                           case "5": //中间品出库
                           case "6": //代储出库
                           case "7": //其他出库
                           case "8": //寄存出库
                              TypeNum = 2;
                              console.log(TypeNum)
                              break;
                        }
                        //判断单据类型
                        if (TypeNum == 0)
                        {
                           if (res.data[i].Type == 0)
                           {
                              $("#CustomerNamep").html("客户");
                              $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
                              res.data[i].CustomerName + '</option>');
                           }
                        }
                        else if (TypeNum == 1)
                        {
                           if (res.data[i].Type == 1)
                           {
                              $("#CustomerNamep").html("供应商");
                              $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
                              res.data[i].CustomerName + '</option>');
                           }
                        }
                        else if (TypeNum == 2)
                        {
                           if (res.data[i].Type == 2)
                           {
                              $("#CustomerNamep").html("货主");
                              $("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
                              res.data[i].CustomerName + '</option>');
                           }
                        }
                     }
                     form.render('select');
                  } else { //不成功
                     layer.msg(res.msg, {