From 1f6c97aa5f23d09a04152038c7d53ce95721cf50 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 22 十二月 2023 16:29:51 +0800
Subject: [PATCH] pp、sd模块界面调整,添加vxetable组件和对应界面跳转

---
 north-glass-erp/northglass-erp/src/views/sd/returns/CreateReturns.vue |  187 +++++++++++++++++++++++++++-------------------
 1 files changed, 111 insertions(+), 76 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/sd/returns/CreateReturns.vue b/north-glass-erp/northglass-erp/src/views/sd/returns/CreateReturns.vue
index c0bbd7c..8e203da 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/returns/CreateReturns.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/returns/CreateReturns.vue
@@ -1,65 +1,100 @@
 <script setup>
 
-let deliveryTitle = $ref([
-  '鍙戣揣鍗曞彿',
-  '鎵规',
-  '鍙��鏁伴噺',
-  '宸查��鏁伴噺',
-  '鎬绘暟閲�',
-  '鏈閫�璐ф暟閲�',
-  '妤煎彿',
-  '浜у搧缂栧彿',
-  '浜у搧鍚嶇О',
-  '鍗曚环',
-  '搴撳尯',
-  '寮傚舰鍙傛暟',//鍙互涓嶉渶瑕�
-  '閲戦',
-  '瀹�',
-  '楂�',
-  '褰㈢姸',
-  '瀹為檯鍗曠墖/鎬婚潰绉�',
-  '缁撶畻鍗曠墖闈㈢Н',
-  '缁撶畻鎬婚潰绉�',
-  '鍔犲伐瑕佹眰',
-  '澶囨敞',
-  '纾ㄨ竟绫诲瀷',
-  '鍛ㄩ暱',
+import {reactive} from "vue";
 
 
-])
 
-let deliveryList =[
-  {
-    '0': 'JG23110101',
-    '1': '20鎵�1',
-    '2': '16',
-    '3': '4',
-    '4': '20',
-    '5': '16',
-    '6': 'A妤糱灞�',
-    '7': '101',
-    '8': '10mmLYTM-140寮挗鍖�',
-    '9': '1008.38',
-    '10': 'A鍙锋煴瀛�',
-    '11': '',
-    '12': '100',
-    '13': '3360',
-    '14': '2440',
-    '15': '鏅舰',
-    '16': '1.11/100.1',
-    '17': '1.22',
-    '18': '11.11',
-    '19': '杩欐槸鍔犲伐瑕佹眰',
-    '20': '杩欐槸澶囨敞',
-    '21': '杩欐槸纾ㄨ竟绫诲瀷',
-    '22': '1.1'
+const gridOptions = reactive({
+  border:  "full",//琛ㄦ牸鍔犺竟妗�
+  keepSource: true,//淇濇寔婧愭暟鎹�
+  align: 'center',//鏂囧瓧灞呬腑
+  stripe:true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'OrderList',
+  showFooter: true,//鏄剧ず鑴�
+  printConfig: {},
+  importConfig: {},
+  exportConfig: {},
+  scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
+  showOverflow:true,
+  columnConfig: {
+    resizable: true,
+    useKey: true
+  },
+  filterConfig: {   //绛涢�夐厤缃」
+    remote: true
+  },
+  customConfig: {
+    storage: true
+  },
+  editConfig: {
+    trigger: 'click',
+    mode: 'row',
+    showStatus: true
+  },//琛ㄥご鍙傛暟
+  columns:[
+    {type:'expand',slots: { content:'content' },width: 50,fixed:"left"},
+    {type:'checkbox',title: '閫夊垯', width: 80,fixed:"left"},
+    {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left"},
+    {field: '0',width:120,  title: '鍙戣揣鍗曞彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '1',width:120,  title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '2',width:120,  title: '鍙��鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '3',width:120,  title: '宸查��鏁伴噺',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '4',width:120,  title: '鎬绘暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '5',width:120,  title: '閫�璐ф暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '6',width:120,  title: '妤煎彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '7',width:120,   title: '浜у搧缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '8',width:120,  title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '9',width:120,  title: '鍗曚环',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '10',width:120,  title: '搴撳尯',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '11',width:120,  title: '閲戦',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '12',width:120,  title: '瀹�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '13',width:120,  title: '楂�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '14',width:120,  title: '褰㈢姸',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '15',width:120,   title: '鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '16',width:120,   title: '鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '17',width:120,  title: '缁撶畻鍗曠墖闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '18',width:120,  title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '19',width:120,  title: '鍔犲伐瑕佹眰',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '20',width:120,  title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '21',width:120,  title: '纾ㄨ竟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: '22',width:120,  title: '鍛ㄩ暱',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+
+
+  ],//琛ㄥご鎸夐挳
+  toolbarConfig: {
+    buttons: [
+      {'code': 'add', 'name': '淇濆瓨',status: 'primary',icon: 'vxe-icon-save'}
+    ],
+    import: false,
+    export: true,
+    print: true,
+    zoom: true,
+    custom: true
+  },
+  data:  [
+  ],//table body瀹為檯鏁版嵁
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        // if (props.tableProp.footList.includes(column.field)) {
+        //   return sumNum(data, column.field)
+        // }
+        return ''
+      })
+    ]
   }
-]
+
+})
+
 </script>
 
 <template>
   <div class="main-div">
-    <div class="order-primary">
+    <div class="order-primary" style="background-color: white" >
       <el-row>
         <el-col  :span="2"><el-text>瀹㈡埛缂栫爜:</el-text></el-col>
         <el-col  :span="5"><el-text style="font-size: large;color: #181818">131</el-text></el-col>
@@ -75,7 +110,7 @@
             <el-option/>
           </el-select>
         </el-col>
-        <el-col  :span="2"><el-text>鍙戣揣鎶ヨ〃鏃ユ湡:</el-text></el-col>
+        <el-col  :span="2"><el-text>閫�璐ф棩鏈�:</el-text></el-col>
         <el-col  :span="5">
           <el-date-picker
               type="week"
@@ -90,33 +125,33 @@
         <el-col  :span="5"><el-text style="font-size: large;color: #181818"></el-text></el-col>
         <el-col  :span="2"><el-text>鍙戣揣鍛�:</el-text></el-col>
         <el-col  :span="5"><el-text style="font-size: large;color: #181818"></el-text></el-col>
-        <el-col style="background-color: #337ecc" :span="2"><el-button style="width: 100%" type="primary">淇濆瓨</el-button></el-col>
       </el-row>
     </div>
     <div class="order-detail">
-      <el-table
-          :data="deliveryList"
-          :header-cell-style="{ 'text-align': 'center' }"
-          :cell-style="{ 'text-align': 'center' }"
-          border
-      >
-        <el-table-column type="expand" fixed>
-          <template #default="props" >
-            <div m="4">
-              <p m="t-0 b-2">璁㈠崟鍙戣揣鏈夊叧鎵�鏈変俊鎭�</p>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column  label="閫夊垯" fixed>
-          <el-checkbox/>
-        </el-table-column>
-        <el-table-column
-            :prop="index.toString()"
-            :show-overflow-tooltip='true'
-            width="110" v-for="(item,index) in deliveryTitle"
-            :label="item" />
+      <vxe-grid
+          max-height="97%"
+          class="mytable-scrollbar"
+          ref="xGrid"
+          v-bind="gridOptions"
 
-      </el-table>
+      >
+        <template #num1_filter="{ column, $panel }">
+          <div>
+            <div v-for="(option, index) in column.filters" :key="index">
+              <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+            </div>
+          </div>
+        </template>
+        <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>
+          </ul>
+        </template>
+
+      </vxe-grid>
     </div>
   </div>
 

--
Gitblit v1.8.0