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 | 393 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 299 insertions(+), 94 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 bb7570d..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,29 +1,36 @@
<script setup>
import {Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router"
- import {reactive} from "vue";
+ import {computed, reactive, ref} from "vue"
+ import ProcessCardProgress from '@/views/pp/report/ProcessCardProgress.vue'
+ 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 getTableRow = (row,type) =>{
- switch (type) {
- case 'edit' :{
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/order/createOrder', query: { orderID: 'NG24010101' }})
- break
- }
- case 'delete':{
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
- break
- }
- }
- }
-
+ const xGrid = ref()
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'OrderList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -45,89 +52,74 @@
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: '鎿嶄綔', width: 110, slots: { default: 'button_slot' },fixed:"left",},
- {type: 'seq', title: '鑷簭', width: 80 ,fixed:"left",},
+ {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
+ {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},
- {title: '涓嬪崟', width: 40, slots: { default: 'state' }},
- {title: '宸ヨ壓', width: 40, slots: { default: 'state' }},
- {title: '瀹℃牳', width: 40, slots: { default: 'state' }},
- {title: '鐢熶骇', width: 40, slots: { default: 'state' }},
- {title: '浜ゆ帴', width: 40, slots: { default: 'state' }},
- {title: '涓嬭揪', width: 40, slots: { default: 'state' }},
- {title: '鍏ュ簱', width: 40, slots: { default: 'state' }},
- {title: '鍙戣揣', width: 40, slots: { default: 'state' }},
+ {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: '1',width:120, title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '2',width:120, title: '瀹㈡埛缂栧彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '3',width:120, title: '瀹㈡埛鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '4',width:120, title: '鎬绘暟閲�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '5',width:120, title: '鍙敤搴撳瓨',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '6',width:120, title: '椤圭洰鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '7',width:120, title: '鎵规',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '8',width:120, title: '鎬婚噾棰�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '9',width:120, title: '缁撶畻鎬婚潰绉�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '10',width:120, title: '鎶ヨ〃鏃ユ湡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '11',width:120, title: '鍖呰鏂瑰紡',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '12',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '13',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: '14',width:120, title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true}
+ {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},
+ {field: 'customerName',width:120, title: t('customer.customerName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
+ {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: '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},
+ {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: '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: '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}
- ],//琛ㄥご鎸夐挳
+ ],
+
+ //琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
],
- import: false,
- export: true,
- print: true,
+ slots:{
+ buttons: "toolbar_buttons"
+ },
+
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
- data: [
- {
- '0': '1',
- '1': 'NG23110102',
- '2': '11',
- '3': '涓缓',
- '4': '534',
- '5': '116',
- '6': '榛勭煶鏈夎建鐢佃溅',
- '7': '20鎵�',
- '8': '111100.02',
- '9': '1008.38',
- '10': '2023-10-30',
- '11': '鍙夎溅鏈ㄧ',
- '12': '鏅�氳鍗�',
- '13': '',
- '14': '鐜嬮緳'
- },
- {
- '0': '1',
- '1': 'NG23110101',
- '2': '11',
- '3': '涓缓',
- '4': '534',
- '5': '116',
- '6': '榛勭煶鏈夎建鐢佃溅',
- '7': '20鎵�',
- '8': '111100.02',
- '9': '1008.38',
- '10': '2023-10-30',
- '11': '鍙夎溅鏈ㄧ',
- '12': '鏅�氳鍗�',
- '13': '',
- '14': '鐜嬮緳'
- }
- ],//table body瀹為檯鏁版嵁
+
footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
// if (props.tableProp.footList.includes(column.field)) {
// return sumNum(data, column.field)
@@ -138,48 +130,231 @@
}
})
+ const gridEvents = {
+ toolbarButtonClick ({ code }) {
+ const $grid = xGrid.value
+ if ($grid) {
+ switch (code) {
+ case 'checkList': {
+ if($grid.getCheckboxRecords().length===0){
+ VXETable.modal.message( t('searchOrder.msg'))
+ return
+ }
+ break
+ }
+ }
+ }
+ },
+ 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
+ }
+ }
+ //鍔犺浇璇锋眰
+ request.post(`/order/getOrderList/1/${total.pageSize}/${orderType.value}/${selectDate.value}`,filterData).then((res) => {
+ if(res.code==200){
+ 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)
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+ const changeFilterEvent = (event, option, $panel) => {
+ // 鎵嬪姩瑙﹀彂绛涢��
+ $panel.changeOption(event, !!option.data, option)
+ }
+
+ function filterChanged(column){
+ gridOptions.loading=true
+ //绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
+ let value = column.datas[0]!=undefined?column.datas[0]:''
+ value = value.trim()
+ //鍒ゆ柇鏄惁瀛樺湪澶栭敭
+ if (column.property.indexOf('.')>-1){
+ const columnArr = column.property.split('.')
+ filterData.value[columnArr[0]] = {
+ [columnArr[1]]:value
+ }
+ }else{
+ filterData.value[column.property] = value
+ }
+ 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)
+ xGrid.value.loadData(orderList.value)
+ gridOptions.loading=false
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+ }
+
+ //鍙屽嚮琛ㄦ牸琛�
+
+ const selectOrderList = ()=>{
+ request.post(`/order/getOrderList/${pageNum.value}/${total.pageSize}/${orderType.value}/${selectDate.value}`
+ ,filterData).then((res) => {
+ if(res.code==200){
+ 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)
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+ }
+
+ const changeOrderType = ()=>{
+ pageNum.value=1
+ selectOrderList()
+ }
+ const changeDate = ()=>{
+ pageNum.value=1
+ selectOrderList()
+ }
+
+ //椤佃剼璺宠浆
+ const handlePageChange = ({ currentPage, pageSize }) => {
+ pageNum.value=currentPage
+ total.pageTotal = pageSize
+ selectOrderList()
+ }
+
+ //椤甸潰璺宠浆鏇存柊鎴栬�呭垹闄よ鍗�
+ const getTableRow = (row,type) => {
+ switch (type) {
+ case 'edit': {
+ router.push({path:'/main/order/createOrder',query:{orderId:row.orderId}})
+ break
+ }
+ case 'delete': {
+ if (Math.abs(row.processReview) === 2) {
+ ElMessage.warning(t('searchOrder.msgDelete'))
+ return
+ }
+ request.post(`/order/deleteOrder/${row.orderId}`).then((res) => {
+ if(res.code==200){
+ ElMessage.success(t('searchOrder.msgDeleteSuccess'))
+ router.push({path:'/main/order/selectOrder',query:{random:Math.random()}})
+ }else{
+ ElMessage.warning(t('searchOrder.msgDeleteFail'))
+ }
+ })
+ break
+ }
+
+ }
+ }
+
+ const showCheckbox = computed(()=>(item)=>{ //璁＄畻灞炴�т紶閫掑弬鏁�
+ return 2 === item
+ })
</script>
<template>
- <div style="width: 100%;height: 100%">
+ <div style="width: 100%;height: 100% ;">
<el-date-picker
- v-model="value1"
+ v-model="selectDate"
type="daterange"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.startDate')"
+ format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD"
+
/>
- <el-button style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">鏌ヨ</el-button>
+ <el-button @click="changeDate" style="margin-top: -5px" id="searchButton" type="primary" :icon="Search">{{ $t('basicData.search') }}</el-button>
<vxe-grid
- max-height="97%"
+ @filter-change="filterChanged"
+ 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 ">
+ <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>
</ul>
</template>
- <template #state="{ row}">
- <el-checkbox checked/>
+ <template #state="{ row,column}">
+ <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">缂栬緫</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+ <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">{{ $t('basicData.edit') }}</el-button>
+ <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>
+ </el-popconfirm>
</template>
<template #num1_filter="{ column, $panel }">
@@ -189,9 +364,39 @@
</div>
</div>
</template>
+
+ <template #toolbar_buttons>
+ <vxe-select @change="changeOrderType" v-model="orderType" :placeholder="$t('searchOrder.orderType')">
+ <vxe-option value="2" :label="$t('searchOrder.regularOrders')"></vxe-option>
+ <vxe-option value="-2" :label="$t('searchOrder.cancelledOrders')"></vxe-option>
+ <vxe-option value="0" :label="$t('searchOrder.allOrders')"></vxe-option>
+ </vxe-select>
+ </template>
+
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+<!-- 'PrevJump','NextJump', -->
+ <vxe-pager
+ @page-change="handlePageChange"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :total="total.dataTotal"
+ >
+ </vxe-pager>
+ </template>
</vxe-grid>
-
+ <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