From 4c71426795d126d0491f2e4105090273909e6d51 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 19 四月 2024 15:16:38 +0800
Subject: [PATCH] 辅助数量限制值修改
---
src/views/productManage/product/AddProductDialog.vue | 267 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 252 insertions(+), 15 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 3534884..18ba9bc 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -86,6 +86,7 @@
<el-input
style="width: 85%"
:disabled="!showFooter"
+ clearable
v-model="editConfig.infomation.specs"
placeholder="璇疯緭鍏�"
></el-input>
@@ -95,6 +96,7 @@
v-model="editConfig.infomation.productType"
placeholder="璇烽�夋嫨"
size="mini"
+ clearable
style="width: 85%"
:disabled="!showFooter"
>
@@ -130,14 +132,46 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍗曚綅" prop="unit">
+ <!-- <el-form-item label="鍗曚綅old" prop="unit">
<el-input
v-model="editConfig.infomation.unit"
placeholder="璇疯緭鍏�"
style="width: 85%"
:disabled="!showFooter"
></el-input>
+ </el-form-item> -->
+
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-select
+ :disabled="!showFooter"
+ v-model="editConfig.infomation.unit"
+ placeholder="鍗曚綅"
+ filterable
+ @change="Gtechange"
+ style="width: calc(85% - 120px)"
+ >
+ <el-option
+ v-for="ele in unitList"
+ :key="ele.id"
+ :label="ele.name"
+ :value="ele.name"
+ ></el-option>
+ </el-select>
+ <i
+ class="el-icon-setting margin_left_10px cursor_pointer"
+ style="font-size: 20px; color: gray"
+ @click="handleUnitShow"
+ ></i>
+ <el-checkbox
+ class="margin_left_10px"
+ :disabled="editConfig.infomation.unit&&showFooter?false:true"
+ v-model="editConfig.infomation.moreUnit"
+ @change="moreUnitChange"
+ >鍚敤澶氬崟浣�</el-checkbox
+ >
+ <!-- <span class="margin_left_10px cursor_pointer" @click="handleUnitMore">鍚敤澶氬崟浣�</span> -->
</el-form-item>
+
<el-form-item label="浜у搧鏍囩" prop="productTagName">
<el-input
v-model="editConfig.infomation.productTagName"
@@ -195,6 +229,8 @@
v-model="editConfig.infomation.categoryId"
placeholder="璇烽�夋嫨"
size="mini"
+ clearable
+ filterable
style="width: 85%"
:disabled="!showFooter"
>
@@ -211,16 +247,18 @@
<el-input
style="width: 85%"
:disabled="!showFooter"
+ filterable
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 label="閲囪喘绫诲瀷" prop="purchaseTypeList">
+ <el-checkbox-group
+ v-model="editConfig.infomation.purchaseTypeList"
+ :disabled="!showFooter"
+ >
+ <el-checkbox v-for="item in bomPurchaseTypeList" :key="item.id" :label="item.id">{{ item.name }}</el-checkbox>
+ </el-checkbox-group>
</el-form-item>
<el-form-item label="鍐呴儴缂栫爜" prop="internalReference">
<el-input
@@ -293,7 +331,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="閲嶉噺" prop="weight" label-width="80px">
+ <!-- <el-form-item label="閲嶉噺" prop="weight" label-width="80px">
<el-input-number
v-model="editConfig.infomation.weight"
placeholder="璇疯緭鍏�"
@@ -304,7 +342,63 @@
:disabled="!showFooter"
></el-input-number>
<span> kg</span>
- </el-form-item>
+ </el-form-item> -->
+ <el-form-item label="姣涢噸" prop="grossWeight">
+ <el-col :span="15"
+ >
+ <el-input
+ v-model="editConfig.infomation.grossWeight"
+ placeholder="璇疯緭鍏�"
+ :disabled="!showFooter"
+ ></el-input>
+ </el-col>
+ <el-col :span="1"> </el-col>
+ <el-col :span="4">
+ <el-select
+ v-model="editConfig.infomation.grossUnit"
+ placeholder="鍗曚綅"
+ filterable
+ :disabled="!showFooter"
+ style="width: 100%; float: right"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="ele in grossUnitList"
+ :key="ele.id"
+ :label="ele.name"
+ :value="ele.name"
+ ></el-option>
+ </el-select>
+ </el-col>
+ </el-form-item>
+ <el-form-item label="鍑�閲�" prop="netWeight">
+ <el-col :span="15"
+ >
+ <el-input
+ v-model="editConfig.infomation.netWeight"
+ :disabled="!showFooter"
+ placeholder="璇疯緭鍏�"
+ ></el-input>
+ </el-col>
+ <el-col :span="1"> </el-col>
+ <el-col :span="4">
+ <el-select
+ v-model="editConfig.infomation.netUnit"
+ placeholder="鍗曚綅"
+ filterable
+ :disabled="!showFooter"
+ style="width: 100%; float: right"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="ele in grossUnitList"
+ :key="ele.id"
+ :label="ele.name"
+ :value="ele.name"
+ ></el-option>
+ </el-select>
+ </el-col>
+ </el-form-item>
<el-form-item label="浣撶Н" prop="volume" label-width="80px">
<el-input-number
v-model="editConfig.infomation.volume"
@@ -510,16 +604,36 @@
<el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
</div>
</el-dialog>
+ <BomDialog
+ ref="editDialog"
+ :editRow="editRow"
+ @handleConfirmSave="handleConfirmSave"
+ :workList="unitList"
+ title="璁￠噺鍗曚綅"
+ ></BomDialog>
+ <UnitMoreDialog
+ ref="unitMoreDialog"
+ @saveUnitMore="saveUnitMore"
+ :workList="unitList"
+ :unitRight='editConfig.infomation.unit'
+ :dataList="editConfig.infomation.moreUnitList"
+ title="鍚敤澶氬崟浣�"
+ ></UnitMoreDialog>
</div>
</template>
<script>
import IconCropper from "./IconCropper"
import { getProductCategoryList } from "@/api/product/productCategory"
-import { getProductList, addProduct, updateProduct } from "@/api/product/product"
-import { uploadFiles, getUserInfo } from "@/api/common/other"
+import { getProductList, addProduct, updateProduct,saveUnitDict } from "@/api/product/product"
+import { uploadFiles, getUserInfo, } from "@/api/common/other"
import codeMixin from "@/components/mixin/codeMixin"
import { getDataByType } from "@/api/data"
+import BomDialog from "./components/bomDialog";
+import {getUnitInfo, } from "@/api/basic/standard";
+// import { postGetSaveSUnitDict } from "@/api/basic/standard";
+import UnitMoreDialog from "./components/UnitMoreDialog";
+
export default {
mixins: [codeMixin],
name: "AddProductDialog",
@@ -536,7 +650,11 @@
}
}
},
- components: { IconCropper },
+ components: {
+ IconCropper,
+ BomDialog,
+ UnitMoreDialog,
+ },
computed: {
modalTitle() {
if (this.editConfig.title === "缂栬緫" && this.editConfig.autoEdit) {
@@ -557,9 +675,31 @@
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: ["change", "blur"] }],
+ unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: ["blur"] }],
// 閲囪喘绫诲瀷
- purchaseType: [{ required: true, message: "璇烽�夋嫨", trigger: "blur" }]
+ purchaseTypeList: [{ required: true, message: "璇烽�夋嫨", trigger: "blur" }],
+ netWeight: [
+ {
+ required: false,
+ message: "璇峰～鍐�",
+ trigger: "change",
+ },
+ {
+ validator: this.validatorNumFour,
+ trigger: "blur",
+ },
+ ],
+ grossWeight: [
+ {
+ required: false,
+ message: "璇峰～鍐�",
+ trigger: "change",
+ },
+ {
+ validator: this.validatorNumFour,
+ trigger: "blur",
+ },
+ ],
},
memberOptions: [],
productCategoryOptions: [], // 浜у搧绫诲埆
@@ -616,7 +756,13 @@
},
isView: false,
fileFormdata: null, // 涓婁紶鍥剧墖鍏ュ弬
- purchaseTypeList: getDataByType("purchaseType")
+ bomPurchaseTypeList: getDataByType("purchaseType"),
+ grossUnitList:getDataByType("grossUnit"),
+ unitList: [],
+ editRow:{
+ editDialogVisible:false,
+ BomTableData:[]
+ }
}
},
created() {
@@ -637,8 +783,77 @@
this.setOptionalFieldsToEmpty()
this.formInfo()
this.getUserInfo()
+ this.getUnitInfo()
},
methods: {
+ validatorNumFour(rule, value, callback) {
+ if (value != "") {
+ if (value == undefined || value == null) {
+ callback(new Error("璇疯緭鍏ユ湁鏁堟暟瀛�"));
+ } else {
+ let reg2 =
+ /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
+ if (!reg2.test(value) || value == 0) {
+ callback(new Error("璇峰～鍐欏ぇ浜庨浂鐨�2浣嶅皬鏁扮殑鏁板瓧"));
+ } else {
+ callback();
+ }
+ }
+ } else {
+ callback();
+ }
+ },
+ // 鍗曚綅
+ handleUnitShow() {
+ this.editRow.editDialogVisible = true;
+ },
+ // 鍚敤澶氬崟浣�
+ handleUnitMore(){
+ if(this.editConfig.infomation.unit){
+ this.$refs.unitMoreDialog.editDialogVisible = true;
+ }else{
+ this.$message.error('璇峰厛閫夋嫨鍗曚綅锛�')
+ }
+ },
+ saveUnitMore(list){
+ this.editConfig.infomation.moreUnitList=list
+ },
+ // 鍚敤澶氬崟浣嶇殑寮�鍏�
+ moreUnitChange(){
+ // let string=false;
+ if(this.editConfig.infomation.unit){
+ // if(this.editConfig.infomation.moreUnitList&&this.editConfig.infomation.moreUnitList.length>0){
+ // for(let i in this.editConfig.infomation.moreUnitList){
+ // if(this.editConfig.infomation.moreUnitList[i].unit&&this.editConfig.infomation.moreUnitList[i].amount){
+ // string=true;
+ // break;
+ // }
+ // }
+ // }
+ if(this.editConfig.infomation.moreUnit){
+ // this.editConfig.infomation.moreUnit=false
+ // this.$message.error('璇峰厛閰嶇疆澶氬崟浣嶏紒')
+ this.$refs.unitMoreDialog.editDialogVisible = true;
+ }
+ }else{
+ this.editConfig.infomation.moreUnit=false
+ this.$message.error('璇峰厛閫夋嫨鍗曚綅锛�')
+ }
+
+ },
+ handleConfirmSave(dataList) {
+ saveUnitDict({ data: dataList }).then((res) => {
+ if (res.code == 200) {
+ this.$message({
+ message: "鎿嶄綔鎴愬姛锛�",
+ type: "success",
+ });
+ this.getUnitInfo()
+ }
+ });
+ this.editRow.editDialogVisible = false;
+
+ },
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
getUserInfo() {
getUserInfo().then((res) => {
@@ -775,6 +990,11 @@
if (this.editConfig.title == "鏂板缓") {
params.codeStandardID = this.autoCodeObj.codeStandardID
params.autoIncr = this.autoCodeObj.maxAutoIncr
+ }
+ if(params.moreUnitList&¶ms.moreUnitList.length>0){
+ for(let i in params.moreUnitList){
+ params.moreUnitList[i].amount=Number(params.moreUnitList[i].amount)
+ }
}
requestUrl(params).then((res) => {
console.log(res)
@@ -915,6 +1135,23 @@
} else if (val === "閿�鍞�") {
this.showSale = param
}
+ },
+ Gtechange(){
+ this.$forceUpdate()
+ },
+ // 鑾峰彇鍗曚綅鍒楄〃鏁版嵁
+ async getUnitInfo(){
+ await getUnitInfo().then((res)=>{
+ if( this.editConfig.title==="鏂板缓"){
+ res.data.map((item)=>{
+ if(item.isDefault){
+ this.editConfig.infomation.unit=item.name
+ }
+ })
+ }
+ this.editRow.BomTableData = res.data;
+ this.unitList=res.data
+ })
}
}
}
--
Gitblit v1.8.0