调整入库表单

src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp

@@ -22,6 +22,7 @@
     if(data.length){
       data = data.map(function(item){
         item.delFlag = 0;
+        item.readonly = item.qrCode && item.qrCode.state === '2'
         return item;
       })
     }
@@ -36,7 +37,7 @@
       //每页的记录行数（*）
       pageSize: 10,
       sidePagination: "client",
-      columns:[{checkbox: true},
+      columns:[{checkbox: true, formatter: function(vlaue,row){return {disabled:  row.qrCode && row.qrCode.state === '2' }}},
         {
           field: 'no',
           title: '序号',
@@ -103,6 +104,17 @@
           }
         },
         {
+          field: 'qrCode.state',
+          title: '  状态  ',
+          formatter: function (value,row,index){
+             if(value === '2'){
+               return '已入库'
+             }else{
+               return '未入库'
+             }
+          }
+        },
+        {
           field: 'remarks',
           title: '备注',
           formatter: function (value,row,index){
@@ -395,11 +407,22 @@
   <input id="storageInfoList{{idx}}_model" name="storageInfoList[{{idx}}].model" type="text" value="{{row.model}}" readonly onchange="onInputChange('{{idx}}', this, 'model')"    class="form-control "/>
 </script>
 <script id="shelvesTpl" type="text/html">//<!--
+  {{#row.readonly}}
+  <sys:shelvesselect id="storageInfoList{{idx}}_shelves" name="storageInfoList[{{idx}}].shelves.id" value="{{row.shelves.id}}" labelName="storageInfoList[{{idx}}].shelves.name" labelValue="{{row.shelves.name}}"
+                   cssClass="form-control required" iframeUrl="/warehouse/storage/storage/form" disabled="disabled"></sys:shelvesselect>
+  {{/row.readonly}}
+  {{^row.readonly}}
   <sys:shelvesselect id="storageInfoList{{idx}}_shelves" name="storageInfoList[{{idx}}].shelves.id" value="{{row.shelves.id}}" labelName="storageInfoList[{{idx}}].shelves.name" labelValue="{{row.shelves.name}}"
-                   cssClass="form-control required" iframeUrl="/warehouse/storage/storage/form" callback="onSelectShelves"></sys:shelvesselect>//-->
+                     cssClass="form-control required" iframeUrl="/warehouse/storage/storage/form" callback="onSelectShelves"></sys:shelvesselect>//-->
+  {{/row.readonly}}
 </script>
 <script id="remarksTpl" type="text/html">
+  {{#row.readonly}}
+  <textarea id="storageInfoList{{idx}}_remarks" name="storageInfoList[{{idx}}].remarks" rows="2"  readonly class="form-control ">{{row.remarks}}</textarea>
+  {{/row.readonly}}
+  {{^row.readonly}}
   <textarea id="storageInfoList{{idx}}_remarks" name="storageInfoList[{{idx}}].remarks" rows="2"  onchange="onInputChange('{{idx}}', this, 'remarks')"  class="form-control ">{{row.remarks}}</textarea>
+  {{/row.readonly}}
 </script>
 <script id="warehouseTpl" type="text/html">
   <input id="storageInfoList{{idx}}_warehouseName" name="storageInfoList[{{idx}}].warehouse.name" type="text" value="{{row.warehouse.name}}" readonly  class="form-control "/>