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/pp/report/ProcessToBeCompleted.vue |  218 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 178 insertions(+), 40 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index f68e379..7afdcbe 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -1,23 +1,127 @@
-<script lang="ts" setup>
-import {reactive, ref} from 'vue'
+<script setup>
 
+import {reactive, ref} from "vue";
+import {useRouter} from  'vue-router'
+let router=useRouter()
+const getTableRow = (row,type) =>{
+  switch (type) {
+    case 'edit' :{
+      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+      router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
+      break
+    }
+    case 'delete':{
+      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+      break
+    }
+    case  'setType':{
+      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
+      break
+    }
+  }
+}
 
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+  let count = 0
+  list.forEach(item => {
+    count += Number(item[field])
+  })
+  return count.toFixed(2)
+}
 
+//瀛愮粍浠舵帴鏀跺弬鏁�
 
-const defaultTime = ref<[Date, Date]>([
-  new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1, 23, 59, 59),
-])
-// do not use same name with ref
-const form = reactive({
-  name: '',
-  region: '',
-  date1: '',
-  date2: '',
-  delivery: false,
-  type: [],
-  resource: '',
-  desc: '',
+const gridOptions = reactive({
+  border:  "full",//琛ㄦ牸鍔犺竟妗�
+  keepSource: true,//淇濇寔婧愭暟鎹�
+  align: 'center',//鏂囧瓧灞呬腑
+  stripe:true,//鏂戦┈绾�
+  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'CustomerList',
+  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',fixed:"left",slots: { content:'content' },width: 50},
+    { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+    {field: '1',  title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+    {field: '2', title: '鍗曠墖鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: '3',title: '鏈畬鏁�', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: '4', title: '鏈畬闈㈢Н',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+
+  ],//琛ㄥご鎸夐挳
+
+  toolbarConfig: {
+    // buttons: [{
+    //
+    // }],
+    import: false,
+    export: true,
+    print: true,
+    zoom: true,
+    custom: true
+  },
+  data:  [
+    {
+      1:'鏂板畨鍖楃幓浜т笟鍥�',
+      2:'19mm瓒呯櫧骞抽挗',
+      3:'1',
+      4:'3.11',
+    },
+    {
+      1:'鏂板畨鍖楃幓浜т笟鍥�',
+      2:'19mm瓒呯櫧骞抽挗',
+      3:'1',
+      4:'3.11',
+    },
+    {
+      1:'鏂板畨鍖楃幓浜т笟鍥�',
+      2:'19mm瓒呯櫧骞抽挗',
+      3:'1',
+      4:'3.11',
+    },
+    {
+      1:'鏂板畨鍖楃幓浜т笟鍥�',
+      2:'19mm瓒呯櫧骞抽挗',
+      3:'1',
+      4:'3.11',
+    },
+  ],//table body瀹為檯鏁版嵁
+  //鑴氶儴姹傚拰
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    let footList=['finishedNumber','finishedArea','wornNumber','wornArea']
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        if (footList.includes(column.field)) {
+          return sumNum(data, column.field)
+        }
+        return ''
+      })
+    ]
+  }
+
 })
 
 const value = ref('')
@@ -35,29 +139,37 @@
     label: 'Option3',
   },
 ]
-const tableData = [
-  {
-    1:'鏂板畨鍖楃幓浜т笟鍥�',
-    2:'19mm瓒呯櫧骞抽挗',
-    3:'1',
-    4:'3.11',
-  },
-]
+
+const form = reactive({
+  name: '',
+  region: '',
+  date1: '',
+  date2: '',
+  delivery: false,
+  type: [],
+  resource: '',
+  desc: '',
+
+})
+
 </script>
-<!--宸ュ簭寰呭畬鎴愭姤琛�-->
+
 <template>
-  <div class="div-main">
+  <div class="main-div-customer">
     <div id="selectForm">
       <el-row :gutter="0">
-<!--        <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
-<!--        <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
+        <!--        <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 150px"/>-->
+        <!--        <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 150px"/>-->
+        &nbsp;&nbsp;
         <el-date-picker
             v-model="form.date1"
             type="daterange"
             start-placeholder="寮�濮嬫椂闂�"
             end-placeholder="缁撴潫鏃堕棿"
             :default-time="defaultTime"
+            style="width: 100px"
         />
+        &nbsp;&nbsp;
         <el-select v-model="value" class="m-2" placeholder="鏌ヨ绫诲瀷">
           <el-option
               v-for="item in options"
@@ -66,30 +178,56 @@
               :value="item.value"
           />
         </el-select>
-        &nbsp;&nbsp;
         <el-button type="primary">鏌ヨ</el-button>
       </el-row>
 
     </div>
-    <div>
-      <el-table :data="tableData" border style="width: 100%" height="100%">
-        <el-table-column prop="1" label="椤圭洰鍚嶇О" width="115" :show-overflow-tooltip='true'/>
-        <el-table-column prop="2" label="鍗曞搧鍚嶇О" width="115" :show-overflow-tooltip='true'/>
-        <el-table-column prop="3" label="鏈畬鏁�" :show-overflow-tooltip='true' />
-        <el-table-column prop="4" label="鏈畬闈㈢Н" :show-overflow-tooltip='true'/>
-      </el-table><!-- <h1>{{msg}}</h1> -->
-    </div>
+    <vxe-grid
+        max-height="100%"
+        @filter-change="filterChanged"
+        class="mytable-scrollbar"
+        ref="xGrid"
+        v-bind="gridOptions"
 
+    >
+      <!--      @toolbar-button-click="toolbarButtonClickEvent"-->
+      <!--      涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+      <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>
+
+      <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+      <template #button_slot="{ row }">
+        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
+        <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鍙嶅</el-button>
+        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+      </template>
+
+      <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>
+
+
+    </vxe-grid>
   </div>
 </template>
 
 <style scoped>
-.div-main{
-  width: 100%;
+.main-div-customer{
+  width: 99%;
   height: 100%;
 }
 #selectForm {
-  width: 70%;
+  width: 60%;
   text-align: center;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0