Browse Source

打印和新增列

Qukaidi 4 years ago
parent
commit
ef4e1af155

+ 18 - 0
src/views/warehouseBusiness/cargoClearance/index.vue

@@ -2293,6 +2293,24 @@
           >
           >
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
+            prop="fCntrno"
+            header-align="center"
+            align="center"
+            label="箱号"
+          />
+          <el-table-column
+            prop="fGrossweightblc"
+            header-align="center"
+            align="center"
+            label="毛重"
+          />
+          <el-table-column
+            prop="fNetweightblc"
+            header-align="center"
+            align="center"
+            label="净重"
+          />
+          <el-table-column
             prop="fQtyblc"
             prop="fQtyblc"
             header-align="center"
             header-align="center"
             align="center"
             align="center"

+ 18 - 0
src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -1774,6 +1774,24 @@
           >
           >
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
+            prop="fCntrno"
+            header-align="center"
+            align="center"
+            label="箱号"
+          />
+          <el-table-column
+            prop="fGrossweightblc"
+            header-align="center"
+            align="center"
+            label="毛重"
+          />
+          <el-table-column
+            prop="fNetweightblc"
+            header-align="center"
+            align="center"
+            label="净重"
+          />
+          <el-table-column
             prop="fQtyblc"
             prop="fQtyblc"
             header-align="center"
             header-align="center"
             align="center"
             align="center"

+ 9 - 9
src/views/warehouseBusiness/outStock/index.vue

@@ -2567,19 +2567,19 @@
           >
           >
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
-            prop="fQtyblc"
+            prop="fCntrno"
             header-align="center"
             header-align="center"
             align="center"
             align="center"
             label="箱号"
             label="箱号"
           />
           />
           <el-table-column
           <el-table-column
-            prop="fQtyblc"
+            prop="fGrossweightblc"
             header-align="center"
             header-align="center"
             align="center"
             align="center"
             label="毛重"
             label="毛重"
           />
           />
           <el-table-column
           <el-table-column
-            prop="fQtyblc"
+            prop="fNetweightblc"
             header-align="center"
             header-align="center"
             align="center"
             align="center"
             label="净重"
             label="净重"
@@ -3246,7 +3246,7 @@
                 <td>{{ item.fTruckno }}</td>
                 <td>{{ item.fTruckno }}</td>
                 <td>{{ item.fWarehouseInformation }}</td>
                 <td>{{ item.fWarehouseInformation }}</td>
                 <td>{{ item.fQty }}</td>
                 <td>{{ item.fQty }}</td>
-                <td>{{ item.fGrossweight }}</td>
+                <td>{{ item.fNetweight }}</td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
@@ -3255,7 +3255,7 @@
               <tr>
               <tr>
                 <td colspan="3">合计</td>
                 <td colspan="3">合计</td>
                 <td>{{ allFqty }}</td>
                 <td>{{ allFqty }}</td>
-                <td>{{ allfGrossweight }}</td>
+                <td>{{ allfNetweight }}</td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
@@ -3358,15 +3358,15 @@
                 <td></td>
                 <td></td>
                 <td>{{ item.fWarehouseInformation }}</td>
                 <td>{{ item.fWarehouseInformation }}</td>
                 <td>{{ item.fQty }}</td>
                 <td>{{ item.fQty }}</td>
-                <td>{{ item.fGrossweight }}</td>
+                <td>{{ item.fNetweight }}</td>
                 <td>{{ item.remark }}</td>
                 <td>{{ item.remark }}</td>
               </tr>
               </tr>
               <tr>
               <tr>
                 <td colspan="3">合计:</td>
                 <td colspan="3">合计:</td>
                 <td></td>
                 <td></td>
                 <td>{{ allFqty }}</td>
                 <td>{{ allFqty }}</td>
-                <td>{{ allfGrossweight }}</td>
                 <td>{{ allfNetweight }}</td>
                 <td>{{ allfNetweight }}</td>
+                <td></td>
               </tr>
               </tr>
             </table>
             </table>
           </div>
           </div>
@@ -3457,15 +3457,15 @@
                 <td></td>
                 <td></td>
                 <td>{{ item.fWarehouseInformation }}</td>
                 <td>{{ item.fWarehouseInformation }}</td>
                 <td>{{ item.fQty }}</td>
                 <td>{{ item.fQty }}</td>
-                <td>{{ item.fGrossweight }}</td>
+                <td>{{ item.fNetweight }}</td>
                 <td>{{ item.remark }}</td>
                 <td>{{ item.remark }}</td>
               </tr>
               </tr>
               <tr>
               <tr>
                 <td colspan="3">合计:</td>
                 <td colspan="3">合计:</td>
                 <td></td>
                 <td></td>
                 <td>{{ allFqty }}</td>
                 <td>{{ allFqty }}</td>
-                <td>{{ allfGrossweight }}</td>
                 <td>{{ allfNetweight }}</td>
                 <td>{{ allfNetweight }}</td>
+                <td></td>
               </tr>
               </tr>
             </table>
             </table>
           </div>
           </div>

File diff suppressed because it is too large
+ 407 - 177
src/views/warehouseBusiness/stockTransfer/index.vue


Some files were not shown because too many files changed in this diff