From c581a6c396f1b367fe132bc302d6337b1ff0ad6f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 四月 2024 08:36:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 137 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 30 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 4fc0bc4..464631f 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
@@ -1,16 +1,28 @@
<script setup>
import {Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router"
- import {reactive, ref} from "vue"
+ import {computed, reactive, ref} from "vue"
import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
- import request from "@/utils/request";
+ import request from "@/utils/request"
import deepClone from "@/utils/deepClone"
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){
@@ -166,6 +225,7 @@
}
request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData.value).then((res) => {
if(res.code==200){
+ total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
orderList.value = deepClone(res.data.data)
@@ -178,15 +238,13 @@
}
//鍙屽嚮琛ㄦ牸琛�
- const cellClickEvent =()=>{
- return
- dialogTableVisible.value = true
- }
+
const selectOrderList = ()=>{
request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
,filterData).then((res) => {
if(res.code==200){
- //total.pageTotal = res.data.total.pageTotal
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal = res.data.total.pageTotal
selectDate.value=res.data.selectDate
orderList.value = deepClone(res.data.data)
xGrid.value.loadData(orderList.value)
@@ -220,7 +278,7 @@
break
}
case 'delete': {
- if (row.processReview === 2) {
+ if (Math.abs(row.processReview) === 2) {
ElMessage.warning(t('searchOrder.msgDelete'))
return
}
@@ -237,6 +295,10 @@
}
}
+
+ const showCheckbox = computed(()=>(item)=>{ //璁＄畻灞炴�т紶閫掑弬鏁�
+ return 2 === item
+ })
</script>
@@ -255,17 +317,17 @@
<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"
>
<!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
<template #content="{ row }">
<ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined && index>9">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!==undefined && index>9">
<span style="font-weight: bold">{{item.title+': '}}</span>
<span>{{ row[item.field] }}</span>
</li>
@@ -273,13 +335,22 @@
</template>
<template #state="{ row,column}">
- <el-checkbox @click.native.prevent :indeterminate="row[column.field]===1" :checked="row[column.field]===2"/>
+ <el-checkbox
+ v-if="row[column.field] === 2"
+ @click.native.prevent
+ :indeterminate="row[column.field]===1"
+ :checked="true"/>
+ <el-checkbox
+ v-else
+ @click.native.prevent
+ :indeterminate="row[column.field]===1"
+ :checked="false"/>
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
<template #button_slot="{ row }">
<el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
- <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('basicData.deleteConfirm')">
+ <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>
@@ -317,8 +388,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