From fcd7ece15a86fc0cb526ee801ff8262b0db22dee Mon Sep 17 00:00:00 2001
From: NNowhZzU <1539353356@qq.com>
Date: 星期一, 25 十二月 2023 11:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue |  399 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 248 insertions(+), 151 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index b2033b5..290b620 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -1,13 +1,207 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ref } from 'vue'
-import {useRouter} from "vue-router";
-const value = ref('')
-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
+<script setup>
+
+import {reactive} from "vue";
+import {useRouter} from  'vue-router'
+let router=useRouter()
+const getTableRow = (row,type) =>{
+  switch (type) {
+    case 'edit' :{
+      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
+      router.push({path: '/main/processCard/PrintFlowCard', 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 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 },
+    {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
+    {field: 'salesOrderNo', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+    {field: 'productionOrderNo', title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'productID', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'entryName', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
+    {field: 'total', title: '鎬绘暟閲�', sortable: true},
+    {field: 'TotalArea', title: '鎬婚潰绉�', sortable: true},
+    {field: 'Cases', title: '鍒嗙', sortable: true,showOverflow:"ellipsis"},
+    {field: 'divider', title: '鍒嗘灦鍛�', sortable: true},
+    {field: 'processRequirements', title: '鍔犲伐瑕佹眰', sortable: true}
+  ],//琛ㄥご鎸夐挳
+
+  toolbarConfig: {
+    // buttons: [{
+    //
+    // }],
+    import: false,
+    export: true,
+    print: true,
+    zoom: true,
+    custom: true
+  },
+  data:  [
+    {
+      salesOrderNo: 'NG231201',
+      productionOrderNo: 'NG231201A',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      salesOrderNo: 'NG231201',
+      productionOrderNo: 'NG231201B',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      salesOrderNo: 'NG231202',
+      productionOrderNo: 'NG231202A',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      salesOrderNo: 'NG231203',
+      productionOrderNo: 'NG231203A',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      salesOrderNo: 'NG231204',
+      productionOrderNo: 'NG231204A',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      salesOrderNo: 'NG231205',
+      productionOrderNo: 'NG231205A',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      salesOrderNo: 'NG231206',
+      productionOrderNo: 'NG231206A',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      salesOrderNo: 'NG231207',
+      productionOrderNo: 'NG231207A',
+      productID: '9001010203000008',
+      productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
+      entryName: '淇″悎鏄ュぉ閲�',
+      total: '169',
+      TotalArea: '175.31',
+      Cases: '3',
+      divider: 'xxx',
+      processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+  ],//table body瀹為檯鏁版嵁
+  //鑴氶儴姹傚拰
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    let footList=['total','TotalArea','Cases']
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        if (footList.includes(column.field)) {
+          return sumNum(data, column.field)
+        }
+        return ''
+      })
+    ]
+  }
+
+})
+
 const form = reactive({
   name: '',
   region: '',
@@ -18,168 +212,71 @@
   resource: '',
   desc: '',
 })
-const router = useRouter()
-function goToPage() {
-  router.push('/main/processCard/PrintFlowCard')
-}
-const tableData = [
-  {
-    salesOrderNo: 'NG231201',
-    productionOrderNo: 'NG231201A',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    salesOrderNo: 'NG231201',
-    productionOrderNo: 'NG231201B',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    salesOrderNo: 'NG231202',
-    productionOrderNo: 'NG231202A',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    salesOrderNo: 'NG231203',
-    productionOrderNo: 'NG231203A',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    salesOrderNo: 'NG231204',
-    productionOrderNo: 'NG231204A',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    salesOrderNo: 'NG231205',
-    productionOrderNo: 'NG231205A',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    salesOrderNo: 'NG231206',
-    productionOrderNo: 'NG231206A',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    salesOrderNo: 'NG231207',
-    productionOrderNo: 'NG231207A',
-    productID: '9001010203000008',
-    productName: '5mm鐧界幓骞抽挗(澶�)+0.76PVB閫忔槑+5mm鐧界幓骞抽挗(鍐�)',
-    entryName: '淇″悎鏄ュぉ閲�',
-    total: '169',
-    TotalArea: '175.31',
-    Cases: '3',
-    divider: 'xxx',
-    processRequirements: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-]
+
 </script>
 
 <template>
-  <div>
-    <div id="selectForm" >
+  <div class="main-div-customer">
+    <div id="selectForm">
       <el-row :gutter="0">
-<!--          <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" style="width: 200px"/>-->
-<!--        &nbsp;&nbsp;-->
-<!--          <el-input placeholder="椤圭洰鍚嶇О" v-model="form.name" style="width: 200px"/>-->
-
-<!--        &nbsp;&nbsp;-->
         <el-date-picker
-            v-model="value"
+            v-model="form.date1"
             type="daterange"
             start-placeholder="寮�濮嬫椂闂�"
             end-placeholder="缁撴潫鏃堕棿"
             :default-time="defaultTime"
         />
         &nbsp;&nbsp;
-        <el-button type="primary" style="width: 80px">鏌ヨ</el-button>
+        <el-button type="primary">鏌ヨ</el-button>
       </el-row>
 
     </div>
-    <el-table :data="tableData" border style="width: 100%" height="100%">
-      <el-table-column fixed label="鎿嶄綔" width="140"  >
-        <el-button link type="primary" size="small">鍒犻櫎</el-button>
-        <el-button link type="primary" size="small">鎺掔増</el-button>
-        <el-button link type="primary" size="small" @click="goToPage">鎵撳嵃</el-button>
-      </el-table-column>
-      <el-table-column sortable prop="salesOrderNo" label="閿�鍞崟鍙�" width="110" >
-        <template v-slot="scope">
-          <router-link :to="{path:'ProcessCardDetails'}" >{{scope.row.salesOrderNo}}</router-link>
-        </template>
-      </el-table-column>
-      <el-table-column prop="productionOrderNo" label="鐢熶骇璁㈠崟鍙�" width="125" />
-      <el-table-column prop="productID" label="浜у搧缂栧彿" width="155" />
-      <el-table-column prop="productName" label="浜у搧鍚嶇О" :show-overflow-tooltip='true' width="180" />
-      <el-table-column prop="entryName" label="椤圭洰鍚嶇О" width="155" />
-      <el-table-column prop="total" label="鎬荤墖鏁�" width="75" />
-      <el-table-column prop="TotalArea" label="鎬婚潰绉�" width="100" />
-      <el-table-column prop="Cases" label="绠辨暟" width="100" />
-      <el-table-column prop="divider" label="鍒嗘灦鍛�" width="70" />
-      <el-table-column prop="processRequirements" label="鍔犲伐瑕佹眰" :show-overflow-tooltip='true' width="350" />
-    </el-table><!-- <h1>{{msg}}</h1> -->
+    <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>
-*{
-  margin: 0;
-  padding:0;
+.main-div-customer{
+  width: 99%;
+  height: 100%;
 }
-
-a{
-  color:#409eff;
-}
-
 #selectForm {
   width: 40%;
-  height: 100%;
   text-align: center;
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0