From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 172 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 99 insertions(+), 73 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index cb03764..6b7ec73 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -1,40 +1,28 @@
<script setup>
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/basic/BasicTable.vue'
-import {VXETable} from "vxe-table";
-import useUserInfoStore from "@/stores/userInfo";
import {changeFilterEvent, filterChanged} from "@/hook"
-import {addListener,toolbarButtonClickEvent} from "@/hook/mouseMove";
+
import { useI18n } from 'vue-i18n'
//璇█鑾峰彇
const { t } = useI18n()
let router=useRouter()
-const getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/ReportingWorkDetail', query: { id: row.id }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
- break
- }
+
+let props = defineProps({
+ orderId:null
+})
+onMounted(()=>{
+ if(props.orderId===null || props.orderId===undefined || props.orderId===''){
+ return
}
-}
+ form.orderId = props.orderId
+ getWorkOrder()
+})
+
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -45,16 +33,7 @@
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: {
@@ -66,24 +45,46 @@
computeGrossArea: '',
processingNote: '',
}
-
})
-
+//闇�瑕佸悎骞剁殑鍒�
+let column = [1,3,8]
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
- let inputVal = form.orderId
-
- request.post(`/processCard/flowCard/${inputVal}`, filterData.value).then((res) => {
+ request.post(`/report/processCardProgress/${form.orderId}`,column).then((res) => {
if (res.code == 200) {
-
- pageTotal.value = res.data.total
+ if(res.data.data.length===0){
+ ElMessage.warning(t('report.noDataFoundForThisOrder'))
+ return
+ }
+ //gridOptions.columns = JSON.parse(JSON.stringify(columns))
+ res.data.title.forEach(item =>{
+ let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
+ gridOptions.columns.push(column)
+ })
+ res.data.data.forEach(item => {
+ item.reportWorkQuantity=JSON.parse(item.reportWorkQuantity)
+ item.reportWorkQuantityCount=JSON.parse(item.reportWorkQuantityCount)
+ })
+ mergeCells.value = res.data.mergeCell
xGrid.value.loadData(res.data.data)
- gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
}
})
+}
+const quantitySum = ( row,column )=>{
+ const reportWorkQuantity = row.reportWorkQuantity[column.title] || 0
+ const reportWorkQuantityCount = row.reportWorkQuantityCount[column.title] || 0
+ if(reportWorkQuantity===reportWorkQuantityCount){
+ return reportWorkQuantity
+ }
+
+ return (reportWorkQuantity
+ +'('
+ +reportWorkQuantityCount
+ +')' )
+ //return
}
@@ -93,7 +94,6 @@
return regex.test(value); // 杩斿洖true/false
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
@@ -101,7 +101,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'ProcessCardProgress',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -113,7 +113,7 @@
useKey: true
},
filterConfig: { //绛涢�夐厤缃」
- remote: true
+ // remote: true
},
customConfig: {
storage: true
@@ -123,29 +123,45 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {field: '1', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: '2',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: '3', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: '4',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
- {field: '5', width: 90,title: '鏍囪',showOverflow:"ellipsis"},
- {field: '6', width: 90,title: '鏁伴噺'},
- {field: '7',width: 90, title: '娆＄牬鏁伴噺'},
-
- {field: '8',width: 120, title: '鍒囧壊'},
- {field: '9',width: 120, title: '纾ㄨ竟'},
- {field: '10',width: 120, title: '閽㈠寲'},
- {field: '11',width: 120, title: '鍏ュ簱闈㈢Н'},
- ],//琛ㄥご鎸夐挳
+ columns : [
+ // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+ {field: 'product_name', width: 150,
+ title: t('order.product'),
+ filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'glass_child',width: 130, title: t('reportingWorks.glassChild') ,filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged},
+ {field: 'quantity', width: 90,title: t('order.quantity')},
+ {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
+ // {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
+ {field: 'inventory',width: 120, title: t('report.inventoryNum')},
+ {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
+ ],
toolbarConfig: {
// buttons: [{
//
// }],
- import: false,
- export: true,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
@@ -177,13 +193,10 @@
})
const mergeCells = ref([
- { row: 0, col: 1, rowspan: 3, colspan: 0},
- { row: 3, col: 1, rowspan: 3, colspan: 0},
-
- { row: 0, col: 6, rowspan: 3, colspan: 0},
- { row: 3, col: 6, rowspan: 3, colspan: 0},
])
+
+
</script>
@@ -191,9 +204,15 @@
<div class="main-div-customer" >
<div id="selectForm">
<el-row :gutter="0">
- <el-input v-model="form.orderId" clearable :placeholder="$t('order.orderId')" style="width: 130px"></el-input>
+ <el-input
+ v-model="form.orderId"
+ clearable
+ :disabled="props.orderId"
+ :placeholder="$t('order.orderId')"
+ style="width: 140px"></el-input>
<el-button
+ :disabled="props.orderId"
@click="getWorkOrder"
id="select"
type="primary" :icon="Search">{{$t('basicData.search')}}
@@ -203,8 +222,7 @@
</div>
<vxe-grid
- height="400px"
- @filter-change="filterChanged"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
@@ -223,12 +241,20 @@
</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 v-model="option.data"
+ type="text"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
+ </template>
+
+ <template #quantitySum="{ row,column }">
+ <span>{{ quantitySum(row,column) }} </span>
</template>
@@ -239,7 +265,7 @@
<style scoped>
.main-div-customer{
width: 99%;
- height: 100%;
+ height: 90%;
}
#selectForm {
width: 60%;
--
Gitblit v1.8.0