From edc227277159601c5cb86829f1c5ce14cf7903a4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 24 九月 2024 10:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 157 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 106 insertions(+), 51 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index fd22964..e4c3edd 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -8,11 +8,16 @@
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 { useI18n } from 'vue-i18n'
+import useUserInfoStore from '@/stores/userInfo'
+import footSum from "@/hook/footSum"
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
//璇█鑾峰彇
const { t } = useI18n()
+const userStore = useUserInfoStore()
+const orderInfo = useOrderInfoStore()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
@@ -21,7 +26,6 @@
const getTableRow = (row, type) => {
switch (type) {
case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/workOrder/addWorkOrder', query: {orderId: row.orderId}})
break
}
@@ -30,13 +34,14 @@
let endTime = form.date1[1]
let state = optionVal.value
request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
- if (res.code == 200) {
- ElMessage.success(t('workOrder.deleteOk'))
- //location.reload();
- router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
- } else {
- ElMessage.warning(res.msg)
- }
+ if (res.code == 200 && res.data===true) {
+ ElMessage.success(t('workOrder.deleteOk'))
+ router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
+ } else {
+
+ ElMessage.warning(t('workOrder.deleteNo'))
+
+ }
})
break
}
@@ -108,7 +113,7 @@
//鑾峰彇3澶╁墠鍒板綋鍓嶆椂闂�
function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
+ const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
.toISOString()
.replace('T', ' ')
.slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
@@ -119,31 +124,37 @@
return [start, end]
}
-
-//绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
-let state = optionVal.value
+const getFirst = () => {
+ //绗竴娆″姞杞借幏鍙栬繎3澶╂椂闂村拰榛樿鐘舵��
+//form.date1 = getNowTime()
+ if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
+ orderInfo.workOrderDate=getNowTime()
+ }
+ let startTime = orderInfo.workOrderDate[0]
+ let endTime = orderInfo.workOrderDate[1]
+ let state = optionVal.value
//绗竴娆″姞杞芥暟鎹�
-request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
+ request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
- if (res.code == 200) {
- pageTotal.value = res.data.total
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
-})
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
+
//鐐瑰嚮鏌ヨ
-const getWorkOrder = (isButtonDisabled) => {
+const getWorkOrder = () => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
+ let startTime = orderInfo.workOrderDate[0]
+ let endTime = orderInfo.workOrderDate[1]
let selectState = optionVal.value
request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
@@ -180,8 +191,8 @@
}
//鑾峰彇閫変腑鏃堕棿鍜屾槸鍚﹁浆鍗曠姸鎬�
- let startTime = form.date1[0]
- let endTime = form.date1[1]
+ let startTime = orderInfo.workOrderDate[0]
+ let endTime = orderInfo.workOrderDate[1]
let selectState = optionVal.value
request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
@@ -212,7 +223,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'selectWorkOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -235,11 +246,19 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
+ checkboxConfig: {
+ labelField: 'name',
+ checkMethod: ({ row }) => {
+ return optionVal.value === '1'
+ }
+ },
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
{title: t('basicData.operate'), width: 110, slots: {default: 'button_slot'}, fixed: "left"},
{type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
{field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+ {field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{
field: 'productionId',
title: t('workOrder.productionId'),
@@ -249,17 +268,19 @@
, width: 130
},
{field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
- {field: 'order.project', title: '椤圭洰鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
- {field: 'order.orderType', title: '璁㈠崟绫诲瀷', showOverflow: "ellipsis", width: 110},
- {field: 'orderDetail.grossArea', title: '闈㈢Н', width: 70},
- {field: 'orderDetail.quantity', title: '鏁伴噺',},
- {field: 'order.creator', title: '鍒涘缓浜�',},
+ {field: 'order.project', title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
+ {field: 'order.orderType', title: t('order.orderType'), showOverflow: "ellipsis", width: 110},
+ {field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
+ {field: 'orderDetail.quantity', title: t('order.quantity'),},
+ {field: 'order.creator', title: t('order.creator'),},
+ {field: 'founder', title: t('product.creator'),},
+ {field: 'order.processingNote', title: t('order.processingNote'), filters: [{data: ''}], slots: {filter: 'num1_filter'},},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
- // buttons: [{
- //
- // }],
+ buttons: [
+ {'code': 'transferOrder', 'name': t('workOrder.transferOrder'),status: 'primary'}
+ ],
// import: false,
// export: true,
// print: true,
@@ -267,15 +288,15 @@
custom: true
},
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['', '', '']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["orderDetail.grossArea",'orderDetail.quantity']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -283,8 +304,27 @@
}
})
+const gridEvents = {
+ async toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'transferOrder': {
+ const idList = []
+ $grid.getCheckboxRecords().forEach(item => {
+ idList.push(item.orderId)
+ })
+ router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:idList.join(',')}})
+ break
+ }
+ }
+ }
+ }
+}
-
+onMounted(() => {
+ getFirst()
+})
</script>
<template>
@@ -292,7 +332,7 @@
<div id="selectForm">
<el-row :gutter="0">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.workOrderDate"
type="daterange"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
@@ -302,7 +342,12 @@
/>
- <el-select :default-first-option="true" ref="getSelect" style="width: 130px" v-model="optionVal" class="m-2"
+ <el-select
+ :default-first-option="true"
+ ref="getSelect" style="width: 130px"
+ v-model="optionVal"
+ class="m-2"
+ @change="getWorkOrder"
>
<el-option
v-for="item in options"
@@ -313,7 +358,7 @@
</el-select>
<el-button
- @click="getWorkOrder(isButtonDisabled)"
+ @click="getWorkOrder"
:disabled="isButtonDisabled"
id="select"
type="primary" :icon="Search">{{$t('basicData.search')}}
@@ -327,6 +372,7 @@
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ v-on="gridEvents"
>
<!-- @toolbar-button-click="toolbarButtonClickEvent"-->
@@ -344,8 +390,17 @@
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>
-<!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
+<!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"-->
+<!-- @click="getTableRow(row,'edit')"-->
+<!-- v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"-->
+<!-- link-->
+<!-- type="primary"-->
+<!-- size="small">-->
+<!-- {{$t('workOrder.transferOrder')}}-->
+<!-- </el-button>-->
+
+ <!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
<el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
--
Gitblit v1.8.0