From 39f4718ac84cc05f5e1f72f18ae042058c481ec4 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 05 十二月 2025 09:26:03 +0800
Subject: [PATCH] 提交 筛选条件错误时进行提示
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 292 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 241 insertions(+), 51 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index 0a5037c..b11c52f 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -4,8 +4,8 @@
import {computed, onMounted, reactive, ref} from "vue"
import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
-import {ElMessage} from "element-plus"
-import {Edit, VXETable} from "vxe-table"
+import {ElMessage, ElMessageBox} from "element-plus"
+import { VXETable} from "vxe-table"
import useUserInfoStore from '@/stores/userInfo'
import companyInfo from "@/stores/sd/companyInfo"
import footSum from "@/hook/footSum"
@@ -15,12 +15,15 @@
import PrintSheet1 from "@/components/sd/order/PrintSheet1.vue"
import PrintSheet2 from "@/components/sd/order/PrintSheet2.vue"
import {useI18n} from "vue-i18n"
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
import {CircleCheck, Download, Printer} from "@element-plus/icons-vue/global"
import { saveAs } from "file-saver"
-import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue";
-import PrintSheet4 from "@/components/sd/order/PrintSheet4.vue";
-import PrintSheet5 from "@/components/sd/order/PrintSheet5.vue";
+import PrintSheet3 from "@/components/sd/order/PrintSheet3.vue"
+import PrintSheet4 from "@/components/sd/order/PrintSheet4.vue"
+import PrintSheet5 from "@/components/sd/order/PrintSheet5.vue"
+import OrderProcessCollect from "@/components/sd/order/OrderProcessCollect.vue";
const { t } = useI18n()
+ const orderInfo = useOrderInfoStore()
const userStore = useUserInfoStore()
const company = companyInfo()
const tabsValue=ref('1')
@@ -31,14 +34,17 @@
let dialogKey = ref(0)
let sheetIndex = ref(-1)
let orderType = ref("2")
- let selectDate = ref(["",""])
let filterData = ref({})
+ let sortData = ref({
+ field:'id',
+ order:null
+ })
let orderList = ref([])
let pageNum=ref(1)
- let total = reactive({
+ let total = ref({
pageTotal : 0,
dataTotal : 0,
- pageSize : 100
+ pageSize : 50
})
@@ -63,6 +69,9 @@
filterConfig: { //绛涢�夐厤缃」
remote: true
},
+ sortConfig: { //鎺掑簭閰嶇疆椤�
+ remote: true//鏄惁鏈嶅姟绔帓搴�
+ },
customConfig: {
storage: true
},
@@ -79,17 +88,29 @@
{ code: 'copyTitle', name: t('searchOrder.copyTitle'), prefixIcon: 'vxe-icon-copy', visible: true},
{
prefixIcon: 'vxe-icon-print',
- name: '鍔犲伐鍗�',
+ name: t('order.processingOrder'),
children: [
- { code: 'sheet1', name: '妯増-鏅��' },
- { code: 'sheet2', name: '妯増-澶氬眰鏄庣粏' },
- { code: 'sheet4', name: '鐢熶骇鍔犲伐鍗曠旱鐗�' },
- { code: 'sheet3', name: '娴忚鍙戣揣淇℃伅' },
- { code: 'sheet5', name: '鐢熶骇鍔犲伐鍗曞集閽�(鍗曠墖)' },
+ // { code: 'sheet1', name: '妯増-鏅��' },
+ { code: 'sheet2', name: t('order.sheet2') },//鍔犲伐鍗曟í鐗�
+ { code: 'sheet4', name: t('order.sheet4') },//鍔犲伐鍗�-绔栫増
+ { code: 'sheet3', name: t('order.sheet3') },//鍙戣揣纭鍗�
+ { code: 'sheet5', name: t('order.sheet5')},//鍔犲伐鍗� 绔栫増鍗曠墖
]
},
- { code: 'oneClickStorage', name: "涓�閿畬宸�", prefixIcon: 'vxe-icon-copy', visible: true},
+ {
+ prefixIcon: 'vxe-icon-repeat',
+ name: t('order.oneClickReturn'),
+ children: [
+ // { code: 'sheet1', name: '妯増-鏅��' },
+ { code: 'back1', name: t('searchOrder.createOrder'),disabled:true },
+ { code: 'back2', name: t('order.technology'),disabled:true },
+ { code: 'back3', name: t('basicData.review'),disabled:true },
+ { code: 'back4', name: t('searchOrder.production'),disabled:true },
+
+ ]
+ },
+ { code: 'oneClickStorage', name: t('order.oneClickStorage'), prefixIcon: 'vxe-icon-copy', visible: true},
// { code: 'getProcessList', name: t('searchOrder.processFlows'), prefixIcon: 'vxe-icon-file-txt', visible: true}
]
]
@@ -102,12 +123,13 @@
{type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},
{field:'createOrder',title: t('searchOrder.createOrder'), width: 40, slots: { default: 'state' }},
- {field:'processReview',title: t('order.technology'), width: 40, slots: { default: 'state' }},
- {field:'orderReview',title: t('basicData.review'), width: 40, slots: { default: 'state' }},
- {field:'productionOrder',title: t('searchOrder.production'), width: 40, slots: { default: 'state' }},
- {field:'processingCard',title: t('searchOrder.process'), width: 40, slots: { default: 'state' }},
- {field:'warehousing',title: t('searchOrder.storage'), width: 40, slots: { default: 'state' }},
- {field:'delivery',title: t('searchOrder.delivery'), width: 40, slots: { default: 'state' }},
+ {field:'processReview',title: t('order.technology'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+ {field:'orderReview',title: t('basicData.review'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+ {field:'productionOrder',title: t('searchOrder.production'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+ {field:'processingCard',title: t('searchOrder.process'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+ {field:'warehousing',title: t('searchOrder.storage'), width: 40, filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+ {field:'delivery',title: t('searchOrder.delivery'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
+
{field: 'orderId',width:120, title: t('order.orderId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'customerId',width:120, title: t('customer.customerNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -118,20 +140,26 @@
{field: 'goodsQuantity',width:120, title: t('searchOrder.inventoryNum'), sortable: true},
{field: 'area',width:120, title: t('order.computeGrossArea'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'money',width:120, title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'createTime',width:120, title: t('basicData.reportData'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'createTime',width:120,filters:[{ data: '' }],slots: { filter: 'num1_filter' }, title: t('basicData.reportData'), sortable: true},
+ {field: 'updateTime',width:120, title: t('productStock.approvedDate'), sortable: true},
{field: 'packType',width:120, title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'orderType',width:120, title: t('order.orderType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'salesman',width:120, title: t('order.salesman'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'creator',width:120, title: t('product.creator'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'verifier',width:120, title: t('basicData.review'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'perimeter',width:120, title: t('searchOrder.perimeter'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'deliveryDate',width:120, title: t('order.deliveryDate'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'deliveryDate',width:120, title: t('order.deliveryDate'), sortable: true},
{field: 'customerBatch',width:120, title: t('order.customerBatch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
//{field: '14',width:120, title: '澶囨敞',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'deliveryAddress',width:120, title: t('order.deliveryAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+ {field: 'deliveryAddress',width:120, title: t('order.deliveryAddress'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {field: 'processingNote',width:120, title: t('order.processingNote'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
],
-
+ mouseConfig:{selected: true},//榧犳爣閫変腑
+ keyboardConfig:{
+ isArrow: true
+ },
//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
@@ -156,7 +184,8 @@
}
const List = ["quantity",'goodsQuantity','area','perimeter','money']
if (List.includes(column.field)) {
- return footSum(data, column.field)
+ //return footSum(data, column.field)
+ return total.value[column.field]
}
return ''
})
@@ -246,6 +275,22 @@
}
break
}
+ case 'back1': {
+ backProcess(1)
+ break
+ }
+ case 'back2': {
+ backProcess(2)
+ break
+ }
+ case 'back3': {
+ backProcess(3)
+ break
+ }
+ case 'back4': {
+ backProcess(4)
+ break
+ }
case 'copy': {
if(rowClickIndex.value===null){
@@ -280,11 +325,11 @@
ElMessage.warning(t('order.orderNotApproved'))
return
}
- if(rowClickIndex.value.warehousing>0){
+ if(rowClickIndex.value.warehousing==2){
ElMessage.warning(t('order.orderHasBeenReceived'))
return
}
- request.post(`/FinishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
+ request.post(`/finishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
if(res.code==200 && res.data===true){
ElMessage.success(t('productStock.receivedSuccessfully'))
router.push({path:'/main/order/selectOrder',query:{random:Math.random()}})
@@ -300,16 +345,75 @@
},
cellClick({ row }){
rowClickIndex.value = row
+ xGrid.value.menuConfig.body.options[0][3].children.forEach((item)=>{
+ item.disabled=true
+ })
+ //鍒ゆ柇鏄惁鍏ュ簱
+ if(row.warehousing>0){
+ return
+ }
+ if(row.processReview===2){
+ xGrid.value.menuConfig.body.options[0][3].children[0].disabled=false
+ }
+ if(row.orderReview===2){
+ xGrid.value.menuConfig.body.options[0][3].children[1].disabled=false
+ }
+ if(row.productionOrder>0){
+ xGrid.value.menuConfig.body.options[0][3].children[2].disabled=false
+ }
+ if(row.processingCard>0){
+ xGrid.value.menuConfig.body.options[0][3].children[3].disabled=false
+ }
+ },
+ sortChange ({ field, order }) {
+ sortData.value = {field,order}
+ selectOrderList()
}
}
+ const backProcess = (status) => {
+ if(rowClickIndex.value===null){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
- const getOrderList = () => {
+ ElMessageBox.confirm(
+ t('searchOrder.msgList.BackSure'),
+ 'Warning',
+ {
+ confirmButtonText: t('basicData.confirmButtonText'),
+ cancelButtonText: t('basicData.cancelButtonText'),
+ type: 'warning',
+ }
+ )
+ .then(() => {
+ request.post(`/order/processBack/${rowClickIndex.value.orderId}/${status}`).then((res) => {
+ if(res.code==='200' && res.data===true){
+ ElMessage.success(t('product.msg.operateSuccess')+'!')
+ selectOrderList()
+ }else if(res.data==='false1'){
+ ElMessage.warning(t('searchOrder.msgList.isOptimize'))
+ }else if(res.data==='false2'){
+ ElMessage.warning(t('searchOrder.msgList.isReportingWork'))
+ }else if(res.data==='false3'){
+ ElMessage.warning(t('searchOrder.msgList.isStorage'))
+ }
+ })
+ })
+ }
+
+
+ const getOrderList = async () => {
//鍔犺浇璇锋眰
- request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ await request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
if(res.code==200){
- total.dataTotal = res.data.total.total*1
- total.pageTotal= res.data.total.pageTotal
- selectDate.value = res.data.selectDate
+ total.value = res.data.total
+ /*total.dataTotal = res.data.total.dataTotal*1
+ total.pageTotal= res.data.total.pageTotal*/
+ orderInfo.selectDate = res.data.selectDate
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
}else{
@@ -317,8 +421,12 @@
}
})
}
- onMounted(() => {
- getOrderList()
+ onMounted(async () => {
+ filterData.value = orderInfo.searchOrderFilter.data
+ await getOrderList()
+ orderInfo.searchOrderFilter.list.forEach(item =>{
+ xGrid.value.getColumnByField(item.field).filters = item.column.filters
+ })
})
const changeFilterEvent = (event, option, $panel) => {
@@ -340,29 +448,47 @@
}else{
filterData.value[column.property] = value
}
- request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
if(res.code==200){
- total.dataTotal = res.data.total.total*1
- total.pageTotal=parseInt(res.data.total)
+ total.value = res.data.total
+ /*total.dataTotal = res.data.total.total*1
+ total.pageTotal=parseInt(res.data.total)*/
pageNum.value=1
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
- gridOptions.loading=false
+
+ orderInfo.searchOrderFilter.list = xGrid.value.getCheckedFilters()
+ orderInfo.searchOrderFilter.data = filterData.value
}else{
ElMessage.warning(res.msg)
}
+ }).catch(e => {
+ xGrid.value.clearFilter()
+ orderInfo.searchOrderFilter.data = {}
+ ElMessage.error(t('searchOrder.msgList.filterError'))
+ }).finally(()=>{
+ gridOptions.loading=false
})
}
//鍙屽嚮琛ㄦ牸琛�
const selectOrderList = ()=>{
- request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
- ,filterData).then((res) => {
+ const config = {
+ filter: filterData.value,
+ sort: sortData.value
+ }
+ request.post(`/order/getOrderList/${pageNum.value}/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`
+ ,config).then((res) => {
if(res.code==200){
- total.dataTotal = res.data.total.total*1
- total.pageTotal = res.data.total.pageTotal
- selectDate.value=res.data.selectDate
+ total.value = res.data.total
+ /*total.dataTotal = res.data.total.total*1
+ total.pageTotal = res.data.total.pageTotal*/
+ orderInfo.selectDate=res.data.selectDate
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
@@ -427,7 +553,7 @@
const exportFile = ()=>{
const html = document.getElementById("child").innerHTML // 鑾峰彇闇�瑕佸鍑虹殑HTML鍐呭
const blob = new Blob([html], { type: 'application/vnd.ms-excel' }) // 鍒涘缓Blob瀵硅薄
- saveAs(blob, rowClickIndex.value.orderId+".xlsx");
+ saveAs(blob, rowClickIndex.value.orderId+".xls");
}
const reviewOrder = ()=>{
@@ -459,13 +585,39 @@
}
+const handleKeyDown = (evnt) =>{
+
+ if(evnt.$event.keyCode === 38 ){
+ let nextRowIndex = xGrid.value.getRowIndex(xGrid.value.getCurrentRecord()) - 1;
+ if (nextRowIndex < xGrid.value.getTableData().fullData.length && nextRowIndex>=0) {
+ xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
+ rowClickIndex.value = xGrid.value.getCurrentRecord()
+ }
+
+ }
+ if(evnt.$event.keyCode === 40 ){
+ let nextRowIndex = xGrid.value.getRowIndex(xGrid.value.getCurrentRecord()) + 1;
+ if (nextRowIndex < xGrid.value.getTableData().fullData.length) {
+ xGrid.value.setCurrentRow(xGrid.value.getTableData().fullData[nextRowIndex]);
+ rowClickIndex.value = xGrid.value.getCurrentRecord()
+ }
+
+ }
+}
+//璁㈠崟璺濈灏忎簬涓夊ぉ鍒欐敼鍙榗heckbox class 鏀瑰彉棰滆壊
+const timeOutChangeColor =(row)=>{
+ if(company.timeOut){
+ return row.timeOut
+ }
+}
+
</script>
<template>
<div style="width: 100%;height: 100% ;">
<div style="width: 100%;height: 55%">
<el-date-picker
- v-model="selectDate"
+ v-model="orderInfo.selectDate"
type="daterange"
:start-placeholder="$t('basicData.startDate')"
:end-placeholder="$t('basicData.startDate')"
@@ -488,6 +640,7 @@
ref="xGrid"
v-bind="gridOptions"
v-on="gridEvents"
+ @keydown="handleKeyDown"
>
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -502,12 +655,14 @@
<template #state="{ row,column}">
<el-checkbox
+ :class="timeOutChangeColor(row)"
v-if="row[column.field] === 2"
@click.native.prevent
:indeterminate="row[column.field]===1"
:checked="true"/>
<el-checkbox
v-else
+ :class="timeOutChangeColor(row)"
@click.native.prevent
:indeterminate="row[column.field]===1"
:checked="false"/>
@@ -522,7 +677,10 @@
size="small">
{{ $t('basicData.edit') }}
</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+ <el-popconfirm
+ v-if="userStore.user.permissions.indexOf('selectOrder.edit') > -1"
+ @confirm="getTableRow(row,'delete')"
+ :title="$t('searchOrder.deleteConfirm')">
<template #reference>
<el-button link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
</template>
@@ -532,7 +690,24 @@
<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
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
+ </div>
+ </template>
+ <template #num2_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <vxe-select
+ v-model="option.data"
+ @change="changeFilterEvent($event, option, $panel)"
+ :placeholder="$t('processCard.pleaseSelect')">
+ <vxe-option value="0" :label="$t('basicData.unchecked')"></vxe-option>
+ <vxe-option value="1" :label="$t('basicData.partiallySelected')"></vxe-option>
+ <vxe-option value="2" :label="$t('basicData.selected')"></vxe-option>
+ </vxe-select>
</div>
</div>
</template>
@@ -569,19 +744,29 @@
<el-tab-pane :label="$t('order.details')" name="1" >
<order-detail
v-if="tabsValue==='1'"
- :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
/>
</el-tab-pane>
<el-tab-pane :label="$t('order.workmanship')" name="2">
<order-craft-detail
v-if="tabsValue==='2'"
:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
/>
</el-tab-pane>
<el-tab-pane :label="$t('order.processCard')" name="3">
<order-process
v-if="tabsValue==='3'"
:orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
+ />
+ </el-tab-pane>
+ <el-tab-pane :label="$t('order.processCardCollect')" name="4">
+ <order-process-collect
+ v-if="tabsValue==='4'"
+ :orderId="rowClickIndex===null?null:rowClickIndex.orderId"
+ :row="rowClickIndex===null?{}:rowClickIndex"
/>
</el-tab-pane>
</el-tabs>
@@ -594,7 +779,9 @@
v-model="dialogTableVisible"
@close="closeDialog"
destroy-on-close
- style="width: 75%;height:75% "
+ style="width: 90%;height:90%;margin-top: 3vh "
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
>
<template #header="{ close, titleId, titleClass }">
<el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
@@ -634,7 +821,10 @@
height: 100%;
}
-
+:deep(.timeOut.is-checked .el-checkbox__inner) {
+ background-color: orangered;
+ border-color: orangered;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0