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/reportingWorks/QualityInspectionReview.vue |  355 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 225 insertions(+), 130 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
index 5cfdacf..a29e9d3 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue
@@ -1,107 +1,199 @@
-<script lang="ts" setup>
-import { reactive } from 'vue'
-import { ref } from 'vue'
-const value = ref('')
-const defaultTime = ref<[Date, Date]>([
-  new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1, 23, 59, 59),
-])
+<script setup>
 
-// do not use same name with ref
-const form = reactive({
-  name: '',
-  region: '',
-  date1: '',
-  date2: '',
-  delivery: false,
-  type: [],
-  resource: '',
-  desc: '',
+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/reportingWorks/QualityInReviewDetail', 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: 120, slots: { default: 'button_slot' },fixed:"left"},
+    {field: 'reportingWorkNo',width: 120,  title: '鎶ュ伐缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+    {field: 'reportingWorkTime',width: 120, title: '鎶ュ伐鏃堕棿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'entryName',width: 120, title: '椤圭洰鍚嶇О', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'customerName',width: 120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+    {field: 'thisProcess',width: 100, title: '鏈伐搴�', sortable: true,showOverflow:"ellipsis"},
+    {field: 'teamName',width: 110, title: '鎶ュ伐鐝粍', sortable: true},
+    {field: 'finishedNumber',width: 100, title: '瀹屽伐鏁伴噺', sortable: true},
+    {field: 'wornNumber', width: 100,title: '娆＄牬鏁伴噺', sortable: true},
+    {field: 'responsibilityProcess',width: 100, title: '璐ｄ换宸ュ簭', sortable: true},
+    {field: 'previousProcess', width: 100,title: '涓婂伐搴�', sortable: true},
+    {field: 'nextProcess',width: 100, title: '涓嬪伐搴�', sortable: true},
+    {field: 'qualityInspector',width: 120, title: '璐ㄦ鍛�', sortable: true},
+    {field: 'qualityState',width: 120, title: '璐ㄦ鐘舵��', sortable: true},
+    {field: 'notes',width: 120, title: '澶囨敞', sortable: true}
+  ],//琛ㄥご鎸夐挳
+
+  toolbarConfig: {
+    // buttons: [{
+    //
+    // }],
+    import: false,
+    export: true,
+    print: true,
+    zoom: true,
+    custom: true
+  },
+  data:  [
+    {
+      reportingWorkNo: 'BG2312070001',
+      reportingWorkTime: '2023-12-01 08:01:22',
+      processCard: 'NG231207A01',
+      entryName: '淇″悎鏄ュぉ閲�',
+      customerName: 'XXXX',
+      thisProcess: '涓┖',
+      teamName:"涓┖涓�鐝�",
+      finishedNumber: '11',
+      wornNumber: '1',
+      responsibilityProcess: '閽㈠寲',
+      previousProcess:'閽㈠寲',
+      nextProcess:'鍖呰',
+      qualityInspector: 'XXX',
+      qualityState: '1',
+      notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      reportingWorkNo: 'BG2312070002',
+      reportingWorkTime: '2023-12-01 08:01:22',
+      processCard: 'NG231207A01',
+      entryName: '淇″悎鏄ュぉ閲�',
+      customerName: 'XXXX',
+      thisProcess: '涓┖',
+      teamName:"涓┖涓�鐝�",
+      finishedNumber: '11',
+      wornNumber: '1',
+      responsibilityProcess: '閽㈠寲',
+      previousProcess:'閽㈠寲',
+      nextProcess:'鍖呰',
+      qualityInspector: 'XXX',
+      qualityState: '1',
+      notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      reportingWorkNo: 'BG2312070003',
+      reportingWorkTime: '2023-12-01 08:01:22',
+      processCard: 'NG231207A01',
+      entryName: '淇″悎鏄ュぉ閲�',
+      customerName: 'XXXX',
+      thisProcess: '涓┖',
+      teamName:"涓┖涓�鐝�",
+      finishedNumber: '11',
+      wornNumber: '1',
+      responsibilityProcess: '閽㈠寲',
+      previousProcess:'閽㈠寲',
+      nextProcess:'鍖呰',
+      qualityInspector: 'XXX',
+      qualityState: '1',
+      notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+    {
+      reportingWorkNo: 'BG2312070004',
+      reportingWorkTime: '2023-12-01 08:01:22',
+      processCard: 'NG231207A01',
+      entryName: '淇″悎鏄ュぉ閲�',
+      customerName: 'XXXX',
+      thisProcess: '涓┖',
+      teamName:"涓┖涓�鐝�",
+      finishedNumber: '11',
+      wornNumber: '1',
+      responsibilityProcess: '閽㈠寲',
+      previousProcess:'閽㈠寲',
+      nextProcess:'鍖呰',
+      qualityInspector: 'XXX',
+      qualityState: '1',
+      notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
+    },
+
+  ],//table body瀹為檯鏁版嵁
+  //鑴氶儴姹傚拰
+  footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+    let footList=['finishedNumber','wornNumber']
+    return[
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0) {
+          return '鍚堣:'
+        }
+        if (footList.includes(column.field)) {
+          return sumNum(data, column.field)
+        }
+        return ''
+      })
+    ]
+  }
+
 })
-const tableData = [
-  {
-    reportingWorkNo: 'BG2312070001',
-    reportingWorkTime: '2023-12-01 08:01:22',
-    processCard: 'NG231207A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    customerName: 'XXXX',
-    thisProcess: '涓┖',
-    teamName:"涓┖涓�鐝�",
-    finishedNumber: '11',
-    wornNumber: '1',
-    responsibilityProcess: '閽㈠寲',
-    previousProcess:'閽㈠寲',
-    nextProcess:'鍖呰',
-    qualityInspector: 'XXX',
-    qualityState: '1',
-    notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    reportingWorkNo: 'BG2312070002',
-    reportingWorkTime: '2023-12-01 08:01:22',
-    processCard: 'NG231207A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    customerName: 'XXXX',
-    thisProcess: '涓┖',
-    teamName:"涓┖涓�鐝�",
-    finishedNumber: '11',
-    wornNumber: '1',
-    responsibilityProcess: '閽㈠寲',
-    previousProcess:'閽㈠寲',
-    nextProcess:'鍖呰',
-    qualityInspector: 'XXX',
-    qualityState: '1',
-    notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    reportingWorkNo: 'BG2312070003',
-    reportingWorkTime: '2023-12-01 08:01:22',
-    processCard: 'NG231207A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    customerName: 'XXXX',
-    thisProcess: '涓┖',
-    teamName:"涓┖涓�鐝�",
-    finishedNumber: '11',
-    wornNumber: '1',
-    responsibilityProcess: '閽㈠寲',
-    previousProcess:'閽㈠寲',
-    nextProcess:'鍖呰',
-    qualityInspector: 'XXX',
-    qualityState: '1',
-    notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
-  {
-    reportingWorkNo: 'BG2312070004',
-    reportingWorkTime: '2023-12-01 08:01:22',
-    processCard: 'NG231207A01',
-    entryName: '淇″悎鏄ュぉ閲�',
-    customerName: 'XXXX',
-    thisProcess: '涓┖',
-    teamName:"涓┖涓�鐝�",
-    finishedNumber: '11',
-    wornNumber: '1',
-    responsibilityProcess: '閽㈠寲',
-    previousProcess:'閽㈠寲',
-    nextProcess:'鍖呰',
-    qualityInspector: 'XXX',
-    qualityState: '1',
-    notes: '1)鎸変紒鏍�2)姣忕墖鐜荤拑鏍囩璐村澶栭潰銆傚唴鐗囩幓鐠冩墦鈥�3C鍟嗘爣鈥濓紝缁熶竴鎵撳湪鐜荤拑鈥滃搴︹�濇柟鍚戝彸涓嬭4)鎸夋壒娆″崟鐙惤鏋躲��',
-  },
 
-]
+
+
 </script>
 
 <template>
-  <div>
+  <div class="main-div-customer">
     <div style="width: 600px">
       <el-row :gutter="0">
-<!--        <el-input placeholder="娴佺▼鍗″彿" v-model="form.name" style="width: 200px"/>-->
-<!--        &nbsp;&nbsp;-->
-        <select class="processesSt">
-          <option value="鏈鏍�">鏈鏍�</option>
-          <option value="宸插鏍�">宸插鏍�</option>
-        </select>
-        &nbsp;&nbsp;
+        <!--        <el-input placeholder="娴佺▼鍗″彿" v-model="form.name" style="width: 200px"/>-->
+        <!--        &nbsp;&nbsp;-->
+<!--        <select class="processesSt">-->
+<!--          <option value="鏈鏍�">鏈鏍�</option>-->
+<!--          <option value="宸插鏍�">宸插鏍�</option>-->
+<!--        </select>-->
+
         <el-date-picker
             v-model="value"
             type="daterange"
@@ -114,44 +206,47 @@
         <el-button type="primary">鏌ヨ</el-button>
       </el-row>
     </div>
-    <div>
-      <el-table :data="tableData" border style="width: 100%" height="100%">
-        <el-table-column fixed label="鎿嶄綔" width="60"  >
-          <el-button link type="primary" size="small">閫氳繃</el-button>
-        </el-table-column>
-        <el-table-column sortable prop="reportingWorkNo" label="鎶ュ伐缂栧彿" width="120" >
-          <template v-slot="scope">
-            <router-link :to="{path:'QualityInReviewDetail'}" >{{scope.row.reportingWorkNo}}</router-link>
-          </template>
-        </el-table-column>
-        <el-table-column prop="reportingWorkTime" label="鎶ュ伐鏃堕棿" width="155" />
-        <el-table-column prop="processCard" label="娴佺▼鍗″彿" width="125" />
-        <el-table-column prop="entryName" label="椤圭洰鍚嶇О"  :show-overflow-tooltip='true' width="155" />
-        <el-table-column prop="customerName" label="瀹㈡埛鍚嶇О"  :show-overflow-tooltip='true' width="155" />
-        <el-table-column prop="thisProcess" label="鏈伐搴�" width="70" />
-        <el-table-column prop="teamName" label="鎶ュ伐鐝粍" width="95" />
-        <el-table-column prop="finishedNumber" label="瀹屽伐鏁伴噺" width="85" />
-        <el-table-column prop="wornNumber" label="娆＄牬鏁伴噺" width="85" />
-        <el-table-column prop="responsibilityProcess" label="璐ｄ换宸ュ簭" width="85" />
-        <el-table-column prop="previousProcess" label="涓婂伐搴�" width="70" />
-        <el-table-column prop="nextProcess" label="涓嬪伐搴�" width="70" />
-        <el-table-column prop="qualityInspector" label="璐ㄦ鍛�" width="80" />
-        <el-table-column prop="qualityState" label="璐ㄦ鐘舵��" width="90" />
-        <el-table-column prop="notes" label="澶囨敞" :show-overflow-tooltip='true' width="350" />
-      </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>
+      </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>
-.processesSt{
-  height: 33px;
-  width: 80px;
-  background-color: #409eff;
-  color: white;
-  border: none;
-  border-radius: 5px;
+.main-div-customer{
+  width: 99%;
+  height: 100%;
 }
-
 </style>
\ No newline at end of file

--
Gitblit v1.8.0