修改采购申请、行政公文下发

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJY.js

@@ -140,11 +140,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
                         label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
@@ -196,15 +196,15 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
                     },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormJYHC.js

@@ -98,22 +98,22 @@ var bootstrap = function ($, learun) {
                     //    label: '耗材编号', name: 'AAICode', width: 150, align: 'left'
                     //},
                     {
-                        label: '资产名称', name: 'AAIName', width: 150, align: 'left'
-                    },
-                    {
-                        label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
-                                key: value,
-                                keyId: 'atid',
-                                callback: function (_data) {
-                                    callback(_data['aname']);
-                                }
-                            });
-                        }
+                        label: '耗材名称', name: 'AAIName', width: 150, align: 'left'
                     },
+                    //{
+                    //    label: '资产类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                    //            key: value,
+                    //            keyId: 'atid',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
-                        label: '资产来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                        label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
                                 key: value,
                                 code: 'zcly',
@@ -140,11 +140,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
                         label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
@@ -195,33 +195,33 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
                     },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
                     },
                     {
                         label: '用途', name: 'AAIUse', width: 100, align: 'left'
                     },
-                    {
-                        label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
-                                key: value,
-                                keyId: 'sid',
-                                callback: function (_data) {
-                                    callback(_data['sname']);
-                                }
-                            });
-                        }
-                    }
+                    //{
+                    //    label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                    //            key: value,
+                    //            keyId: 'sid',
+                    //            callback: function (_data) {
+                    //                callback(_data['sname']);
+                    //            }
+                    //        });
+                    //    }
+                    //}
                 ],
                 height: 400,
                 mainId: 'AAIId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJY.js

@@ -139,11 +139,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
+                    //{
+                    //    label: '生成资产明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
                         label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
@@ -169,15 +169,15 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
                     },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
                     },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoApply/FormViewJYHC.js

@@ -90,18 +90,18 @@ var bootstrap = function ($, learun) {
                     {
                         label: '耗材名称', name: 'AAIName', width: 150, align: 'left'
                     },
-                    {
-                        label: '耗材类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
-                                key: value,
-                                keyId: 'atid',
-                                callback: function (_data) {
-                                    callback(_data['aname']);
-                                }
-                            });
-                        }
-                    },
+                    //{
+                    //    label: '耗材类别', name: 'AAITId', width: 150, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_AssetsType',
+                    //            key: value,
+                    //            keyId: 'atid',
+                    //            callback: function (_data) {
+                    //                callback(_data['aname']);
+                    //            }
+                    //        });
+                    //    }
+                    //},
                     {
                         label: '耗材来源', name: 'AAISource', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('dataItem', {
@@ -130,11 +130,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    {
-                        label: '生成耗材明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
-                            return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
-                        }
-                    },
+                    //{
+                    //    label: '生成耗材明细', name: 'AAIHasDetail', width: 80, align: 'left', formatter: function (cellvalue) {
+                    //        return (cellvalue === true || cellvalue === "true") ? "<i class=\"fa fa-toggle-on\"></i>" : "<i class=\"fa fa-toggle-off\"></i>";
+                    //    }
+                    //},
                     {
                         label: '库房', name: 'AAIStorageId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
@@ -150,33 +150,33 @@ var bootstrap = function ($, learun) {
                     {
                         label: '库位', name: 'AAIStoragePosition', width: 100, align: 'left'
                     },
-                    {
-                        label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '英文名称', name: 'AAIEName', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产型号', name: 'AAIModel', width: 100, align: 'left'
                     },
-                    {
-                        label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
-                    },
+                    //{
+                    //    label: '生产厂家', name: 'AAIManufacturer', width: 100, align: 'left'
+                    //},
                     {
                         label: '资产规格', name: 'AAISpecification', width: 100, align: 'left'
                     },
                     {
                         label: '用途', name: 'AAIUse', width: 100, align: 'left'
                     },
-                    {
-                        label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
-                                key: value,
-                                keyId: 'sid',
-                                callback: function (_data) {
-                                    callback(_data['sname']);
-                                }
-                            });
-                        }
-                    }
+                    //{
+                    //    label: '供应商', name: 'AAISupplierId', width: 100, align: 'left', formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('custmerData', {
+                    //            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Ass_SupplierData',
+                    //            key: value,
+                    //            keyId: 'sid',
+                    //            callback: function (_data) {
+                    //                callback(_data['sname']);
+                    //            }
+                    //        });
+                    //    }
+                    //}
                 ],
                 height: 400,
                 mainId: 'AAIId',

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.cshtml

@@ -21,33 +21,33 @@
         <div class="lr-form-item-title">资产名称<font face="宋体">*</font></div>
         <input id="AAIName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+            <div class="lr-form-item-title">英文名称</div>
+            <input id="AAIEName" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">英文名称</div>
-        <input id="AAIEName" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">资产型号</div>
-        <input id="AAIModel" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">生产厂家</div>
-        <input id="AAIManufacturer" type="text" class="form-control" />
+        <div class="lr-form-item-title">资产型号<font face="宋体">*</font></div>
+        <input id="AAIModel" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+            <div class="lr-form-item-title">生产厂家</div>
+            <input id="AAIManufacturer" type="text" class="form-control" />
+        </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">资产规格</div>
-        <input id="AAISpecification" type="text" class="form-control" />
+        <div class="lr-form-item-title">资产规格<font face="宋体">*</font></div>
+        <input id="AAISpecification" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AAIUse" type="text" class="form-control" />
+        <div class="lr-form-item-title">用途<font face="宋体">*</font></div>
+        <input id="AAIUse" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">资产来源</div>
-        <div id="AAISource"></div>
+        <div class="lr-form-item-title">资产来源<font face="宋体">*</font></div>
+        <div id="AAISource" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">供应商</div>
-        <div id="AAISupplierId"></div>
+        <div class="lr-form-item-title">供应商<font face="宋体">*</font></div>
+        <div id="AAISupplierId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">单价<font face="宋体">*</font></div>
@@ -58,30 +58,30 @@
         <input id="AAIStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">数量单位</div>
-        <div id="AAIUnit"></div>
+        <div class="lr-form-item-title">数量单位<font face="宋体">*</font></div>
+        <div id="AAIUnit" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
         <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
-        <input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" value="1" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
         <div id="AAIStorageId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">房间号</div>
-        <div id="AAIStoragePosition"></div>
+        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
+        <div id="AAIStoragePosition" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">使用部门<font face="宋体">*</font></div>
-        <div id="AAIUseDeptId"  isvalid="yes" checkexpession="NotNull"></div>
+        <div id="AAIUseDeptId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">使用人<font face="宋体">*</font></div>
-        <div id="AAIUseUserId"  isvalid="yes" checkexpession="NotNull"></div>
+        <div id="AAIUseUserId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
         <div class="lr-form-item-title">生成明细<font face="宋体">*</font></div>
         <div id="AAIHasDetail" isvalid="yes" checkexpession="NotNull"></div>
     </div>
@@ -90,8 +90,8 @@
         <div id="AAIPhoto"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="AAIContent" class="form-control" style="height: 120px;"></textarea>
+        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
+        <textarea id="AAIContent" class="form-control" style="height: 120px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJY.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.cshtml

@@ -9,10 +9,10 @@
             <div class="lr-form-item-title">选择已登记耗材<font face="宋体">*</font></div>
             <div id="AAOldCode"></div>
         </div>*@
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">耗材类别<font face="宋体">*</font></div>
         <div id="AAITId" isvalid="yes" checkexpession="NotNull"></div>
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none">
         <div class="lr-form-item-title">耗材编号</div>
         <input id="AAICode" type="text" class="form-control" value="@ViewBag.AAICode" />
@@ -21,34 +21,34 @@
         <div class="lr-form-item-title">耗材名称<font face="宋体">*</font></div>
         <input id="AAIName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">英文名称</div>
         <input id="AAIEName" type="text" class="form-control" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">耗材型号</div>
-        <input id="AAIModel" type="text" class="form-control" />
+        <div class="lr-form-item-title">耗材型号<font face="宋体">*</font></div>
+        <input id="AAIModel" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"/>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">生产厂家</div>
         <input id="AAIManufacturer" type="text" class="form-control" />
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">耗材规格</div>
-        <input id="AAISpecification" type="text" class="form-control" />
+        <div class="lr-form-item-title">耗材规格<font face="宋体">*</font></div>
+        <input id="AAISpecification" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">用途</div>
-        <input id="AAIUse" type="text" class="form-control" />
+        <div class="lr-form-item-title">用途<font face="宋体">*</font></div>
+        <input id="AAIUse" type="text" class="form-control"  isvalid="yes" checkexpession="NotNull"/>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">耗材来源</div>
-        <div id="AAISource"></div>
+        <div class="lr-form-item-title">耗材来源<font face="宋体">*</font></div>
+        <div id="AAISource"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    @*<div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">供应商</div>
         <div id="AAISupplierId"></div>
-    </div>
+    </div>*@
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">单价<font face="宋体">*</font></div>
         <input id="AAIPrice" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatintZero" />
@@ -58,20 +58,20 @@
         <input id="AAIStock" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">数量单位</div>
-        <div id="AAIUnit"></div>
+        <div class="lr-form-item-title">数量单位<font face="宋体">*</font></div>
+        <div id="AAIUnit"  isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
         <div class="lr-form-item-title">排序<font face="宋体">*</font></div>
-        <input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="AAIOrder" type="text" class="form-control" isvalid="yes" checkexpession="Num" value="1" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">楼宇名称<font face="宋体">*</font></div>
         <div id="AAIStorageId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">房间号</div>
-        <div id="AAIStoragePosition" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">房间号<font face="宋体">*</font></div>
+        <div id="AAIStoragePosition" checkexpession="NotNull" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
         <div class="lr-form-item-title">使用部门<font face="宋体">*</font></div>
@@ -81,7 +81,7 @@
         <div class="lr-form-item-title">使用人<font face="宋体">*</font></div>
         <div id="AAIUseUserId" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply">
+    <div class="col-xs-6 lr-form-item" data-table="Ass_AssetsInfoItemApply" style="display: none;">
         <div class="lr-form-item-title">生成明细<font face="宋体">*</font></div>
         <div id="AAIHasDetail" isvalid="yes" checkexpession="NotNull"></div>
     </div>
@@ -90,8 +90,8 @@
         <div id="AAIPhoto"></div>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Ass_AssetsInfoItemApply">
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="AAIContent" class="form-control" style="height: 120px;"></textarea>
+        <div class="lr-form-item-title">备注<font face="宋体">*</font></div>
+        <textarea id="AAIContent" class="form-control" style="height: 120px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/Ass_AssetsInfoItemApply/FormJYHC.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Form.js

@@ -89,7 +89,7 @@ var bootstrap = function ($, learun) {
                     }
                 }
             });
-            $('#SendType').lrselectSet("1");
+            $('#SendType').lrselectSet("2");
             $('#Url').lrUploader();
             var ContentsUE = UE.getEditor('Contents');
             $('#Contents')[0].ue = ContentsUE;

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.cshtml

@@ -18,8 +18,28 @@
                                     <input id="Title" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">接收对象</div>
+                                    <div id="SendType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item" id="ReceiverIddiv">
                                     <div class="lr-form-item-title">接收人</div>
-                                    <input id="Receiver" type="text" class="form-control" />
+                                    <div id="ReceiverUserId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item" id="DeptIddiv">
+                                    <div class="lr-form-item-title">接收部门</div>
+                                    <div id="DeptId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item" id="PostIddiv">
+                                    <div class="lr-form-item-title">接收岗位</div>
+                                    <div id="PostId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item" id="CompanyIddiv">
+                                    <div class="lr-form-item-title">接收校区</div>
+                                    <div id="CompanyId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">文号</div>
+                                    <input id="DocNo" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendFile/Index.js

@@ -51,6 +51,71 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            $("#ReceiverIddiv").hide();
+            $("#PostIddiv").hide();
+            $('#CompanyId').lrCompanySelect({ type: 'multiple' });
+            $('#DeptId').lrDepartmentSelect({ type: 'treemultiple' });
+            $('#PostId').lrPostSelect({ type: 'treemultiple' });
+            $('#ReceiverUserId').lrUserSelect({ type: '1' });
+            $('#SendType').lrDataItemSelect({
+                code: 'FileSendType', select: function (item) {
+                    if (item != null && item != undefined) {
+                        if (item.id === 1 || item.id === "1") {
+                            $("#CompanyIddiv").show();
+                            $("#CompanyId").attr("isvalid", "yes");
+                            $("#CompanyId").attr("checkexpession", "NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                        } else if (item.id === 2 || item.id === "2") {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").show();
+                            $("#DeptId").attr("isvalid", "yes");
+                            $("#DeptId").attr("checkexpession", "NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                        } else if (item.id === 3 || item.id === "3") {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").hide();
+                            $("#ReceiverUserId").removeAttr("isvalid");
+                            $("#ReceiverUserId").removeAttr("NotNull");
+                            $("#PostIddiv").show();
+                            $("#PostId").attr("isvalid", "yes");
+                            $("#PostId").attr("checkexpession", "NotNull");
+                        } else {
+                            $("#CompanyIddiv").hide();
+                            $("#CompanyId").removeAttr("isvalid");
+                            $("#CompanyId").removeAttr("NotNull");
+                            $("#DeptIddiv").hide();
+                            $("#DeptId").removeAttr("isvalid");
+                            $("#DeptId").removeAttr("NotNull");
+                            $("#ReceiverIddiv").show();
+                            $("#ReceiverUserId").attr("isvalid", "yes");
+                            $("#ReceiverUserId").attr("checkexpession", "NotNull");
+                            $("#PostIddiv").hide();
+                            $("#PostId").removeAttr("isvalid");
+                            $("#PostId").removeAttr("NotNull");
+                        }
+                    }
+                }
+            });
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
@@ -238,6 +303,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.ReceiverId = param.DeptId + param.ReceiverUserId + param.PostId + param.CompanyId;
             param.SqlParameter = ' AND SendFlag<>4';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendFile/Sys_SendFileService.cs

@@ -48,13 +48,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
                     dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
-                    strSql.Append(" AND ( t.SendTime >= @startTime AND t.SendTime <= @endTime ) ");
+                    strSql.Append(" AND ( t.SendTime >= @startTime AND t.SendTime <= @endTime or (t.SendTime is null or len(t.SendTime)=0)) ");
                 }
+                
                 if (!queryParam["Title"].IsEmpty())
                 {
                     dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Title Like @Title ");
                 }
+                if (!queryParam["DocNo"].IsEmpty())
+                {
+                    dp.Add("DocNo", "%" + queryParam["DocNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.DocNo Like @DocNo ");
+                }
                 if (!queryParam["SenderId"].IsEmpty())
                 {
                     dp.Add("SenderId", "" + queryParam["SenderId"].ToString() + "", DbType.String);
@@ -65,6 +71,34 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Receiver", "%" + queryParam["Receiver"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Receiver Like @Receiver ");
                 }
+                if (!queryParam["ReceiverId"].IsEmpty())
+                {
+                    if (queryParam["ReceiverId"].ToString().Contains(","))
+                    {
+                        var arr = queryParam["ReceiverId"].ToString().Split(',');
+                        var str = "";
+                        str += " AND (";
+                       
+                        foreach (var item in arr)
+                        {
+                            str += $" t.ReceiverId Like '%{item}%' and";
+                        }
+
+                        str=str.Remove(str.LastIndexOf("and"), 3);
+                        str += " )";
+                        strSql.Append(str);
+                    }
+                    else
+                    {
+                        strSql.Append($" AND t.ReceiverId Like '%{queryParam["ReceiverId"].ToString()}%' ");
+                    }
+
+                }
+                if (!queryParam["SendType"].IsEmpty())
+                {
+                    dp.Add("SendType", "" + queryParam["SendType"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.SendType = @SendType ");
+                }
                 //sql条件
                 if (!queryParam["SqlParameter"].IsEmpty())
                 {