From 59ef6e9b5b8aff7614711c2afdba23a460ac1c56 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 27 三月 2024 08:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue | 236 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 125 insertions(+), 111 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 f2b4c5b..bebd527 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,25 +1,28 @@
<script setup>
-import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
+import request from "@/utils/request"
+import {ElDatePicker, ElMessage} from "element-plus"
+import {nextTick, onMounted, onUnmounted, reactive, ref, watch} from "vue"
+import {Search} from "@element-plus/icons-vue"
+import {useRouter} from 'vue-router'
+import {changeFilterEvent, filterChanged} from "@/hook"
+
+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) => {
@@ -30,8 +33,88 @@
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: '',
+ }
+})
+const columns = [
+ {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+ {field: 'product_name', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'glass_child',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'order_type', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'process_id',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
+ {field: 'technology_number', width: 90,title: '鏍囪',showOverflow:"ellipsis"},
+ {field: 'quantity', width: 90,title: '鏁伴噺'},
+ {field: 'broken_num',width: 90, title: '娆＄牬鏁伴噺'},
+ {field: 'inventoryArea',width: 120, title: '鍏ュ簱闈㈢Н'},
+]
+//闇�瑕佸悎骞剁殑鍒�
+let column = [1,3,8]
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+ request.post(`/report/processCardProgress/${form.orderId}`,column).then((res) => {
+ if (res.code == 200) {
+ if(res.data.data.length===0){
+ ElMessage.warning('鏈煡璇㈠埌姝よ鍗曟祦绋嬪崱鏁版嵁')
+ 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
+ console.log(res.data.title)
+ xGrid.value.loadData(res.data.data)
+ } 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
+}
+
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+const xGrid = ref()
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -60,71 +143,19 @@
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' }, sortable: true, },
- {field: '2',width: 130, title: '鍗曠墖鍚嶇О', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '3', width: 120,title: '璁㈠崟绫诲瀷', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: '4',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5', width: 90,title: '鏍囪', sortable: true,showOverflow:"ellipsis"},
- {field: '6', width: 90,title: '鏁伴噺', sortable: true},
- {field: '7',width: 90, title: '娆＄牬鏁伴噺', sortable: true},
- {field: '8',width: 120, title: '鍒囧壊', sortable: true},
- {field: '9',width: 120, title: '纾ㄨ竟', sortable: true},
- {field: '10',width: 120, title: '閽㈠寲', sortable: true},
- {field: '11',width: 120, title: '鍏ュ簱闈㈢Н', sortable: true},
- ],//琛ㄥご鎸夐挳
+ columns:[],//琛ㄥご鎸夐挳
toolbarConfig: {
// buttons: [{
//
// }],
- import: false,
- export: true,
- print: true,
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
data: [
- {
- 1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- 2:'10mm瓒呯櫧UD60骞抽挗(澶�)',
- 3:'鏅�氳鍗�',
- 4:'NG23052602A01/1',
- 5:'1',
- 6:'33',
- 7:'1',
- 8:'22',
- 9:'22',
- 10:'22',
- 11:'314.13',
- },
- {
- 1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- 2:'10mm瓒呯櫧骞抽挗+12Ar(缁�)',
- 3:'鏅�氳鍗�',
- 4:'NG23052602A01/2',
- 5:'2',
- 6:'33',
- 7:'1',
- 8:'22',
- 9:'22',
- 10:'22',
- 11:'314.13',
- },
- {
- 1:'10mm瓒呯櫧UD60骞抽挗(澶�)+12Ar(缁�)+10mm瓒呯櫧骞抽挗+12Ar(缁�)+10mm瓒呯櫧骞抽挗(鍐�)',
- 2:'10mm瓒呯櫧骞抽挗(鍐�)',
- 3:'鏅�氳鍗�',
- 4:'NG23052602A01/3',
- 5:'3',
- 6:'33',
- 7:'1',
- 8:'22',
- 9:'22',
- 10:'22',
- 11:'314.13',
- },
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
// footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
@@ -144,40 +175,14 @@
})
-const value = ref('')
-const options = [
- {
- value: 'Option1',
- label: 'Option1',
- },
- {
- value: 'Option2',
- label: 'Option2',
- },
- {
- value: 'Option3',
- label: 'Option3',
- },
-]
+
const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+ orderId: '',
})
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},
])
@@ -187,9 +192,20 @@
<div class="main-div-customer" >
<div id="selectForm">
<el-row :gutter="0">
- <el-input placeholder="閿�鍞崟鍙�" v-model="form.name" value="NG23110102" style="width: 150px"/>
+ <el-input
+ v-model="form.orderId"
+ clearable
+ :disabled="props.orderId"
+ :placeholder="$t('order.orderId')"
+ style="width: 130px"></el-input>
- <el-button type="primary">鏌ヨ</el-button>
+ <el-button
+ :disabled="props.orderId"
+ @click="getWorkOrder"
+ id="select"
+ type="primary" :icon="Search">{{$t('basicData.search')}}
+
+ </el-button>
</el-row>
</div>
@@ -213,12 +229,6 @@
</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>
@@ -228,6 +238,10 @@
</div>
</template>
+ <template #quantitySum="{ row,column }">
+ <span>{{ quantitySum(row,column) }} </span>
+ </template>
+
</vxe-grid>
</div>
--
Gitblit v1.8.0