Merge branch 'master' into wxw

Administrator

2024-02-21 87d55df7b7446d7c4c3532a2dd2e78f72574e34b

 HTML/views/ASNSetting/ArrivalNoticeDetail.html

@@ -116,7 +116,15 @@
               </script>
               <script type="text/html" id="table-content-list">
                     <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> <i class="layui-icon layui-icon-delete"></i>删除</a>
                  </script>
               </script>
               <script type="text/html" id="table-content-Packlist">
                  {{# 
                     function GetPack(d){ 
                        return d.PackagNo + '-' + d.PackagName;
                     }
                  }}
                  {{ GetPack(d) }}
               </script>
            </div>
         </div>
      </div>
@@ -161,7 +169,7 @@
                  {field: 'UnitName',title: '计量单位',align: 'center',width: 70}, 
                  {field: 'Standard',title: '规格',width: 160,align: 'center'}, 
                  {field: 'LotText',title: '批次描述',align: 'center',edit: 'text',width: 160}, 
                  {field: 'PackagNo',title: '包装名称',width: 160}, 
                  {field: 'PackagNo',title: '包装名称',width: 160, templet: "#table-content-Packlist"},
                  {field: 'Price',title: '单价',align: 'center',width: 80}, 
                  {field: 'Money',title: '金额',align: 'center',width: 100}, 
                  {field: 'UDF1',title: '自定义列1',align: 'center',edit: 'text',width: 140}, 
@@ -681,12 +689,14 @@
               }
               arr.push(data[i]); //属性
            }
				
            $.extend(infoOptions, {
               data: arr
            });
            infoOptions.page = {
               curr: 1
            }
            console.log(infoOptions)
            table.render(infoOptions);
         }