From b12f66d871593ec6f8e28aa63e45dbd92aab760b Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 11 四月 2023 15:54:36 +0800
Subject: [PATCH] 1.制造模型、采购管理模块下的动态列表完成

---
 src/views/makeModel/materialList.vue |  365 +++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 262 insertions(+), 103 deletions(-)

diff --git a/src/views/makeModel/materialList.vue b/src/views/makeModel/materialList.vue
index e0e2092..4fa42f3 100644
--- a/src/views/makeModel/materialList.vue
+++ b/src/views/makeModel/materialList.vue
@@ -92,8 +92,13 @@
       </div>
 
       <div class="elTableDiv">
+        <TableColumnSettings
+          :list1="tableColumnSettingsArray"
+          @tableColumnUpdate="tableColumnUpdate"
+        />
         <el-table
           ref="tableDataRef"
+          :key="tableTimeStampKey"
           class="tableFixed"
           :data="tableData"
           :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
@@ -105,115 +110,146 @@
           :cell-style="this.$cellStyle"
           @sort-change="sortChange"
         >
+
           <el-table-column
-            prop="RowNum"
-            width="50"
-            fixed
-            label="搴忓彿"
-          />
-          <el-table-column
-            prop="partcode"
-            label="姣嶄欢缂栫爜"
-            min-width="160"
+            v-for="item in tableColumnSettingsArray"
+            v-if="item.show"
+            :key="item.id"
+            :sortable="item.sortable"
+            :prop="item.prop"
+            :min-width="item.minWidth"
+            :label="item.label"
+            :width="item.width"
             show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="partname"
-            label="姣嶄欢鍚嶇О"
-            min-width="160"
-            show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="partspec"
-            label="姣嶄欢瑙勬牸"
-            min-width="160"
-            show-tooltip-when-overflow
-            sortable="custom"
+            :fixed="item.fixed?(item.fixed==='left'?'left':'right'):false"
           >
             <template slot-scope="{row}">
-              <div v-if="row.partspec">{{ row.partspec }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="stocktype_name"
-            label="瀛樿揣绫诲瀷"
-            width="110"
-            show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="uom_name"
-            label="璁¢噺鍗曚綅"
-            width="110"
-            show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="quantity"
-            label="鍩虹鏁伴噺"
-            width="110"
-            show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="status"
-            width="110"
-            show-tooltip-when-overflow
-            label="鍚敤鐘舵��"
-            sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.status==='Y'">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                鏄�
+              <div v-if="!row[item.prop]">/</div>
+
+              <div v-else-if="item.prop==='startdate'">{{ row.startdate.substring(0,11) }}</div>
+              <div v-else-if="item.prop==='status'">
+                <div v-if="row[item.prop]==='Y'">
+                  <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+                  鏄�
+                </div>
+                <div v-if="row[item.prop]==='N'">
+                  <i class="el-icon-info" style="margin-right: 2px" />
+                  鍚�
+                </div>
               </div>
-              <div v-if="row.status==='N'">
-                <i class="el-icon-info" style="margin-right: 2px" />
-                鍚�
-              </div>
+              <div v-else>{{ row[item.prop] }}</div>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="startdate"
-            label="鍚敤鏃ユ湡"
-            width="110"
-            show-tooltip-when-overflow
-            sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.startdate">{{ row.startdate.substring(0, 11) }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="version"
-            label="鐗堟湰鍙�"
-            width="110"
-            show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="username"
-            label="鍒涘缓浜哄憳"
-            width="110"
-            show-tooltip-when-overflow
-            sortable="custom"
-          />
-          <el-table-column
-            prop="lm_date"
-            label="鍒涘缓鏃堕棿"
-            show-tooltip-when-overflow
-            width="110"
-            sortable="custom"
-          >
-            <template slot-scope="{row}">
-              <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>
-              <div v-else>/</div>
-            </template>
-          </el-table-column>
+
+          <!--          <el-table-column-->
+          <!--            prop="RowNum"-->
+          <!--            width="50"-->
+          <!--            fixed-->
+          <!--            label="搴忓彿"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="partcode"-->
+          <!--            label="姣嶄欢缂栫爜"-->
+          <!--            min-width="160"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="partname"-->
+          <!--            label="姣嶄欢鍚嶇О"-->
+          <!--            min-width="160"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="partspec"-->
+          <!--            label="姣嶄欢瑙勬牸"-->
+          <!--            min-width="160"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.partspec">{{ row.partspec }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="stocktype_name"-->
+          <!--            label="瀛樿揣绫诲瀷"-->
+          <!--            width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="uom_name"-->
+          <!--            label="璁¢噺鍗曚綅"-->
+          <!--            width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="quantity"-->
+          <!--            label="鍩虹鏁伴噺"-->
+          <!--            width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="status"-->
+          <!--            width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            label="鍚敤鐘舵��"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.status==='Y'">-->
+          <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+          <!--                鏄�-->
+          <!--              </div>-->
+          <!--              <div v-if="row.status==='N'">-->
+          <!--                <i class="el-icon-info" style="margin-right: 2px" />-->
+          <!--                鍚�-->
+          <!--              </div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="startdate"-->
+          <!--            label="鍚敤鏃ユ湡"-->
+          <!--            width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.startdate">{{ row.startdate.substring(0, 11) }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            prop="version"-->
+          <!--            label="鐗堟湰鍙�"-->
+          <!--            width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="username"-->
+          <!--            label="鍒涘缓浜哄憳"-->
+          <!--            width="110"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            sortable="custom"-->
+          <!--          />-->
+          <!--          <el-table-column-->
+          <!--            prop="lm_date"-->
+          <!--            label="鍒涘缓鏃堕棿"-->
+          <!--            show-tooltip-when-overflow-->
+          <!--            width="110"-->
+          <!--            sortable="custom"-->
+          <!--          >-->
+          <!--            <template slot-scope="{row}">-->
+          <!--              <div v-if="row.lm_date">{{ row.lm_date.substring(0, 11) }}</div>-->
+          <!--              <div v-else>/</div>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
           <el-table-column
             label="鎿嶄綔"
             width="120"
@@ -598,11 +634,12 @@
 } from '@/api/makeModel'
 import elDragDialog from '@/directive/el-drag-dialog'
 import waves from '@/directive/waves'
+import TableColumnSettings from '@/components/TableColumnSettings'
 
 export default {
   name: 'Zzjg',
   components: {
-    Pagination, ImportPicker
+    Pagination, ImportPicker, TableColumnSettings
   },
   directives: { elDragDialog, waves },
   data() {
@@ -633,6 +670,121 @@
 
       total: 10,
       tableData: [],
+
+      tableColumnSettingsArray: [
+        { minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒�  show: false闅愯棌锛宼rue鏄剧ず
+        { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partcode',
+          label: '姣嶄欢缂栫爜',
+          id: 3,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partname',
+          label: '姣嶄欢鍚嶇О',
+          id: 4,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'partspec',
+          label: '姣嶄欢瑙勬牸',
+          id: 5,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'stocktype_name',
+          label: '瀛樿揣绫诲瀷',
+          id: 6,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'uom_name',
+          label: '璁¢噺鍗曚綅',
+          id: 7,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: 110,
+          width: false,
+          prop: 'quantity',
+          label: '鍩虹鏁伴噺',
+          id: 8,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: false,
+          width: 110,
+          prop: 'status',
+          label: '鍚姩鐘舵��',
+          id: 9,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: false,
+          width: 110,
+          prop: 'startdate',
+          label: '鍚敤鏃ユ湡',
+          id: 10,
+          show: true,
+          fixed: false,
+          sortable: true
+        }, {
+          minWidth: false,
+          width: 110,
+          prop: 'version',
+          label: '鐗堟湰鍙�',
+          id: 11,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: false,
+          width: 110,
+          prop: 'username',
+          label: '鍒涘缓浜哄憳',
+          id: 12,
+          show: true,
+          fixed: false,
+          sortable: true
+        },
+        {
+          minWidth: false,
+          width: 160,
+          prop: 'lm_date',
+          label: '鍒涘缓鏃堕棿',
+          id: 13,
+          show: true,
+          fixed: false,
+          sortable: true
+        }
+      ],
+      tableTimeStampKey: new Date().getTime(), // 琛ㄦ牸key
+
       dialogVisible: false,
       dialogForm: {
         bomid: '',
@@ -701,6 +853,13 @@
     this.getHeight()
   },
   methods: {
+    tableColumnUpdate(val, isCopyTrue) {
+      if (isCopyTrue) {
+        this.tableColumnSettingsArray = val
+      }
+      this.tableTimeStampKey = new Date().getTime()
+      this.$refs.tableDataRef.doLayout()
+    },
     handleRequest() {
       this.getBoIventorySelect().then(res => {
         if (res.code === '200') {

--
Gitblit v1.9.3