From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 187 ++++++++++++++++++++++++++++++++++------------
1 files changed, 137 insertions(+), 50 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 f5af339..477bf86 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
@@ -8,9 +8,15 @@
import {Search} from "@element-plus/icons-vue";
import { useI18n } from 'vue-i18n'
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' :{
@@ -19,24 +25,21 @@
break
}
case 'delete':{
- request.post(`/reportingWork/deleteWork/${row.reportingWorkId}/${row.processId}/${row.thisProcess}`).then((res) => {
- if (res.code == 200) {
+ 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()}})
} else {
-
- ElMessage.warning(res.msg)
-
+ ElMessage.warning(t('processCard.deleteNoProcedure'))
}
})
break
}
}
-}
-
-
-function padLeftZero(str) {
- return ('00' + str).substr(str.length)
}
//鎻愪氦鐨勮〃鍗�
@@ -86,7 +89,7 @@
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
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澶╁墠
@@ -119,7 +122,23 @@
total.pageTotal= res.data.total.pageTotal
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ return { ...item, reviewedState: "宸插鏍�" };
+ }
+ else if (item.reviewedState === 0) {
+ return { ...item, reviewedState: "鏈鏍�" };
+ }
+ else if (item.reviewedState === 2){
+ return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
@@ -139,7 +158,23 @@
produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ return { ...item, reviewedState: "宸插鏍�" };
+ }
+ else if (item.reviewedState === 0) {
+ return { ...item, reviewedState: "鏈鏍�" };
+ }
+ else if (item.reviewedState === 2){
+ return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
}else{
ElMessage.warning(res.msg)
}
@@ -160,7 +195,24 @@
total.dataTotal = res.data.total.total*1
total.pageTotal= res.data.total.pageTotal
pageTotal.value = res.data.total
- xGrid.value.loadData(res.data.data)
+ produceList=res.data.data
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ return { ...item, reviewedState: "宸插鏍�" };
+ }
+ else if (item.reviewedState === 0) {
+ return { ...item, reviewedState: "鏈鏍�" };
+ }
+ else if (item.reviewedState === 2){
+ return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
@@ -182,17 +234,17 @@
}
function filterChanged(column) {
- gridOptions.loading = true
+ gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
- let value = column.datas[0] != undefined ? column.datas[0] : ''
+ let value = column.datas[0]!=undefined?column.datas[0]:''
value = value.trim()
//鍒ゆ柇鏄惁瀛樺湪澶栭敭
- if (column.property.indexOf('.') > -1) {
- const columnArr = column.property.split('.')
+ if (column.property.indexOf('.')>-1){
+ const columnArr = column.property.split('.')
filterData.value[columnArr[0]] = {
- [columnArr[1]]: value
+ [columnArr[1]]:value
}
- } else {
+ }else{
filterData.value[column.property] = value
}
@@ -202,11 +254,27 @@
request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${startTime}/${endTime}/${inputVal}`, filterData.value).then((res) => {
if(res.code==200){
- pageTotal.value=res.data.total
+ total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
produceList = deepClone(res.data.data)
- xGrid.value.loadData(produceList)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ return { ...item, reviewedState: "宸插鏍�" };
+ }
+ else if (item.reviewedState === 0) {
+ return { ...item, reviewedState: "鏈鏍�" };
+ }
+ else if (item.reviewedState === 2){
+ return { ...item, reviewedState: "瀹℃牳涓嶉�氳繃" };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.reloadData(modifiedCollection)
gridOptions.loading=false
}else{
ElMessage.warning(res.msg)
@@ -229,7 +297,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ id: 'SelectReportingWorks',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -253,23 +321,24 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'reportingWorkId', width: 120, title: '鎶ュ伐缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
- {field: 'reportingWorkTime',width: 120, title: '鎶ュ伐鏃堕棿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderId', width: 130,title: '閿�鍞崟鍙�' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'processId', width: 130,title: '娴佺▼鍗″彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'order.project',width: 120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
- {field: 'order.batch', width: 100,title: '鎵规' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-
- {field: 'thisProcess',width: 100, title: '鏈伐搴�',filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
- {field: 'thisCompletedQuantity',width: 120, title: '鏈伐搴忓畬宸�' },
- {field: 'completedArea', width: 120,title: '瀹屽伐闈㈢Н', },
- {field: 'thisWornQuantity',width: 120, title: '鏈伐搴忔鐮�', },
- {field: 'wornArea',width: 120, title: '娆＄牬闈㈢Н', },
- {field: 'deviceName', width: 100,title: '鎶ュ伐璁惧', },
- {field: 'teamsGroupsName',width: 120, title: '鎶ュ伐鐝粍', },
- {field: 'reviewedState',width: 120, title: '瀹℃牳鐘舵��', },
+ {title: t('basicData.operate'), width: 140, slots: { default: 'button_slot' },fixed:"left"},
+ { type: 'seq',fixed:"left", title: t('basicData.Number'), width: 50 },
+ {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: 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'),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: '瀹℃牳浜�', },
+ {field: 'notes',width: 120, title: t('basicData.remarks'), },
],//琛ㄥご鎸夐挳
@@ -286,14 +355,14 @@
data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['','','','']
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["thisCompletedQuantity",'completedArea','thisWornQuantity','wornArea']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -332,7 +401,7 @@
</div>
<vxe-grid
- max-height="100%"
+ height="100%"
@filter-change="filterChanged"
class="mytable-scrollbar"
ref="xGrid"
@@ -354,13 +423,31 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>
-<!-- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>-->
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+<!-- <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"
+ 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-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">
<template #reference>
- <el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ <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>-->
+<!-- </template>-->
+<!-- </el-popconfirm>-->
</template>
<template #num1_filter="{ column, $panel }">
@@ -394,7 +481,7 @@
<style scoped>
.main-div-customer{
width: 99%;
- height: 100%;
+ height: 96%;
}
#selectForm {
width: 45%;
--
Gitblit v1.8.0