From 62dd7a29fb929865cfcd72e8412beb3b5d41a7fc Mon Sep 17 00:00:00 2001
From: zzq <a13193816592@163.com>
Date: 星期四, 28 九月 2023 15:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzq'
---
src/views/productManage/product/AddProductDialog.vue | 392 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 269 insertions(+), 123 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index b939663..d92daeb 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -18,7 +18,14 @@
<i class="el-icon-s-tools"></i>
<span>鍔ㄤ綔</span>
</span>
- <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button>
+ <el-button
+ v-if="showEdit"
+ plain
+ size="mini"
+ style="margin-left: 15px"
+ @click="editClick"
+ >缂栬緫</el-button
+ >
</div>
</div>
<!-- 鍐呭 -->
@@ -46,9 +53,15 @@
<div class="basic-info-view">
<el-row>
<el-col :span="23">
- <div style="margin-left: 20px"><span style="color: #f56c6c">*</span>浜у搧鍚嶇О</div>
+ <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-input
+ v-model="editConfig.infomation.name"
+ placeholder=""
+ :disabled="!showFooter"
+ ></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="4">
@@ -81,7 +94,11 @@
<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="productType"
+ style="margin-left: 20px"
+ >
<el-select
v-model="editConfig.infomation.productType"
placeholder="璇烽�夋嫨"
@@ -89,11 +106,20 @@
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in productTypeOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in productTypeOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="寮�绁ㄧ瓥鐣�" prop="invoicingStrategy" style="margin-left: 20px">
+ <el-form-item
+ label="寮�绁ㄧ瓥鐣�"
+ prop="invoicingStrategy"
+ style="margin-left: 20px"
+ >
<el-select
v-model="editConfig.infomation.invoicingStrategy"
placeholder="璇烽�夋嫨"
@@ -101,13 +127,26 @@
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in strategyOptions" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in strategyOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
- <div class="font_size_13" style="color: gray">鍙偍瀛樼殑浜у搧鏄偍绠＄悊搴撳瓨姘村钩鐨勫疄鐗╅」鐩��</div>
- <div class="font_size_13" style="color: gray">鎮ㄥ彲浠ュ湪鍙戣揣鍓嶄负鍏跺紑鍏风粨绠楀崟銆�</div>
+ <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
+ label="鐗╂枡绫诲瀷"
+ prop="model"
+ style="margin-left: 20px"
+ >
<el-select
v-model="editConfig.infomation.model"
placeholder="璇烽�夋嫨"
@@ -117,11 +156,20 @@
:popper-append-to-body="false"
:disabled="!showFooter"
>
- <el-option v-for="item in materialTypeList" :key="item.id" :label="item.name" :value="item.id">
+ <el-option
+ v-for="item in materialTypeList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍗曚綅" prop="unit" style="margin-left: 20px">
+ <el-form-item
+ label="鍗曚綅"
+ prop="unit"
+ style="margin-left: 20px"
+ >
<el-input
v-model="editConfig.infomation.unit"
placeholder="璇疯緭鍏�"
@@ -129,7 +177,11 @@
:disabled="!showFooter"
></el-input>
</el-form-item>
- <el-form-item label="浜у搧鏍囩" prop="productTagName" style="margin-left: 20px">
+ <el-form-item
+ label="浜у搧鏍囩"
+ prop="productTagName"
+ style="margin-left: 20px"
+ >
<el-input
v-model="editConfig.infomation.productTagName"
placeholder="璇疯緭鍏�"
@@ -139,7 +191,11 @@
</el-form-item>
</div>
<div class="right">
- <el-form-item label="閿�鍞环鏍�" prop="salePrice" style="margin-left: 20px">
+ <el-form-item
+ label="閿�鍞环鏍�"
+ prop="salePrice"
+ style="margin-left: 20px"
+ >
<span>锟�</span>
<el-input-number
v-model.trim="editConfig.infomation.salePrice"
@@ -151,7 +207,11 @@
:disabled="!showFooter"
></el-input-number>
</el-form-item>
- <el-form-item label="閿�椤圭◣" prop="customerTaxes" style="margin-left: 20px">
+ <el-form-item
+ label="閿�椤圭◣"
+ prop="customerTaxes"
+ style="margin-left: 20px"
+ >
<el-input-number
v-model="editConfig.infomation.customerTaxes"
placeholder="璇疯緭鍏�"
@@ -161,7 +221,11 @@
:disabled="!showFooter"
></el-input-number>
</el-form-item>
- <el-form-item label="鎴愭湰" prop="cost" style="margin-left: 20px">
+ <el-form-item
+ label="鎴愭湰"
+ prop="cost"
+ style="margin-left: 20px"
+ >
<span>锟�</span>
<el-input-number
v-model.trim="editConfig.infomation.cost"
@@ -173,7 +237,11 @@
:disabled="!showFooter"
></el-input-number>
</el-form-item>
- <el-form-item label="浜у搧绫诲埆" prop="categoryId" style="margin-left: 20px">
+ <el-form-item
+ label="浜у搧绫诲埆"
+ prop="categoryId"
+ style="margin-left: 20px"
+ >
<el-select
v-model="editConfig.infomation.categoryId"
placeholder="璇烽�夋嫨"
@@ -190,7 +258,11 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍐呴儴鍙傝��" prop="internalReference" style="margin-left: 20px">
+ <el-form-item
+ label="鍐呴儴鍙傝��"
+ prop="internalReference"
+ style="margin-left: 20px"
+ >
<el-input
v-model.trim="editConfig.infomation.internalReference"
placeholder="璇疯緭鍏�"
@@ -199,7 +271,11 @@
:disabled="!showFooter"
></el-input>
</el-form-item>
- <el-form-item label="鏉＄爜" prop="barcode" style="margin-left: 20px">
+ <el-form-item
+ label="鏉＄爜"
+ prop="barcode"
+ style="margin-left: 20px"
+ >
<el-input
v-model.trim="editConfig.infomation.barcode"
placeholder="璇疯緭鍏�"
@@ -212,7 +288,12 @@
</div>
<div class="all">
<div class="second-label">鍐呴儴璇存槑</div>
- <el-form-item label="" prop="internalNotes" style="margin-left: 20px" label-width="0px">
+ <el-form-item
+ label=""
+ prop="internalNotes"
+ style="margin-left: 20px"
+ label-width="0px"
+ >
<el-input
v-model.trim="editConfig.infomation.internalNotes"
placeholder="璇疯緭鍏�"
@@ -244,7 +325,12 @@
</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"
+ style="margin-left: 20px"
+ label-width="80px"
+ >
<el-select
v-model="editConfig.infomation.principal"
placeholder="璇烽�夋嫨"
@@ -252,11 +338,21 @@
style="width: 85%"
:disabled="!showFooter"
>
- <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="item.name">
+ <el-option
+ v-for="item in memberOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.name"
+ >
</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"
+ style="margin-left: 20px"
+ label-width="80px"
+ >
<el-input-number
v-model="editConfig.infomation.weight"
placeholder="璇疯緭鍏�"
@@ -268,7 +364,12 @@
></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"
+ style="margin-left: 20px"
+ label-width="80px"
+ >
<el-input-number
v-model="editConfig.infomation.volume"
placeholder="璇疯緭鍏�"
@@ -338,7 +439,12 @@
<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"
+ style="margin-left: 20px"
+ label-width="0px"
+ >
<el-input
v-model.trim="editConfig.infomation.inStorageExplain"
placeholder="姝よ鏄庢坊鍔犲埌鏀惰揣璁㈠崟涓�(渚嬪锛屼骇鍝佸湪浠撳簱鐨勫瓨鍌ㄤ綅缃�)"
@@ -352,7 +458,12 @@
</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"
+ style="margin-left: 20px"
+ label-width="0px"
+ >
<el-input
v-model.trim="editConfig.infomation.outStorageExplain"
placeholder="姝ら�氱煡宸叉坊鍔犲埌閫佽揣鍗曚腑"
@@ -368,9 +479,16 @@
<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"
+ style="margin-left: 20px"
+ label-width="0px"
+ >
<el-input
- v-model.trim="editConfig.infomation.internalTransferExplain"
+ v-model.trim="
+ editConfig.infomation.internalTransferExplain
+ "
placeholder="姝よ鏄庢坊鍔犲埌鍐呴儴璋冩嫧璁㈠崟涓�(渚嬪锛屽湪浠撳簱涓綍澶勬彁鍙栦骇鍝�)"
size="mini"
type="textarea"
@@ -484,8 +602,12 @@
</el-form>
<!-- 灏� -->
<div v-if="showFooter" slot="footer" class="dialog-footer">
- <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button>
- <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button>
+ <el-button type="primary" size="small" @click="saveClick('form')"
+ >淇濆瓨</el-button
+ >
+ <el-button size="small" @click="editConfig.visible = false"
+ >鍙栨秷</el-button
+ >
</div>
</el-dialog>
</div>
@@ -493,10 +615,14 @@
<script>
// import CommonFormTableView from "@/components/makepager/CommonFormTableView"
-import { getProductCategoryList } from "@/api/product/productCategory"
-import { getProductList, addProduct, updateProduct } from "@/api/product/product"
+import { getProductCategoryList } from "@/api/product/productCategory";
+import {
+ getProductList,
+ addProduct,
+ updateProduct,
+} from "@/api/product/product";
-let inputElement = null
+let inputElement = null;
export default {
name: "AddProductDialog",
props: {
@@ -506,10 +632,10 @@
return {
visible: false,
title: "鏂板缓",
- infomation: {}
- }
- }
- }
+ infomation: {},
+ };
+ },
+ },
},
components: {},
computed: {},
@@ -519,20 +645,24 @@
editConfig: this.editCommonConfig,
rules: {
name: [{ required: true, message: "璇疯緭鍏ヤ骇鍝佸悕绉�", trigger: "blur" }],
- model: [{ required: true, message: "璇烽�夋嫨鐗╂枡绫诲瀷", trigger: "change" }],
- salePrice: [{ required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" }],
- unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }]
+ model: [
+ { required: true, message: "璇烽�夋嫨鐗╂枡绫诲瀷", trigger: "change" },
+ ],
+ salePrice: [
+ { required: true, message: "璇疯緭鍏ラ攢鍞环鏍�", trigger: "blur" },
+ ],
+ unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
},
memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
{ name: "鑳芥秷鑰�", id: 1 },
{ name: "鏈嶅姟", id: 2 },
- { name: "鍙簱瀛樹骇鍝�", id: 3 }
+ { name: "鍙簱瀛樹骇鍝�", id: 3 },
], // 浜у搧绫诲瀷
strategyOptions: [
{ name: "璁㈣喘鏁伴噺", id: 1 },
- { name: "浜や粯鏁伴噺", id: 2 }
+ { name: "浜や粯鏁伴噺", id: 2 },
], // 寮�绁ㄧ瓥鐣�
selectProductOptions: [], // 鍙�変骇鍝�
showButton: true,
@@ -557,15 +687,15 @@
{ name: "鎴愬搧", id: "鎴愬搧" },
{ name: "杈呮枡", id: "杈呮枡" },
{ name: "鑰楁潗", id: "鑰楁潗" },
- { name: "鍏朵粬", id: "鍏朵粬" }
- ]
- }
+ { name: "鍏朵粬", id: "鍏朵粬" },
+ ],
+ };
},
created() {
- this.getProductCategoryList()
- this.getProductList()
- this.setTableForm()
- this.setBottonView()
+ this.getProductCategoryList();
+ this.getProductList();
+ this.setTableForm();
+ this.setBottonView();
},
methods: {
// 鑾峰彇浜у搧绫诲埆
@@ -573,73 +703,74 @@
await getProductCategoryList({
keyWord: "",
page: 0,
- pageSize: 0
+ pageSize: 0,
}).then((res) => {
if (res.code === 200) {
- this.productCategoryOptions = res.data
+ this.productCategoryOptions = res.data;
}
- })
+ });
},
// 鑾峰彇鍙�変骇鍝�
async getProductList() {
await getProductList({
keyWord: "",
page: 1,
- pageSize: 20
+ pageSize: 20,
}).then((res) => {
if (res.code === 200) {
const list = res.data.map((item) => {
return {
id: item.id,
- name: item.name
- }
- })
- this.selectProductOptions = list || []
+ name: item.name,
+ };
+ });
+ this.selectProductOptions = list || [];
}
- })
+ });
},
// 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず
setBottonView() {
if (this.editConfig.title === "鏂板缓") {
- this.showButton = false
- this.showEdit = false
- this.showFooter = true
- this.addProduct = true
+ this.showButton = false;
+ this.showEdit = false;
+ this.showFooter = true;
+ this.addProduct = true;
} else {
- this.showEdit = true
- this.showFooter = false
- this.addProduct = false
+ this.showEdit = true;
+ this.showFooter = false;
+ this.addProduct = false;
}
},
// 鍏抽棴
handleClose() {
- this.editConfig.visible = false
+ this.editConfig.visible = false;
},
// 缂栬緫
editClick() {
- this.showEdit = false
- this.showButton = false
- this.showFooter = true
- this.setTableForm()
+ this.showEdit = false;
+ this.showButton = false;
+ this.showFooter = true;
+ this.setTableForm();
},
// 淇濆瓨
saveClick(formName) {
- console.log(this.editConfig.infomation)
+ console.log(this.editConfig.infomation);
this.$refs[formName].validate((valid) => {
if (valid) {
- let requestUrl = this.editConfig.title === "鏂板缓" ? addProduct : updateProduct
+ let requestUrl =
+ this.editConfig.title === "鏂板缓" ? addProduct : updateProduct;
requestUrl({
- ...this.editConfig.infomation
+ ...this.editConfig.infomation,
}).then((res) => {
- console.log(res)
- this.editConfig.visible = false
+ console.log(res);
+ this.editConfig.visible = false;
if (res.code === 200) {
- this.$message.success("娣诲姞鎴愬姛")
- this.$parent.getData()
+ this.$message.success("娣诲姞鎴愬姛");
+ this.$parent.getData();
}
- })
+ });
}
- })
+ });
},
// 鍒犻櫎
delClick() {},
@@ -655,33 +786,33 @@
{ label: "鍏徃", prop: "total", select: true },
{ label: "鏁伴噺", prop: "total", inputFloat: true },
{ label: "浠锋牸", prop: "price", inputFloat: true },
- { label: "甯佺", prop: "total", select: true }
+ { label: "甯佺", prop: "total", select: true },
// { label: "浜よ揣鎻愬墠鏃堕棿", prop: "total", inputNumber: true }
- ]
- }
+ ],
+ };
},
// 浜у搧鍒楄〃杈撳叆
inputContent(val, prop, row) {
- this.productId = row.productId
+ this.productId = row.productId;
this.tableData.map((item) => {
if (item.productId === row.productId) {
- item[prop] = val
+ item[prop] = val;
}
- })
+ });
},
// 浜у搧鏂板
addProductClick() {
- console.log(this.tableData)
+ console.log(this.tableData);
for (let i = 0; i < this.tableData.length; i++) {
if (this.tableData[i].name.length === 0) {
- this.isNoProduct = true
- break
+ this.isNoProduct = true;
+ break;
} else {
- this.isNoProduct = false
+ this.isNoProduct = false;
}
}
if (!this.isNoProduct) {
- this.productId++
+ this.productId++;
this.tableData.push({
productId: this.productId,
id: 0,
@@ -690,81 +821,96 @@
name: "",
number: "",
price: 0,
- total: 0
- })
+ total: 0,
+ });
}
},
// 浜у搧鍒犻櫎
handleDelClick(scope) {
- console.log(scope)
- this.tableData.splice(scope.$index, 1)
+ console.log(scope);
+ 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"
+ inputElement = document.createElement("input");
+ inputElement.setAttribute("type", "file");
+ inputElement.style.display = "none";
if (window.addEventListener) {
- inputElement.addEventListener("change", this.uploadFile, false)
+ inputElement.addEventListener("change", this.uploadFile, false);
} else {
- inputElement.attachEvent("onchange", this.uploadFile)
+ inputElement.attachEvent("onchange", this.uploadFile);
}
- document.body.appendChild(inputElement)
+ document.body.appendChild(inputElement);
}
- inputElement.click()
+ 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)
+ 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!")
+ this.$message.error("涓婁紶澶村儚鍥剧墖澶у皬涓嶈兘瓒呰繃 2MB!");
} else if (files.type.indexOf("image") === -1) {
//濡傛灉涓嶆槸鍥剧墖鏍煎紡
- this.$message.error("璇烽�夋嫨鍥剧墖鏂囦欢")
+ this.$message.error("璇烽�夋嫨鍥剧墖鏂囦欢");
} else {
- const that = this
- const reader = new FileReader() // 鍒涘缓璇诲彇鏂囦欢瀵硅薄
- reader.readAsDataURL(el.target.files[0]) // 鍙戣捣寮傛璇锋眰锛岃鍙栨枃浠�
+ 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)
+ that.imageSrc = this.result;
+ console.log(this.result);
// 鏁版嵁浼犲埌鍚庡彴
//const formData = new FormData()
//formData.append('file', files); // 鍙互浼犲埌鍚庡彴鐨勬暟鎹�
- }
+ };
}
}
},
// 杩涘嚭鐐瑰嚮
inOutBoundClick() {
if (this.editConfig.title !== "鏂板缓") {
- console.log(this.editConfig.infomation)
+ console.log(this.editConfig.infomation);
this.$router.push({
- name: "inOutboundDetail",
- params: { name: this.editConfig.infomation.name, id: this.editConfig.infomation.id }
- })
+ name: "inboundOutboundDetail",
+ params: {
+ name: this.editConfig.infomation.name,
+ id: this.editConfig.infomation.id,
+ pageName:"浜у搧",
+ paramsKey: {
+ amount: "amount", //鏁伴噺
+ productName:"productName", //浜у搧鍚嶇О
+ status: "status", // 鐘舵��
+ contactedName: "admin", //瀹屾垚鑰�
+ date: "operationDate", // 鏃ユ湡
+ fromLocation: "from", // 浠�
+ number: "number", //鍗曞彿
+ toLocation: "to", //鑷�
+ unit: "unit", //鍗曚綅
+ },
+ },
+ });
}
},
// 鍙攢鍞�/鍙噰璐�
checkboxChange(val, param) {
if (val === "閲囪喘") {
- this.showProcure = param
+ this.showProcure = param;
} else if (val === "閿�鍞�") {
- this.showSale = param
+ this.showSale = param;
}
- }
- }
-}
+ },
+ },
+};
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
--
Gitblit v1.8.0