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/reportingWorks/AddReportingWork.vue | 432 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 284 insertions(+), 148 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index 686d4b1..397022b 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -1,124 +1,239 @@
<script setup>
-import { reactive } from 'vue'
-import {Open} from "@element-plus/icons-vue";
+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
+ }
+ }
+}
-// do not use same name with ref
+//琛ㄥ熬姹傚拰
+const sumNum = (list, field) => {
+ let count = 0
+ list.forEach(item => {
+ count += Number(item[field])
+ })
+ return count.toFixed(2)
+}
+
const form = reactive({
- lckh:'',
+ lckh: 'NG23120801A01/1'
+})
+//瀛愮粍浠舵帴鏀跺弬鏁�
+
+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},
+ {field: 'serialNumber',width:90, title: '搴忓彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
+ {field: 'singlePieceName',width:120, title: '鍗曠墖鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'marking',width:90, title: '鏍囪', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'pieces',width:100, title: '鐗囨爣璁�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'processCardNumber',width:110, title: '娴佺▼鍗℃暟閲�', sortable: true,showOverflow:"ellipsis"},
+ {field: 'width',width:70, title: '瀹�', sortable: true},
+ {field: 'height',width:70, title: '楂�', sortable: true},
+ {field: 'shape',width:70, title: '褰㈢姸', sortable: true,showOverflow:"ellipsis"},
+ {field: 'upCompletedQuantity',width:120, title: '涓婂伐瀹屽伐鏁伴噺', sortable: true},
+ {field: 'completedQuantity',width:100, title: '瀹屽伐鏁伴噺', sortable: true},
+ {field: 'numberBroken',width:100, title: '娆＄牬鏁伴噺', sortable: true},
+ {field: 'availableUse',width:80, title: '鍙埄鐢�', sortable: true},
+ {field: 'returnProcess',width:100, title: '閫�鍥炲伐搴�', sortable: true},
+ {field: 'reasonType',width:100, title: '娆＄牬绫诲瀷', sortable: true},
+ {field: 'reasonDamage',width:100, title: '娆＄牬鍘熷洜', sortable: true},
+ {field: 'responsibilityDevice',width:100, title: '璐ｄ换璁惧', sortable: true},
+ {field: 'responsibilityProcess',width:100, title: '璐ｄ换宸ュ簭', sortable: true},
+ {field: 'responsibilityTeams',width:100, title: '璐ｄ换鐝粍', sortable: true},
+ {field: 'responsibilityPersonnel',width:100, title: '璐ｄ换浜哄憳', sortable: true},
+ {field: 'completed', width:90,title: '宸插畬宸�', sortable: true},
+ {field: 'onceBroken', width:90,title: '宸叉鐮�', sortable: true}
+
+ ],//琛ㄥご鎸夐挳
+
+ toolbarConfig: {
+ buttons: [
+ { code: 'empty', name: '娓呯┖鎶ュ伐鏁伴噺' },
+ { code: 'sameCompletion', name: '瀹屽伐鐩稿悓' },
+ { code: 'sameDamage', name: '娆＄牬鐩稿悓' },
+ { code: 'sameOneCompletion', name: '瀹屽伐涓�鍒楃浉鍚�' },
+ { code: 'sameOneDamage', name: '娆＄牬涓�鍒楃浉鍚�' },
+ {code: 'print_lck', name: '淇濆瓨',status:'primary' ,icon:'vxe-icon-save'},
+ {code: 'print_lck', name: '淇濆瓨骞跺鏍�',status:'primary' ,icon:'vxe-icon-save'},
+ ],
+ import: false,
+ export: true,
+ print: true,
+ zoom: true,
+ custom: true
+ },
+ data: [
+ {
+ serialNumber:'1',
+ singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
+ marking: '1',
+ pieces: '(澶�)',
+ processCardNumber: '11',
+ width: '575',
+ height:"2241",
+ shape: '鏅舰',
+ upCompletedQuantity: '11',
+ completedQuantity: '1',
+ numberBroken:'',
+ availableUse:'',
+ returnProcess:'',
+
+ reasonType: '鏈哄櫒',
+ reasonDamage:'姘旀场瓒呮爣',
+ available:'',
+ reworkProcess:'',
+ responsibilityProcess:'涓┖',
+ responsibilityTeams:'涓┖涓�鐝�',
+ responsibilityPersonnel:'',
+ responsibilityDevice:'涓┖3#绾�',
+ completed:'',
+ onceBroken:'',
+ },
+ {
+ serialNumber:'1',
+ singlePieceName: '6mm鐧界幓骞抽挗(鍐�)',
+ marking: '2',
+ pieces: '(鍐�)',
+ processCardNumber: '11',
+ width: '575',
+ height:"2241",
+ shape: '鏅舰',
+ upCompletedQuantity: '11',
+ completedQuantity: '1',
+ numberBroken:'',
+ availableUse:'',
+ returnProcess:'',
+
+ reasonType: '鏈哄櫒',
+ reasonDamage:'姘旀场瓒呮爣',
+ available:'',
+ reworkProcess:'',
+ responsibilityProcess:'涓┖',
+ responsibilityTeams:'涓┖涓�鐝�',
+ responsibilityPersonnel:'',
+ responsibilityDevice:'涓┖3#绾�',
+ completed:'',
+ onceBroken:'',
+ },
+ {
+ serialNumber:'2',
+ singlePieceName: '8mm鐧界幓骞抽挗(澶�)',
+ marking: '1',
+ pieces: '(澶�)',
+ processCardNumber: '11',
+ width: '575',
+ height:"2241",
+ shape: '鏅舰',
+ upCompletedQuantity: '11',
+ completedQuantity: '1',
+ numberBroken:'',
+ availableUse:'',
+ returnProcess:'',
+
+ reasonType: '鏈哄櫒',
+ reasonDamage:'姘旀场瓒呮爣',
+ available:'',
+ reworkProcess:'',
+ responsibilityProcess:'涓┖',
+ responsibilityTeams:'涓┖涓�鐝�',
+ responsibilityPersonnel:'',
+ responsibilityDevice:'涓┖3#绾�',
+ completed:'',
+ onceBroken:'',
+ },
+ {
+ serialNumber:'2',
+ singlePieceName: '8mm鐧界幓骞抽挗(鍐�)',
+ marking: '2',
+ pieces: '(鍐�)',
+ processCardNumber: '11',
+ width: '575',
+ height:"2241",
+ shape: '鏅舰',
+ upCompletedQuantity: '11',
+ completedQuantity: '1',
+ numberBroken:'',
+ availableUse:'',
+ returnProcess:'',
+
+ reasonType: '鏈哄櫒',
+ reasonDamage:'姘旀场瓒呮爣',
+ available:'',
+ reworkProcess:'',
+ responsibilityProcess:'涓┖',
+ responsibilityTeams:'涓┖涓�鐝�',
+ responsibilityPersonnel:'',
+ responsibilityDevice:'涓┖3#绾�',
+ completed:'',
+ onceBroken:'',
+ },
+ ],//table body瀹為檯鏁版嵁
+ //鑴氶儴姹傚拰
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ let footList=['processCardNumber','upCompletedQuantity','completedQuantity','numberBroken','']
+ return[
+ columns.map((column, columnIndex) => {
+ if (columnIndex === 0) {
+ return '鍚堣:'
+ }
+ if (footList.includes(column.field)) {
+ return sumNum(data, column.field)
+ }
+ return ''
+ })
+ ]
+ }
+
})
-const tableData = [
- {
- serialNumber:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
- {
- serialNumber:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(鍐�)',
- marking: '2',
- pieces: '(鍐�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
- {
- serialNumber:'2',
- singlePieceName: '8mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
- {
- serialNumber:'2',
- singlePieceName: '8mm鐧界幓骞抽挗(鍐�)',
- marking: '2',
- pieces: '(鍐�)',
- processCardNumber: '11',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- upCompletedQuantity: '12',
- completedQuantity: '1',
- numberBroken:'',
- availableUse:'',
- returnProcess:'',
-
- reasonType: '鏈哄櫒',
- reasonDamage:'姘旀场瓒呮爣',
- available:'',
- reworkProcess:'',
- responsibilityProcess:'涓┖',
- responsibilityTeams:'涓┖涓�鐝�',
- responsibilityPersonnel:'',
- responsibilityDevice:'涓┖3#绾�',
- completed:'',
- onceBroken:'',
- },
-]
</script>
<template>
<div>
<div id="head">
- <el-input placeholder="娴佺▼鍗″彿" v-model="form.name" style="width: 200px"/>
+ <el-input placeholder="娴佺▼鍗″彿" v-model="form.lckh" style="width: 200px"/>
<select class="processesSt">
@@ -172,55 +287,76 @@
<td>1</td>
</tr>
<tr>
- <td></td>
- <td></td>
- <td><el-button type="primary">淇濆瓨</el-button></td>
- <td><el-button type="primary">淇濆瓨骞跺鏍�</el-button></td>
- <td><el-button type="primary">娓呯┖鎶ュ伐鏁伴噺</el-button></td>
- <td><el-button type="primary">瀹屽伐鐩稿悓</el-button></td>
- <td><el-button type="primary">娆＄牬鐩稿悓</el-button></td>
+ <td>鍗曠墖娆＄牬</td>
+ <td>
+ <el-select v-model="value" placeholder="鍏佽" >
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </td>
- <td><el-button type="primary">瀹屽伐涓�鍒楃浉鍚�</el-button></td>
- <td><el-button type="primary">娆＄牬涓�鍒楃浉鍚�</el-button></td>
- <td><el-button type="primary">鏄惁鍏佽</el-button></td>
+ <td></td>
+ <td></td>
+ <td></td>
+
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
+ <td></td>
</tr>
</table>
</div>
- <div>
- <el-table :data="tableData" border style="width: 100%" height="100%">
- <el-table-column prop="serialNumber" label="搴忓彿" width="60" />
- <el-table-column prop="singlePieceName" :show-overflow-tooltip='true' label="鍗曠墖鍚嶇О" width="120" />
- <el-table-column prop="marking" label="鏍囪" width="60" />
- <el-table-column prop="pieces" label="鐗囨爣璁�" width="70" />
- <el-table-column prop="processCardNumber" label="娴佺▼鍗℃暟閲�" width="95" />
- <el-table-column prop="width" label="瀹�" width="60" />
- <el-table-column prop="height" label="楂�" width="60" />
- <el-table-column prop="shape" label="褰㈢姸" :show-overflow-tooltip='true' width="60" />
- <el-table-column prop="upCompletedQuantity" label="涓婂伐瀹屽伐鏁伴噺" width="110" />
- <el-table-column prop="completedQuantity" label="瀹屽伐鏁伴噺" width="85" />
- <el-table-column prop="numberBroken" label="娆＄牬鏁伴噺" width="85" />
- <el-table-column prop="availableUse" label="鍙埄鐢�" width="70" />
- <el-table-column prop="returnProcess" label="閫�鍥炲伐搴�" width="85" />
- <el-table-column prop="reasonType" label="娆＄牬绫诲瀷" :show-overflow-tooltip='true' width="85" />
- <el-table-column prop="reasonDamage" label="娆＄牬鍘熷洜" :show-overflow-tooltip='true' width="85" />
- <el-table-column prop="responsibilityDevice" label="璐ｄ换璁惧" :show-overflow-tooltip='true' width="85" />
- <el-table-column prop="responsibilityProcess" label="璐ｄ换宸ュ簭" :show-overflow-tooltip='true' width="85" />
- <el-table-column prop="responsibilityTeams" label="璐ｄ换鐝粍" :show-overflow-tooltip='true' width="85" />
- <el-table-column prop="responsibilityPersonnel" label="璐ｄ换浜哄憳" :show-overflow-tooltip='true' width="85" />
- <el-table-column prop="completed" label="宸插畬宸�" width="90" />
- <el-table-column prop="onceBroken" label="宸叉鐮�" width="90" />
+ <div class="main-div-customer">
+ <vxe-grid
+ max-height="100%"
+ min-height="100px"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ size="small"
+
+ >
+ <!-- @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>
-
-
-
- </el-table><!-- <h1>{{msg}}</h1> -->
+ </vxe-grid>
</div>
</div>
</template>
<style scoped>
+
.processCard{
width: 140px;
}
--
Gitblit v1.8.0