From ed6f35069824d71ee6da599a328d865eb0c58550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 四月 2024 09:16:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue |  447 ++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 310 insertions(+), 137 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 aa78875..c32560c 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,25 +1,90 @@
 <script setup>
 
-import {reactive} from "vue";
-import {useRouter} from  'vue-router'
-let router=useRouter()
-const getTableRow = (row,type) =>{
+import request from "@/utils/request"
+import deepClone from "@/utils/deepClone"
+import {ElDatePicker, ElMessage} from "element-plus"
+import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import GlassType from "@/components/sd/product/GlassType.vue"
+import {useRouter} from 'vue-router'
+import Sortable from 'sortablejs'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
+import {VXETable} from "vxe-table";
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+const { t } = useI18n()
+let productGlassTypeStore = useProductGlassTypeStore()
+let router = useRouter()
+let props = defineProps({
+  rowIndex:{}
+})
+const getTableRow = (row, type) => {
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
   switch (type) {
-    case 'edit' :{
-      //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
-      router.push({path: '/main/processCard/PrintFlowCard', query: { id: row.id }})
+    case 'select' : {
+      router.push({path: '/main/processCard/SelectDetailProcessCard', query: { processId: row.processId }})
       break
     }
-    case 'delete':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+    case 'setType': {
+      let state=row.layoutStatus
+
+      if (state=='鍙帓鐗�'){
+        request.post(`/processCard/updateLayoutStatus/${row.processId}/2`).then((res) => {
+          if (res.code == 200) {
+            ElMessage.success(t('processCard.typesettingSuccess')
+            )
+            router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
+          } else {
+
+            ElMessage.warning(res.msg)
+          }
+        })
+      }
+      else if(state=='涓嶅彲鎺掔増'){
+        request.post(`/processCard/updateLayoutStatus/${row.processId}/1`).then((res) => {
+          if (res.code == 200) {
+            ElMessage.success(t('processCard.modifySuccessfully'))
+            router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
+          } else {
+
+            ElMessage.warning(res.msg)
+          }
+        })
+      }
+
       break
     }
-    case  'setType':{
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
+    case 'delete': {
+      request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
+        if (res.code == 200) {
+          ElMessage.success(t('workOrder.deleteOk'))
+          router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
+        } else {
+
+          ElMessage.warning(res.msg)
+
+        }
+      })
       break
     }
   }
 }
+
+
+
+function padLeftZero(str) {
+  return ('00' + str).substr(str.length)
+}
+
+//瀹氫箟鏃堕棿
+const form = reactive({
+  date1: '',
+})
+
+
+
 
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
@@ -30,14 +95,168 @@
   return count.toFixed(2)
 }
 
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀹氫箟婊氬姩鏉￠珮搴�
+let scrollTop = ref(null)
+let scrollHeight = ref(null)
+let clientHeight = ref(null)
+const scrollEvnt = (row) => {
+  // 鍐呭楂樺害
+  scrollTop.value = row.$event.target.scrollTop
+  scrollHeight.value = row.$event.target.scrollHeight
+  clientHeight.value = row.$event.target.clientHeight
+}
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+  order: {
+    project: ''
+  },
+  orderDetail: {
+    productId: '',
+    productName: '',
+    computeGrossArea: '',
+    processingNote: '',
+  }
 
+})
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum=ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+  const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
+      .toISOString()
+      .replace('T', ' ')
+      .slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
+  const end = new Date(new Date().getTime()+3600 * 1000 * 24)
+      .toISOString()
+      .replace('T', ' ')
+      .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+  return [start, end]
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1=getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let total = reactive({
+  pageTotal : 0,
+  dataTotal : 0,
+  pageSize : 100
+})
+//绗竴娆″姞杞芥暟鎹�
+request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+
+  if (res.code == 200) {
+    total.dataTotal = res.data.total.total*1
+    total.pageTotal= res.data.total.pageTotal
+    pageTotal.value = res.data.total
+    produceList = produceList.value.concat(deepClone(res.data.data))
+    xGrid.value.reloadData(produceList)
+    gridOptions.loading = false
+  } else {
+    ElMessage.warning(res.msg)
+  }
+})
+
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = ()=>{
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
+  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`,filterData.value).then((res) => {
+    if(res.code==200){
+
+      produceList = deepClone(res.data.data)
+      xGrid.value.reloadData(produceList)
+    }else{
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
+  request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+    if (res.code == 200) {
+
+      pageTotal.value = res.data.total
+      xGrid.value.loadData(res.data.data)
+      gridOptions.loading = false
+    } else {
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+  pageNum.value=currentPage
+  total.pageTotal    = pageSize
+  selectPageList()
+}
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+const changeFilterEvent = (event, option, $panel,) => {
+  // 鎵嬪姩瑙﹀彂绛涢��
+  $panel.changeOption(event, !!option.data, option)
+}
+
+function filterChanged(column) {
+  gridOptions.loading = true
+  //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+  let value = column.datas[0] != undefined ? column.datas[0] : ''
+  value = value.trim()
+  //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+  if (column.property.indexOf('.') > -1) {
+    const columnArr = column.property.split('.')
+    filterData.value[columnArr[0]] = {
+      [columnArr[1]]: value
+    }
+  } else {
+    filterData.value[column.property] = value
+  }
+
+//鑾峰彇閫変腑鏃堕棿
+  let startTime = form.date1[0]
+  let endTime = form.date1[1]
+
+  request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+    if(res.code==200){
+      pageTotal.value=res.data.total
+      total.pageTotal=parseInt(res.data.total)
+      pageNum.value=1
+      produceList = deepClone(res.data.data)
+      xGrid.value.loadData(produceList)
+      gridOptions.loading=false
+    }else{
+      ElMessage.warning(res.msg)
+    }
+  })
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+  const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+  return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
 const gridOptions = reactive({
+  loading: true,
   border:  "full",//琛ㄦ牸鍔犺竟妗�
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
   id: 'CustomerList',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
@@ -62,18 +281,18 @@
   },//琛ㄥご鍙傛暟
   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}
+    {title: t('basicData.operate'), width: 160, slots: { default: 'button_slot' },fixed:"left"},
+    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
+    {field: 'orderId', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 110 },
+    {field: 'processId', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'orderDetail.productId', title: t('order.productId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+    {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
+    {field: 'order.project', title: t('order.project') ,showOverflow:"ellipsis"},
+    {field: 'quantity', title: t('order.quantity'), },
+    {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
+    {field: 'founder', title: t('processCard.founder'), },
+    {field: 'orderDetail.processingNote', title: t('order.processingNote'), },
+    {field: 'layoutStatus', title: t('processCard.layoutStatus'), }
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -81,116 +300,21 @@
     //
     // }],
     import: false,
-    export: true,
-    print: true,
+    // 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[
+  footerMethod({columns, data}) {//椤佃剼鍑芥暟
+    let footList = ['', '',]
+    return [
       columns.map((column, columnIndex) => {
         if (columnIndex === 0) {
-          return '鍚堣:'
+          return t('basicData.total')
         }
         if (footList.includes(column.field)) {
           return sumNum(data, column.field)
@@ -208,6 +332,28 @@
 
 <template>
   <div class="main-div-customer">
+    <div id="selectForm">
+      <el-row :gutter="0">
+        <el-date-picker
+            v-model="form.date1"
+            type="daterange"
+            format="YYYY/MM/DD"
+            value-format="YYYY-MM-DD"
+            :start-placeholder="$t('basicData.startDate')"
+            :end-placeholder="$t('basicData.endDate')"
+            :default-time="defaultTime"
+
+        />
+        &nbsp;&nbsp;
+        <el-button
+            @click="getWorkOrder"
+            id="select"
+            type="primary" :icon="Search">{{$t('basicData.search')}}
+
+        </el-button>
+      </el-row>
+
+    </div>
     <vxe-grid
         max-height="100%"
         @filter-change="filterChanged"
@@ -218,30 +364,53 @@
     >
       <!--      @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 v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+            <span v-else>{{ row[item.field] }}</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 #button_slot="{ row }" >
+        <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}
+        </el-button>
+        <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>
+        <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>
+        <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>
+<!--        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+        <el-popconfirm   @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+          <template #reference>
+            <el-button  link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+          </template>
+        </el-popconfirm>
       </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)"/>
+            <input type="text" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
       </template>
-
+      <template #pager>
+        <!--浣跨敤 pager 鎻掓Ы-->
+        <!--        'PrevJump','NextJump', -->
+        <vxe-pager
+            @page-change="handlePageChange"
+            :layouts="[  'PrevPage', 'Jump','PageCount', 'NextPage',  'Total']"
+            v-model:current-page="pageNum"
+            v-model:page-size="total.pageSize"
+            v-model:pager-count="total.pageTotal"
+            :total="total.dataTotal"
+        >
+        </vxe-pager>
+      </template>
 
     </vxe-grid>
   </div>
@@ -252,4 +421,8 @@
   width: 99%;
   height: 100%;
 }
+#selectForm {
+  width: 40%;
+  text-align: center;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0