From c0f1d0b0a1ca936f073ee000b23c08b97fe5b190 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Fri, 10 Oct 2025 12:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/clzApply.js | 2 + src/store/modules/clzOutBound.js | 2 + .../material/lease/materialConfirm/index.vue | 42 ++- .../materialStation/authorize/index.vue | 35 ++- .../equipment/equipmentRecord/index.vue | 2 +- .../equipment/equipmentRecord/proDetails.vue | 2 +- .../equipmentRecord/supplyDemandBalance.vue | 2 +- .../equipment/safetyWarn/index.vue | 82 ++++-- .../equipment/teamEntrance/index.vue | 1 + .../equipment/teamStorage/index.vue | 1 + .../equipment/totalLeaseRecord/index.vue | 71 ++++-- .../equipment/totalReturnRecord/index.vue | 53 +++- .../straight/straightTransfer/index.vue | 19 +- .../components/StraightforwardBills.vue | 239 ++++++++++++++++++ .../straight/straightTransferReview/index.vue | 40 ++- .../toolsBack/back/component/home.vue | 65 +++-- .../toolsBack/back/outRecord.vue | 24 +- .../toolsBack/backAppointment/index.vue | 31 ++- .../toolsLease/apply/component/homeApply.vue | 42 ++- .../toolsLease/apply/leaseRecord.vue | 41 ++- .../outBound/component/homeApply.vue | 59 +++-- 21 files changed, 684 insertions(+), 171 deletions(-) create mode 100644 src/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue diff --git a/src/store/modules/clzApply.js b/src/store/modules/clzApply.js index bc6709d3..e88d9b91 100644 --- a/src/store/modules/clzApply.js +++ b/src/store/modules/clzApply.js @@ -3,6 +3,8 @@ const state = { pageNum: 1, pageSize: 10, time: [], //申请时间 + startTime: '', + endTime: '', keyWord: '', taskStatus: null, //申请时间 impUnitName:'',//分公司 diff --git a/src/store/modules/clzOutBound.js b/src/store/modules/clzOutBound.js index 676272ec..9aa83975 100644 --- a/src/store/modules/clzOutBound.js +++ b/src/store/modules/clzOutBound.js @@ -3,6 +3,8 @@ const state = { pageNum: 1, pageSize: 10, time: [], //申请时间 + startTime: '', + endTime: '', keyWord: '', taskStatus: null, //申请时间 impUnitName:'',//分公司 diff --git a/src/views/material/lease/materialConfirm/index.vue b/src/views/material/lease/materialConfirm/index.vue index be303dc6..e9ce57b0 100644 --- a/src/views/material/lease/materialConfirm/index.vue +++ b/src/views/material/lease/materialConfirm/index.vue @@ -71,16 +71,28 @@ - + + format="yyyy-MM-dd" + style="width: 130px" + /> + + - + + + @@ -224,9 +249,13 @@ import TreeSelect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import {getSafetyListApi,getSafeNumListApi,getAgreementIdApi,getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi,getTeamList, getSubUnitList } from '@/api/materialsStation' - import {getDeviceType} from "@/api/ma/device"; +import {getDeviceType} from "@/api/ma/device"; +import QRCodeView from '@/components/QRCodeView' +import { formatTime } from '@/utils/bonus.js' + export default { - components: { TreeSelect }, + name: 'SafetyWarn', + components: { TreeSelect, QRCodeView }, data() { return { showSearch: true, @@ -257,6 +286,7 @@ export default { proOptions: [], // 工程下拉 subUnitOptions: [], // 分包单位下拉 materialNameList: [], + agreementIdList: [] } }, created() { @@ -485,10 +515,11 @@ export default { async getList() { console.log('列表-查询', this.queryParams) const loading = this.$loading({ text: '加载中...' }) - this.queryParams.startTime = this.queryParams.time ? this.queryParams.time[0] : ''; - this.queryParams.endTime = this.queryParams.time? this.queryParams.time[1] : ''; + // this.queryParams.startTime = this.queryParams.time ? this.queryParams.time[0] : ''; + // this.queryParams.endTime = this.queryParams.time? this.queryParams.time[1] : ''; try { const resTemp = await getAgreementIdApi() + this.agreementIdList = resTemp.data console.log("xxxxxhhhhhhhhhh",resTemp) const params = { ...this.queryParams,agreementIdList:resTemp.data} const res = await getSafetyListApi(params) @@ -533,6 +564,21 @@ export default { // 打开新窗口 window.open(pdfUrl, "_blank"); }, + handleSee(row) { + this.$refs.qrCodeView.showQRCode(row.qrCode, row.maCode) + }, + // 导出数据 + handleExport() { + try { + let fileName = `安全工器具预警_${formatTime(new Date())}.xLsx` + let url = '/material/material_maMachine/exportSafeDetailsList' + const params = { ...this.queryParams, agreementIdList: this.agreementIdList } + console.log('🚀 ~ 导出 ~ params:', params) + this.download(url, params, fileName) + } catch (error) { + console.log('导出数据失败', error) + } + } } } diff --git a/src/views/materialsStation/equipment/teamEntrance/index.vue b/src/views/materialsStation/equipment/teamEntrance/index.vue index 4c4896df..90dfe911 100644 --- a/src/views/materialsStation/equipment/teamEntrance/index.vue +++ b/src/views/materialsStation/equipment/teamEntrance/index.vue @@ -82,6 +82,7 @@ import { getTeamInOrOutInfoApi, getListProject } from '@/api/materialsStation' export default { + name: 'TeamEntrance', data() { return { isLoading: false, diff --git a/src/views/materialsStation/equipment/teamStorage/index.vue b/src/views/materialsStation/equipment/teamStorage/index.vue index 355c3818..dc1209f0 100644 --- a/src/views/materialsStation/equipment/teamStorage/index.vue +++ b/src/views/materialsStation/equipment/teamStorage/index.vue @@ -250,6 +250,7 @@ import QRCodeView from '@/components/QRCodeView' import { getTeamNumListApi,getTeamNumSecondListApi, getTeamNumThirdApi,getImpUnitListApi, getDepartListByImpUnitApi, getProListByDepartApi, getTeamList, getSubUnitList } from '@/api/materialsStation' export default { + name: 'TeamStorage', components: { TreeSelect, QRCodeView }, data() { return { diff --git a/src/views/materialsStation/equipment/totalLeaseRecord/index.vue b/src/views/materialsStation/equipment/totalLeaseRecord/index.vue index dbd93d2a..14aecabf 100644 --- a/src/views/materialsStation/equipment/totalLeaseRecord/index.vue +++ b/src/views/materialsStation/equipment/totalLeaseRecord/index.vue @@ -66,17 +66,27 @@ - + + + - + + @@ -118,6 +128,9 @@ + + 导出数据 + @@ -156,9 +169,19 @@ icon="el-icon-document" style="color: #67c23a" @click="handleLld(row)" + v-if="row.isZz == 0" > 领料单 + + 直转单 + 提交 + + + @@ -457,8 +483,12 @@ import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import vueEasyPrint from 'vue-easy-print' import printJS from 'print-js' +import StraightforwardBills from '@/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue' +import { formatTime } from '@/utils/bonus.js' + export default { - components: { Treeselect,vueEasyPrint }, + name: 'TotalLeaseRecord', + components: { Treeselect,vueEasyPrint, StraightforwardBills }, data() { return { showSearch: true, @@ -544,6 +574,8 @@ export default { let start = new Date() start.setMonth(start.getMonth() - 1) this.queryParams.timeRange = [this.format(start), this.format(end)] + this.queryParams.startTime = this.queryParams.timeRange[0] + this.queryParams.endTime = this.queryParams.timeRange[1] this.getImpUnitOptions() this.handleDepartChange() this.getDeviceType() @@ -628,14 +660,16 @@ export default { let start = new Date() start.setMonth(start.getMonth() - 1) this.queryParams.timeRange = [this.format(start), this.format(end)] + this.queryParams.startTime = this.queryParams.timeRange[0] + this.queryParams.endTime = this.queryParams.timeRange[1] this.getList() }, // 获取列表 async getList() { console.log('列表-查询', this.queryParams) const loading = this.$loading({ text: '加载中...' }) - this.queryParams.startTime = this.queryParams.timeRange ? this.queryParams.timeRange[0] : '' - this.queryParams.endTime = this.queryParams.timeRange ? this.queryParams.timeRange[1] : '' + // this.queryParams.startTime = this.queryParams.timeRange ? this.queryParams.timeRange[0] : '' + // this.queryParams.endTime = this.queryParams.timeRange ? this.queryParams.timeRange[1] : '' try { const params = { ...this.queryParams } const res = await getTotalListApi(params) @@ -752,8 +786,9 @@ export default { this.leaseLoading = false } }, - - + handleDialog(id) { + this.$refs.straightforwardBills.openDialog(id, 2) + }, //打印 printView() { this.$refs.remarksPrintRefView.print() @@ -781,18 +816,12 @@ export default { }, // 导出数据 handleExport() { - // 提示 - this.$message({ - type: 'warning', - message: '导出功能开发中，敬请期待！' - }) try { - let fileName = `数据_${new Date().getTime()}.xLsx` - let url = '' + let fileName = `材料站领料记录_${formatTime(new Date())}.xLsx` + let url = '/material/material_lease_apply_info/exportTotalList' const params = { ...this.queryParams } console.log('🚀 ~ 导出 ~ params:', params) - // this.derive(url, params, fileName) - // this.download(url, params, fileName) + this.download(url, params, fileName) } catch (error) { console.log('导出数据失败', error) } diff --git a/src/views/materialsStation/equipment/totalReturnRecord/index.vue b/src/views/materialsStation/equipment/totalReturnRecord/index.vue index 9e992751..d1ae6f5f 100644 --- a/src/views/materialsStation/equipment/totalReturnRecord/index.vue +++ b/src/views/materialsStation/equipment/totalReturnRecord/index.vue @@ -66,17 +66,27 @@ - + + + - + + @@ -144,6 +154,7 @@ @@ -200,6 +220,9 @@ 关 闭 + + + @@ -211,8 +234,11 @@ import dialogFormByClz from '@/views/materialsStation/equipment/totalReturnRecor import {getDeviceType} from "@/api/ma/device"; import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' +import StraightforwardBills from '@/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue' + export default { - components: { dialogFormByClz,Treeselect }, + name: 'TotalReturnRecord', + components: { dialogFormByClz,Treeselect,StraightforwardBills, StraightforwardBills }, data() { return { showSearch: true, @@ -284,6 +310,8 @@ export default { let start = new Date() start.setMonth(start.getMonth() - 1) this.queryParams.timeRange = [this.format(start), this.format(end)] + this.queryParams.startTime = this.queryParams.timeRange[0] + this.queryParams.endTime = this.queryParams.timeRange[1] this.getImpUnitOptions() this.handleDepartChange() this.getDeviceType() @@ -368,14 +396,16 @@ export default { let start = new Date() start.setMonth(start.getMonth() - 1) this.queryParams.timeRange = [this.format(start), this.format(end)] + this.queryParams.startTime = this.queryParams.timeRange[0] + this.queryParams.endTime = this.queryParams.timeRange[1] this.getList() }, // 获取列表 async getList() { console.log('列表-查询', this.queryParams) const loading = this.$loading({ text: '加载中...' }) - this.queryParams.startTime = this.queryParams.timeRange ? this.queryParams.timeRange[0] : '' - this.queryParams.endTime = this.queryParams.timeRange ? this.queryParams.timeRange[1] : '' + // this.queryParams.startTime = this.queryParams.timeRange ? this.queryParams.timeRange[0] : '' + // this.queryParams.endTime = this.queryParams.timeRange ? this.queryParams.timeRange[1] : '' try { const params = { ...this.queryParams } const res = await getBackTotalListApi(params) @@ -418,6 +448,9 @@ export default { this.isShowOneFlag = true this.rowObj = row }, + handleDialog(id) { + this.$refs.straightforwardBills.openDialog(id, 2) + }, // 导出数据 handleExport() { // 提示 diff --git a/src/views/materialsStation/straight/straightTransfer/index.vue b/src/views/materialsStation/straight/straightTransfer/index.vue index 00e98ae4..4d1b62dc 100644 --- a/src/views/materialsStation/straight/straightTransfer/index.vue +++ b/src/views/materialsStation/straight/straightTransfer/index.vue @@ -92,8 +92,8 @@ - - + + { + this.projectInfoList() // 单位工程下拉选 + }, 300) console.log(this.$store, 'this.$store.getters') console.log(this.$route.query, 'this.$route.query') }, @@ -825,10 +829,14 @@ export default { return } this.maForm.backProName = obj.proName + this.maForm.leaseProId = obj.proId setTimeout(() => { getTeamListApi({ isAll: 0, proId: obj.proId }).then(response => { this.uniteList = response.data }) + getBmTeamApi({ isAll: 0, projectId: obj.projectId }).then(res => { + this.lessUniteList = res.data + }) }, 500) }, leaseUniteChange(val) { @@ -890,6 +898,7 @@ export default { this.maForm.backProId = Number(this.maForm.backProId) this.maForm.backTeamId = Number(this.maForm.backTeamId) this.maForm.leaseProId = Number(this.maForm.leaseProId) + console.log('🚀 ~ 详情 ~ this.maForm:', this.maForm) // this.getList() console.log('🚀 ~ getTaskInfo ~ this.equipmentList:', this.equipmentList) loading.close() diff --git a/src/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue b/src/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue new file mode 100644 index 00000000..9bc73cb9 --- /dev/null +++ b/src/views/materialsStation/straight/straightTransferReview/components/StraightforwardBills.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/views/materialsStation/straight/straightTransferReview/index.vue b/src/views/materialsStation/straight/straightTransferReview/index.vue index 7dfe6d8c..2d74ef64 100644 --- a/src/views/materialsStation/straight/straightTransferReview/index.vue +++ b/src/views/materialsStation/straight/straightTransferReview/index.vue @@ -2,17 +2,27 @@
- + + + - + + @@ -100,6 +110,7 @@ 删除 查看 + 直转单 @@ -112,15 +123,18 @@ :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" /> +