From 98d4e2b26ce3a542b8ab6f2c04b9e56f9dd95f42 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期五, 29 三月 2024 10:36:27 +0800
Subject: [PATCH] 供应商管理列表搜索功能修改6202

---
 src/components/makepager/CommonFormTableView.vue |   63 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/components/makepager/CommonFormTableView.vue b/src/components/makepager/CommonFormTableView.vue
index 145cd11..c48c044 100644
--- a/src/components/makepager/CommonFormTableView.vue
+++ b/src/components/makepager/CommonFormTableView.vue
@@ -3,15 +3,17 @@
     <el-form ref="form" :model="tableList" :show-message="false" label-position="right">
       <el-table
         ref="fromTable"
+        :border="isBoder"
         :data="tableList.tableData"
         :show-summary="showSummary.show"
         :summary-method="getSummaries"
         :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>
         <el-table-column
@@ -27,6 +29,9 @@
           <template slot="header">
             <span v-if="item.isRequird" style="color: #f56c6c">*</span>
             <span>{{ item.label }}</span>
+            <FilterPopover @toFiltering="toFiltering" class="margin_left_3px" v-if="item.isFilter" 
+            :layout="item.prop" :isFilterList="item.isFilterList"
+            :selectedListDefault="item.selectedListDefault"></FilterPopover>
           </template>
           <!-- column鏍峰紡 -->
           <template slot-scope="scope">
@@ -49,6 +54,13 @@
                   "
                 ></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=" "
@@ -173,9 +185,14 @@
                 "
               ></el-input-number>
             </el-form-item>
-            <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span>
+            <span v-else style="text-align: right">{{ scope.row[item.prop] }}</span> 
+            
           </template>
+          <!-- <template slot-scope="scope" v-if="item.compute">   
+          </template>  -->
         </el-table-column>
+        <!-- <el-table-column label="鍓╀綑鏀惰揣鏁伴噺">   
+        </el-table-column> -->
         <el-table-column label="鎿嶄綔" width="40" v-if="!detailEnter" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" :disabled="!isOperate" @click="deleteClick(scope)">鍒犻櫎</el-button>
@@ -217,11 +234,21 @@
 <script>
 import { getProductListFromGrpc, getProductList } from "@/api/productManage/product"
 import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
+import FilterPopover from "@/components/makepager/FilterPopover";
 export default {
   name: "CommmonFormTableView",
-  components: { SelectCommonDialog },
+  components: { SelectCommonDialog ,FilterPopover},
   props: {
     detailEnter: {
+      type: Boolean,
+      default: false
+    },
+    // selection 閫夋嫨鐘舵�� 椤甸潰
+    name: {
+      type: String,
+      default: "",
+    },
+    isBoder:{
       type: Boolean,
       default: false
     },
@@ -309,6 +336,34 @@
   },
   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;
+        return  row.surplusReceiveAmount
+      } else {  
+        return 0; 
+      }  
+    },
+    toFiltering(event){
+      this.$emit("toFiltering", event);
+    },
     getTableInfo() {
       this.tableList = this.productTableList
     },

--
Gitblit v1.8.0