Merge branch 'master' into yyk

yyk

2024-08-22 1310b47a24f0cc70f0128c820bd490dca6a1a921

 HTML/views/HouseWithinSetting/StockCheck.html

@@ -188,7 +188,20 @@
                  }}
                   
               </script>

            <script type="text/html" id="table-content-list2">
                  {{# 
                        var html = ''; 
								
                                if(d.Status >= 1){
                                    html += `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="viewPicture"> 
                                                <i class="layui-icon layui-icon-ok"></i>查看图片
                                            </a>`;
                                }
                        return html;
							
                  }}
						 
               </script>
            <script type="text/html" id="toolbarDemo">

                  <button class="layui-btn layuiadmin-btn-list layui-btn-sm  addClass" lay-event="add">
@@ -401,6 +414,7 @@
               { field: 'CreateTime', title: '创建时间', align: 'center', width: 160, templet: '#CreateTimeButton', },
               { field: 'UpdateUserName', title: '修改人', align: 'center', width: 120, hide: true },
               { field: 'UpdateTime', title: '修改时间', align: 'center', width: 160, hide: true, templet: '#UpdateTimeButton', },
               { field: 'caozuo', title: '操作', fixed: 'right', align: 'center', toolbar: '#table-content-list2', width: 100 }
            ]];
         var TotalColsSysArrm = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArrm)))//将表头数据进行url编码
         refreshTable();
@@ -783,7 +797,7 @@
                  }
               });
            } else if (obj.event === 'vision') {
					

               layer.confirm('确定视觉盘点', function () {
                  if (isChongFu == true) {
                     isChongFu = false;
@@ -860,7 +874,24 @@
               });
            }
         });

         table.on('tool(LAY-app-content-list2)', function (obj) {
            var data = obj.data;
            if (obj.event === 'viewPicture') {//查看图片
               debugger;
               layer.open({
                  type: 2,
                  title: '查看图片',
                  content: 'ViewPicture.html',
                  maxmin: true,
                  area: ['100%', '100%'],
                  success: function (layero, index) {
                     var body = layer.getChildFrame('body', index);
                     body.find('#CrNo').val(data.CrNo);
                     body.find('#PalletNo').val(data.PalletNo);
                  }
               });
            }
         });
         var $ = layui.$,
            active = {
               customCols: function () {