From d4d5ee67c6c628498055ab3c9f3fc417117c4c9f Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期三, 22 十一月 2023 15:07:34 +0800
Subject: [PATCH] 供应商管理-产品返回值修改

---
 src/views/purchaseManage/purchase/index.vue |   51 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/views/purchaseManage/purchase/index.vue b/src/views/purchaseManage/purchase/index.vue
index e16f0dd..f5ef1f0 100644
--- a/src/views/purchaseManage/purchase/index.vue
+++ b/src/views/purchaseManage/purchase/index.vue
@@ -32,19 +32,19 @@
               </el-table-column>
               <el-table-column label="鎿嶄綔" width="220" fixed="right">
                 <template slot-scope="scope">
-                  <el-button type="text" size="small" @click="btnConfirm(scope.row)" style="margin-right: 5px"
+                  <el-button v-if="scope.row.status===1" type="text" size="small" @click="btnConfirm(scope.row)" style="margin-right: 5px"
                   >纭</el-button
                   >
-                  <el-button type="text" size="small" @click="btnEdit(scope.row)" style="margin-right: 5px"
+                  <el-button v-if="scope.row.status===1" type="text" size="small" @click="btnEdit(scope.row)" style="margin-right: 5px"
                   >缂栬緫</el-button
                   >
                   <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
                   >鏌ョ湅</el-button
                   >
-                  <el-button type="text" size="small" @click="btnCancel(scope.row)" style="margin-right: 5px"
+                  <el-button v-if="scope.row.status===1" type="text" size="small" @click="btnCancel(scope.row)" style="margin-right: 5px"
                   >鍙栨秷</el-button
                   >
-                  <el-button type="text" size="small" @click="btnDelete(scope.row)" style="margin-right: 5px"
+                  <el-button v-if="scope.row.status===1" type="text" size="small" @click="btnDelete(scope.row)" style="margin-right: 5px"
                   >鍒犻櫎</el-button
                   >
                   <!-- <el-button v-if="scope.row.status< 4" @click="submitClick(scope.row)" type="text" size="small">鎻愪氦</el-button> -->
@@ -96,21 +96,26 @@
         visible: false,
         title: "鍒涘缓",
         isDisabled:false,
+        detailEnter:false,
         infomation: {
           supplierList:[]
         }
       },
       tableColumn: [
+        { label: "鍗曟嵁绫诲瀷", prop: "orderType", min: 130 },
         { label: "閲囪喘鍗曞彿", prop: "number", min: 150, isCommonClick: true ,default:true},
         { label: "閲囪喘鍗曞悕绉�", prop: "name", min: 130, isCommonClick: true },
-        { label: "鍗曟嵁绫诲瀷", prop: "orderType", min: 130 },
-        { label: "渚涘簲鍟嗗悕绉�", prop: "contact", min: 130 },
+        { label: "渚涘簲鍟嗗悕绉�", prop: "supplierName", min: 130 },
         { label: "閲囪喘鏁伴噺", prop: "quantity", min: 130 },
         { label: "鏀惰揣浠撳簱", prop: "warehouse", min: 130 },
         { label: "缁忓姙浜�", prop: "handledBy", min: 130 },
         { label: "鍒跺崟浜�", prop: "creator", min: 130 }
       ],
-      showCol: ['閲囪喘鍗曞彿', '閲囪喘鍗曞悕绉�', '鍗曟嵁绫诲瀷', '渚涘簲鍟嗗悕绉�', '閲囪喘鏁伴噺', '鏀惰揣浠撳簱']
+      showCol: ['閲囪喘鍗曞彿', '閲囪喘鍗曞悕绉�', '鍗曟嵁绫诲瀷', '渚涘簲鍟嗗悕绉�', '閲囪喘鏁伴噺', '鏀惰揣浠撳簱','缁忓姙浜�','鍒跺崟浜�'],
+      pagerOptions:{
+        pageSize:15,
+        currPage:1,
+      }
     }
   },
   created() {
@@ -162,25 +167,29 @@
     // 璇锋眰鏁版嵁
     async getData() {
       await getPurchaseList({
-        keyword: this.search,
+        keyword: this.search||'',
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize
       })
-        .then((res) => {
-          if (res.data.code === 200) {
-            const list = res.data.data.list
-            this.tableList.tableInfomation = list || []
-            this.pagerOptions.totalCount = res.data.data.total
-          }
-        })
-        .catch((err) => {
-          console.log(err)
-        })
+      .then((res) => {
+        if (res.code === 200) {
+          let list = res.data.list
+          list.map((item)=>{
+            item.supplierName=item.supplier.name
+          })
+          this.tableList.tableInfomation = list || []
+          this.pagerOptions.totalCount = res.data.total
+        }
+      })
+      .catch((err) => {
+        console.log(err)
+      })
     },
     // 鑾峰彇渚涘簲鍟嗘暟鎹�
     async getSupplierData() {
       await getSupplierList({
         // [val]: content,
+        status:1,
         page:1,
         pageSize: 10
       })
@@ -199,6 +208,7 @@
     },
     // 鏂板缓
     addBtnClick() {
+      this.editConfig.detailEnter=false
       this.editConfig.isDisabled=false
       // this.editRow = {};
       // this.$refs.add.islook = true;
@@ -226,6 +236,8 @@
 
     // 缂栬緫
     btnEdit(row) {
+      this.editConfig.detailEnter=false
+      this.editConfig.isDisabled=false
       this.tableLoading = true
       getPurchaseInfo({ id: row.ID }).then((res) => {
         if (res.code == 200) {
@@ -311,6 +323,7 @@
     },
     // 鏌ョ湅
     btnLook(row){
+      this.editConfig.detailEnter=true
       this.editConfig.isDisabled=true
       this.tableLoading = true
       getPurchaseInfo({ id: row.ID }).then((res) => {
@@ -333,10 +346,10 @@
     },
     // 璇︽儏
     selCommonClick(row) {
-      console.log(row)
       this.tableLoading = true
       getPurchaseInfo({ id: row.ID }).then((res) => {
         if (res.code == 200) {
+          console.log(res,"浜у搧璇︽儏")
           this.tableLoading = false
           this.commonDetail.visible = true
           this.commonDetail.infomation = {

--
Gitblit v1.8.0