qiuhongwu 3 months ago
parent 546a941504
commit 1d2bcca2d1

@ -130,7 +130,7 @@
<el-button link type="primary" @click="openDetail('update', scope.row.id)">
编辑
</el-button>
<!-- <el-button link type="primary" @click="openDetail('Check', scope.row.id)">
<!-- <el-button link type="primary" @click="openDetail('Check', scope.row.id)">
审核
</el-button> -->
<el-button link type="primary" @click="openDetail('detail', scope.row.id)">

@ -102,14 +102,12 @@
<el-table-column prop="matType" label="物料类型" min-width="120" align="center" />
<el-table-column prop="shortName" label="物料简称" min-width="120" align="center" />
<el-table-column prop="matSpec" label="规格/型号" min-width="120" align="center" />
<el-table-column prop="matBrand" label="品牌" min-width="120" align="center" />
<el-table-column prop="rgId" min-width="140" align="center">
<!-- <el-table-column prop="matBrand" label="品牌" min-width="120" align="center" /> -->
<!-- <el-table-column prop="rgId" min-width="140" align="center">
<template #header> <span class="hl-table_header">*</span>库区 </template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.rgId`" :rules="subFormRules.rgId" class="mb-0px!">
<!-- <el-select v-model="scope.row.rgId" placeholder="" style="width: 100%" @change="(val)=>handleRg(val,scope)" v-bind:disabled="ctrView || ctrSave">
<el-option v-for="dict in rgList" :key="dict.id" :label="dict.rg_name" :value="dict.id" />
</el-select> -->
<RgSelect v-model="scope.row.rgId" v-bind:disabled="ctrView || ctrSave" :anotherProp="formData.whId" @update:newValue="handleSelectedrg(scope.$index, $event)" />
</el-form-item>
</template>
@ -118,13 +116,11 @@
<template #header> <span class="hl-table_header">*</span>库位 </template>
<template #default="scope">
<el-form-item :prop="`${scope.$index}.pnId`" :rules="subFormRules.pnId" class="mb-0px!">
<!-- <el-select v-model="scope.row.pnId" placeholder="" style="width: 100%" @change="(val)=>handlePn(val,scope)" v-bind:disabled="ctrView || ctrSave">
<el-option v-for="dict in scope.row.pnlist" :key="dict.id" :label="dict.pn_name" :value="dict.id" />
</el-select> -->
<PnSelect v-model="scope.row.pnId" v-bind:disabled="ctrView || ctrSave" :anotherProp="formData.matItemDOList[scope.$index].rgId" @update:newValue="handleSelectedpn(scope.$index, $event)" />
</el-form-item>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="matRest" label="库存数量" min-width="120" align="center" />
<el-table-column prop="storageOkQty" min-width="120" align="center">
<template #header> <span class="hl-table_header">*</span>盘点数量</template>

@ -17,6 +17,9 @@
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_MAT_CHECK_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="stockNo">
<el-input v-model="queryParams.stockNo" placeholder="物料名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="queryParams.status" placeholder="单据状态" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_STORAGE_MAT_CHECK_STATUS).filter(item=> item.value !==3)" :key="dict.value" :label="dict.label" :value="dict.value" />
@ -50,21 +53,22 @@
{{scope.row.stockNo}}</el-button>
</template>
</el-table-column>
<el-table-column label="盘点开始时间" align="center" prop="checkTime" min-width="160">
<el-table-column label="盘点类型" align="center" prop="checkType" min-width="120">
<template #default="scope">
<span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
<dict-tag :type="DICT_TYPE.BIZ_STORAGE_MAT_CHECK_TYPE" :value="scope.row.checkType" />
</template>
</el-table-column>
<el-table-column label="盘点仓库" align="center" prop="whId" min-width="100">
<el-table-column label="盘点仓库" align="center" prop="whId" min-width="100">
<template #default="scope">
{{ whList.find((tag) => tag.id === scope.row.whId)?.wh_name }}
</template>
</el-table-column>
<el-table-column label="盘点类型" align="center" prop="checkType" min-width="120">
<el-table-column label="盘点开始时间" align="center" prop="checkTime" min-width="160">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_STORAGE_MAT_CHECK_TYPE" :value="scope.row.checkType" />
<span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="排除库存为0的物料" align="center" prop="noZero" min-width="160" >
<template #default="scope">

Loading…
Cancel
Save