From 1888b426ff2b6a529f5fdef0f0453dadef71824b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 17 四月 2024 10:17:38 +0800
Subject: [PATCH] 隐藏多单位的问题
---
src/views/productManage/product/AddProductDialog.vue | 632 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 453 insertions(+), 179 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index b939663..48f2ad1 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -1,14 +1,14 @@
<template>
<div class="add-common">
<el-dialog
- :title="editCommonConfig.title + '閲囪喘鍏ュ簱'"
+ :title="modalTitle + '浜у搧'"
:visible.sync="editConfig.visible"
:width="dialogWidth"
:before-close="handleClose"
>
<!-- 澶� -->
<div slot="title" class="dialog-header">
- <span>{{ editCommonConfig.title + "閲囪喘鍏ュ簱" }}</span>
+ <span>{{ modalTitle + "浜у搧" }}</span>
<div class="header_btns">
<span class="btn">
<i class="el-icon-printer"></i>
@@ -26,49 +26,26 @@
ref="form"
:model="editConfig.infomation"
:rules="rules"
- label-position="left"
+ label-position="right"
label-width="110px"
size="mini"
- style="height: 60vh; overflow-x: hidden"
>
- <div class="content-btn">
+ <!-- <div class="content-btn">
<el-button plain size="mini" disabled>鏍囩鎵撳嵃</el-button>
<el-button plain size="mini" disabled>鏇存柊鏁伴噺</el-button>
<el-button plain size="mini" disabled>鎵ц琛ヨ揣</el-button>
- </div>
+ </div> -->
<div class="basic-info">
<FormBtnsView
:add-product="addProduct"
@inOutBoundClick="inOutBoundClick"
+ @inLibraryClick="inLibraryClick"
:show-procure="showProcure"
+ :countObject="statisticsMap"
:show-sale="showSale"
+ @listingRulesClick="listingRulesClick"
+ @reorderRulesClick="reorderRulesClick"
/>
- <div class="basic-info-view">
- <el-row>
- <el-col :span="23">
- <div style="margin-left: 20px"><span style="color: #f56c6c">*</span>浜у搧鍚嶇О</div>
- <el-form-item label="" prop="name" label-width="20px">
- <el-input v-model="editConfig.infomation.name" placeholder="" :disabled="!showFooter"></el-input>
- </el-form-item>
- </el-col>
- <!-- <el-col :span="4">
- <div class="upload" @click="toGetImg">
- <img v-if="imageSrc" :src="imageSrc" style="height: 90px; width: 90px" />
- <div v-else class="upload-icon"><i class="el-icon-plus"></i></div>
- </div>
- </el-col> -->
- <!-- <el-col :span="24">
- <div style="margin-left: 20px">
- <el-checkbox v-model="marketable" :disabled="!showFooter" @change="checkboxChange('閿�鍞�', $event)"
- >鍙攢鍞�</el-checkbox
- >
- <el-checkbox v-model="procurable" :disabled="!showFooter" @change="checkboxChange('閲囪喘', $event)"
- >鍙噰璐�</el-checkbox
- >
- </div>
- </el-col> -->
- </el-row>
- </div>
<div class="bottom">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first"></el-tab-pane>
@@ -81,7 +58,39 @@
<div v-if="activeName === 'first'">
<div class="purchase-view">
<div class="left">
- <el-form-item label="浜у搧绫诲瀷" prop="productType" style="margin-left: 20px">
+ <el-form-item label="浜у搧鍚嶇О" prop="name">
+ <el-input
+ v-model="editConfig.infomation.name"
+ placeholder=""
+ :disabled="!showFooter"
+ 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"
placeholder="璇烽�夋嫨"
@@ -93,7 +102,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="寮�绁ㄧ瓥鐣�" prop="invoicingStrategy" style="margin-left: 20px">
+ <!-- <el-form-item label="寮�绁ㄧ瓥鐣�" prop="invoicingStrategy" >
<el-select
v-model="editConfig.infomation.invoicingStrategy"
placeholder="璇烽�夋嫨"
@@ -106,8 +115,8 @@
</el-select>
<div class="font_size_13" style="color: gray">鍙偍瀛樼殑浜у搧鏄偍绠＄悊搴撳瓨姘村钩鐨勫疄鐗╅」鐩��</div>
<div class="font_size_13" style="color: gray">鎮ㄥ彲浠ュ湪鍙戣揣鍓嶄负鍏跺紑鍏风粨绠楀崟銆�</div>
- </el-form-item>
- <el-form-item label="鐗╂枡绫诲瀷" prop="model" style="margin-left: 20px">
+ </el-form-item> -->
+ <el-form-item label="鐗╂枡绫诲瀷" prop="model">
<el-select
v-model="editConfig.infomation.model"
placeholder="璇烽�夋嫨"
@@ -121,15 +130,48 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍗曚綅" prop="unit" style="margin-left: 20px">
+ <!-- <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% - 0px)"
+ >
+ <!-- style="width: calc(85% - 110px)" -->
+ <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" style="margin-left: 20px">
+
+ <el-form-item label="浜у搧鏍囩" prop="productTagName">
<el-input
v-model="editConfig.infomation.productTagName"
placeholder="璇疯緭鍏�"
@@ -137,21 +179,29 @@
:disabled="!showFooter"
></el-input>
</el-form-item>
+ <el-form-item label="鍥剧墖涓婁紶锛�" prop="imageUrl">
+ <IconCropper
+ :isView="isView"
+ :image-url="editConfig.infomation.imageSrc"
+ @getImageData="getImageData"
+ style="width: 85%"
+ />
+ </el-form-item>
</div>
<div class="right">
- <el-form-item label="閿�鍞环鏍�" prop="salePrice" style="margin-left: 20px">
- <span>锟�</span>
+ <el-form-item label="閿�鍞环鏍�" prop="salePrice">
+ <!-- <span>锟�</span> -->
<el-input-number
v-model.trim="editConfig.infomation.salePrice"
placeholder="璇疯緭鍏�"
:min="0"
:controls="false"
size="mini"
- style="width: 81%"
+ style="width: 85%"
:disabled="!showFooter"
></el-input-number>
</el-form-item>
- <el-form-item label="閿�椤圭◣" prop="customerTaxes" style="margin-left: 20px">
+ <!-- <el-form-item label="閿�椤圭◣" prop="customerTaxes" >
<el-input-number
v-model="editConfig.infomation.customerTaxes"
placeholder="璇疯緭鍏�"
@@ -160,20 +210,20 @@
style="width: 85%; margin-right: 5px"
:disabled="!showFooter"
></el-input-number>
- </el-form-item>
- <el-form-item label="鎴愭湰" prop="cost" style="margin-left: 20px">
- <span>锟�</span>
+ </el-form-item> -->
+ <el-form-item label="鎴愭湰" prop="cost">
+ <!-- <span>锟�</span> -->
<el-input-number
v-model.trim="editConfig.infomation.cost"
placeholder="璇疯緭鍏�"
:min="0"
:controls="false"
size="mini"
- style="width: 81%"
+ style="width: 85%"
:disabled="!showFooter"
></el-input-number>
</el-form-item>
- <el-form-item label="浜у搧绫诲埆" prop="categoryId" style="margin-left: 20px">
+ <el-form-item label="浜у搧绫诲埆" prop="categoryId">
<el-select
v-model="editConfig.infomation.categoryId"
placeholder="璇烽�夋嫨"
@@ -190,7 +240,23 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍐呴儴鍙傝��" prop="internalReference" style="margin-left: 20px">
+ <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="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
v-model.trim="editConfig.infomation.internalReference"
placeholder="璇疯緭鍏�"
@@ -199,7 +265,7 @@
:disabled="!showFooter"
></el-input>
</el-form-item>
- <el-form-item label="鏉＄爜" prop="barcode" style="margin-left: 20px">
+ <el-form-item label="鏉＄爜" prop="barcode">
<el-input
v-model.trim="editConfig.infomation.barcode"
placeholder="璇疯緭鍏�"
@@ -211,10 +277,10 @@
</div>
</div>
<div class="all">
- <div class="second-label">鍐呴儴璇存槑</div>
- <el-form-item label="" prop="internalNotes" style="margin-left: 20px" label-width="0px">
+ <!-- <div class="second-label">澶囨敞</div> -->
+ <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"
@@ -235,7 +301,7 @@
<div class="purchase-view">
<!-- <div class="left">
<div class="second-label">鎿嶄綔</div>
- <el-form-item label="璺嚎" prop="checkedRoute" style="margin-left: 20px">
+ <el-form-item label="璺嚎" prop="checkedRoute" >
<el-checkbox-group v-model="checkedRoute" :min="1" :max="2">
<el-checkbox v-for="city in route" :label="city" :key="city" class="list-item">{{
city.length > 20 ? city.substring(0, 20) + "..." : city
@@ -244,19 +310,24 @@
</el-form-item>
</div> -->
<div class="left">
- <el-form-item label="璐熻矗浜�" prop="principal" style="margin-left: 20px" label-width="80px">
+ <el-form-item label="璐熻矗浜�" prop="principal" label-width="80px">
<el-select
v-model="editConfig.infomation.principal"
placeholder="璇烽�夋嫨"
size="mini"
style="width: 85%"
- :disabled="!showFooter"
+ disabled
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="item.name">
+ <el-option
+ v-for="(item, index) in memberOptions"
+ :key="index"
+ :label="item.userName"
+ :value="item.userName"
+ >
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="閲嶉噺" prop="weight" style="margin-left: 20px" label-width="80px">
+ <el-form-item label="閲嶉噺" prop="weight" label-width="80px">
<el-input-number
v-model="editConfig.infomation.weight"
placeholder="璇疯緭鍏�"
@@ -268,7 +339,7 @@
></el-input-number>
<span> kg</span>
</el-form-item>
- <el-form-item label="浣撶Н" prop="volume" style="margin-left: 20px" label-width="80px">
+ <el-form-item label="浣撶Н" prop="volume" label-width="80px">
<el-input-number
v-model="editConfig.infomation.volume"
placeholder="璇疯緭鍏�"
@@ -282,12 +353,7 @@
</el-form-item>
</div>
<div class="right">
- <el-form-item
- label="鍒堕�犲墠缃椂闂�"
- prop="makeAdvanceTime"
- style="margin-left: 20px"
- label-width="130px"
- >
+ <el-form-item label="鍒堕�犲墠缃椂闂�" prop="makeAdvanceTime" label-width="130px">
<el-input-number
v-model="editConfig.infomation.makeAdvanceTime"
placeholder="璇疯緭鍏�"
@@ -299,12 +365,7 @@
></el-input-number>
<span> 澶╂暟</span>
</el-form-item>
- <el-form-item
- label="鐢熶骇璁㈠崟鍑嗗澶╂暟"
- prop="orderAdvanceTime"
- style="margin-left: 20px"
- label-width="130px"
- >
+ <el-form-item label="鐢熶骇璁㈠崟鍑嗗澶╂暟" prop="orderAdvanceTime" label-width="130px">
<el-input-number
v-model="editConfig.infomation.orderAdvanceTime"
placeholder="璇疯緭鍏�"
@@ -316,12 +377,7 @@
></el-input-number>
<span> 澶╂暟</span>
</el-form-item>
- <el-form-item
- label="瀹㈡埛鍓嶇疆鏃堕棿"
- prop="deliveryAdvanceTime"
- style="margin-left: 20px"
- label-width="130px"
- >
+ <el-form-item label="瀹㈡埛鍓嶇疆鏃堕棿" prop="deliveryAdvanceTime" label-width="130px">
<el-input-number
v-model="editConfig.infomation.deliveryAdvanceTime"
placeholder="璇疯緭鍏�"
@@ -335,10 +391,10 @@
</el-form-item>
</div>
</div>
- <div class="purchase-view">
+ <!-- <div class="purchase-view">
<div class="left">
<div class="second-label">鏀惰揣璇存槑</div>
- <el-form-item label="" prop="inStorageExplain" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="inStorageExplain" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.inStorageExplain"
placeholder="姝よ鏄庢坊鍔犲埌鏀惰揣璁㈠崟涓�(渚嬪锛屼骇鍝佸湪浠撳簱鐨勫瓨鍌ㄤ綅缃�)"
@@ -352,7 +408,7 @@
</div>
<div class="right">
<div class="second-label">鍑哄簱鍗曡鏄�</div>
- <el-form-item label="" prop="outStorageExplain" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="outStorageExplain" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.outStorageExplain"
placeholder="姝ら�氱煡宸叉坊鍔犲埌閫佽揣鍗曚腑"
@@ -368,7 +424,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">鍐呴儴璋冩嫧璇存槑</div>
- <el-form-item label="" prop="internalTransferExplain" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="internalTransferExplain" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.internalTransferExplain"
placeholder="姝よ鏄庢坊鍔犲埌鍐呴儴璋冩嫧璁㈠崟涓�(渚嬪锛屽湪浠撳簱涓綍澶勬彁鍙栦骇鍝�)"
@@ -381,7 +437,7 @@
</el-form-item>
</div>
<div class="right"></div>
- </div>
+ </div> -->
</div>
<!-- 涓嬮潰涓嶈鍒� 浜屾湡鎴栦笁鏈熶細鐢ㄥ埌 -->
<!-- 閿�鍞� -->
@@ -389,7 +445,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">{{ "鍔犲敭&浜ゅ弶閿�鍞�" }}</div>
- <el-form-item label="鍙�変骇鍝�" prop="selectProduct" style="margin-left: 20px">
+ <el-form-item label="鍙�変骇鍝�" prop="selectProduct" >
<el-select
v-model="editConfig.infomation.selectProduct"
multiple
@@ -408,7 +464,7 @@
</el-select>
</el-form-item>
<div class="second-label">閿�鍞鏄�</div>
- <el-form-item label="" prop="sellExplain" style="margin-left: 20px" label-width="20px">
+ <el-form-item label="" prop="sellExplain" label-width="20px">
<el-input
v-model.trim="editConfig.infomation.sellExplain"
size="mini"
@@ -443,7 +499,7 @@
<div class="purchase-view">
<div class="left">
<div class="second-label">渚涘簲鍟嗚处鍗�</div>
- <el-form-item label="杩涢」绋�" prop="client_name" style="margin-left: 20px">
+ <el-form-item label="杩涢」绋�" prop="client_name" >
<el-select
v-model="editConfig.infomation.memberId"
multiple
@@ -456,7 +512,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎺у埗绛栫暐" prop="client_name" style="margin-left: 20px">
+ <el-form-item label="鎺у埗绛栫暐" prop="client_name" >
<el-radio-group v-model="editConfig.infomation.resource">
<el-radio label="璁㈠崟鏁伴噺"></el-radio>
<el-radio label="鏀跺埌鏁伴噺"></el-radio>
@@ -465,7 +521,7 @@
</div>
<div class="right">
<div class="second-label">閲囪喘璇存槑</div>
- <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
+ <el-form-item label="" prop="name" label-width="0px">
<el-input
v-model.trim="editConfig.infomation.desc"
placeholder="鏈潯澶囨敞琚坊鍔犲埌閲囪喘璁㈠崟"
@@ -483,21 +539,42 @@
</div>
</el-form>
<!-- 灏� -->
- <div v-if="showFooter" slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" size="small" @click="saveClick('form')" :disabled="!showFooter">淇濆瓨</el-button>
<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"
+ :dataList="editConfig.infomation.moreUnitList"
+ title="鍚敤澶氬崟浣�"
+ ></UnitMoreDialog>
</div>
</template>
<script>
-// import CommonFormTableView from "@/components/makepager/CommonFormTableView"
+import IconCropper from "./IconCropper"
import { getProductCategoryList } from "@/api/product/productCategory"
-import { getProductList, addProduct, updateProduct } from "@/api/product/product"
+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";
-let inputElement = null
export default {
+ mixins: [codeMixin],
name: "AddProductDialog",
props: {
editCommonConfig: {
@@ -506,24 +583,42 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {}
+ infomation: {},
+ autoEdit: false
}
}
}
},
- components: {},
- computed: {},
+ components: {
+ IconCropper,
+ BomDialog,
+ UnitMoreDialog,
+ },
+ computed: {
+ modalTitle() {
+ if (this.editConfig.title === "缂栬緫" && this.editConfig.autoEdit) {
+ return "缂栬緫"
+ } else if (this.editConfig.title === "缂栬緫") {
+ return !this.showEdit ? "缂栬緫" : "鏌ョ湅"
+ } else {
+ return "鏂板缓"
+ }
+ }
+ },
data() {
return {
dialogWidth: "50%",
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" }]
+ // salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
+ unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: ["blur"] }],
+ // 閲囪喘绫诲瀷
+ purchaseTypeList: [{ required: true, message: "璇烽�夋嫨", trigger: "blur" }]
},
- memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
+ memberOptions: [],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
{ name: "鑳芥秷鑰�", id: 1 },
@@ -558,16 +653,140 @@
{ name: "杈呮枡", id: "杈呮枡" },
{ name: "鑰楁潗", id: "鑰楁潗" },
{ name: "鍏朵粬", id: "鍏朵粬" }
- ]
+ ],
+ statisticsMap: {
+ 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, // 涓婁紶鍥剧墖鍏ュ弬
+ bomPurchaseTypeList: getDataByType("purchaseType"),
+ unitList: [],
+ editRow:{
+ editDialogVisible:false,
+ BomTableData:[]
+ }
}
},
created() {
+ if (this.editConfig.title === "缂栬緫" && !this.editConfig.autoEdit) {
+ this.isView = true
+ }
this.getProductCategoryList()
this.getProductList()
this.setTableForm()
this.setBottonView()
+ this.statisticsMap.inLibrary = this.editConfig?.infomation?.amount ?? 0
+ // 杩涘嚭鍙ｇ殑浜у搧 鏁伴噺 杩樻病鏈�
+ this.statisticsMap.enter = this.editConfig?.infomation?.amount ?? 0
+ this.statisticsMap.exit = this.editConfig?.infomation?.amount ?? 0
+ if (this.editConfig.autoEdit) {
+ this.editClick()
+ }
+ this.setOptionalFieldsToEmpty()
+ this.formInfo()
+ this.getUserInfo()
+ this.getUnitInfo()
},
methods: {
+ // 鍗曚綅
+ 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.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(!string){
+ 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) => {
+ console.log(res)
+ if (res.code == 200) {
+ this.editConfig.infomation.principal = res.data.userName
+ this.memberOptions.push(res.data)
+ }
+ console.log(this.memberOptions)
+ })
+ },
+ formInfo() {
+ this.objCode.type = "鐗╂枡缂栫爜"
+ this.objCode.codeStandID = ""
+ if (this.editConfig.infomation.codeStandardID) {
+ this.objCode.codeStandID = this.editConfig.infomation.codeStandardID
+ }
+ this.getRCodeStandardList()
+ },
+ /**
+ * 闈炲繀濉」鍚庣杩斿洖鐨勬槸鏁板瓧 0,琛ㄥ崟闇�瑕佺┖涓叉墠鑳借涓烘湭閫夋嫨鍥炴樉
+ */
+ setOptionalFieldsToEmpty() {
+ let arr = ["productType", "categoryId"]
+ arr
+ .filter((filed) => this.editConfig.infomation[filed] === 0)
+ .forEach((filed) => {
+ this.editConfig.infomation[filed] = ""
+ })
+ },
+ /**
+ * 鍚庣鍙帴鍙楁暟瀛楀舰寮�, 淇濆瓨鏃惰繕寰楀啀杞洖鍘�
+ */
+ unsetFieldsToNumber() {
+ let arr = ["productType", "categoryId"]
+ arr
+ .filter((filed) => this.editConfig.infomation[filed] === "")
+ .forEach((filed) => {
+ this.editConfig.infomation[filed] = 0
+ })
+ },
// 鑾峰彇浜у搧绫诲埆
async getProductCategoryList() {
await getProductCategoryList({
@@ -620,6 +839,7 @@
this.showEdit = false
this.showButton = false
this.showFooter = true
+ this.isView = false
this.setTableForm()
},
// 淇濆瓨
@@ -627,19 +847,55 @@
console.log(this.editConfig.infomation)
this.$refs[formName].validate((valid) => {
if (valid) {
- let requestUrl = this.editConfig.title === "鏂板缓" ? addProduct : updateProduct
- requestUrl({
- ...this.editConfig.infomation
- }).then((res) => {
- console.log(res)
- this.editConfig.visible = false
- if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
+ console.log(this.fileFormdata == null)
+ let attachmentIDs = []
+ if (this.fileFormdata == null) {
+ if (this.editConfig.infomation.attachmentList?.length > 0) {
+ this.editConfig.infomation.attachmentList.forEach((ele) => {
+ attachmentIDs.push(ele.id)
+ })
+ } else {
+ attachmentIDs = []
}
- })
+ this.saveEditRequest(attachmentIDs)
+ } else {
+ uploadFiles(this.fileFormdata).then((res) => {
+ if (res.code == 200) {
+ res.data.forEach((ele) => {
+ attachmentIDs.push(ele.id)
+ })
+ }
+ this.saveEditRequest(attachmentIDs)
+ })
+ }
}
})
+ },
+ // 淇濆瓨/缂栬緫鎺ュ彛璇锋眰
+ saveEditRequest(attachmentIDs) {
+ let requestUrl = this.editConfig.title === "鏂板缓" ? addProduct : updateProduct
+ this.unsetFieldsToNumber()
+ let params = {
+ ...this.editConfig.infomation,
+ attachmentIDs
+ }
+ if (this.editConfig.title == "鏂板缓") {
+ params.codeStandardID = this.autoCodeObj.codeStandardID
+ params.autoIncr = this.autoCodeObj.maxAutoIncr
+ }
+ if(params.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)
+ this.editConfig.visible = false
+ if (res.code === 200) {
+ this.$message.success(this.editConfig.title === "鏂板缓" ? "娣诲姞" : "缂栬緫" + "鎴愬姛!")
+ this.$parent.getData()
+ }
+ }, console.error)
},
// 鍒犻櫎
delClick() {},
@@ -700,60 +956,69 @@
this.tableData.splice(scope.$index, 1)
},
// 涓婁紶鍥剧墖
- toGetImg() {
- if (this.showFooter) {
- if (inputElement === null) {
- // 鐢熸垚鏂囦欢涓婁紶鐨勬帶浠�
- inputElement = document.createElement("input")
- inputElement.setAttribute("type", "file")
- inputElement.style.display = "none"
- if (window.addEventListener) {
- inputElement.addEventListener("change", this.uploadFile, false)
- } else {
- inputElement.attachEvent("onchange", this.uploadFile)
- }
- document.body.appendChild(inputElement)
- }
- inputElement.click()
- }
- },
- uploadFile(el) {
- if (el && el.target && el.target.files && el.target.files.length > 0) {
- console.log(el)
- const files = el.target.files[0]
- const isLt2M = files.size / 1024 / 1024 < 2
- const size = files.size / 1024 / 1024
- console.log(size)
- // 鍒ゆ柇涓婁紶鏂囦欢鐨勫ぇ灏�
- if (!isLt2M) {
- this.$message.error("涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!")
- } else if (files.type.indexOf("image") === -1) {
- //濡傛灉涓嶆槸鍥剧墖鏍煎紡
- this.$message.error("璇烽�夋嫨鍥剧墖鏂囦欢")
- } else {
- const that = this
- const reader = new FileReader() // 鍒涘缓璇诲彇鏂囦欢瀵硅薄
- reader.readAsDataURL(el.target.files[0]) // 鍙戣捣寮傛璇锋眰锛岃鍙栨枃浠�
- reader.onload = function () {
- // 璇诲彇瀹屾垚鍚庯紝灏嗙粨鏋滆祴鍊肩粰img鐨剆rc
- that.imageSrc = this.result
- console.log(this.result)
- // 鏁版嵁浼犲埌鍚庡彴
- //const formData = new FormData()
- //formData.append('file', files); // 鍙互浼犲埌鍚庡彴鐨勬暟鎹�
- }
- }
- }
+ getImageData(formdata) {
+ this.fileFormdata = formdata
+ // console.log(formdata, "鍥剧墖鏁版嵁")
},
// 杩涘嚭鐐瑰嚮
- inOutBoundClick() {
+ inOutBoundClick(val) {
+ if (this.editConfig.title !== "鏂板缓") {
+ console.log(this.editConfig.infomation)
+ let url=''
+ if(val=='杩�'){
+ url='inboundOutboundDetail'
+ }else{
+ url='outboundDetail'
+ }
+ this.$router.push({
+ name:url,
+ params: {
+ name: this.editConfig.infomation.name,
+ id: this.editConfig.infomation.id
+ }
+ })
+ }
+ },
+ // 鍦ㄥ簱鐐瑰嚮
+ inLibraryClick() {
if (this.editConfig.title !== "鏂板缓") {
console.log(this.editConfig.infomation)
this.$router.push({
- name: "inOutboundDetail",
- params: { name: this.editConfig.infomation.name, id: this.editConfig.infomation.id }
+ name: "inventoryReport",
+ params: {
+ name: this.editConfig.infomation.name,
+ id: this.editConfig.infomation.id
+ }
})
}
+ },
+ // 涓婃灦瑙勫垯
+ listingRulesClick() {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.$router.push({
+ path: "/warehouseManage/listingRules",
+ query: {
+ productName: this.editConfig.infomation.name,
+ productId: this.editConfig.title === "鏂板缓" ? "" : this.editConfig.infomation.id
+ }
+ })
+ }
+ })
+ },
+ // 閲嶈璐鍒�
+ reorderRulesClick() {
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.$router.push({
+ path: "/productManage/reorderRules",
+ query: {
+ productName: this.editConfig.infomation.name,
+ productId: this.editConfig.title === "鏂板缓" ? "" : this.editConfig.infomation.id
+ }
+ })
+ }
+ })
},
// 鍙攢鍞�/鍙噰璐�
checkboxChange(val, param) {
@@ -762,6 +1027,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
+ })
}
}
}
@@ -791,16 +1073,19 @@
.basic-info {
height: calc(100% - 80px);
overflow: auto;
- margin: 20px;
- border: 1px solid #dcdfe6;
- box-shadow: inset 0 0 2px #dee2e6;
- -moz-box-shadow: inset 0 0 2px #dee2e6;
- -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ margin: 10px;
+ // border: 1px solid #dcdfe6;
+ // box-shadow: inset 0 0 2px #dee2e6;
+ // -moz-box-shadow: inset 0 0 2px #dee2e6;
+ // -webkit-box-shadow: inset 0 0 2px #dee2e6;
+ .bottom {
+ margin-top: 10px;
+ }
.content-number {
display: flex;
justify-content: right;
height: 44px;
- border-bottom: 1px solid #e9e9e9;
+ // border-bottom: 1px solid #e9e9e9;
font-size: 13px;
.sub-number {
width: 12.5%;
@@ -824,22 +1109,6 @@
height: 38px;
line-height: 38px;
}
- }
- }
- }
- .basic-info-view {
- margin-top: 20px;
- .upload {
- position: relative;
- width: 90px;
- height: 90px;
- margin-left: 40px;
- border: 1px dotted #d9d9d9;
- border-radius: 4px;
- .upload-icon {
- position: absolute;
- top: 40%;
- right: 43%;
}
}
}
@@ -899,13 +1168,18 @@
color: #333;
}
}
- .el-tabs--card > .el-tabs__header .el-tabs__nav {
- margin-left: 20px;
+ .el-tabs--card > .el-tabs__header {
+ border-bottom: none;
+ }
+ .el-tabs__item.is-active {
+ color: #fff;
+ background: #2a78fb;
}
.el-tabs__item {
height: 30px;
line-height: 30px;
font-size: 13px;
+ background: #f3f3f3;
}
.el-input__inner {
text-align: left;
--
Gitblit v1.8.0