From 4008d83696a6998ce987133ae2d2b0ec912cf178 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期日, 07 四月 2024 09:40:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 176 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 135 insertions(+), 41 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 480b918..c546fb8 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -11,18 +11,63 @@
import Sortable from 'sortablejs'
import BasicTable from '@/components/basic/BasicTable.vue'
import {VXETable} from "vxe-table";
-
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+const { t } = useI18n()
let productGlassTypeStore = useProductGlassTypeStore()
let router = useRouter()
+let props = defineProps({
+ rowIndex:{}
+})
const getTableRow = (row, type) => {
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
switch (type) {
- case 'edit' : {
- //alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑缂栬緫淇℃伅')
- router.push({path: '/main/workOrder/addWorkOrder', query: {id: row.id}})
+ case 'select' : {
+ console.log(row.processId)
+ router.push({path: '/main/processCard/SelectDetailProcessCard', query: { processId: row.processId }})
+ break
+ }
+ case 'setType': {
+ let state=row.layoutStatus
+
+ if (state=='鍙帓鐗�'){
+ request.post(`/processCard/updateLayoutStatus/${row.processId}/2`).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success(t('processCard.typesettingSuccess')
+ )
+ router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
+ } else {
+
+ ElMessage.warning(res.msg)
+ }
+ })
+ }
+ else if(state=='涓嶅彲鎺掔増'){
+ request.post(`/processCard/updateLayoutStatus/${row.processId}/1`).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success(t('processCard.modifySuccessfully'))
+ router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
+ } else {
+
+ ElMessage.warning(res.msg)
+ }
+ })
+ }
+
break
}
case 'delete': {
- alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+ request.post(`/processCard/deleteFlowCard/${row.orderId}/${row.processId}`).then((res) => {
+ if (res.code == 200) {
+ ElMessage.success(t('workOrder.deleteOk'))
+ router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
+ } else {
+
+ ElMessage.warning(res.msg)
+
+ }
+ })
break
}
}
@@ -79,7 +124,7 @@
//瀹氫箟鏁版嵁杩斿洖缁撴灉
let produceList = ref([])
//瀹氫箟褰撳墠椤垫暟
-let pageNum = $ref(1)
+let pageNum=ref(1)
let pageState = null
//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
@@ -88,7 +133,7 @@
.toISOString()
.replace('T', ' ')
.slice(0,10) //榛樿寮�濮嬫椂闂�7澶╁墠
- const end = new Date(new Date().getTime())
+ const end = new Date(new Date().getTime()+3600 * 1000 * 24)
.toISOString()
.replace('T', ' ')
.slice(0,10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -100,13 +145,17 @@
form.date1=getNowTime()
let startTime = form.date1[0]
let endTime = form.date1[1]
-
+let total = reactive({
+ pageTotal : 0,
+ dataTotal : 0,
+ pageSize : 100
+})
//绗竴娆″姞杞芥暟鎹�
-
-request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
if (res.code == 200) {
- console.log(res.data.data)
+ total.dataTotal = res.data.total.total*1
+ total.pageTotal= res.data.total.pageTotal
pageTotal.value = res.data.total
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
@@ -116,12 +165,27 @@
}
})
+//椤佃剼缈婚〉鏌ヨ
+const selectPageList = ()=>{
+ let startTime = form.date1[0]
+ let endTime = form.date1[1]
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`,filterData.value).then((res) => {
+ if(res.code==200){
+
+ produceList = deepClone(res.data.data)
+ xGrid.value.reloadData(produceList)
+ }else{
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
let startTime = form.date1[0]
let endTime = form.date1[1]
- request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
if (res.code == 200) {
pageTotal.value = res.data.total
@@ -131,6 +195,13 @@
ElMessage.warning(res.msg)
}
})
+}
+
+//椤佃剼璺宠浆
+const handlePageChange = ({ currentPage, pageSize }) => {
+ pageNum.value=currentPage
+ total.pageTotal = pageSize
+ selectPageList()
}
/*浣跨敤绛涢�夛紝鍚庣鑾峰彇鏁版嵁*/
@@ -154,14 +225,15 @@
filterData.value[column.property] = value
}
-//鑾峰彇閫変腑鏃堕棿鍜屾槸鍚﹁浆鍗曠姸鎬�
+//鑾峰彇閫変腑鏃堕棿
let startTime = form.date1[0]
let endTime = form.date1[1]
- request.post(`/processCard/flowCard/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
if(res.code==200){
pageTotal.value=res.data.total
-
+ total.pageTotal=parseInt(res.data.total)
+ pageNum.value=1
produceList = deepClone(res.data.data)
xGrid.value.loadData(produceList)
gridOptions.loading=false
@@ -184,7 +256,7 @@
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
stripe:true,//鏂戦┈绾�
- rowConfig: {isCurrent: true, isHover: true,height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+ rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
id: 'CustomerList',
showFooter: true,//鏄剧ず鑴�
printConfig: {},
@@ -209,17 +281,18 @@
},//琛ㄥご鍙傛暟
columns:[
{type:'expand',fixed:"left",slots: { content:'content' },width: 50},
- {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
- { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
- {field: 'orderId', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
- {field: 'processId', width: 130, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productId', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
- {field: 'orderDetail.productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
- {field: 'order.project', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
- {field: 'binningQuantity', title: '鏁伴噺', sortable: true},
- {field: 'orderDetail.computeGrossArea', title: '闈㈢Н', sortable: true},
- {field: 'founder', title: '鍒嗘灦鍛�', sortable: true},
- {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰', sortable: true}
+ {title: t('basicData.operate'), width: 160, 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: 'processId', width: 140, title: t('processCard.processId') ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+ {field: 'orderDetail.productId', title: t('order.productId') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },},
+ {field: 'orderDetail.productName', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, width: 180},
+ {field: 'order.project', title: t('order.project') ,showOverflow:"ellipsis"},
+ {field: 'quantity', title: t('order.quantity'), },
+ {field: 'orderDetail.computeGrossArea', title: t('order.area'), },
+ {field: 'founder', title: t('processCard.founder'), },
+ {field: 'orderDetail.processingNote', title: t('order.processingNote'), },
+ {field: 'layoutStatus', title: t('processCard.layoutStatus'), }
],//琛ㄥご鎸夐挳
toolbarConfig: {
@@ -227,8 +300,8 @@
//
// }],
import: false,
- export: true,
- print: true,
+ // export: true,
+ // print: true,
zoom: true,
custom: true
},
@@ -236,12 +309,12 @@
],//table body瀹為檯鏁版嵁
//鑴氶儴姹傚拰
- footerMethod ({ columns, data }) {//椤佃剼鍑芥暟
- let footList=['鎬绘暟閲�','鎬婚潰绉�','鍒嗙鏁�']
- return[
+ footerMethod({columns, data}) {//椤佃剼鍑芥暟
+ let footList = ['quantity', 'computeGrossArea',]
+ return [
columns.map((column, columnIndex) => {
if (columnIndex === 0) {
- return '鍚堣:'
+ return t('basicData.total')
}
if (footList.includes(column.field)) {
return sumNum(data, column.field)
@@ -266,13 +339,18 @@
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-button type="primary">鏌ヨ</el-button>
+ <el-button
+ @click="getWorkOrder"
+ id="select"
+ type="primary" :icon="Search">{{$t('basicData.search')}}
+
+ </el-button>
</el-row>
</div>
@@ -298,10 +376,14 @@
</template>
<!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
- <template #button_slot="{ row }">
- <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">鎵撳嵃</el-button>
- <el-button @click="getTableRow(row,'setType')" link type="primary" size="small">鎺掔増</el-button>
- <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">鍒犻櫎</el-button>
+
+ <template #button_slot="{ row }" >
+ <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}
+ </el-button>
+ <el-button v-if="row.layoutStatus=='鍙帓鐗�'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composing')}}</el-button>
+ <el-button v-else-if="row.layoutStatus=='涓嶅彲鎺掔増'" @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.composingOk')}}</el-button>
+ <el-button v-else-if="row.layoutStatus=='宸叉帓鐗�'" disabled @click="getTableRow(row,'setType')" link type="primary" size="small">{{$t('processCard.typesetter')}}</el-button>
+ <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">{{$t('basicData.delete')}}</el-button>
</template>
<template #num1_filter="{ column, $panel }">
@@ -311,7 +393,19 @@
</div>
</div>
</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>
</div>
--
Gitblit v1.8.0