From 2ad00b6623beac3b504105beba9cb56143f7db13 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 22 一月 2024 08:29:45 +0800
Subject: [PATCH] 实体类相关文件提交

---
 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
index a97896d..80a0380 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -77,13 +77,13 @@
   },//琛ㄥご鍙傛暟
   columns:[
     {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
     {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left"},
+    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
     {field: 'reworkNumber',width: 120, title: '杩斿伐缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
     {field: 'salesOrderNo',width: 120, title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
     {field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
     {field: 'entryName', width: 120,title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'batch',width: 80, title: '鎵规', sortable: true,showOverflow:"ellipsis"},
+    {field: 'batch',width: 100, title: '鎵规', filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
     {field: 'serialNumber',width: 80, title: '搴忓彿', sortable: true},
     {field: 'singlePieceName',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
     {field: 'marking',width: 80, title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
@@ -185,13 +185,16 @@
 <template>
   <div class="main-div-customer">
     <div id="head" >
+      <el-row :gutter="0">
       <el-date-picker
           v-model="value"
           type="daterange"
           start-placeholder="寮�濮嬫椂闂�"
           end-placeholder="缁撴潫鏃堕棿"
       />
+        &nbsp;
       <el-button type="primary">鏌ヨ</el-button>
+      </el-row>
     </div>
     <vxe-grid
         max-height="100%"
@@ -203,11 +206,11 @@
     >
       <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
       <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
-      <template #content="{ row}">
+      <template #content="{ row }">
         <ul class="expand-wrapper">
-          <li  v-for="(item,key,index) in row">
-            <span style="font-weight: bold">{{key+':  '}}</span>
-            <span>{{ item }}</span>
+          <li  v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+            <span style="font-weight: bold">{{item.title+':  '}}</span>
+            <span>{{ row[item.field] }}</span>
           </li>
         </ul>
       </template>
@@ -257,4 +260,8 @@
   width: 99%;
   height: 100%;
 }
+#head{
+  width:40%;
+
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0