From 59ef6e9b5b8aff7614711c2afdba23a460ac1c56 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 27 三月 2024 08:41:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 108 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 85 insertions(+), 23 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 c009259..f23ba28 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
@@ -8,9 +8,21 @@
import {ElMessage} from "element-plus"
import {VXETable} from "vxe-table"
import {useI18n} from "vue-i18n"
+ import {toolbarButtonClickEvent} from "@/hook/mouseMove";
const { t } = useI18n()
const router = useRouter()
-
+ let rowClickIndex = ref(null)
+ const dialogTableVisible = ref(false)
+ let orderType = ref("2")
+ let selectDate = ref(["",""])
+ let filterData = ref({})
+ let orderList = ref([])
+ let pageNum=ref(1)
+ let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+ })
const xGrid = ref()
const gridOptions = reactive({
@@ -40,7 +52,19 @@
trigger: 'click',
mode: 'row',
showStatus: true
- },//琛ㄥご鍙傛暟
+ },
+ menuConfig: {
+ body: {
+ options: [
+ [
+ { code: 'copy', name: t('searchOrder.copy'), prefixIcon: 'vxe-icon-copy', visible: true},
+ { code: 'copyTitle', name: t('searchOrder.copyTitle'), prefixIcon: 'vxe-icon-copy', visible: true},
+ { code: 'getProcessList', name: t('searchOrder.processFlows'), prefixIcon: 'vxe-icon-file-txt', visible: true}
+ ]
+ ]
+ }
+ },
+ //琛ㄥご鍙傛暟
columns:[
{type:'expand',slots: { content:'content' },width: 50,fixed:"left",},
{title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
@@ -60,7 +84,7 @@
{field: 'project',width:120, title: t('order.project'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'batch',width:120, title: t('order.batch'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'quantity',width:120, title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '14',width:120, title: t('searchOrder.inventoryNum'), sortable: true},
+ {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: 'createTime',width:120, title: t('basicData.reportData'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
{field: 'packType',width:120, title: t('order.packType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
@@ -73,7 +97,9 @@
//{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}
- ],//琛ㄥご鎸夐挳
+ ],
+
+ //琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
@@ -110,7 +136,7 @@
if ($grid) {
switch (code) {
case 'checkList': {
- if($grid.getCheckboxRecords().length==0){
+ if($grid.getCheckboxRecords().length===0){
VXETable.modal.message( t('searchOrder.msg'))
return
}
@@ -120,18 +146,51 @@
}
}
},
+ menuClick ({ menu, row, column }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (menu.code) {
+ case 'getProcessList': {
+ if(rowClickIndex.value===null){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ dialogTableVisible.value = true
+ break
+ }
+ case 'copy': {
+ if(rowClickIndex.value===null){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ router.push({path:'/main/order/createOrder',
+ state:{
+ orderId:rowClickIndex.value.orderId,
+ type:'copy'
+ }})
+ break
+ }
+ case 'copyTitle': {
+ if(rowClickIndex.value===null){
+ ElMessage.warning(t('searchOrder.msgList.checkOrder'))
+ return
+ }
+ router.push({path:'/main/order/createOrder',
+ state:{
+ orderId:rowClickIndex.value.orderId,
+ type:'copyTitle'
+ }})
+ break
+ }
+
+ }
+ }
+ },
+ cellClick({ row }){
+ rowClickIndex.value = row
+ }
}
- const dialogTableVisible = ref(false)
- let orderType = ref("2")
- let selectDate = ref(["",""])
- let filterData = ref({})
- let orderList = ref([])
- let pageNum=ref(1)
- let total = reactive({
- pageTotal : 0,
- dataTotal : 0,
- pageSize : 100
- })
+
//鍔犺浇璇锋眰
request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
if(res.code==200){
@@ -179,10 +238,7 @@
}
//鍙屽嚮琛ㄦ牸琛�
- const cellClickEvent =()=>{
- return
- dialogTableVisible.value = true
- }
+
const selectOrderList = ()=>{
request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
,filterData).then((res) => {
@@ -262,11 +318,11 @@
<el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{ $t('basicData.search') }}</el-button>
<vxe-grid
@filter-change="filterChanged"
- @cell-dblclick="cellClickEvent"
max-height="100%"
class="mytable-scrollbar"
ref="xGrid"
v-bind="gridOptions"
+ v-on="gridEvents"
>
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
@@ -333,8 +389,14 @@
</template>
</vxe-grid>
- <el-dialog v-model="dialogTableVisible" title="娴佺▼鍗¤繘搴�" style="width: 80%;height:75% ">
- <ProcessCardProgress style="width: 100%;height: 100%" />
+ <el-dialog
+ v-model="dialogTableVisible"
+ destroy-on-close
+ :title="$t('searchOrder.processFlows')"
+ style="width: 80%;height:75% ">
+ <ProcessCardProgress
+ :orderId="rowClickIndex.orderId"
+ style="width: 100%;height: 100%" />
</el-dialog>
</div>
</template>
--
Gitblit v1.8.0