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/reportForm/inventoryReport/index.vue | 2 +-
src/views/reportForm/inboundOutboundDetail/index.vue | 1 +
src/api/common/other.js | 8 ++++++++
src/components/makepager/SearchCommonView.vue | 1 +
src/components/makepager/FormBtnsView.vue | 9 ++++-----
src/views/reportForm/locationReport/index.vue | 2 +-
src/views/operate/outEnterLibrary/index.vue | 1 +
src/views/productManage/product/AddProductDialog.vue | 35 +++++++++++++++++++++++++++++------
8 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/src/api/common/other.js b/src/api/common/other.js
index 09e37d6..1e35ea7 100644
--- a/src/api/common/other.js
+++ b/src/api/common/other.js
@@ -32,3 +32,11 @@
data
})
}
+// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+export const getUserInfo = (data) => {
+ return request({
+ url: "/api-wms/v1/product/getUserInfo",
+ method: "get",
+ params: data
+ })
+}
diff --git a/src/components/makepager/FormBtnsView.vue b/src/components/makepager/FormBtnsView.vue
index 876a61c..35c4d25 100644
--- a/src/components/makepager/FormBtnsView.vue
+++ b/src/components/makepager/FormBtnsView.vue
@@ -28,13 +28,12 @@
<div
v-if="!showProduct && !showWarehouse && !showPosition"
class="sub-number yes-cursor"
- @click="inOutBoundClick"
:class="{ left_border: addProduct }"
>
<div class="left icon-view"><i class="el-icon-sort"></i></div>
<div class="right">
- <div class="right-label">{{ "杩�: " + (countObject?.inputAmount ?? 0) }}</div>
- <div class="right-label">{{ "鍑�: " + (countObject?.outputAmount ?? 0) }}</div>
+ <div class="right-label" @click="inOutBoundClick('杩�')">{{ "杩�: " + (countObject?.inputAmount ?? 0) }}</div>
+ <div class="right-label" @click="inOutBoundClick('鍑�')">{{ "鍑�: " + (countObject?.outputAmount ?? 0) }}</div>
</div>
</div>
<!-- <div
@@ -161,8 +160,8 @@
this.$emit("positionReport")
},
// 杩涘嚭
- inOutBoundClick() {
- this.$emit("inOutBoundClick")
+ inOutBoundClick(val) {
+ this.$emit("inOutBoundClick",val)
},
// 浜у搧
productClick() {
diff --git a/src/components/makepager/SearchCommonView.vue b/src/components/makepager/SearchCommonView.vue
index 3c280c3..fc3e2ea 100644
--- a/src/components/makepager/SearchCommonView.vue
+++ b/src/components/makepager/SearchCommonView.vue
@@ -260,6 +260,7 @@
this.selList.push(ele.title)
})
this.selectArr = this.searchTaskMap
+ this.searchInput = this.inputName
},
methods: {
// 鎼滅储
diff --git a/src/views/operate/outEnterLibrary/index.vue b/src/views/operate/outEnterLibrary/index.vue
index 2008867..03c0913 100644
--- a/src/views/operate/outEnterLibrary/index.vue
+++ b/src/views/operate/outEnterLibrary/index.vue
@@ -7,6 +7,7 @@
:placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
@addCommonClick="addBtnClick"
+ :inputName="params.keyWord"
@searchClick="getList"
/>
</div>
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
diff --git a/src/views/reportForm/inboundOutboundDetail/index.vue b/src/views/reportForm/inboundOutboundDetail/index.vue
index 7d36fb4..0c487e5 100644
--- a/src/views/reportForm/inboundOutboundDetail/index.vue
+++ b/src/views/reportForm/inboundOutboundDetail/index.vue
@@ -6,6 +6,7 @@
:showAdd="false"
:placeholder="'璇锋牴鎹崟鍙枫�佷骇鍝併�佷笟鍔＄被鍨嬭繘琛屾悳绱�'"
:amount-view="false"
+ :inputName="params.keyWord"
@addCommonClick="addBtnClick"
@searchClick="getList"
/>
diff --git a/src/views/reportForm/inventoryReport/index.vue b/src/views/reportForm/inventoryReport/index.vue
index 9198a5c..52fa318 100644
--- a/src/views/reportForm/inventoryReport/index.vue
+++ b/src/views/reportForm/inventoryReport/index.vue
@@ -308,7 +308,7 @@
this.$router.push({
name: "inboundOutboundDetail",
params: {
- keyWord: row.productType,
+ keyWord: row.productName,
produceId: row.produceId,
unit: row.unit,
productName: row.productName,
diff --git a/src/views/reportForm/locationReport/index.vue b/src/views/reportForm/locationReport/index.vue
index 4fb850f..378c2e4 100644
--- a/src/views/reportForm/locationReport/index.vue
+++ b/src/views/reportForm/locationReport/index.vue
@@ -262,7 +262,7 @@
this.$router.push({
name: "outEnterLibrary",
params: {
- keyWord:row.productTypeName,
+ keyWord:row.productName,
produceId:row.produceId,
productName:row.productName,
unit:row.unit,
--
Gitblit v1.8.0