From 1113100cb5d8293e94b6b99515ba6320676fd9ab Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Wed, 21 May 2025 18:19:16 +0800
Subject: [PATCH] =?UTF-8?q?2025.05.21=20=E5=BA=93=E5=AD=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8A=A8=E6=80=81=E5=88=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/partspare/inventorystock.vue      | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/partspare/inventorystock.vue b/src/views/modules/partspare/inventorystock.vue
index fae6d38..e4458fd 100644
--- a/src/views/modules/partspare/inventorystock.vue
+++ b/src/views/modules/partspare/inventorystock.vue
@@ -95,6 +95,7 @@
     </el-form>
 
     <el-table
+      v-if="queryForm.groupType === '0'"
       :data="dataList"
       border
       :height="height"
@@ -103,14 +104,38 @@
       :row-style="controlRowStyle"
       style="width: 100%;">
       <el-table-column
-        v-if="queryForm.groupType === '0'"
         type="selection"
         header-align="center"
         align="center"
         width="50">
       </el-table-column>
       <el-table-column
-        v-for="(item,index) in columnList" :key="index"
+        v-for="(item,index) in arrayColumns" :key="index"
+        :sortable="item.columnSortable"
+        :prop="item.columnProp"
+        :header-align="item.headerAlign"
+        :show-overflow-tooltip="item.showOverflowTooltip"
+        :align="item.align"
+        :fixed="item.fixed==''?false:item.fixed"
+        :min-width="item.columnWidth"
+        :label="item.columnLabel">
+        <template slot-scope="scope">
+          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-table
+      v-if="queryForm.groupType === '1'"
+      :data="dataList"
+      border
+      :height="height"
+      v-loading="dataListLoading"
+      @selection-change="handleSelectionChange"
+      :row-style="controlRowStyle"
+      style="width: 100%;">
+      <el-table-column
+        v-for="(item,index) in arrayPart" :key="index"
         :sortable="item.columnSortable"
         :prop="item.columnProp"
         :header-align="item.headerAlign"
@@ -718,7 +743,6 @@ export default {
     this. getBu ()
     this.$nextTick(() => {
       this.height = window.innerHeight - 210
-      this.columnList = this.arrayColumns
     })
   },
   methods: {
@@ -813,6 +837,11 @@ export default {
     finishDownload () {},
 
     fields () {
+      if (this.queryForm.groupType === '0'){
+        this.columnList = this.arrayColumns
+      }else {
+        this.columnList = this.arrayPart
+      }
       let json = "{"
       this.columnList.forEach((item, index) => {
         if (index == this.columnList.length - 1) {