From d897e9aac7689926551ae413a22430540f765846 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期二, 21 十一月 2023 20:06:15 +0800
Subject: [PATCH] 供应商信息修改
---
src/views/supplierManage/supplier/index.vue | 5 +++--
src/views/purchaseManage/purchase/components/AddPurchase.vue | 2 ++
src/components/makepager/SearchCommonView.vue | 6 +++---
src/views/purchaseManage/purchase/index.vue | 6 ++++++
src/views/other/commonDialog/SelectCommonDialog.vue | 11 +++--------
src/views/purchaseManage/purchase/DetailSupplier.vue | 4 ++--
src/views/purchaseManage/purchase/components/SelectSupplierDialog.vue | 1 +
7 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/components/makepager/SearchCommonView.vue b/src/components/makepager/SearchCommonView.vue
index 277f5d8..a4f107a 100644
--- a/src/components/makepager/SearchCommonView.vue
+++ b/src/components/makepager/SearchCommonView.vue
@@ -3,9 +3,9 @@
<div class="search-top">
<div class="search">
<el-input v-if="inputSelect" :placeholder="placeholder" v-model="searchInput" class="input-with-select" clearable>
- <el-select v-model="searchSelValue" slot="prepend" placeholder="璇烽�夋嫨" class="search-sel">
+ <!-- <el-select v-model="searchSelValue" slot="prepend" placeholder="璇烽�夋嫨" class="search-sel">
<el-option v-for="item in searchOptions" :key="item.value" :label="item.label" :value="item"> </el-option>
- </el-select>
+ </el-select> -->
<!-- <i slot="suffix" class="el-icon-search" style="cursor: pointer" @click="searchClick"></i> -->
</el-input>
<el-input v-else :placeholder="placeholder" v-model="searchInput" class="input-with-select" clearable>
@@ -94,7 +94,7 @@
},
methods: {
searchClick() {
- this.$emit("searchClick", this.searchSelValue, this.searchInput)
+ this.$emit("searchClick", this.searchInput)
},
resetClick() {
this.searchSelValue = this.searchSel
diff --git a/src/views/other/commonDialog/SelectCommonDialog.vue b/src/views/other/commonDialog/SelectCommonDialog.vue
index 2b2516f..2256300 100644
--- a/src/views/other/commonDialog/SelectCommonDialog.vue
+++ b/src/views/other/commonDialog/SelectCommonDialog.vue
@@ -155,8 +155,7 @@
async getProductList() {
let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc
await fn({
- productName: this.keywordType === "浜у搧鍚嶇О" ? this.keyword : "",
- productNumber: this.keywordType === "浜у搧缂栧彿" ? this.keyword : "",
+ keyword:this.keyword,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
}).then((res) => {
@@ -187,13 +186,9 @@
}
},
// 鎼滅储
- searchClick(val, content) {
- console.log(val, content)
- this.search_map = {
- [val.value]: content
- }
+ searchClick(content) {
+ console.log( content)
this.keyword = content
- this.keywordType = val.label
this.getData()
},
resetClick() {
diff --git a/src/views/purchaseManage/purchase/DetailSupplier.vue b/src/views/purchaseManage/purchase/DetailSupplier.vue
index 9c9fa16..75feb1e 100644
--- a/src/views/purchaseManage/purchase/DetailSupplier.vue
+++ b/src/views/purchaseManage/purchase/DetailSupplier.vue
@@ -252,7 +252,7 @@
this.formInfoList = [
{
str: "渚涘簲鍟嗗悕绉�",
- value: item.name,
+ value: item.supplier.name,
},
{
str: "鍚堣",
@@ -288,7 +288,7 @@
leftStr: "閲囪喘璁㈠崟缂栧彿",
leftValue: item.number,
rightStr: "渚涘簲鍟嗗悕绉�",
- rightValue: item.name,
+ rightValue: item.supplier.name,
},
{
leftStr: "閲囪喘鍗曠姸鎬�",
diff --git a/src/views/purchaseManage/purchase/components/AddPurchase.vue b/src/views/purchaseManage/purchase/components/AddPurchase.vue
index 7764bdb..7edbafb 100644
--- a/src/views/purchaseManage/purchase/components/AddPurchase.vue
+++ b/src/views/purchaseManage/purchase/components/AddPurchase.vue
@@ -175,6 +175,7 @@
<div class="basic-info-title" style="display: flex">浜у搧淇℃伅</div>
<div class="product-view">
<CommonFormTableView
+ :detailEnter=editCommonConfig.detailEnter
:show-summary="showSummary"
:recalculateShow="false"
:product-table-list="productTableList"
@@ -296,6 +297,7 @@
type: Object,
default: () => {
return {
+ detailEnter:true,
visible: false,
title: "鍒涘缓",
infomation: {},
diff --git a/src/views/purchaseManage/purchase/components/SelectSupplierDialog.vue b/src/views/purchaseManage/purchase/components/SelectSupplierDialog.vue
index 9e553ad..0f57884 100644
--- a/src/views/purchaseManage/purchase/components/SelectSupplierDialog.vue
+++ b/src/views/purchaseManage/purchase/components/SelectSupplierDialog.vue
@@ -128,6 +128,7 @@
await getSupplierList({
[val]: content,
+ status:1,
page: this.pagerOptions.currPage,
pageSize: this.pagerOptions.pageSize
})
diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index aab8d10..9bf233e 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -96,6 +96,7 @@
visible: false,
title: "鍒涘缓",
isDisabled:false,
+ detailEnter:false,
infomation: {
supplierList:[]
}
@@ -184,6 +185,7 @@
async getSupplierData() {
await getSupplierList({
// [val]: content,
+ status:1,
page:1,
pageSize: 10
})
@@ -202,6 +204,7 @@
},
// 鏂板缓
addBtnClick() {
+ this.editConfig.detailEnter=false
this.editConfig.isDisabled=false
// this.editRow = {};
// this.$refs.add.islook = true;
@@ -229,6 +232,8 @@
// 缂栬緫
btnEdit(row) {
+ this.editConfig.detailEnter=false
+ this.editConfig.isDisabled=false
this.tableLoading = true
getPurchaseInfo({ id: row.ID }).then((res) => {
if (res.code == 200) {
@@ -314,6 +319,7 @@
},
// 鏌ョ湅
btnLook(row){
+ this.editConfig.detailEnter=true
this.editConfig.isDisabled=true
this.tableLoading = true
getPurchaseInfo({ id: row.ID }).then((res) => {
diff --git a/src/views/supplierManage/supplier/index.vue b/src/views/supplierManage/supplier/index.vue
index 43ed6f4..9deb6a0 100644
--- a/src/views/supplierManage/supplier/index.vue
+++ b/src/views/supplierManage/supplier/index.vue
@@ -277,7 +277,8 @@
await getSupplierList({
name: this.searchSupplierName,
page: this.pagerOptions.currPage,
- pageSize: this.pagerOptions.pageSize
+ pageSize: this.pagerOptions.pageSize,
+ status:1,
}).then((res) => {
console.log(res)
if (res.code === 200) {
@@ -348,7 +349,7 @@
addBtnClick() {
this.editConfig.visible = true
this.editConfig.title = "鏂板缓"
- this.editConfig.infomation = { fileId: 0 }
+ this.editConfig.infomation = { fileId: 0,responsiblePersonName:'admin'}
},
// 鍚敤渚涘簲鍟�
async enableClick(row, value) {
--
Gitblit v1.8.0