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/reportingWorks/SelectReportingWorks.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index 7bd50c0..528ffe0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -10,11 +10,13 @@
import SelectProduct from "@/views/sd/product/SelectProduct.vue";
import useUserInfoStore from "@/stores/userInfo";
import footSum from "@/hook/footSum"
+import userInfo from "@/stores/userInfo"
//璇█鑾峰彇
const { t } = useI18n()
const userStore = useUserInfoStore()
let router=useRouter()
+const user=userInfo()
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -23,7 +25,11 @@
break
}
case 'delete':{
- request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${row.processId}/${row.thisProcess}`).then((res) => {
+ let userId=user.user.userId;
+ let userName=user.user.userName;
+ const str=row.processId
+ let processId=str.split('/')[0];
+ request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${processId}/${row.thisProcess}/${userId}/${userName}`).then((res) => {
if (res.code == 200 && res.data===true) {
ElMessage.success(t('workOrder.deleteOk'))
router.push({path: '/main/reportingWorks/SelectReportingWorks', query: {random:Math.random()}})
@@ -83,11 +89,11 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
function getNowTime() {
- const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 7)
+ const start = new Date(new Date().getTime()- 3600 * 1000 * 24 * 3)
.toISOString()
.replace('T', ' ')
.slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime()+3600 * 1000 * 24)
+ const end = new Date(new Date().getTime())
.toISOString()
.replace('T', ' ')
.slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -320,18 +326,19 @@
{field: 'reportingWorkId', width: 120, title: t('reportingWorks.reportingWorkId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
{field: 'reportingWorkTime',width: 120, title: t('reportingWorks.reportingWorkTime') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
{field: 'orderId', width: 130,title: t('order.orderId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'processId', width: 130,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'order.project',width: 120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
+ {field: 'processId', width: 160,title: t('processCard.processId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'order.project',width: 150, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
{field: 'order.batch', width: 100,title: t('order.batch') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-
{field: 'thisProcess',width: 100, title: t('reportingWorks.thisProcess'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
{field: 'thisCompletedQuantity',width: 120, title: t('reportingWorks.thisCompletedQuantity') },
{field: 'completedArea', width: 120,title: t('reportingWorks.completedArea'), },
{field: 'thisWornQuantity',width: 120, title: t('reportingWorks.thisWornQuantity'), },
{field: 'wornArea',width: 120, title: t('reportingWorks.wornArea'), },
- {field: 'deviceName', width: 100,title: t('reportingWorks.deviceType'), },
- {field: 'teamsGroupsName',width: 120, title: t('reportingWorks.teamsType'), },
+ {field: 'deviceName', width: 100,title: t('reportingWorks.deviceType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
+ {field: 'teamsGroupsName',width: 120, title: t('reportingWorks.teamsType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
{field: 'reviewedState',width: 120, title: t('processCard.reviewedState'), },
+ {field: 'reviewed',width: 120, title: t('processCard.reviewed'), },
+ {field: 'notes',width: 120, title: t('basicData.remarks'), },
],//琛ㄥご鎸夐挳
@@ -394,7 +401,7 @@
</div>
<vxe-grid
- max-height="100%"
+ height="100%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
@@ -418,19 +425,24 @@
<template #button_slot="{ row }">
<!-- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>-->
<el-button @click="getTableRow(row,'edit')"
- v-if="userStore.user.permissions.indexOf('SelectReportingWorks.edit') > -1"
+ v-if="userStore.user.permissions.indexOf('selectReportingWorks.edit') > -1"
link
type="primary"
size="small">
{{ $t('basicData.edit') }}
</el-button>
- <el-button @click="getTableRow(row,'delete')"
- v-if="userStore.user.permissions.indexOf('basicData.delete') > -1"
- link
- type="primary"
- size="small">
- {{ $t('basicData.delete') }}
- </el-button>
+<!-- <el-button @click="getTableRow(row,'delete')"-->
+<!-- v-if="userStore.user.permissions.indexOf('basicData.delete') > -1"-->
+<!-- link-->
+<!-- type="primary"-->
+<!-- size="small">-->
+<!-- {{ $t('basicData.delete') }}-->
+<!-- </el-button>-->
+ <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
+ <template #reference>
+ <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
<!-- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">-->
<!-- <template #reference>-->
<!-- <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>-->
@@ -441,7 +453,9 @@
<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>
@@ -469,7 +483,7 @@
<style scoped>
.main-div-customer{
width: 99%;
- height: 100%;
+ height: 96%;
}
#selectForm {
width: 45%;
--
Gitblit v1.8.0