From b8982b86a15d186c4cf6144fface700d9769fa95 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 21 三月 2025 09:13:13 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue | 334 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 203 insertions(+), 131 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 82a303c..b267239 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
@@ -17,6 +17,8 @@
import footSum from "@/hook/footSum"
import userInfo from "@/stores/userInfo"
import useOrderInfoStore from "@/stores/sd/order/orderInfo"
+import {Printer} from "@element-plus/icons-vue/global";
+import SelectProcessCardDetail from "@/components/pp/SelectProcessCardDetail.vue";
//璇█鑾峰彇
const {t} = useI18n()
@@ -25,13 +27,15 @@
const orderInfo = useOrderInfoStore()
let productGlassTypeStore = useProductGlassTypeStore()
+const dialogTableVisible = ref(false)
let router = useRouter()
let props = defineProps({
rowIndex: {}
})
+let printRow = ref({
+ list: null,
+})
const getTableRow = (row, type) => {
- let startTime = form.date1[0]
- let endTime = form.date1[1]
switch (type) {
case 'select' : {
router.push({path: '/main/processCard/SelectDetailProcessCard', query: {processId: row.processId}})
@@ -47,6 +51,10 @@
}
})
+ break
+ }
+ case 'rack' : {
+ dialogTableVisible.value = true
break
}
}
@@ -104,55 +112,42 @@
let pageNum = ref(1)
let pageState = null
-//鑾峰彇涓冨ぉ鍓嶅埌褰撳墠鏃堕棿
-function getNowTime() {
- const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 15)
- .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]
-}
-
-
-//绗竴娆″姞杞借幏鍙栬繎涓冨ぉ鏃堕棿鍜岄粯璁ょ姸鎬�
-if (orderInfo.workOrderDate[0]=="" && orderInfo.workOrderDate[1]==""){
- orderInfo.workOrderDate=getNowTime()
-}
-let startTime = orderInfo.workOrderDate[0]
-let endTime = orderInfo.workOrderDate[1]
let total = reactive({
pageTotal: 0,
dataTotal: 0,
pageSize: 100
})
+
+const getFlowCardList = async () => {
//绗竴娆″姞杞芥暟鎹�
-request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ await request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
- if (res.code == 200) {
- 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)
- gridOptions.loading = false
- } else {
- ElMessage.warning(res.msg)
- }
+ if (res.code == 200) {
+ total.dataTotal = res.data.total.total * 1
+ total.pageTotal = res.data.total.pageTotal
+ orderInfo.workOrderDate = res.data.selectDate
+ pageTotal.value = res.data.total
+ produceList.value = produceList.value.concat(deepClone(res.data.data))
+ xGrid.value.loadData(produceList.value)
+ } else {
+ ElMessage.warning(res.msg)
+ }
+ })
+}
+onMounted(async () => {
+ filterData.value = orderInfo.selectProcessCardFilter.data
+ await getFlowCardList()
+ orderInfo.selectProcessCardFilter.list.forEach(item =>{
+ xGrid.value.getColumnByField(item.field).filters = item.column.filters
+ })
})
-
//椤佃剼缈婚〉鏌ヨ
const selectPageList = () => {
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
- produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
+ produceList.value = deepClone(res.data.data)
+ xGrid.value.loadData(produceList.value)
} else {
ElMessage.warning(res.msg)
}
@@ -162,9 +157,7 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/${pageNum.value}/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total * 1
total.pageTotal = res.data.total.pageTotal
@@ -205,18 +198,17 @@
filterData.value[column.property] = value
}
-//鑾峰彇閫変腑鏃堕棿
- let startTime = orderInfo.workOrderDate[0]
- let endTime = orderInfo.workOrderDate[1]
- request.post(`/processCard/flowCard/1/${total.pageSize}/${startTime}/${endTime}`, filterData.value).then((res) => {
+ request.post(`/processCard/flowCard/1/${total.pageSize}/${orderInfo.workOrderDate}`, filterData.value).then((res) => {
if (res.code == 200) {
total.dataTotal = res.data.total.total*1
total.pageTotal=parseInt(res.data.total)
pageNum.value=1
- produceList = deepClone(res.data.data)
- xGrid.value.reloadData(produceList)
+ produceList.value = deepClone(res.data.data)
+ xGrid.value.loadData(produceList.value)
gridOptions.loading=false
+ orderInfo.selectProcessCardFilter.list = xGrid.value.getCheckedFilters()
+ orderInfo.selectProcessCardFilter.data = filterData.value
} else {
ElMessage.warning(res.msg)
}
@@ -232,7 +224,6 @@
//瀛愮粍浠舵帴鏀跺弬鏁�
const xGrid = ref()
const gridOptions = reactive({
- loading: true,
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
align: 'center',//鏂囧瓧灞呬腑
@@ -267,6 +258,8 @@
{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: 'order.batch', title: t('order.batch'), filters: [{data: ''}], slots: {filter: 'num1_filter'}, width: 110},
+
{
field: 'processId',
width: 140,
@@ -295,13 +288,16 @@
{field: 'orderDetail.processingNote', title: t('order.processingNote'),},
{field: 'layoutStatus',width:100, title: t('processCard.layoutStatus'), filters: [{data: ''}], slots: {filter: 'select_filter'}},
- {field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
+ {field: 'merge',width:100, title: t('processCard.mergeState'), filters: [{data: ''}], slots: {filter: 'num1_filter'}},
+ {field: 'rack',width:100, title: t('鏋跺彿'), filters: [{data: ''}], slots: {filter: 'num1_filter'}}
],//琛ㄥご鎸夐挳
toolbarConfig: {
buttons: [
{code: 'update', name: t('processCard.composing'), status: 'primary'},
+ {code: 'revoke', name: t('processCard.revoke'), status: 'primary'},
{code: 'delete', name: t('basicData.delete'), status: 'primary'},
+ {code: 'rack', name: t('鍚堟灦'), status: 'primary'},
],
import: false,
// export: true,
@@ -372,6 +368,43 @@
return;
}
+ case 'revoke': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length == 0) {
+ ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+ return;
+ }
+
+ let composingData = ref({
+ composing: selectRecords,
+ })
+ selectRecords.forEach(item => {
+ if (item.layoutStatus == "宸叉帓鐗�"){
+ ElMessage.warning(t('processCard.notSelectTheOptionData'))
+ return;
+ }
+ });
+ //鎾ら攢鍙帓鐗堢姸鎬�
+ request.post("/processCard/revokeComposing", composingData.value).then((res) => {
+ if (res.code == 200 && res.data === true) {
+ ElMessage.success(t('basicData.msg.saveSuccess'))
+ router.push({
+ path: '/main/processCard/SelectProcessCard',
+ query: {random: Math.random()}
+ })
+ } else {
+
+ ElMessage.warning("鎾ら攢澶辫触锛岃妫�鏌ユ槸鍚﹀凡鐢熸垚宸ョ▼鍙�")
+
+ }
+ })
+
+ }
+ return;
+
+ }
case 'delete': {
const $table = xGrid.value
if ($table) {
@@ -409,6 +442,29 @@
return;
}
+ case 'rack': {
+ const $table = xGrid.value
+ if ($table) {
+ const selectRecords = $table.getCheckboxRecords()
+ if (selectRecords.length == 0) {
+ ElMessage.warning(t('processCard.pleaseCheckTheRequiredData'))
+ return;
+ }
+ let id = ""
+ for (let i = 0; i < selectRecords.length; i++) {
+ if (i + 1 === selectRecords.length) {
+ id += selectRecords[i].id
+ } else {
+ id += selectRecords[i].id + "|"
+ }
+ }
+ printRow.value.list = JSON.stringify(selectRecords)
+ dialogTableVisible.value = true
+
+ }
+ return;
+
+ }
}
}
@@ -430,9 +486,8 @@
</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="orderInfo.workOrderDate"
:default-time="defaultTime"
@@ -447,103 +502,120 @@
<el-button
id="select"
:icon="Search"
+ style="margin-top: -5px"
type="primary" @click="getWorkOrder">{{ $t('basicData.search') }}
</el-button>
- </el-row>
</div>
- <vxe-grid
- ref="xGrid"
- :checkbox-config="checkBoxConfig"
- class="mytable-scrollbar"
- height="100%"
- v-bind="gridOptions"
- v-on="gridEvents"
- @filter-change="filterChanged"
+ <div class="main-table">
+ <vxe-grid
+ ref="xGrid"
+ :checkbox-config="checkBoxConfig"
+ class="mytable-scrollbar"
+ height="100%"
+ v-bind="gridOptions"
+ v-on="gridEvents"
+ @filter-change="filterChanged"
- >
- <!-- @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 @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
- <!-- </el-button>-->
- <el-button v-if="userStore.user.permissions.indexOf('SelectProcessCard.edit') > -1"
- link
- size="small"
- type="primary"
- @click="getTableRow(row,'select')">
- {{ $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>-->
-<!-- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
-<!-- <template #reference>-->
-<!-- <el-button link size="small" type="primary">{{ $t('basicData.delete') }}</el-button>-->
-<!-- </template>-->
-<!-- </el-popconfirm>-->
- </template>
+ <template #button_slot="{ row }">
+ <!-- <el-button @click="getTableRow(row,'select')" link type="primary" size="small">{{$t('basicData.edit')}}-->
+ <!-- </el-button>-->
+ <el-button v-if="userStore.user.permissions.indexOf('selectProcessCard.edit') > -1"
+ link
+ size="small"
+ type="primary"
+ @click="getTableRow(row,'select')">
+ {{ $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>-->
+ <!-- <el-popconfirm :title="$t('searchOrder.deleteConfirm')" @confirm="getTableRow(row,'delete')">-->
+ <!-- <template #reference>-->
+ <!-- <el-button link size="small" type="primary">{{ $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 v-model="option.data" type="text" @input="changeFilterEvent($event, option, $panel)"/>
+ <template #num1_filter="{ column, $panel }">
+ <div>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <input
+ v-model="option.data"
+ @keyup.enter.native="$panel.confirmFilter()"
+ @input="changeFilterEvent($event, option, $panel)"/>
+ </div>
</div>
- </div>
- </template>
- <template #select_filter="{ column, $panel }">
- <div>
+ </template>
+ <template #select_filter="{ column, $panel }">
+ <div>
- <div v-for="(option, index) in column.filters" :key="index">
- <select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
- <option :value="$t('processCard.typesetter')" :label="$t('processCard.typesetter')"></option>
- <option :value="$t('processCard.composingOk')" :label="$t('processCard.composingOk')"></option>
- <option :value="$t('processCard.composingNo')" :label="$t('processCard.composingNo')"></option>
- </select>
+ <div v-for="(option, index) in column.filters" :key="index">
+ <select v-model="option.data" @change="changeFilterEvent($event, option, $panel)" style="width: 100%">
+ <option :value="$t('processCard.typesetter')" :label="$t('processCard.typesetter')"></option>
+ <option :value="$t('processCard.composingOk')" :label="$t('processCard.composingOk')"></option>
+ <option :value="$t('processCard.composingNo')" :label="$t('processCard.composingNo')"></option>
+ </select>
+ </div>
</div>
- </div>
- </template>
- <template #pager>
- <!--浣跨敤 pager 鎻掓Ы-->
- <!-- 'PrevJump','NextJump', -->
- <vxe-pager
- v-model:current-page="pageNum"
- v-model:page-size="total.pageSize"
- v-model:pager-count="total.pageTotal"
- :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
- :total="total.dataTotal"
- @page-change="handlePageChange"
- >
- </vxe-pager>
- </template>
+ </template>
+ <template #pager>
+ <!--浣跨敤 pager 鎻掓Ы-->
+ <!-- 'PrevJump','NextJump', -->
+ <vxe-pager
+ v-model:current-page="pageNum"
+ v-model:page-size="total.pageSize"
+ v-model:pager-count="total.pageTotal"
+ :layouts="[ 'PrevPage', 'Jump','PageCount', 'NextPage', 'Total']"
+ :total="total.dataTotal"
+ @page-change="handlePageChange"
+ >
+ </vxe-pager>
+ </template>
- </vxe-grid>
+ </vxe-grid>
+ </div>
+
+ <el-dialog
+ id="sizePrintCalrd"
+ v-model="dialogTableVisible"
+ :title="$t('娴佺▼鍗″悎鏋�')"
+ destroy-on-close
+ style="width: 75%;height:75% ">
+ <select-process-card-detail
+ id="child"
+ :printList="printRow.list"
+ style="width: 100%;height: 100%"/>
+ </el-dialog>
</div>
</template>
<style scoped>
-.main-div-customer {
- width: 99%;
- height: 95%;
+.head{
+ width: 100%;
+ height: 35px;
}
-#selectForm {
- width: 40%;
- text-align: center;
+.main-table{
+ width: 100%;
+ height: calc(100% - 35px);
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0