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/rework/SelectRework.vue | 465 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 316 insertions(+), 149 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
index 17cff85..b0c1fba 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue
@@ -1,13 +1,27 @@
<script setup>
import {reactive, ref} from "vue";
-import {useRouter} from 'vue-router'
-let router=useRouter()
+import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import {ElMessage} from "element-plus";
+import deepClone from "@/utils/deepClone";
+import {Search} from "@element-plus/icons-vue";
+import useUserInfoStore from "@/stores/userInfo";
+import { useI18n } from 'vue-i18n'
+import footSum from "@/hook/footSum";
+//璇█鑾峰彇
+const { t } = useI18n()
+
+const userStore = useUserInfoStore()
+const username = userStore.user.userName
+const userid = userStore.user.userId
+let router = useRouter()
+let produceList = ref([])
const dialogFormVisible = ref(false)
const formLabelWidth = '140px'
-
-const form = reactive({
+/*缂栬緫寮圭獥鏄剧ず鏁版嵁*/
+const editData = reactive({
name: 'FG20202020',
region: '',
date1: '',
@@ -17,49 +31,110 @@
resource: '',
desc: '',
})
-const getTableRow = (row,type) =>{
+const getTableRow = (row, type) => {
switch (type) {
- case 'edit' :{
- console.log(type)
+ case 'edit' : {
- // router.push({path: '/main/Rework/SelectRework', query: { id: row.id }})
+ // router.push({path: '/main/Rework/SelectRework', query: { id: row.id }})
break
}
- case 'delete':{
+ case 'delete': {
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
break
}
- case 'setType':{
+ case 'setType': {
alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鎺掔増鐘舵��')
break
}
}
}
+let pageNum=ref(1)
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
-//琛ㄥ熬姹傚拰
-const sumNum = (list, field) => {
- let count = 0
- list.forEach(item => {
- count += Number(item[field])
+let selectDate = ref(["",""])
+
+//绛涢�夋潯浠讹紝鏈夊閿渶瑕佸厛瀹氫箟鏄庣粏閲岄潰鐨勬暟鎹�
+let filterData = ref({
+
+
+})
+
+//绗竴娆¤皟鐢�
+request.post(`/rework/SelectRework/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+ if(res.code==200){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+
+ selectDate.value = res.data.selectDate
+ pageNum.value=1
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+})
+
+const changeFilterEvent = (event, option, $panel,) => {
+ // 鎵嬪姩瑙﹀彂绛涢��
+ $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
+ }
+ request.post(`/rework/SelectRework/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+
+ if(res.code==200){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+
+ selectDate.value = res.data.selectDate
+ pageNum.value=1
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.loadData(produceList)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
})
- return count.toFixed(2)
}
-//瀛愮粍浠舵帴鏀跺弬鏁�
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
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: 'SelectRework',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
exportConfig: {},
- scrollY:{ enabled: true },//寮�鍚櫄鎷熸粴鍔�
- showOverflow:true,
+ scrollY: {enabled: true},//寮�鍚櫄鎷熸粴鍔�
+ showOverflow: true,
columnConfig: {
resizable: true,
useKey: true
@@ -75,101 +150,67 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
- columns:[
- {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {title: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left"},
- {field: 'reworkNumber',width: 120, title: '杩斿伐缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {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: '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: 'reworkProcess',width: 120, title: '杩斿伐宸ュ簭', sortable: true},
- {field: 'reworkTeams',width: 120, title: '杩斿伐鐝粍', sortable: true},
- {field: 'qualityInspector',width: 100, title: '璐ㄦ鍛�', sortable: true}
+ columns: [
+ {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type:'checkbox',title: t('basicData.check'), width: 80,fixed:"left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'reviewStatus',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
+ {field: 'reworkId', width: 120, title: t('rework.reworkNumber'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reworkTeam', width: 120, title: t('rework.reworkTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'orderId', width: 120, title: t('order.orderId'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'processId', width: 140, title: t('processCard.processId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'batch', width: 80, title: t('order.batch'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'glassNumber', width: 100, title: t('reportingWorks.glassNumber')},
+ {field: 'orderSort', width: 80, title: t('order.OrderNum'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'technologyNumber', width: 80, title: t('replenish.mark'), showOverflow: "ellipsis", filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reworkType', width: 100, title: t('rework.reworkType'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reworkReason', width: 120, title: t('rework.reasonForRework'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'responsibleEquipment', width: 120, title: t('reportingWorks.responsibleEquipment'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'responsibleTeam', width: 120, title: t('reportingWorks.responsibleTeam'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reworkProcesses', width: 120, title: t('rework.reworkProcess'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'glassAddress', width: 90, title: t('replenish.sliceMarking'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reworkNum', width: 80, title: t('productStock.reworkQuantity'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reworkArea', width: 120, title: t('rework.reworkArea'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'width', width: 80, title: t('order.width'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'height', width: 80, title: t('order.height'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'shape', width: 80, title: t('order.shape'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'qualityInspector', width: 100, title: t('reportingWorks.qualityInspector'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reviewer', width: 100, title: t('productStock.reviewed'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'createTime', width: 100, title: t('productStock.productionDate')},
+ {field: 'updateTime', width: 120, title: t('productStock.approvedDate')},
+ {field: 'productName', width: 120, title: t('order.product'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'reportingWorkId', width: 100,title: t('reportingWorks.reportingWorkId'),filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
- // buttons: [{
- //
- // }],
- import: false,
+ buttons: [
+ {
+ 'name': t('basicData.review'),status: 'primary',
+ 'code':'add'
+ },
+ {
+ 'name': t('basicData.delete'),status: 'primary',
+ 'code':'delete'
+ }
+ ],
+ /*import: false,
export: true,
- print: 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: '鏅舰',
- reworkTeams:'XX浜岀彮',
- type: '鏈哄櫒',
- damage:'姘旀场瓒呮爣',
- reworkProcess:'XXXX',
- device:'XXX'
- },
- {
-
- 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: '鏅舰',
- reworkTeams:'XX浜岀彮',
- type: '鏈哄櫒',
- damage:'姘旀场瓒呮爣',
- reworkProcess:'XXXX',
- device:'XXX'
- },
- ],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['number','area']
+ let footList = ['rework_num','rework_area']
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 ''
})
@@ -178,90 +219,216 @@
})
+const gridEvents = {
+ toolbarButtonClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'add': {
+ const $table = xGrid.value
+ //gridOptions.columns.unshift(a)
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ let flowData = ref({
+
+ userId:userid,
+ userName:username,
+ rework:selectRecords
+
+ })
+ request.post("/rework/updateRework",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.ReviewSuccess'))
+ router.push({path:'/main/rework/SelectRework',query:{random:Math.random()}})
+
+ }else{
+ ElMessage.warning(t('basicData.msg.reviewFail'))
+ router.push("/login")
+ }
+ }).catch((err)=>{
+ ElMessage.error(t('basicData.msg.ServerConnectionError'))
+ router.push("/login")
+ })
+ }
+ return;
+
+ }
+ case 'delete': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length === 0) {
+ ElMessage.warning(t('productStock.unselectedData'))
+ return
+ }
+ let flowData = ref({
+ userId:userid,
+ userName:username,
+ rework:selectRecords
+
+ })
+ request.post("/rework/deleteRework",flowData.value).then((res) => {
+ if(res.code==200 && res.data===true){
+ ElMessage.success(t('basicData.msg.deleteSuccess'))
+ router.push({path:'/main/rework/SelectRework',query:{random:Math.random()}})
+
+ }else{
+ ElMessage.warning(t('basicData.msg.deleteFail'))
+ router.push("/login")
+ }
+ })
+ }
+ return
+
+ }
+
+ }
+ }
+ },
+
+}
+
+
+const selectOrderList = ()=>{
+ request.post(`/rework/SelectRework/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
+ if(res.code==200){
+ if (res.data.total!=null){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ }
+ 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 changeDate = ()=>{
+ selectOrderList()
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ total.pageTotal = pageSize
+ pageNum.value=currentPage
+
+ selectOrderList()
+}
+
+const checkBoxConfig = {
+ checkMethod: ({ row }) => {
+ if (row['review_status']===1){
+ return row.disable
+ }else{
+ return !row.disable
+ }
+
+ },
+ reserve:true
+}
+
</script>
<template>
<div class="main-div-customer">
- <div id="head" >
- <el-row :gutter="0">
+ <el-header height="auto" style="padding: 0;margin:0">
<el-date-picker
- v-model="value"
+ v-model="selectDate"
type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+
/>
-
- <el-button type="primary">鏌ヨ</el-button>
- </el-row>
- </div>
+ <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
+ </el-header>
+
+
<vxe-grid
- max-height="100%"
@filter-change="filterChanged"
+ height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ v-on="gridEvents"
+ :checkbox-config="checkBoxConfig"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row}">
+ <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 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="dialogFormVisible = true" link type="primary" size="small">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'setType')" 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)"/>
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
</div>
</div>
</template>
+ <template #state="{ row,column}">
+ <el-checkbox
+ v-if="row[column.field] === 1"
+ @click.native.prevent
+ :checked="true"/>
+ <el-checkbox
+ v-else
+ @click.native.prevent
+ :checked="false"/>
+ </template>
+
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <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 v-model="dialogFormVisible" title="杩斿伐缂栬緫">
- <el-form :model="form">
- <el-form-item label="杩斿伐缂栧彿" :label-width="formLabelWidth">
- <el-input v-model="form.name" disabled autocomplete="off" style="width: 200px"/>
- </el-form-item>
- <el-form-item label="杩斿伐鐝粍" :label-width="formLabelWidth">
- <el-select v-model="form.region" placeholder="鐝粍涓�" style="width: 200px">
- <el-option label="鐝粍涓�" value="shanghai" />
- <el-option label="鐝粍浜�" value="beijing" />
- </el-select>
- </el-form-item>
- </el-form>
- <template #footer>
- <span class="dialog-footer">
- <el-button @click="dialogFormVisible = false">鍙栨秷</el-button>
- <el-button type="primary" @click="dialogFormVisible = false">
- 纭
- </el-button>
- </span>
- </template>
- </el-dialog>
+
+
+
</div>
+
</template>
<style scoped>
-.main-div-customer{
+.main-div-customer {
width: 99%;
- height: 100%;
+ height: 95%;
}
-#head{
- width:40%;
+:deep(.el-col div) {
+ font-weight: bold;
+ width: 99%;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0