Merge branch 'dev_KTHG' of http://114.132.189.42:9002/r/product-inventory-m...

zhangwencui

23 小时以前 e3f7ae14a6b98e4fbfba04a0c1bbe26802dfc1c5

 src/views/inventoryManagement/receiptManagement/Record.vue

@@ -73,6 +73,10 @@
        <el-table-column label="入库数量"
                         prop="stockInNum"
                         show-overflow-tooltip/>
        <el-table-column label="净重(吨)"
                         prop="netWeight"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="入库人"
                         prop="createBy"
                         show-overflow-tooltip/>
@@ -83,6 +87,10 @@
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column label="过磅日期"
                         prop="weighingDate"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
      </el-table>
      <pagination v-show="total > 0"
                  :total="total"