From 54df47d5b8c4de6d5dbddd05f96bd6add9be78a6 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 14 十一月 2023 15:03:27 +0800
Subject: [PATCH] 产品模块 增加 在库数量,预测数量,进,出数量,重订货规则1个的时候显示 最小最大,否则显示规则数量
---
src/views/productManage/product/AddProductDialog.vue | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 07ce3bf..fdd3521 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -66,6 +66,27 @@
style="width: 85%"
></el-input>
</el-form-item>
+ <el-form-item label="浜у搧缂栫爜" prop="id">
+ <el-input
+ style="width: 85%"
+ v-if="
+ editConfig.title == '缂栬緫' ||
+ (editConfig.title == '鏂板缓' &&
+ codenumer &&
+ (explain != '' || isIdDisabled))
+ "
+ :disabled="editConfig.title != '鏂板缓'"
+ v-model="editConfig.infomation.id"
+ placeholder="璇疯緭鍏ョ紪鐮�"
+ >
+ </el-input>
+ <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c;width: 85%"
+ >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+ >
+ </el-form-item>
+ <el-form-item label="浜у搧瑙勬牸" prop="specs">
+ <el-input style="width: 85%" :disabled="!showFooter" v-model="editConfig.infomation.specs" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
<el-form-item label="浜у搧绫诲瀷" prop="productType">
<el-select
v-model="editConfig.infomation.productType"
@@ -183,6 +204,14 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="浜у搧鍨嬪彿" prop="type">
+ <el-input style="width: 85%" :disabled="!showFooter" v-model="editConfig.infomation.type" placeholder="璇疯緭鍏�"></el-input>
+ </el-form-item>
+ <el-form-item label="閲囪喘绫诲瀷" prop="purchaseType">
+ <el-radio-group :disabled="!showFooter" v-model="editConfig.infomation.purchaseType">
+ <el-radio v-for="item in purchaseTypeList" :key="item.id" :label="item.id">{{ item.name }}</el-radio>
+ </el-radio-group>
+ </el-form-item>
<el-form-item label="鍐呴儴缂栫爜" prop="internalReference">
<el-input
v-model.trim="editConfig.infomation.internalReference"
@@ -205,9 +234,9 @@
</div>
<div class="all">
<!-- <div class="second-label">澶囨敞</div> -->
- <el-form-item label="澶囨敞" prop="internalNotes">
+ <el-form-item label="澶囨敞" prop="note">
<el-input
- v-model.trim="editConfig.infomation.internalNotes"
+ v-model.trim="editConfig.infomation.note"
placeholder="璇疯緭鍏�"
size="mini"
type="textarea"
@@ -474,8 +503,10 @@
import { getProductCategoryList } from "@/api/product/productCategory"
import { getProductList, addProduct, updateProduct } from "@/api/product/product"
import { uploadFiles } from "@/api/common/other"
-
+import codeMixin from "@/components/mixin/codeMixin";
+import { getDataByType } from "@/api/data";
export default {
+ mixins: [codeMixin],
name: "AddProductDialog",
props: {
editCommonConfig: {
@@ -508,9 +539,12 @@
editConfig: this.editCommonConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏ヤ骇鍝佸悕绉�", trigger: "blur" }],
+ id: [{ required: true, validator: this.validateCheckCode, trigger: ["change",'blur' ]}],
model: [{ required: true, message: "璇烽�夋嫨鐗╂枡绫诲瀷", trigger: "change" }],
// salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
- unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }]
+ unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: ["change",'blur' ] }],
+ // 閲囪喘绫诲瀷
+ purchaseType: [{ required: true, message: "璇烽�夋嫨", trigger: "blur" }],
},
memberOptions: [{ name: "绠$悊鍛�", id: 1 }],
productCategoryOptions: [], // 浜у搧绫诲埆
@@ -549,12 +583,17 @@
{ name: "鍏朵粬", id: "鍏朵粬" }
],
statisticsMap: {
- inLibrary: 0,// 鍦ㄥ簱
- enter:0,//杩�
- exit:0,//鍑�
+ amount: this.editCommonConfig.infomation.amount?this.editCommonConfig.infomation.amount:0,// 鍦ㄥ簱
+ predictionAmount:this.editCommonConfig.infomation.predictionAmount?this.editCommonConfig.infomation.predictionAmount:0,//棰勬祴
+ inputAmount:this.editCommonConfig.infomation.inputAmount?this.editCommonConfig.infomation.inputAmount:0,//杩�
+ outputAmount:this.editCommonConfig.infomation.outputAmount?this.editCommonConfig.infomation.outputAmount:0,//鍑�
+ reorderRuleNum:this.editCommonConfig.infomation.reorderRuleNum?this.editCommonConfig.infomation.reorderRuleNum:0,//閲嶈璐ц鍒欐暟閲�
+ minInventoryRule:this.editCommonConfig.infomation.minInventoryRule?this.editCommonConfig.infomation.minInventoryRule:0,//鏈�灏忛噸璁㈣揣
+ maxInventoryRule:this.editCommonConfig.infomation.maxInventoryRule?this.editCommonConfig.infomation.maxInventoryRule:0,//鏈�澶ч噸璁㈣揣
},
isView: false,
- fileFormdata: null // 涓婁紶鍥剧墖鍏ュ弬
+ fileFormdata: null, // 涓婁紶鍥剧墖鍏ュ弬
+ purchaseTypeList: getDataByType("purchaseType"),
}
},
created() {
@@ -573,8 +612,17 @@
this.editClick()
}
this.setOptionalFieldsToEmpty()
+ this.formInfo();
},
methods: {
+ formInfo() {
+ this.objCode.type = "鐗╂枡缂栫爜";
+ this.objCode.codeStandID = "";
+ if (this.editConfig.infomation.codeStandardID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandardID;
+ }
+ this.getRCodeStandardList();
+ },
/**
* 闈炲繀濉」鍚庣杩斿洖鐨勬槸鏁板瓧 0,琛ㄥ崟闇�瑕佺┖涓叉墠鑳借涓烘湭閫夋嫨鍥炴樉
*/
@@ -684,14 +732,19 @@
saveEditRequest(attachmentIDs) {
let requestUrl = this.editConfig.title === "鏂板缓" ? addProduct : updateProduct
this.unsetFieldsToNumber()
- requestUrl({
+ let params={
...this.editConfig.infomation,
attachmentIDs
- }).then((res) => {
+ }
+ if (this.editConfig.title == "鏂板缓") {
+ params.codeStandardID = this.autoCodeObj.codeStandardID;
+ params.autoIncr = this.autoCodeObj.maxAutoIncr;
+ }
+ requestUrl(params).then((res) => {
console.log(res)
this.editConfig.visible = false
if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
+ this.$message.success(this.editConfig.title === "鏂板缓"?'娣诲姞':'缂栬緫'+'鎴愬姛!')
this.$parent.getData()
}
}, console.error)
--
Gitblit v1.8.0