From 03c046189b4c4cdf59043990b3a21d0908eb8032 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期日, 28 四月 2024 17:18:46 +0800
Subject: [PATCH] 采购订单模块 判断供应商和产品是否匹配的数据来源对应的接口修改和联调+供应商列表 搜索功能的问题修改

---
 src/components/makepager/CommonFormTableView.vue |   58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 822b967..6eec853 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -10,9 +10,9 @@
         :span-method="arraySpanMethod"
         style="width: 100%"
         @selection-change="handleSelectionChange"
-        :row-key="(row) => row.productId"
+        :row-key="getRowKeys"
       >
-        <el-table-column v-if="selectBox"  type="selection" :reserve-selection="true" width="40" align="center">
+        <el-table-column v-if="selectBox"  type="selection" :selectable="isDisabled" :reserve-selection="true" width="40" align="center">
           
         </el-table-column>
         <el-table-column v-if="tableList.isReturn" type="index" label="#" width="50" align="center"></el-table-column>
@@ -36,7 +36,6 @@
           <!-- column鏍峰紡 -->
           <template slot-scope="scope">
             <template v-if="!detailEnter || isOperate">
-              
               <el-form-item
                 v-if="item.input"
                 label=" "
@@ -56,7 +55,12 @@
                 ></el-input>
               </el-form-item>
               <span v-else-if="item.compute">{{ calculateDifference(scope.row) }}</span>
-
+              <!-- 璋冪敤鏂规硶鏄剧ず鏂囧瓧 -->
+              <div v-else-if="item.isCallMethod">
+                <span :class="item.isClass ? item.getClassName(scope.row[item.prop], scope.row) : ''">{{
+                  item.getCallMethod(scope.row[item.prop], scope.row)
+                }}</span>
+              </div>
               <el-form-item
                 v-else-if="item.productName"
                 label=" "
@@ -239,6 +243,11 @@
       type: Boolean,
       default: false
     },
+    // selection 閫夋嫨鐘舵�� 椤甸潰
+    name: {
+      type: String,
+      default: "",
+    },
     isBoder:{
       type: Boolean,
       default: false
@@ -306,9 +315,11 @@
         editVisible: false,
         isSelectBox: false,
         title: "",
-        infomation: {}
+        infomation: {},
+        supplierId:null,
       },
-      productIndex: 0
+      productIndex: 0,
+      supplierId:null,
     }
   },
   created() {
@@ -323,10 +334,31 @@
         this.getTableInfo()
       },
       immediate: true
-    }
+    },
+    supplierId(n,o) {  
+      this.editSelCommonConfig.supplierId=n
+      console.log(n,o,"鐪嬬湅閭�") 
+    } 
   },
   computed: {},
   methods: {
+    // 鑾峰彇row鐨刱ey鍊�
+    getRowKeys(row) {
+      let string;
+      string = row[this.productTableList.key?this.productTableList.key:this.productTableList.productId];
+      return string;
+    },
+    isDisabled(row){ 
+      if (this.name == "rework") {
+        if (row.status == 1) {
+          return true;
+        } else {
+          return false;
+        }
+      }else {
+        return true;
+      }
+    },
     calculateDifference(row) {  
       if (row.notReceiveAmount !== null && row.nowReceiveAmount !== null) {  
         row.surplusReceiveAmount=row.notReceiveAmount - row.nowReceiveAmount;
@@ -345,9 +377,9 @@
     async getProductList() {
       let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc
       await fn({
-        page: 1,
-        pageSize: 100
-      }).then((res) => {
+          page: 1,
+          pageSize: 100,
+        }).then((res) => {
         if (res.code === 200) {
           if (res.data.list && res.data.list.length > 0) {
             this.productList = res.data.list
@@ -462,7 +494,7 @@
       }
     },
     commonInputChange(val, prop, row, scope) {
-      if (prop === "amount") {
+      if (prop === "amount"||prop=='purchasePrice') {
         this.tableList.tableData.map((ite) => {
           if (ite.name === row.name) {
             ite.total = row.amount * row.purchasePrice
@@ -521,6 +553,7 @@
       this.tableList.tableData.map((ite) => {
         if (ite.name === item.name) {
           ite.amount = item.amount || 1
+          ite.productId = item.id
           ite.number = item.number
           ite.purchasePrice = item.purchasePrice
           ite.price = item.purchasePrice
@@ -533,8 +566,7 @@
       })
     },
     // 鏂板
-    selClientClick(scope, prop) {
-      console.log(scope, prop)
+    selClientClick(scope) {
       this.productIndex = scope.$index
       this.editSelCommonConfig.title = "浜у搧鍚嶇О"
       this.editSelCommonConfig.isSelectBox = true

--
Gitblit v1.8.0