From 25cc86fd8a2fb3b2bb6b385cba0adaf89ff3dcdc Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:32 +0800
Subject: [PATCH] 流程卡进度打印部分代码
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue | 382 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 251 insertions(+), 131 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index 2896e37..92b1427 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -2,25 +2,28 @@
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
-import {ElDatePicker, ElMessage} from "element-plus"
+import {ElDatePicker, ElMessage, ElMessageBox} from "element-plus"
import useProductGlassTypeStore from "@/stores/sd/product/productGlassType"
+import footSum from "@/hook/footSum"
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 BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
-
+import useUserInfoStore from '@/stores/userInfo'
+import {useI18n} from "vue-i18n";
+import { computed } from 'vue'
+import UpdateOrderCraft from "@/components/sd/order/UpdateOrderCraft.vue";
+import {filterChanged} from "@/hook";
let productGlassTypeStore = useProductGlassTypeStore()
+const { t } = useI18n()
+const userStore = useUserInfoStore()
let router = useRouter()
let props = defineProps({
rowIndex:{}
})
-
-
-
-
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -62,7 +65,131 @@
let pageNum=ref(1)
let pageState = null
+let craftVisible = ref(false)
+const craftObj = reactive({
+ newCraft: [],
+ oldCraft: [],
+})
+
+const numberList = reactive({
+ technologyNumber:[],
+})
+
+const saveCraft = () => {
+ //rowIndex.value.process = craftObj.newCraft.join('->')
+ let orderProcess= craftObj.newCraft.join('->')
+ //鑾峰彇宸紓宸ュ簭
+ const diffCraft = computed(() => {
+ return [
+ ...craftObj.oldCraft.filter(item => !craftObj.newCraft.includes(item)), //鍒犻櫎
+ ...craftObj.newCraft.filter(item => !craftObj.oldCraft.includes(item))//澧炲姞
+ ]
+ })
+ if (diffCraft.value == '') {//鏃犲彉鍖栦笉鎵ц鍚庣画
+ return
+ }
+ //鑾峰彇鏈�鏂版姤宸ュ伐搴忕殑椤哄簭
+request.post(`/processCard/getNewProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${diffCraft.value}`).then((res) => {
+ if (res.code == 200 ) {
+ if (res.data){
+ request.post(`/processCard/updateProcess/${rowIndex.value.process_id}/${rowIndex.value.order_number}/${rowIndex.value.technology_number}/${rowIndex.value.order_id}/${orderProcess}`, craftObj).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({
+ path: '/main/processCard/SelectDetailProcessCard',
+ query: {processId: processId,random: Math.random()}
+ })
+ } else {
+
+ ElMessage.warning(t('processCard.updateProcessMsg'))
+
+ }
+ })
+ craftVisible.value= false
+ }else {
+ ElMessage.warning(t('processCard.updateProcessMsg'))
+ }
+ }
+ })
+
+}
+
+
+let process = ref([])
+request.get(`/basicData/BasicDataByType/product/process`).then((res) =>{
+ if (res.code==200){
+ process.value=res.data
+ }
+})
+
+let rowIndex = ref({})
+const updateCraft = (row) => {
+ craftVisible.value= true
+ Object.keys(craftObj).forEach((key) =>{
+ craftObj[key] = row['process'].split('->')
+ })
+ Object.keys(numberList).forEach((key) =>{
+ numberList[key] = row['concatNumber'].split(',')
+ })
+ craftObj.technologyNumber=[]
+ craftObj.technologyNumber.push(...numberList.technologyNumber);
+ rowIndex.value = row
+}
+
+const updateTerminationNo = (row) => {
+ let processId = row.process_id
+ let orderNumber = row.order_number
+ request.post(`/processCard/updateTerminationNo/${processId}/${orderNumber}`).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({
+ path: '/main/processCard/SelectDetailProcessCard',
+ query: {processId: processId,random: Math.random()}
+ })
+ }
+ })
+}
+
+const updateTermination = (row) => {
+ let processId = row.process_id
+ let orderNumber = row.order_number
+ let process = row.process
+ const completed = ref()
+ const completedOk = ref()
+ //鑾峰彇绗竴閬撳伐搴忓畬宸ユ暟閲�
+ request.post(`/processCard/selectCompleted/${processId}/${orderNumber}/${process}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ completed.value=res.data.data
+ completedOk.value = row.quantity*1 - completed.value*1
+ //寮圭獥
+ ElMessageBox.prompt( t('processCard.maxCompleted'), {
+ confirmButtonText: t('basicData.save'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ inputPattern:/^(\d+|)$/,
+ inputErrorMessage: t('processCard.terminationMsg'),
+ inputValue:row.quantity
+ }).then(({ value }) => {
+
+ request.post(`/processCard/updateTermination/${processId}/${orderNumber}/${value}`).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({
+ path: '/main/processCard/SelectDetailProcessCard',
+ query: {processId: processId,random: Math.random()}
+ })
+ }
+ })
+ })
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+
+
+
+}
//绗竴娆″姞杞�
@@ -70,12 +197,17 @@
const route = currentRoute.value
let processId = route.query.processId
+let merge = null
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/flowCardDetail/${processId}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
+ merge = res.data.merge
+ if(merge != 0){
+ gridOptions.toolbarConfig.buttons[0].name=t('processCard.cancelMerger')
+ }
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -83,37 +215,6 @@
}
})
-//椤佃剼缈婚〉鏌ヨ
-const selectPageList = ()=>{
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`,filterData.value).then((res) => {
- if(res.code==200){
-
- produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
- }else{
- ElMessage.warning(res.msg)
- }
- })
-}
-
-//鐐瑰嚮鏌ヨ
-const getWorkOrder = () => {
-
- let startTime = form.date1[0]
- let endTime = form.date1[1]
- request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
- if (res.code == 200) {
-
- pageTotal.value = res.data.total
- xGrid.value.loadData(res.data.data)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
- })
-}
//椤佃剼璺宠浆
const handlePageChange = ({ currentPage, pageSize }) => {
@@ -128,38 +229,6 @@
$panel.changeOption(event, !!option.data, option)
}
-function filterChanged(column) {
- gridOptions.loading = true
- //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0] != undefined ? column.datas[0] : ''
- value = value.trim()
- //鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.') > -1) {
- const columnArr = column.property.split('.')
- filterData.value[columnArr[0]] = {
- [columnArr[1]]: value
- }
- } else {
- filterData.value[column.property] = value
- }
-
-//鑾峰彇閫変腑鏃堕棿
- let startTime = form.date1[0]
- let endTime = form.date1[1]
-
- request.post(`/processCard/detailFlowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
- if(res.code==200){
- pageTotal.value=res.data.total
- total.pageTotal=parseInt(res.data.total)
- pageNum.value=1
- produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
- gridOptions.loading=false
- }else{
- ElMessage.warning(res.msg)
- }
- })
-}
/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
const hasDecimal = (value) => {
@@ -175,7 +244,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectDetailProcessCard',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -199,23 +268,31 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'orderId', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 80 },
- {field: 'processId', width: 130, title: '娴佺▼鍗″彿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productId', title: '浜у搧缂栧彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
- {field: 'orderDetail.productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
- {field: 'order.project', title: '椤圭洰鍚嶇О' ,showOverflow:"ellipsis"},
- {field: 'quantity', title: '鏁伴噺', },
- {field: 'orderDetail.computeGrossArea', title: '闈㈢Н', },
- {field: 'founder', title: '鍒嗘灦鍛�', },
- {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰', },
- {field: 'layoutStatus', title: '鎺掔増鐘舵��', }
+ {title: t('basicData.operate'), width: 200, slots: { default: 'button_slot' },fixed:"left",},
+ { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
+ {field: 'order_id', title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 110 },
+ {field: 'process_id', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order_number', title: t('order.OrderNum') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
+ {field: 'technology_number', title: t('processCard.technologyNumber') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },width: 100},
+ {field: 'quantity', title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
+ {field: 'termination_quantity', title: t('processCard.terminationQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 80},
+ {field: 'child_width', title: t('order.width'),width: 80 },
+ {field: 'child_height', title: t('order.height'),width: 80 },
+ {field: 'area', title: t('order.area') ,showOverflow:"ellipsis",width: 70},
+ {field: 'process',width:250, title: t('craft.process'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+ {field: 'product_name', title: t('order.product'),width: 310 },
+ {field: 'glass_child', title: t('reportingWorks.glassChild'),width: 200 },
+ {field: 'founder', title: t('processCard.founder'),width: 110 },
+ {field: 'splitFrame_time', title: t('processCard.splitFrameTime'),width: 110 },
+ {field: 'concatNumber', title: t('processCard.totalSequenceNumber'),width: 110},
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- //
- // }],
+ buttons: [
+ {'code': 'add', 'name': t('processCard.merge'),status: 'primary'},
+
+ ],
import: false,
// export: true,
// print: true,
@@ -226,15 +303,30 @@
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
+ // footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ // return[
+ // columns.map((column, columnIndex) => {
+ // if (columnIndex === 0) {
+ // return '鍚堣:'
+ // }
+ // // if (props.tableProp.footList.includes(column.field)) {
+ // // return sumNum(data, column.field)
+ // // }
+ // return ''
+ // })
+ // ]
+ // }
+
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
- // if (props.tableProp.footList.includes(column.field)) {
- // return sumNum(data, column.field)
- // }
+ const List = ["quantity",'area']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
+ }
return ''
})
]
@@ -243,38 +335,63 @@
})
+const gridEvents = {
+ toolbarButtonClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'add': {
+ const selectRecords = $grid.getTableData().visibleData
+ let flowData = ref({
+ flowCard: selectRecords
+
+ })
+ ElMessageBox.confirm(
+ t('processCard.msg.msg6'),
+ {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ distinguishCancelAndClose: true,
+ type: 'warning',
+ }
+ ).then(()=>{
+ request.post(`/processCard/mergeFlowCard/${merge}`, flowData.value).then((res) => {
+ if(res.code==200 && res.data==="true"){
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({path: '/main/processCard/SelectProcessCard', query:{random:Math.random()}})
+ }else{
+ ElMessage.warning(t('basicData.msg.saveFail'))
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ })
+
+ })
+ break
+
+
+
+ }
+ }
+ }
+ }
+}
+
+
</script>
<template>
<div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
- <el-date-picker
- v-model="form.date1"
- type="daterange"
- format="YYYY/MM/DD"
- value-format="YYYY-MM-DD"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
- :default-time="defaultTime"
- />
-
- <el-button
- @click="getWorkOrder"
- id="select"
- type="primary" :icon="Search">鏌ヨ
- </el-button>
- </el-row>
-
- </div>
<vxe-grid
- max-height="100%"
+ height="99%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ v-on="gridEvents"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -292,36 +409,39 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }" >
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">鎵撳嵃</el-button>
- <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">鎺掔増</el-button>
- <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">鍙帓鐗�</el-button>
- <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @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 #button_slot="{ row }">
+ <el-button @click="updateCraft(row)" link type="primary" size="small">{{$t('craft.updateCraft')}}</el-button>
+ <el-button @click="updateTermination(row)" link type="primary" size="small">{{$t('processCard.termination')}}</el-button>
+ <el-button @click="updateTerminationNo(row)" link type="primary" size="small">{{$t('processCard.terminationNo')}}</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)"/>
+ <input type="text"
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
- <template #pager>
- <!--浣跨敤 pager 鎻掓Ы-->
- <!-- 'PrevJump','NextJump', -->
- <vxe-pager
- @page-change="handlePageChange"
- :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
- v-model:current-page="pageNum"
- v-model:page-size="total.pageSize"
- v-model:pager-count="total.pageTotal"
- :total="total.dataTotal"
- >
- </vxe-pager>
- </template>
-
</vxe-grid>
+
+ <el-dialog id="processChange"
+ v-model="craftVisible"
+ :title="$t('craft.technologicalProcess')"
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
+ style="width: 60%;height:60% ;position: relative;" >
+
+ <update-order-craft
+ :craftObj="craftObj"
+ :process="process"
+ @saveCraft="saveCraft"
+ />
+ </el-dialog>
</div>
</template>
--
Gitblit v1.8.0