From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 460 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 316 insertions(+), 144 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index 9dc6fe7..bb51b5a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -1,56 +1,97 @@
<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/AddProcessCard', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
- break
- }
- }
-}
+import {onMounted, reactive, ref} from "vue";
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+import deepClone from "@/utils/deepClone";
+import {changeFilterEvent,filterChanged} from "@/hook"
+import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
+import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum";
+import userInfo from "@/stores/userInfo"
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
- })
- return count.toFixed(2)
-}
+//璇█鑾峰彇
+const { t } = useI18n()
+const user=userInfo()
+
+let router = useRouter()
+
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal=ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum=$ref(1)
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
+const xGrid = ref();
+let cellArea = ref()
+
+
+let filterData = ref({
+
+})
+
+
+//瀹氫箟鎺ユ敹鍔犺浇琛ㄥご涓嬫媺鏁版嵁
+const titleSelectJson = ref({
+})
+
+//绗竴娆¤皟鐢�
+request.post(`/rework/getSelectRework/${pageNum}/100`,filterData.value).then((res) => {
+
+ if(res.code==200){
+
+ produceList = deepClone(res.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+})
+
+
+
+
+
+
+
//瀛愮粍浠舵帴鏀跺弬鏁�
const gridOptions = reactive({
- border: "full",//琛ㄦ牸鍔犺竟妗�
+ border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
- stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ stripe: true,//鏂戦┈绾�
+ rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'AddRework',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
+ ]
+ ]
+ }
+ },
columnConfig: {
resizable: true,
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ //remote: true
},
customConfig: {
storage: true
@@ -60,99 +101,54 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 70, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {field: 'select',type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'reworkTeam', width: 160, title: t('rework.reworkTeam'), slots: {default: 'responsibleTeam_default', edit: 'responsibleTeam'}, editRender: {}},
+ {field: 'orderId', width: 130, title: t('order.orderId'), sortable: true, showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'processId', width: 140, title: t('processCard.processId'), sortable: true, filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
+ {field: 'orderSort', width: 120, title: t('order.OrderNum'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'technologyNumber', width: 110, title: t('replenish.mark'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
+ {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
+ {field: 'reworkProcesses', width: 120, title: t('rework.reworkProcess'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkType', width: 120, title: t('rework.reworkType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkReason', width: 120, title: t('rework.reasonForRework'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'responsibleTeam', width: 120, title: t('reportingWorks.responsibleTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'batch', width: 90, title: t('order.batch'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
+ {field: 'glassAddress', width: 120, title: t('replenish.sliceMarking'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'breakageQuantity', width: 120, title: t('reportingWorks.quantityBroken'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'reworkNum',width:120, title: t('productStock.reworkQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } },filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'width', width: 80, title: t('order.width'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'height', width: 80, title: t('order.height'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'shape', width: 100, title: t('order.shape'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'area', width: 120, title: t('rework.reworkArea'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'qualityInspector', width: 120, title: t('reportingWorks.qualityInspector'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
+ {field: 'productName', width: 120, title: t('order.product'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
- {field: 'reworkTeams',width: 90, title: '杩斿伐鐝粍', editRender: { name: 'input', attrs: { placeholder: '' } }},
- {field: 'salesOrderNo',width: 120, title: '閿�鍞崟鍙�', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'processCardNo',width: 120, title: '娴佺▼鍗″彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'entryName', width: 120,title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'batch',width: 80, title: '鎵规', sortable: true,showOverflow:"ellipsis"},
- {field: 'serialNumber',width: 80, title: '搴忓彿', sortable: true},
- {field: 'singlePieceName',width: 120, title: '鍗曠墖鍚嶇О', sortable: true},
- {field: 'marking',width: 80, title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
- {field: 'pieces',width: 90, title: '鐗囨爣璁�', sortable: true},
- {field: 'number',width: 80, title: '鏁伴噺', sortable: true},
- {field: 'width',width: 80, title: '瀹�', sortable: true},
- {field: 'height',width: 80, title: '楂�', sortable: true},
- {field: 'shape',width: 80, title: '褰㈢姸', sortable: true},
- {field: 'type',width: 100, title: '杩斿伐宸ュ簭', sortable: true},
- {field: 'type',width: 100, title: '杩斿伐绫诲瀷', sortable: true},
- {field: 'damage',width: 120, title: '杩斿伐鍘熷洜', sortable: true},
- {field: 'device',width: 120, title: '璐ｄ换璁惧', sortable: true},
- {field: 'teams',width: 120, title: '璐ｄ换鐝粍', sortable: true},
- {field: 'area',width: 120, title: '杩斿伐闈㈢Н', sortable: true},
- {field: 'qualityInspector',width: 100, title: '璐ㄦ鍛�', sortable: true}
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- // name:'淇濆瓨'
- // }],
+ buttons: [
+ {'code': 'add', 'name': t('basicData.save'),status: 'primary',icon: 'vxe-icon-save'}
+ ],
import: false,
export: true,
print: true,
zoom: true,
custom: true
},
- data: [
- {
-
- reworkNumber:'FG20202020',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- batch:'浜屾壒涓�',
- serialNumber:'1',
- area:'23.11',
- qualityInspector:"寮犱笁",
- number:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- type: '鏈哄櫒',
- damage:'姘旀场瓒呮爣',
- device:'XXX',
- reworkProcess:'鍒囧壊',
- },
- {
-
- reworkNumber:'FG20203333',
- salesOrderNo:'NG23010101',
- processCardNo:'NG23010101A01',
- entryName:'xxxx',
- batch:'浜屾壒涓�',
- serialNumber:'1',
- area:'23.11',
- qualityInspector:"寮犱笁",
- number:'1',
- singlePieceName: '6mm鐧界幓骞抽挗(澶�)',
- marking: '1',
- pieces: '(澶�)',
- width: '575',
- height:"2241",
- shape: '鏅舰',
- type: '鏈哄櫒',
- damage:'姘旀场瓒呮爣',
- reworkProcess:'纾ㄨ竟',
- device:'XXX'
- },
- ],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['total','TotalArea']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['reworkNum', 'breakageQuantity']
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ return footSum(data, column.field)
}
return ''
})
@@ -161,53 +157,229 @@
})
+const gridEvents = {
+ async toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'add': {
+ const selectRecords = $grid.getCheckboxRecords()
+
+ if (selectRecords.length > 0) {
+ const errMap = await $grid.validate(selectRecords)
+ if (errMap) {
+ return
+ }
+ } else {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+
+ gridOptions.loading=true
+ let flowData = ref({
+ rework: selectRecords,
+ userId:user.user.userId,
+ userName:user.user.userName
+ })
+ request.post("/rework/saveRework", flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({path:'/main/rework/AddRework',query:{random:Math.random()}})
+ gridOptions.loading=false
+ }else{
+ gridOptions.loading=false
+ ElMessage.warning(t('basicData.msg.saveFail'))
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ })
+ break
+ }
+
+
+
+ }
+ }
+ },
+ menuClick ({ menu, row, column }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+
+ case 'copyChecked' :{
+ let result = toolbarButtonClickEvent()
+ if(result){
+ const dataList = xGrid.value.getTableData().visibleData
+ let firstVal=null;
+ if(result.cell.indexOf('.')>-1){
+ firstVal = eval("dataList["+result.start +"]."+result.cell)
+ }else {
+ firstVal=dataList[result.start][result.cell];
+ }
+ dataList.forEach((item,index) =>{
+ if(index>=result.start && index<=result.end){
+ if(result.cell.indexOf('.')>-1){
+ const columnArr = result.cell.split('.')
+ item[columnArr[0]][columnArr[1]] = firstVal
+ }else{
+ item[result.cell] = firstVal
+ }
+
+ }
+ })
+ }
+ break
+ }
+
+ }
+ }
+ }
+}
+
+const selectOrderList = ()=>{
+ request.post(`/rework/SelectRework/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ if(res.code==200){
+ selectDate.value = res.data.selectDate
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+}
+
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ total.pageTotal = pageSize
+ pageNum.value=currentPage
+
+ selectOrderList()
+}
+
+/*鏁版嵁鏍￠獙*/
+const validRules = ref({
+ reworkTeam: [
+ { required: true, message: t('rework.PleaseSelectAReworkTeam') }
+ ],
+
+ reworkNum: [{
+ validator (e) {
+ if (e.row.reworkNum > e.row.breakageQuantity) {
+ return new Error(t('rework.TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity'))
+ }else if (e.row.reworkNum ==="") {
+ return new Error(t('rework.reworkQuantityCannotBeEmptyOr0'))
+ }
+ const regex = /^[1-9]\d*$/g
+ if ( !regex.test(e.row.reworkNum) ) {
+ return new Error(t('productStock.pleaseEnterAPositiveInteger'))
+ }
+
+ }
+
+ }]
+
+})
+
+
+onMounted(()=>{
+ //鍚敤琛ㄦ牸鎷栧姩閫変腑
+ addListener(xGrid.value,gridOptions,cellArea.value)
+})
+
+
+
</script>
<template>
- <div class="main-div-customer">
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
+ <div style="width: 100%;height: 100%">
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+ :edit-rules="validRules"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{item.title+': '}}</span>
- <span>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span>{{ row[item.field] }}</span>
+ </li>
+ </ul>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">淇濆瓨</el-button>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">淇濆瓨</el-button>
- </template>
+ </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)"/>
+ <!-- 绛涢�夋彃妲� -->
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
+
+ <!-- 杩斿伐鐝粍-->
+ <template #responsibleTeam="{ row }">
+ <vxe-select v-model="row.reworkTeam" transfer >
+ <vxe-option v-for="item in row.basicCategory" :key="item.basicName" :label="item.basicName" :value="item.basicName"/>
+ </vxe-select>
+ </template>
+ <template #responsibleTeam_default="{ row }">
+ <span>{{ row.reworkTeam }}</span>
+ </template>
- </vxe-grid>
+
+
+ </vxe-grid>
+ </div>
+ <div class="vxe-table--cell-area" ref="cellArea" >
+ <span class="vxe-table--cell-main-area" ></span>
+
+ <span class="vxe-table--cell-active-area" ></span>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
- height: 100%;
+ height: 95%;
+}
+.vxe-grid {
+ /* 绂佺敤娴忚鍣ㄩ粯璁ら�変腑 */
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+}
+
+.head{
+ width: 100%;
+ height: 35px;
+}
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 0px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0