Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业

liyong

7 小时以前 d4255374b1dfeb673258f484dca0b7137d1e824b

 src/views/inventoryManagement/stockManagement/index.vue

@@ -47,12 +47,15 @@
                             label="序号"
                             type="index"
                             width="60" />
            <el-table-column label="入库日期"
                             prop="createTime"
                             width="120">
              <template #default="scope">
                {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') || '-' }}
              </template>
            </el-table-column>
            <el-table-column label="产品名称"
                             prop="productName"
                             width="180"
                             show-overflow-tooltip />
            <el-table-column label="产品编号"
                             prop="productCode"
                             width="180"
                             show-overflow-tooltip />
            <el-table-column label="产品规格"
@@ -129,8 +132,12 @@
                             width="60" />
            <el-table-column label="入库日期"
                             prop="createTime"
                             width="100"
                             show-overflow-tooltip />
                             width="120"
                             show-overflow-tooltip>
              <template #default="scope">
                {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') || '-' }}
              </template>
            </el-table-column>
            <el-table-column label="采购合同号"
                             prop="purchaseContractNumber"
                             width="180"