From a6649a3319e9f5e9260848872d8cddabfcfc7553 Mon Sep 17 00:00:00 2001 From: haoxuan <haoxuan> Date: 星期三, 15 十一月 2023 10:42:55 +0800 Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM --- src/views/purchaseManage/purchase/index.vue | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue index 0511bbe..4a12b42 100644 --- a/src/views/purchaseManage/purchase/index.vue +++ b/src/views/purchaseManage/purchase/index.vue @@ -35,7 +35,7 @@ <el-button type="text" size="small" @click="editClick(scope.row)" style="margin-right: 5px" >缂栬緫</el-button > - <el-button @click="submitClick(scope.row)" type="text" size="small">鎻愪氦</el-button> + <el-button v-if="scope.row.status< 4" @click="submitClick(scope.row)" type="text" size="small">鎻愪氦</el-button> </template> </el-table-column> </template> @@ -63,6 +63,7 @@ import DetailSupplier from "@/views/purchaseManage/purchase/DetailSupplier" import AddPurchase from "@/views/purchaseManage/purchase/components/AddPurchase" import { getDataByType } from "@/api/data" +import { getSupplierList } from "@/api/supplierManage/supplier" export default { name: "SupplierManage", props: {}, @@ -83,7 +84,9 @@ editConfig: { visible: false, title: "鍒涘缓", - infomation: {} + infomation: { + supplierList:[] + } }, purchaseStatusList: getDataByType("purchaseStatus"), tableColumn: [ @@ -102,6 +105,7 @@ created() { this.setTable() this.getData() + this.getSupplierData() }, methods: { getpurchaseStatus(val) { @@ -155,18 +159,24 @@ console.log(err) }) }, + // 鑾峰彇渚涘簲鍟嗘暟鎹� + async getSupplierData() { + await getSupplierList({ + // [val]: content, + page:1, + pageSize: 10 + }) + .then((res) => { + if (res.data.code == 200) { + this.editConfig.infomation.supplierList=res.data.data.list + + } + }) + }, // 鎼滅储 - searchClick(val, content) { - console.log(val, content) - this.search = content - this.getData() - }, - resetClick() { - this.search = "" - this.getData() - }, onFilterSearch(searchText){ this.search = searchText ?? '' + this.pagerOptions.currPage = 1 this.getData() }, // 鏂板缓 @@ -235,8 +245,9 @@ this.$message.warning("鎻愪氦澶辫触") } }) + },(e)=>{ + console.error(e) }) - .catch(() => {}) }, // 璇︽儏 -- Gitblit v1.8.0