From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue | 305 +++++++++++++++++++++++++++++---------------------
1 files changed, 176 insertions(+), 129 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
index ba84425..07c3a42 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/SelectWorkOrder.vue
@@ -8,37 +8,44 @@
import GlassType from "@/components/sd/product/GlassType.vue"
import {useRouter} from 'vue-router'
import Sortable from 'sortablejs'
-import BasicTable from '@/components/basic/BasicTable.vue'
+import BasicTable from '@/components/sd/product/BasicTable.vue'
import {VXETable} from "vxe-table";
-
+import { useI18n } from 'vue-i18n'
+import useUserInfoStore from '@/stores/userInfo'
+import footSum from "@/hook/footSum"
+import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+//璇█鑾峰彇
+const { t } = useI18n()
+const userStore = useUserInfoStore()
+const orderInfo = useOrderInfoStore()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
+let isButtonDisabled=false
+
const getTableRow = (row, type) => {
switch (type) {
case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
router.push({path: '/main/workOrder/addWorkOrder', query: {orderId: row.orderId}})
break
}
case 'delete': {
- request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.orderDetail.productName}`).then((res) => {
- if (res.code == 200) {
- ElMessage.success("鍒犻櫎鎴愬姛")
- location.reload();
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ let state = optionVal.value
+ request.post(`/workOrder/deleteOrderWork/${row.orderId}/${row.productionId}`).then((res) => {
+ if (res.code == 200 && res.data===true) {
+ ElMessage.success(t('workOrder.deleteOk'))
+ router.push({path: '/main/workOrder/SelectWorkOrder', query: {startTime:startTime,endTime:endTime,state:state,random:Math.random()}})
+ } else {
+
+ ElMessage.warning(t('workOrder.deleteNo'))
+
+ }
})
break
}
}
-}
-
-
-function padLeftZero(str) {
- return ('00' + str).substr(str.length)
}
//瀹氫箟鏃堕棿
@@ -52,11 +59,11 @@
const options = [
{
value: '0',
- label: '宸茶浆',
+ label: t('workOrder.convert'),
},
{
value: '1',
- label: '鏈浆',
+ label: t('workOrder.unConverted'),
},
]
@@ -104,54 +111,40 @@
let pageNum = $ref(1)
let pageState = null
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime()+3600 * 1000 * 24)
- .toISOString()
- .replace('T', ' ')
- .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
- return [start, end]
+const getFirst = () => {
+
+ let state = optionVal.value
+
+//绗竴娆″姞杞芥暟鎹�
+ request.post(`/workOrder/orderGlassDetail/${orderInfo.workOrderDate}/${state}`, filterData.value).then((res) => {
+
+ if (res.code == 200) {
+ pageTotal.value = res.data.total
+ orderInfo.workOrderDate = res.data.selectDate
+ produceList = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
}
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-form.date1 = getNowTime()
-let startTime = form.date1[0]
-let endTime = form.date1[1]
-let state = optionVal.value
-
-//绗竴娆″姞杞芥暟鎹�
-
-request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${state}`, filterData.value).then((res) => {
-
- if (res.code == 200) {
- pageTotal.value = res.data.total
- produceList = produceList.value.concat(deepClone(res.data.data))
- xGrid.value.reloadData(produceList)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
-})
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
- let startTime = form.date1[0]
- let endTime = form.date1[1]
+ gridOptions.loading = true
let selectState = optionVal.value
- request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
+ request.post(`/workOrder/orderGlassDetail/${orderInfo.workOrderDate}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
-
pageTotal.value = res.data.total
+ orderInfo.workOrderDate = res.data.selectDate
xGrid.value.loadData(res.data.data)
gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
+ gridOptions.loading = false
}
})
}
@@ -162,6 +155,7 @@
$panel.changeOption(event, !!option.data, option)
}
+//绛涢�夋椂鏌ヨ
function filterChanged(column) {
gridOptions.loading = true
//绛涢�夋潯浠跺彂鐢熷彉鍖栨潯浠跺彂鐢熷彉鍖�
@@ -178,11 +172,10 @@
}
//鑾峰彇閫変腑鏃堕棿鍜屾槸鍚﹁浆鍗曠姸鎬�
- let startTime = form.date1[0]
- let endTime = form.date1[1]
+
let selectState = optionVal.value
- request.post(`/workOrder/orderGlassDetail/${startTime}/${endTime}/${selectState}`, filterData.value).then((res) => {
+ request.post(`/workOrder/orderGlassDetail/${orderInfo.workOrderDate}/${selectState}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
@@ -202,7 +195,6 @@
}
//瀛愮粍浠舵帴鏀跺弬鏁�
-
const xGrid = ref()
const gridOptions = reactive({
loading: true,
@@ -211,7 +203,7 @@
align: 'center',//鏂囧瓧灞呬腑
stripe: true,//鏂戦┈绾�
rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
- id: 'demo_1',
+ id: 'selectWorkOrder',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
importConfig: {},
@@ -234,49 +226,57 @@
mode: 'row',
showStatus: true
},//琛ㄥご鍙傛暟
+ checkboxConfig: {
+ labelField: 'name',
+ checkMethod: ({ row }) => {
+ return optionVal.value === '1'
+ }
+ },
columns: [
{type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
- {title: '鎿嶄綔', width: 110, slots: {default: 'button_slot'}, fixed: "left"},
- {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
- {field: 'orderId', title: '閿�鍞崟鍙�', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+ {type: 'checkbox', fixed: "left", title: t('basicData.check'), width: 80},
+ {title: t('basicData.operate'), width: 110, slots: {default: 'button_slot'}, fixed: "left"},
+ {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+ {field: 'orderId', title: t('order.orderId'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+ {field: 'order.customerName', title: t('processCard.customerName'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
{
field: 'productionId',
- title: '鐢熶骇璁㈠崟鍙�',
+ title: t('workOrder.productionId'),
showOverflow: "ellipsis",
filters: [{data: ''}],
slots: {filter: 'num1_filter'}
, width: 130
},
- {field: 'order.batch', title: '鎵规', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
- {field: 'orderDetail.productName', title: '浜у搧鍚嶇О', filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
- {field: 'orderDetail.computeArea', title: '鍗曠墖鎬婚潰绉�', showOverflow: "ellipsis", width: 110},
- {field: 'orderDetail.quantity', title: '鎬绘暟閲�', width: 70},
- {field: 'orderDetail.computeGrossArea', title: '鎴愬搧鎬婚潰绉�',},
- {field: 'orderDetail.perimeter', title: '鍛ㄩ暱', showOverflow: "ellipsis"},
- {field: 'orderDetail.bendRadius', title: '鍗婂緞',},
- {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰',}
+ {field: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+ {field: 'order.project', title: t('order.project'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 210},
+ {field: 'order.orderType', title: t('order.orderType'), showOverflow: "ellipsis", width: 110},
+ {field: 'orderDetail.grossArea', title: t('order.grossArea'), width: 70},
+ {field: 'orderDetail.quantity', title: t('order.quantity'),},
+ {field: 'order.creator', title: t('order.creator'),},
+ {field: 'founder', title: t('product.creator'),},
+ {field: 'order.processingNote', title: t('order.processingNote'), filters: [{data: ''}], slots: {filter: 'num1_filter'},},
],//琛ㄥご鎸夐挳
data: null,//琛ㄦ牸鏁版嵁
toolbarConfig: {
- // buttons: [{
- //
- // }],
- import: false,
- export: true,
- print: true,
+ buttons: [
+ {'code': 'transferOrder', 'name': t('workOrder.transferOrder'),status: 'primary'}
+ ],
+ // import: false,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
//鑴氶儴姹傚拰
- footerMethod({columns, data}) {//椤佃剼鍑芥暟
- let footList = ['', '', '']
- return [
+ footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
+ return[
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
- if (footList.includes(column.field)) {
- return sumNum(data, column.field)
+ const List = ["orderDetail.grossArea",'orderDetail.quantity']
+ if (List.includes(column.field)) {
+ return footSum(data, column.field)
}
return ''
})
@@ -284,27 +284,55 @@
}
})
+const gridEvents = {
+ async toolbarButtonClick({code}) {
+ const $grid = xGrid.value
+ const checkedList = $grid.getCheckboxRecords()
+ if ($grid) {
+ switch (code) {
+ case 'transferOrder': {
+ if (checkedList.length == 0) {
+ ElMessage.warning(t('workOrder.msgSelect'))
+ return
+ }
+ const idList = []
+ $grid.getCheckboxRecords().forEach(item => {
+ idList.push(item.orderId)
+ })
+ router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:idList.join(',')}})
+ break
+ }
+ }
+ }
+ }
+}
-
+onMounted(() => {
+ getFirst()
+})
</script>
<template>
- <div class="main-div-customer">
- <div id="selectForm">
- <el-row :gutter="0">
+ <div style="width: 100%;height: 100%">
+ <div class="head">
<el-date-picker
- v-model="form.date1"
+ v-model="orderInfo.workOrderDate"
type="daterange"
format="YYYY/MM/DD"
value-format="YYYY-MM-DD"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿"
+ :start-placeholder="$t('basicData.startDate')"
+ :end-placeholder="$t('basicData.endDate')"
:default-time="defaultTime"
/>
- <el-select :default-first-option="true" ref="getSelect" style="width: 120px" v-model="optionVal" class="m-2"
- placeholder="鏄惁杞伐鍗�">
+ <el-select
+ :default-first-option="true"
+ ref="getSelect" style="width: 130px"
+ v-model="optionVal"
+ class="m-2"
+ @change="getWorkOrder"
+ >
<el-option
v-for="item in options"
:key="item.value"
@@ -315,60 +343,79 @@
<el-button
@click="getWorkOrder"
+ :disabled="isButtonDisabled"
id="select"
- type="primary" :icon="Search">鏌ヨ
+ type="primary" :icon="Search">{{$t('basicData.search')}}
</el-button>
- </el-row>
</div>
- <vxe-grid
- max-height="100%"
- @filter-change="filterChanged"
- class="mytable-scrollbar"
- ref="xGrid"
- v-bind="gridOptions"
+ <div class="main-table">
+ <vxe-grid
+ height="100%"
+ @filter-change="filterChanged"
+ class="mytable-scrollbar"
+ ref="xGrid"
+ v-bind="gridOptions"
+ v-on="gridEvents"
- >
- <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
- <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
- <template #content="{ row }">
- <ul class="expand-wrapper">
- <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
- <span style="font-weight: bold">{{ item.title + ': ' }}</span>
- <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
- <span v-else>{{ row[item.field] }}</span>
+ >
+ <!-- @toolbar-button-click="toolbarButtonClickEvent"-->
+ <!-- 涓嬫媺鏄剧ず鎵�鏈変俊鎭彃妲�-->
+ <template #content="{ row }">
+ <ul class="expand-wrapper">
+ <li v-for="(item,index) in gridOptions.columns" v-show="item.field!=undefined ">
+ <span style="font-weight: bold">{{ item.title + ': ' }}</span>
+ <span v-if="hasDecimal(item.field)">{{ row[item.field.split('.')[0]][item.field.split('.')[1]] }}</span>
+ <span v-else>{{ row[item.field] }}</span>
- </li>
- </ul>
- </template>
+ </li>
+ </ul>
+ </template>
- <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">杞伐鍗�</el-button>
- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
- </template>
+ <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
+ <template #button_slot="{ row }">
+ <!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0" @click="getTableRow(row,'edit')" link type="primary" size="small">{{$t('workOrder.transferOrder')}}</el-button>-->
+ <!-- <el-button :class="{disable: optionVal== 0}" :disabled="optionVal == 0"-->
+ <!-- @click="getTableRow(row,'edit')"-->
+ <!-- v-if="userStore.user.permissions.indexOf('SelectWorkOrder.edit') > -1"-->
+ <!-- link-->
+ <!-- type="primary"-->
+ <!-- size="small">-->
+ <!-- {{$t('workOrder.transferOrder')}}-->
+ <!-- </el-button>-->
- <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)"/>
+ <!-- <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>-->
+ <el-popconfirm @confirm="getTableRow(row,'delete')" :title="$t('searchOrder.deleteConfirm')">
+ <template #reference>
+ <el-button :class="{disable: optionVal== 1}" :disabled="optionVal == 1" link type="primary" size="small">{{ $t('basicData.delete') }}</el-button>
+ </template>
+ </el-popconfirm>
+ </template>
+
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input type="type" v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 100%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 50%;
- text-align: center;
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0