From abb6d7f841c9a0fcd4ca2e1f9b5caaf849b40482 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 24 四月 2026 11:07:08 +0800
Subject: [PATCH] Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inventory-management into dev_河南_鹤壁天沐玻璃厂
---
src/views/inventoryManagement/stockManagement/New.vue | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1f86fd6..7d20e64 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -7,17 +7,7 @@
@close="closeModal"
>
<el-form label-width="140px" :model="formState" label-position="top" ref="formRef">
- <el-form-item
- label="浜у搧鍚嶇О"
- prop="productModelId"
- :rules="[
- {
- required: true,
- message: '璇烽�夋嫨浜у搧',
- trigger: 'change',
- }
- ]"
- >
+ <el-form-item label="浜у搧鍚嶇О" prop="productName">
<el-button type="primary" @click="showProductSelectDialog = true">
{{ formState.productName ? formState.productName : '閫夋嫨浜у搧' }}
</el-button>
@@ -38,14 +28,40 @@
</el-form-item>
<el-form-item
- label="搴撳瓨鏁伴噺"
- prop="qualitity"
+ label="搴撳瓨绫诲瀷"
+ prop="inventoryType"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨搴撳瓨绫诲瀷',
+ trigger: 'change',
+ }
+ ]"
>
+ <el-select
+ v-model="formState.inventoryType"
+ placeholder="璇烽�夋嫨搴撳瓨绫诲瀷"
+ clearable
+ filterable
+ style="width: 100%"
+ >
+ <el-option
+ label="鍚堟牸搴撳瓨"
+ value="qualified"
+ />
+ <el-option
+ label="涓嶅悎鏍煎簱瀛�"
+ value="unqualified"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="搴撳瓨鏁伴噺" prop="qualitity">
<el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
</el-form-item>
<el-form-item
- v-if="type === 'qualified'"
+ v-if="formState.inventoryType === 'qualified'"
label="搴撳瓨棰勮鏁伴噺"
prop="warnNum"
>
@@ -74,7 +90,7 @@
</template>
<script setup>
-import {ref, computed, getCurrentInstance} from "vue";
+import { ref, computed, getCurrentInstance, watch } from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {createStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {createStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
@@ -90,6 +106,10 @@
required: true,
default: 'qualified',
},
+ parentId: {
+ type: [Number, String],
+ default: undefined,
+ },
});
const emit = defineEmits(['update:visible', 'completed']);
@@ -98,6 +118,7 @@
const formState = ref({
productId: undefined,
productModelId: undefined,
+ inventoryType: "qualified",
productName: "",
productModelName: "",
unit: "",
@@ -124,9 +145,13 @@
formState.value = {
productId: undefined,
productModelId: undefined,
+ inventoryType: props.type || "qualified",
productName: "",
productModelName: "",
- description: '',
+ unit: "",
+ qualitity: 0,
+ warnNum: 0,
+ remark: '',
};
isShow.value = false;
};
@@ -158,7 +183,7 @@
proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
return;
}
- if (props.type === 'qualified') {
+ if (formState.value.inventoryType === 'qualified') {
createStockInventory(formState.value).then(res => {
// 鍏抽棴妯℃�佹
isShow.value = false;
@@ -186,4 +211,14 @@
handleSubmit,
isShow,
});
+
+watch(
+ () => props.visible,
+ (visible) => {
+ if (visible) {
+ formState.value.inventoryType = props.type || "qualified";
+ }
+ },
+ { immediate: true }
+);
</script>
--
Gitblit v1.9.3