|
@@ -61,6 +61,21 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="是否入库:">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.isInbound"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择生产状态"
|
|
|
+ style="width: 145px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in inventory_production_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="标识:">
|
|
|
<el-select
|
|
|
style="width: 160px"
|
|
@@ -95,7 +110,7 @@
|
|
|
style="width: 145px"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="dict in is_taks_stock"
|
|
|
+ v-for="dict in is_inventory_inbound"
|
|
|
:key="dict.value"
|
|
|
:label="dict.label"
|
|
|
:value="dict.value"
|
|
@@ -145,17 +160,17 @@
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
icon="List"
|
|
|
- v-hasPermi="['business:inventoryCheck:notInboundCheck']"
|
|
|
+ v-hasPermi="['business:inventoryCheck:notInboundCheck']"
|
|
|
@click="handleNotInboundCheckFrom"
|
|
|
>未入库盘点
|
|
|
- </el-button>
|
|
|
- <el-button
|
|
|
+ </el-button>
|
|
|
+ <el-button
|
|
|
type="primary"
|
|
|
icon="List"
|
|
|
- v-hasPermi="['business:inventoryCheck:anyInboundCheck']"
|
|
|
+ v-hasPermi="['business:inventoryCheck:anyInboundCheck']"
|
|
|
@click="handleAnyInboundCheckFrom"
|
|
|
>部分入库盘点
|
|
|
- </el-button>
|
|
|
+ </el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div class="el-table-container">
|
|
@@ -343,6 +358,21 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="盘点状态"
|
|
|
+ prop="isTaksStock"
|
|
|
+ width="100"
|
|
|
+ align="center"
|
|
|
+ >
|
|
|
+ <template #default="scope">
|
|
|
+ <div>
|
|
|
+ <dict-tag
|
|
|
+ :options="is_inventory_inbound"
|
|
|
+ :value="scope.row.isProductStatus"
|
|
|
+ />
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
width="160"
|
|
@@ -392,7 +422,7 @@
|
|
|
<OutsourceCheckDialog ref="outsourceCheckDialogRef" />
|
|
|
<taksForm ref="taksFormRef" @handleSaveSuccess="getList" />
|
|
|
<OutsourceCheckFom ref="outsourceCheckFom" @handleSaveSuccess="getList" />
|
|
|
- <NotInboundCheckForm ref="notInboundCheckForm" />
|
|
|
+ <NotInboundCheckForm ref="notInboundCheckForm" />
|
|
|
<AnyInboundCheckForm ref="anyInboundCheckForm" />
|
|
|
</el-drawer>
|
|
|
</template>
|
|
@@ -420,6 +450,7 @@ const { is_taks_stock } = proxy.useDict("is_taks_stock");
|
|
|
const { inventory_production_status } = proxy.useDict(
|
|
|
"inventory_production_status"
|
|
|
);
|
|
|
+const { is_inventory_inbound } = proxy.useDict("is_inventory_inbound");
|
|
|
|
|
|
// 组件
|
|
|
const outsourceCheckDialogRef = ref(null);
|
|
@@ -500,10 +531,10 @@ function handleEdit(row, index) {
|
|
|
function outsourceCheckFrom() {
|
|
|
proxy.$refs.outsourceCheckFom.open(detailInfo.value);
|
|
|
}
|
|
|
-function handleNotInboundCheckFrom(){
|
|
|
+function handleNotInboundCheckFrom() {
|
|
|
proxy.$refs.notInboundCheckForm.open(detailInfo.value);
|
|
|
}
|
|
|
-function handleAnyInboundCheckFrom(){
|
|
|
+function handleAnyInboundCheckFrom() {
|
|
|
proxy.$refs.anyInboundCheckForm.open(detailInfo.value);
|
|
|
}
|
|
|
function handleTaksLot() {
|