From 75954b2d3519560691726fd043b99737524491fb Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期一, 05 二月 2024 19:12:46 +0800
Subject: [PATCH] 合并dev
---
src/views/productManage/product/AddProductDialog.vue | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index 3184808..a6ded80 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -305,9 +305,14 @@
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>
@@ -542,7 +547,7 @@
import IconCropper from "./IconCropper"
import { getProductCategoryList } from "@/api/product/productCategory"
import { getProductList, addProduct, updateProduct } from "@/api/product/product"
-import { uploadFiles } from "@/api/common/other"
+import { uploadFiles, getUserInfo } from "@/api/common/other"
import codeMixin from "@/components/mixin/codeMixin"
import { getDataByType } from "@/api/data"
import BomDialog from "./components/bomDialog";
@@ -593,7 +598,7 @@
// 閲囪喘绫诲瀷
purchaseType: [{ required: true, message: "璇烽�夋嫨", trigger: "blur" }]
},
- memberOptions: [{ name: "绠＄悊鍛�", id: 1 }],
+ memberOptions: [],
productCategoryOptions: [], // 浜у搧绫诲埆
productTypeOptions: [
{ name: "鑳芥秷鑰�", id: 1 },
@@ -669,6 +674,7 @@
}
this.setOptionalFieldsToEmpty()
this.formInfo()
+ this.getUserInfo()
},
methods: {
// 鍗曚綅
@@ -708,6 +714,17 @@
// });
this.$refs.editDialog.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 = "鐗╂枡缂栫爜"
@@ -908,11 +925,17 @@
// 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: "inboundOutboundDetail",
+ name:url,
params: {
name: this.editConfig.infomation.name,
id: this.editConfig.infomation.id
--
Gitblit v1.8.0