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 | 110 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 85 insertions(+), 25 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 4e0bb1d..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
@@ -21,6 +21,7 @@
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()
@@ -90,22 +91,22 @@
name: t('order.processingOrder'),
children: [
// { 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: 'sheet2', name: t('order.sheet2') },//鍔犲伐鍗曟í鐗�
+ { code: 'sheet4', name: t('order.sheet4') },//鍔犲伐鍗�-绔栫増
+ { code: 'sheet3', name: t('order.sheet3') },//鍙戣揣纭鍗�
+ { code: 'sheet5', name: t('order.sheet5')},//鍔犲伐鍗� 绔栫増鍗曠墖
]
},
{
- prefixIcon: 'vxe-icon-print',
- name: '涓�閿��鍥�',
+ prefixIcon: 'vxe-icon-repeat',
+ name: t('order.oneClickReturn'),
children: [
// { code: 'sheet1', name: '妯増-鏅��' },
- { code: 'back1', name: t('searchOrder.createOrder') },
- { code: 'back2', name: t('order.technology') },
- { code: 'back3', name: t('basicData.review') },
- { code: 'back4', name: t('searchOrder.production')},
+ { 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 },
]
},
@@ -139,15 +140,15 @@
{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: 'updateTime',width:120, title: t('productStock.approvedDate'),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},
@@ -344,6 +345,25 @@
},
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}
@@ -357,7 +377,7 @@
}
ElMessageBox.confirm(
- '纭畾涓�閿��鍥炵浉搴旀祦绋�?',
+ t('searchOrder.msgList.BackSure'),
'Warning',
{
confirmButtonText: t('basicData.confirmButtonText'),
@@ -367,22 +387,28 @@
)
.then(() => {
request.post(`/order/processBack/${rowClickIndex.value.orderId}/${status}`).then((res) => {
- if(res.code==='200'){
+ 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 = () => {
+ const getOrderList = async () => {
//鍔犺浇璇锋眰
const config = {
filter: filterData.value,
sort: sortData.value
}
- request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
+ await request.post(`/order/getOrderList/1/${total.value.pageSize}/${orderType.value}/${orderInfo.selectDate}`,config).then((res) => {
if(res.code==200){
total.value = res.data.total
/*total.dataTotal = res.data.total.dataTotal*1
@@ -395,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) => {
@@ -405,7 +435,6 @@
}
function filterChanged(column){
- //console.log(column)
gridOptions.loading=true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
let value = column.datas[0]!=undefined?column.datas[0]:''
@@ -419,7 +448,6 @@
}else{
filterData.value[column.property] = value
}
-
const config = {
filter: filterData.value,
sort: sortData.value
@@ -432,10 +460,18 @@
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
})
}
@@ -568,6 +604,12 @@
}
}
+//璁㈠崟璺濈灏忎簬涓夊ぉ鍒欐敼鍙榗heckbox class 鏀瑰彉棰滆壊
+const timeOutChangeColor =(row)=>{
+ if(company.timeOut){
+ return row.timeOut
+ }
+}
</script>
@@ -613,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"/>
@@ -633,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>
@@ -697,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>
@@ -764,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