Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/warehouseBusiness/inStock/index.vue

@@ -756,13 +756,28 @@
           prop="fplangrossweight"
           header-align="center"
           align="center"
-          label="重量"
+          label="计划毛重"
         >
           <template slot-scope="scope">
             <el-input
               oninput="value=value.replace(/[^\d.]/g,'')"
               v-model="scope.row.fPlangrossweight"
-              placeholder="重量"
+              placeholder="计划毛重"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fplannetweight"
+          header-align="center"
+          align="center"
+          label="计划净重"
+        >
+          <template slot-scope="scope">
+            <el-input
+              oninput="value=value.replace(/[^\d.]/g,'')"
+              v-model="scope.row.fplannetweight"
+              placeholder="计划净重"
               show-word-limit
             />
           </template>
@@ -801,13 +816,28 @@
           prop="fgrossweight"
           header-align="center"
           align="center"
-          label="入库重量"
+          label="入库毛重"
         >
           <template slot-scope="scope">
             <el-input
               oninput="value=value.replace(/[^\d.]/g,'')"
               v-model="scope.row.fGrossweight"
-              placeholder="入库重量"
+              placeholder="入库毛重"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fnetweight"
+          header-align="center"
+          align="center"
+          label="入库净重"
+        >
+          <template slot-scope="scope">
+            <el-input
+              oninput="value=value.replace(/[^\d.]/g,'')"
+              v-model="scope.row.fNetweight"
+              placeholder="入库净重"
               show-word-limit
             />
           </template>
@@ -879,7 +909,6 @@
         >
           <template slot-scope="scope">
             <el-input
-              disabled
               oninput="value=value.replace(/[^\d.]/g,'')"
               v-model="scope.row.fGoodsval"
               placeholder="货值"
@@ -1194,6 +1223,21 @@
           </template>
         </el-table-column>
         <el-table-column
+          prop="remarks"
+          header-align="center"
+          align="center"
+          label="备注"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.remarks"
+              :disabled="browseStatus"
+              placeholder="备注"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
           header-align="center"
           align="center"
           label="操作"
@@ -1355,6 +1399,21 @@
           </template>
         </el-table-column>
         <el-table-column
+          prop="remarks"
+          header-align="center"
+          align="center"
+          label="备注"
+        >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.remarks"
+              :disabled="browseStatus"
+              placeholder="备注"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
           header-align="center"
           align="center"
           label="操作"
@@ -1770,7 +1829,6 @@
             this.warehouseOptions = []
             this.warehouseOptions.push(response.data.warehouse)
           }
-          console.log(JSON.stringify(response.data.warehouseBillsItem))
           if (typeof response.data.warehouseBillsItem !== 'undefined' && response.data.warehouseBillsItem !== null) {
             this.dataList = response.data.warehouseBillsItem
             if (response.data.goodsList !== null) {