From fd1047bdc639fd4d6edc585ff9be4319f16ee49d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 11 四月 2026 11:55:46 +0800
Subject: [PATCH] 合同管理字段调整
---
src/views/inventoryManagement/stockManagement/New.vue | 126 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 111 insertions(+), 15 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 8243748..341010d 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -6,7 +6,7 @@
width="800"
@close="closeModal"
>
- <el-form label-width="140px" :model="formState" label-position="top" ref="formRef">
+ <el-form label-width="140px" :model="formState" :rules="rules" label-position="top" ref="formRef">
<el-form-item
label="浜у搧鍚嶇О"
prop="productModelId"
@@ -31,17 +31,54 @@
</el-form-item>
<el-form-item
- label="鍗曚綅"
+ label="鍗曚綅(涓�)"
prop="unit"
>
<el-input v-model="formState.unit" disabled />
</el-form-item>
+ <el-form-item
+ label="鍗曚綅(杈�)"
+ prop="subUnit"
+ >
+ <el-input v-model="formState.subUnit" disabled />
+ </el-form-item>
<el-form-item
- label="鏁伴噺"
+ label="浠撳簱缂栫爜"
+ prop="warehouseCode"
+ >
+ <el-select v-model="formState.warehouseCode" :options="warehouseCode" placeholder="璇烽�夋嫨浠撳簱缂栫爜" @change="handleWarehouseSelect">
+ <el-option v-for="item in warehouseCode" :key="item.value" :label="item.value" :value="item.value" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="浠撳簱鍚嶇О"
+ prop="warehouseName"
+ >
+ <el-input v-model="formState.warehouseName" disabled />
+ </el-form-item>
+
+ <el-form-item
+ label="瀛樿揣缂栫爜"
+ prop="productCode"
+ >
+ <el-input v-model="formState.productCode" />
+ </el-form-item>
+
+ <el-form-item
+ label="搴撳瓨鏁伴噺"
prop="qualitity"
>
- <el-input-number v-model="formState.qualitity" :step="1" :min="0" style="width: 100%" />
+ <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
+ </el-form-item>
+
+ <el-form-item
+ v-if="type === 'qualified'"
+ label="搴撳瓨棰勮鏁伴噺"
+ prop="warnNum"
+ >
+ <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -69,11 +106,25 @@
import {ref, computed, getCurrentInstance} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {createStockInventory} from "@/api/inventoryManagement/stockInventory.js";
+import {createStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
+const { proxy } = getCurrentInstance();
+// 鑾峰彇瀛楀吀
+const { warehouse_code } = proxy.useDict(
+ "warehouse_code"
+);
+
+const warehouseCode = computed(() => warehouse_code?.value || []);// 鎺у埗寮圭獥鏄剧ず
const props = defineProps({
visible: {
type: Boolean,
required: true,
+ },
+
+ type: {
+ type: String,
+ required: true,
+ default: 'qualified',
},
});
@@ -86,8 +137,23 @@
productName: "",
productModelName: "",
unit: "",
+ subUnit: "",
+ productCode: "",
+ warehouseCode: "",
+ warehouseName: "",
qualitity: 0,
+ warnNum: 0,
remark: '',
+});
+
+// 琛ㄥ崟楠岃瘉瑙勫垯
+const rules = ref({
+ warehouseCode: [
+ { required: true, message: '璇烽�夋嫨浠撳簱缂栫爜', trigger: 'change' },
+ ],
+ productCode: [
+ { required: true, message: '璇疯緭鍏ュ簱瀛樻暟閲�', trigger: 'blur' },
+ ],
});
const isShow = computed({
@@ -101,8 +167,6 @@
const showProductSelectDialog = ref(false);
-let { proxy } = getCurrentInstance()
-
const closeModal = () => {
// 閲嶇疆琛ㄥ崟鏁版嵁
formState.value = {
@@ -110,21 +174,42 @@
productModelId: undefined,
productName: "",
productModelName: "",
- description: '',
+ unit: "",
+ subUnit: "",
+ qualitity: 0,
+ productCode: "",
+ warehouseCode: "",
+ warehouseName: "",
+ warnNum: 0,
+ remark: '',
};
isShow.value = false;
};
+
+// 浠撳簱閫夋嫨澶勭悊
+const handleWarehouseSelect = (val) => {
+ if (val) {
+ console.log(val);
+ // 杩囨护鍑烘潵warehouseCode
+ warehouseCode.value.find(item => {
+ if(item.value == val){
+ formState.value.warehouseName = item.label;
+ }
+ })
+ }
+}
+
// 浜у搧閫夋嫨澶勭悊
const handleProductSelect = async (products) => {
if (products && products.length > 0) {
const product = products[0];
- console.log(product)
formState.value.productId = product.productId;
formState.value.productName = product.productName;
formState.value.productModelName = product.model;
formState.value.productModelId = product.id;
formState.value.unit = product.unit;
+ formState.value.subUnit = product.subUnit;
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
@@ -143,13 +228,24 @@
proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
return;
}
- createStockInventory(formState.value).then(res => {
- // 鍏抽棴妯℃�佹
- isShow.value = false;
- // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
- emit('completed');
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- })
+ if (props.type === 'qualified') {
+ createStockInventory(formState.value).then(res => {
+ // 鍏抽棴妯℃�佹
+ isShow.value = false;
+ // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+ emit('completed');
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ })
+ } else {
+ createStockUnInventory(formState.value).then(res => {
+ // 鍏抽棴妯℃�佹
+ isShow.value = false;
+ // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+ emit('completed');
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ })
+ }
+
}
})
};
--
Gitblit v1.9.3