From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue | 598 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 429 insertions(+), 169 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 0e752bb..fb092ed 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
@@ -1,25 +1,54 @@
<script setup>
-import {reactive} from "vue";
+import {onMounted, reactive, ref} from "vue";
import {useRouter} from 'vue-router'
+import request from "@/utils/request";
+import deepClone from "@/utils/deepClone";
+import {ElDatePicker, ElMessage} from "element-plus";
+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"
+import useOrderInfoStore from "@/stores/sd/order/orderInfo";
+
+//璇█鑾峰彇
+const { t } = useI18n()
+const userStore = useUserInfoStore()
let router=useRouter()
+const user=userInfo()
+const orderInfo = useOrderInfoStore()
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
//alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/reportingWorks/AddReportingWork', query: { id: row.id }})
+ router.push({path: '/main/reportingWorks/AddReportingWork', query: { reportingWorkId: row.reportingWorkId }})
break
}
case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- case 'setType':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍙嶅鐘舵��')
+ 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(t('processCard.deleteNoProcedure'))
+ }
+ })
break
}
}
}
+
+//鎻愪氦鐨勮〃鍗�
+const form = reactive({
+ date1: '',
+ orderId: ''
+})
//琛ㄥ熬姹傚拰
const sumNum = (list, field) => {
@@ -30,15 +59,278 @@
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: '',
+ batch:''
+ },
+ orderGlassDetail: {
+ completedArea:'',
+ wornArea:''
+ }
+})
+//瀹氫箟椤甸潰鎬婚〉鏁�
+let pageTotal = ref('')
+//瀹氫箟鏁版嵁杩斿洖缁撴灉
+let produceList = ref([])
+//瀹氫箟褰撳墠椤垫暟
+let pageNum=ref(1)
+let pageState = null
+
+//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
+function getNowTime() {
+ 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())
+ .toISOString()
+ .replace('T', ' ')
+ .slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
+ return [start, end]
+}
+
+
+//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
+form.date1=getNowTime()
+let startTime = form.date1[0]
+let endTime = form.date1[1]
+let inputVal = form.orderId
+if (inputVal == '') {
+ inputVal = null
+}
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
+let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+date.setDate(date.getDate() + 1);
+let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+const getReportingWorkList = async () => {
+//绗竴娆″姞杞芥暟鎹�
+ await request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total * 1
+ total.pageTotal = res.data.total.pageTotal
+ orderInfo.reportingWorkDate = res.data.selectDate
+ pageTotal.value = res.data.total
+ total.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ return {...item, reviewedState: t('productStock.approved')};
+ } else if (item.reviewedState === 0) {
+ return {...item, reviewedState: t('reportingWorks.unreviewed')};
+ } else if (item.reviewedState === 2) {
+ return {...item, reviewedState: t('reportingWorks.notunreviewed')};
+ } else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.loadData(modifiedCollection)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = ()=>{
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ gridOptions.loading=true
+ request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`,filterData.value).then((res) => {
+ if(res.code==200){
+ total.value = res.data.total
+
+ produceList = deepClone(res.data.data)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ //宸插鏍�
+ return { ...item, reviewedState: t('productStock.approved') };
+ }
+ else if (item.reviewedState === 0) {
+ //鏈鏍�
+ return { ...item, reviewedState: t('reportingWorks.unreviewed') };
+ }
+ else if (item.reviewedState === 2){
+ //瀹℃牳鏈�氳繃
+ return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.loadData(modifiedCollection)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//鐐瑰嚮鏌ヨ
+const getWorkOrder = () => {
+ gridOptions.loading = true
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let inputVal = form.orderId
+ if (inputVal == '') {
+ inputVal = null
+ }
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/reportingWork/selectReportingWork/${pageNum.value}/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`, filterData.value).then((res) => {
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
+ pageTotal.value = res.data.total
+ total.value = res.data.total
+ orderInfo.reportingWorkDate = res.data.selectDate
+ produceList=res.data.data
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ //宸插鏍�
+ return { ...item, reviewedState: t('productStock.approved') };
+ }
+ else if (item.reviewedState === 0) {
+ //鏈鏍�
+ return { ...item, reviewedState: t('reportingWorks.unreviewed') };
+ }
+ else if (item.reviewedState === 2){
+ //瀹℃牳鏈�氳繃
+ return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.loadData(modifiedCollection)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ pageNum.value=currentPage
+ total.pageTotal = pageSize
+ selectPageList()
+}
+
+/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
+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
+ }
+
+//鑾峰彇閫変腑鏃堕棿
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
+// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
+ date.setDate(date.getDate() + 1);
+ let newEndTime = date.toISOString().split('T')[0]; // 鑾峰彇 YYYY-MM-DD 鏍煎紡鐨勫瓧绗︿覆
+ request.post(`/reportingWork/selectReportingWork/1/${total.pageSize}/${orderInfo.reportingWorkDate}/${inputVal}`, filterData.value).then((res) => {
+ if(res.code==200){
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal=parseInt(res.data.total)
+ pageNum.value=1
+ total.value = res.data.total
+ produceList = deepClone(res.data.data)
+ // 浣跨敤map鏂规硶鏉ュ鐞嗘瘡涓璞�
+ let modifiedCollection = produceList.map(item => {
+ if (item.reviewedState === 1) {
+ //宸插鏍�
+ return { ...item, reviewedState: t('productStock.approved') };
+ }
+ else if (item.reviewedState === 0) {
+ //鏈鏍�
+ return { ...item, reviewedState: t('reportingWorks.unreviewed') };
+ }
+ else if (item.reviewedState === 2){
+ //瀹℃牳鏈�氳繃
+ return { ...item, reviewedState: t('reportingWorks.notunreviewed') };
+ }
+ else {
+ // 鍏朵粬鎯呭喌淇濇寔涓嶅彉
+ return item;
+ }
+ });
+ xGrid.value.loadData(modifiedCollection)
+ gridOptions.loading=false
+ orderInfo.selectReportingWorksFilter.list = xGrid.value.getCheckedFilters()
+ orderInfo.selectReportingWorksFilter.data = filterData.value
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+/*鍚庣杩斿洖缁撴灉澶氬眰宓屽灞曠ず*/
+const hasDecimal = (value) => {
+ const regex = /\./; // 瀹氫箟姝ｅ垯琛ㄨ揪寮忥紝鏌ユ壘灏忔暟鐐�
+ return regex.test(value); // 杩斿洖true/false
+}
+
+//瀛愮粍浠舵帴鏀跺弬鏁�
+const xGrid = ref()
const gridOptions = reactive({
+ loading: true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'CustomerList',
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ id: 'SelectReportingWorks',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -62,20 +354,25 @@
},//琛ㄥご鍙傛暟
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: 'reportingWorkNo', width: 120, title: '鎶ュ伐缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'reportingWorkTime',width: 120, title: '鎶ュ伐鏃堕棿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'processCard', width: 130,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: 100,title: '鎵规', sortable: true,showOverflow:"ellipsis"},
- {field: 'device', width: 100,title: '璁惧', sortable: true},
- {field: 'thisProcess',width: 100, title: '鏈伐搴�', sortable: true},
- {field: 'finishedNumber',width: 120, title: '鏈伐搴忓畬宸�', sortable: true,showOverflow:"ellipsis"},
- {field: 'finishedArea', width: 120,title: '瀹屽伐闈㈢Н', sortable: true},
- {field: 'wornNumber',width: 120, title: '鏈伐搴忔鐮�', sortable: true},
- {field: 'wornArea',width: 120, title: '娆＄牬闈㈢Н', sortable: true},
- {field: 'teamName',width: 120, title: '鐝粍鍚嶇О', sortable: true}
+ {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" ,},
+ {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: t('processCard.reviewed'), },
+ {field: 'notes',width: 120, title: t('basicData.remarks'), },
+
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -88,102 +385,18 @@
zoom: true,
custom: true
},
- data: [
- {
- reportingWorkNo: 'BG2312080011',
- reportingWorkTime: '2023-12-08 09:05:58',
- processCard: 'NG23120801A01',
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '鍥涙壒浜�',
- device:'澶ф捣鍒╁畞',
- thisProcess: '鍒囧壊',
- finishedNumber: '13',
- finishedArea: '44.22',
- wornNumber: '',
- wornArea: '',
- teamName:'鍒囧壊涓�鐝�'
- },
- {
- reportingWorkNo: 'BG2312080013',
- reportingWorkTime: '2023-12-08 09:05:58',
- processCard: 'NG23120801A01',
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '涓�鎵逛簩',
- device:'澶ф捣鍒╁畞',
- thisProcess: '鍒囧壊',
- finishedNumber: '13',
- finishedArea: '44.22',
- wornNumber: '',
- wornArea: '',
- teamName:'鍒囧壊涓�鐝�'
- },
- {
- reportingWorkNo: 'BG2311080025',
- reportingWorkTime: '2023-12-08 09:05:58',
- processCard: 'NG23120801A01',
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '涓�鎵逛簩',
- device:'澶ф捣鍒╁畞',
- thisProcess: '鍒囧壊',
- finishedNumber: '13',
- finishedArea: '44.22',
- wornNumber: '',
- wornArea: '',
- teamName:'鍒囧壊涓�鐝�'
- },
- {
- reportingWorkNo: 'BG2303080025',
- reportingWorkTime: '2023-12-08 09:05:58',
- processCard: 'NG23120801A01',
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '涓�鎵逛簩',
- device:'澶ф捣鍒╁畞',
- thisProcess: '鍒囧壊',
- finishedNumber: '13',
- finishedArea: '44.22',
- wornNumber: '',
- wornArea: '',
- teamName:'鍒囧壊涓�鐝�'
- },
- {
- reportingWorkNo: 'BG2312080001',
- reportingWorkTime: '2023-12-08 09:05:58',
- processCard: 'NG23120801A01',
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '涓�鎵逛簩',
- device:'澶ф捣鍒╁畞',
- thisProcess: '鍒囧壊',
- finishedNumber: '13',
- finishedArea: '44.22',
- wornNumber: '',
- wornArea: '',
- teamName:'鍒囧壊涓�鐝�'
- },
- {
- reportingWorkNo: 'BG2312080015',
- reportingWorkTime: '2023-12-08 09:05:58',
- processCard: 'NG23120801A01',
- entryName: '淇″悎鏄ュぉ閲�',
- batch: '涓�鎵逛簩',
- device:'澶ф捣鍒╁畞',
- thisProcess: '鍒囧壊',
- finishedNumber: '13',
- finishedArea: '44.22',
- wornNumber: '',
- wornArea: '',
- teamName:'鍒囧壊涓�鐝�'
- },
- ],//table body瀹為檯鏁版嵁
+ data: [],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['finishedNumber','finishedArea','wornNumber','wornArea']
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 total.value?.[column.field] ?? 0
}
return ''
})
@@ -192,81 +405,128 @@
})
-
-const form = reactive({
- name: '',
- region: '',
- date1: '',
- date2: '',
- delivery: false,
- type: [],
- resource: '',
- desc: '',
+onMounted(async () => {
+ filterData.value = orderInfo.selectReportingWorksFilter.data
+ await getReportingWorkList()
+ orderInfo.selectReportingWorksFilter.list.forEach(item => {
+ xGrid.value.getColumnByField(item.field).filters = item.column.filters
+ })
})
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.reportingWorkDate"
type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ format="YYYY/MM/DD"
+ value-format="YYYY-MM-DD"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
:default-time="defaultTime"
+
/>
- <el-button type="primary">鏌ヨ</el-button>
- </el-row>
+ <el-input v-model="form.orderId" clearable :placeholder="$t('order.orderId')" style="width: 130px"></el-input>
+
+ <el-button
+ @click="getWorkOrder"
+ id="select"
+ type="primary" :icon="Search">{{$t('basicData.search')}}
+ </el-button>
</div>
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <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>
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <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>
+ </li>
+ </ul>
+ </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)"/>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <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"
+ 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 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 }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </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>
+ </vxe-grid>
+ </div>
+<!-- <el-dialog v-model="updateWork" style="width: 80%;height:75% ">-->
+<!-- <select-product :rowIndex="rowIndex" @getProductRow="getProductRow" style="width: 100%;height: 100%" />-->
+<!-- </el-dialog>-->
</div>
</template>
<style scoped>
-.main-div-customer{
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 40%;
- text-align: center;
+
+.main-table{
+ width: 100%;
+ height: calc(100% - 25px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0