Merge branch 'wxw'

Administrator

2024-03-23 1401f0156b5338a110f1d3a803a3c09c134b7e0d

 HTML/views/SOSetting/ExportAllot.html

@@ -217,7 +217,13 @@
                              }}
                              {{ GetBtn7(d) }}
                           </script>

                           <script type="text/html" id="templetUpdateTime">
                              {{# function GetBtn71(d){
                                    return formatDate(d.UpdateTime);
                                 }	
                              }}
                              {{ GetBtn71(d) }}
                           </script>
                           <script type="text/html" id="templetUnstackingMode">
                              {{# function GetBtn8(d){
                                    switch (d.UnstackingMode) {
@@ -278,7 +284,7 @@
            <script type="text/html" id="table-content-list2">
               {{# function GetBtn2(d){
                     var html = '';
                     if(d.SkuNo != "100099"){
                     if(d.SkuNo != "100099" && d.BoxNo != ''){
                        html =`<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sel"> 
                           <i class="layui-icon layui-icon-edit"></i>详情</a>`;
                     } 
@@ -347,6 +353,7 @@
            { field: 'IsBale', title: '是否裹包', align: 'center', templet: '#templetIsBale', width: 90 },
            { field: 'IsBelt', title: '是否打带', align: 'center', templet: '#templetIsBelt', width: 90 },
            { field: 'CreateTime', align: 'center', title: '创建时间', width: 160, templet: '#templetCreateTime' },
            { field: 'UpdateTime', align: 'center', title: '完成时间', width: 160, templet: '#templetUpdateTime' },
            { field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'center', toolbar: '#table-content-list', "disabled": true }
         ]];
         var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//将表头数据进行url编码
@@ -608,7 +615,7 @@
            { field: 'LotText', title: '批次描述', align: 'center', width: 150, },
            { field: 'SupplierLot', title: '供货批次', align: 'center', width: 110, },
            { field: 'Standard', title: '物料规格', align: 'center', width: 120, },
            //{field: 'CreateTime',align: 'center',title: '创建时间',width: 165,templet: '#templetCreateTime2'}, 
            //{field: 'CreateTime',align: 'center',title: '拣货时间',width: 165,templet: '#templetCreateTime2'}, 
            { field: 'caozuo', title: '操作', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
         ]];
         var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//将表头数据进行url编码
@@ -829,25 +836,33 @@
            console.log(obj);
            if (obj.event === 'del') {
               layer.confirm('确定撤销选中的分配信息吗？', function (index) {
                  var param = {
                     Id: parseInt(obj.data.Id)
                  };
                  sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) {
                     console.log(res);
                     if (res.code == 0) { //成功
                        layer.msg(res.msg, {
                           icon: 1,
                           time: 1000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () {
                           refreshTable();
                        });
                     } else { //不成功
                        layer.msg(res.msg, {
                           icon: 2,
                           time: 2000 //2秒关闭（如果不配置，默认是3秒）
                        }, function () { });
                     }
                  });
                  if (doing) {
                     doing = false;

                     var param = {
                        Id: parseInt(obj.data.Id)
                     };
                     sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) {
                        console.log(res);
                        if (res.code == 0) { //成功
                           layer.msg(res.msg, {
                              icon: 1,
                              time: 1000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () {
                              refreshTable();
                              doing = true;
                           });
                        } else { //不成功
                           layer.msg(res.msg, {
                              icon: 2,
                              time: 2000 //2秒关闭（如果不配置，默认是3秒）
                           }, function () {
                              doing = true;
                            });
                        }
                     });
                  }
						
               });
            }
         });