From c05b81c7f50df80ab247a05f9f92af2d799e77cd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 10 四月 2026 15:59:04 +0800
Subject: [PATCH] feat:1.销售添加是否生产 2.生产订单添加备注
---
src/views/inventoryManagement/stockManagement/New.vue | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 8243748..d4ea20b 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -31,17 +31,40 @@
</el-form-item>
<el-form-item
+ label="鏂欏彿"
+ prop="materialCode"
+ >
+ <el-input v-model="formState.materialCode" disabled />
+ </el-form-item>
+
+ <el-form-item
label="鍗曚綅"
prop="unit"
>
<el-input v-model="formState.unit" disabled />
</el-form-item>
+ <el-form-item label="鎵瑰彿" prop="batchNo">
+ <el-input
+ v-model="formState.batchNo"
+ clearable
+ placeholder="鍙緭鍏ユ壒鍙凤紝鐣欑┖灏嗚嚜鍔ㄧ敓鎴�"
+ />
+ </el-form-item>
+
<el-form-item
- label="鏁伴噺"
+ 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 +92,18 @@
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 props = defineProps({
visible: {
type: Boolean,
required: true,
+ },
+
+ type: {
+ type: String,
+ required: true,
+ default: 'qualified',
},
});
@@ -85,8 +115,11 @@
productModelId: undefined,
productName: "",
productModelName: "",
+ materialCode: "",
unit: "",
+ batchNo: "",
qualitity: 0,
+ warnNum: 0,
remark: '',
});
@@ -110,7 +143,12 @@
productModelId: undefined,
productName: "",
productModelName: "",
- description: '',
+ materialCode: "",
+ unit: "",
+ batchNo: "",
+ qualitity: 0,
+ warnNum: 0,
+ remark: "",
};
isShow.value = false;
};
@@ -119,12 +157,12 @@
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.materialCode = product.materialCode;
showProductSelectDialog.value = false;
// 瑙﹀彂琛ㄥ崟楠岃瘉鏇存柊
proxy.$refs["formRef"]?.validateField('productModelId');
@@ -143,13 +181,28 @@
proxy.$modal.msgError("璇烽�夋嫨瑙勬牸");
return;
}
- createStockInventory(formState.value).then(res => {
- // 鍏抽棴妯℃�佹
- isShow.value = false;
- // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
- emit('completed');
- proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
- })
+ const payload = { ...formState.value };
+ const bn = (payload.batchNo || "").trim();
+ payload.batchNo = bn;
+
+ if (props.type === 'qualified') {
+ createStockInventory(payload).then(res => {
+ // 鍏抽棴妯℃�佹
+ isShow.value = false;
+ // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+ emit('completed');
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ })
+ } else {
+ createStockUnInventory(payload).then(res => {
+ // 鍏抽棴妯℃�佹
+ isShow.value = false;
+ // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+ emit('completed');
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ })
+ }
+
}
})
};
--
Gitblit v1.9.3