耗材领取需求变更

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_AssetsOutApply/Inventory.cshtml

@@ -98,7 +98,7 @@
                 </tr>
                 <tr>
                     <td colspan="4">领用/出库日期</td>
-                    <td colspan="4" id="applyData">2020年 &nbsp; &nbsp; &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp; &nbsp; 日</td>
+                    <td colspan="4" id="applyData">&nbsp; &nbsp; &nbsp; &nbsp;年 &nbsp; &nbsp; &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp; &nbsp; 日</td>
                 </tr>
                 <tr>
                     <td style="width: 10%;">序 号</td>
@@ -115,7 +115,7 @@
                     <td>（人民币）大写：</td>
                     <td colspan="3" id="moneyUp"></td>
                     <td colspan="2">（人民币）小写：</td>
-                    <td id='moneyLow'>1333.00</td>
+                    <td id='moneyLow'></td>
                 </tr>
             </table>
             <div class="tableTxt">
@@ -158,7 +158,8 @@
                         var price = parseFloat(0), str = '';
                         for (var i = 0; i < val.list.length; i++) {
                             var entity = val.list[i];
-                            str += '<tr><td>' + i + '</td>'; //序号
+                            var s = (i + 1);
+                            str += '<tr><td>' + s + '</td>';//序号
                             str += '<td>' + entity.aName + '</td>'; //品名
                             str += '<td></td>'; //规格
                             str += '<td>' + (entity.aUnit ? entity.aUnit : '') + '</td>'; //单位

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Form.js

@@ -54,6 +54,12 @@ var bootstrap = function ($, learun) {
                             type: 'input',
                         }
                     },
+                    {
+                        label: "规格型号", name: "ASpecification", width: 100, align: "left",
+                    },
+                    {
+                        label: "备注", name: "Demo", width: 100, align: "left",
+                    },
                 ],
                 mainId: 'RIID',
                 isEdit: true,
@@ -93,7 +99,9 @@ var bootstrap = function ($, learun) {
                                         }
                                     });
                                 }
-                            }
+                            },
+                            { label: "备注", name: "Demo", width: 200, align: "left" },
+
                         ],
                         select: function (values, texts) {
                             if (values && values.length > 0) {
@@ -106,8 +114,10 @@ var bootstrap = function ($, learun) {
                                         return;
                                     }
                                     $input.val(data.AName);
-                                    //$('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['AName'] = data.AName;
-                                    //$('.jfgrid-data-cell[colname="AName"][rowIndex="' + rowIndex + '"]').attr('title', data.AName).html(data.AName);
+                                    $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['ASpecification'] = data.ASpecification;
+                                    $('.jfgrid-data-cell[colname="ASpecification"][rowIndex="' + rowIndex + '"]').attr('title', data.ASpecification).html(data.ASpecification);
+                                    $('#Ass_ReceiveItem')[0].dfop.running.rowdata[rowIndex]['jfgridRowData']['Demo'] = data.Demo;
+                                    $('.jfgrid-data-cell[colname="Demo"][rowIndex="' + rowIndex + '"]').attr('title', data.Demo).html(data.Demo);
                                     $input.trigger('propertychange');
 
                                     $('jfgrid_edit_Ass_ReceiveItem_' + 'ANum').val(0);

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Index.js

@@ -158,7 +158,7 @@ var bootstrap = function ($, learun) {
             });
             //打印清单
             $('#lr_inventory').on('click',
-                function() {
+                function () {
                     var keyValue = $('#gridtable').jfGridValue('RID');
                     if (learun.checkrow(keyValue)) {
                         learun.layerForm({
@@ -167,7 +167,7 @@ var bootstrap = function ($, learun) {
                             url: top.$.rootUrl + '/AssetManagementSystem/Ass_Receive/Inventory?keyValue=' + keyValue,
                             width: 1000,
                             height: 700,
-                            callBack: function(id) {
+                            callBack: function (id) {
                             }
                         });
                     }
@@ -215,7 +215,8 @@ var bootstrap = function ($, learun) {
                             } else {
                                 return '<span class=\"label label-default\" >草稿</span>';
                             }
-                        } },
+                        }
+                    },
                 ],
                 mainId: 'RID',
                 isPage: true

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/Ass_Receive/Inventory.cshtml

@@ -98,7 +98,7 @@
                 </tr>
                 <tr>
                     <td colspan="4">领用/出库日期</td>
-                    <td colspan="4" id="applyData">2020年 &nbsp; &nbsp; &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp; &nbsp; 日</td>
+                    <td colspan="4" id="applyData">&nbsp; &nbsp; &nbsp; &nbsp;年 &nbsp; &nbsp; &nbsp; &nbsp; 月 &nbsp; &nbsp; &nbsp; &nbsp; 日</td>
                 </tr>
                 <tr>
                     <td style="width: 10%;">序 号</td>
@@ -115,7 +115,7 @@
                     <td>（人民币）大写：</td>
                     <td colspan="3" id="moneyUp"></td>
                     <td colspan="2">（人民币）小写：</td>
-                    <td id='moneyLow'>1333.00</td>
+                    <td id='moneyLow'>&nbsp; &nbsp; &nbsp; &nbsp;</td>
                 </tr>
             </table>
             <div class="tableTxt">
@@ -155,7 +155,8 @@
                     var price = parseFloat(0), str = '';
                     for (var i = 0; i < val.list.length; i++) {
                         var entity = val.list[i];
-                        str += '<tr><td>' + i + '</td>';//序号
+                        var s = (i + 1);
+                        str += '<tr><td>' + s + '</td>';//序号
                         str += '<td>' + entity.aName + '</td>';//品名
                         str += '<td></td>';//规格
                         str += '<td>' + (entity.aUnit ? entity.aUnit : '') + '</td>';//单位

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoEntity.cs

@@ -111,8 +111,13 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
         [Column("AASSTYPE")]
         public int? AAssType { get; set; }
 
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("DEMO")]
+        public string Demo { get; set; }
 
-               #endregion
+        #endregion
 
         #region  扩展操作
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/Ass_AssetsInfo/Ass_AssetsInfoService.cs

@@ -50,7 +50,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 t.ASpecification, 
                 t.AUse, 
                 t.AAssType, 
-                t.AName 
+                t.AName
                 ");
                 strSql.Append("  FROM Ass_AssetsInfo t ");
                 strSql.Append("  WHERE 1=1 ");
@@ -399,7 +399,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 t.HasDetail,
                 t.AOrder,
                 t.APhoto,
-                t.AContent
+                t.AContent,t.Demo
                 ");
                 strSql.Append("  FROM Ass_AssetsInfo t ");
                 strSql.Append("  WHERE 1=1 ");
@@ -451,7 +451,7 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem
                 t.HasDetail,
                 t.AOrder,
                 t.APhoto,
-                t.AContent
+                t.AContent,t.Demo
                 ");
                 strSql.Append("  FROM Ass_AssetsInfo t ");
                 strSql.Append("  WHERE 1=1 and AAssType=1 ");