diff --git a/src/views/business-examine/direct-rotation-apply/index.vue b/src/views/business-examine/direct-rotation-apply/index.vue index 20f336f6..0a5ef36c 100644 --- a/src/views/business-examine/direct-rotation-apply/index.vue +++ b/src/views/business-examine/direct-rotation-apply/index.vue @@ -49,7 +49,7 @@ - + - + - + - + @@ -474,7 +474,7 @@ export default { //租赁工程 projectList: [], leaseProjectList: [], - // 物资类型 + // 物资名称 materialTypeOpts: [], // 类型规格 typeModelNameOpts: [], @@ -483,7 +483,7 @@ export default { // 表头 tableColumns: [ { label: '直转数量', prop: 'directNum' }, - { label: '类型名称', prop: 'typeName' }, + { label: '物资名称', prop: 'typeName' }, { label: '规格型号', prop: 'typeModelName' }, { label: '设备编码', prop: 'maCode' }, { label: '计量单位', prop: 'unitName' }, @@ -505,7 +505,7 @@ export default { queryParams: { pageNum: 1, // 当前页码 pageSize: 20, // 每页显示数量 - maId: undefined, // 物资类型 + maId: undefined, // 物资名称 typeId: '', // 类型规格 keyWord: '' }, @@ -995,7 +995,7 @@ export default { this.loading = false } }, - // 获取物资类型 + // 获取物资名称 async getMaTypeOpt() { try { const params = { diff --git a/src/views/business/businessHandling/groundDirect.vue b/src/views/business/businessHandling/groundDirect.vue index 26249401..d7e62bc5 100644 --- a/src/views/business/businessHandling/groundDirect.vue +++ b/src/views/business/businessHandling/groundDirect.vue @@ -185,7 +185,7 @@ - + @@ -381,7 +381,7 @@ export default { //租赁工程 projectList: [], leaseProjectList: [], - // 物资类型 + // 物资名称 materialTypeOpts: [], // 类型规格 typeModelNameOpts: [], @@ -390,7 +390,7 @@ export default { // 表头 tableColumns: [ { label: '直转数量', prop: 'directNum' }, - { label: '类型名称', prop: 'typeName' }, + { label: '物资名称', prop: 'typeName' }, { label: '规格型号', prop: 'typeModelName' }, { label: '设备编码', prop: 'maCode' }, { label: '计量单位', prop: 'unitName' }, @@ -412,7 +412,7 @@ export default { queryParams: { pageNum: 1, // 当前页码 pageSize: 20, // 每页显示数量 - maId: undefined, // 物资类型 + maId: undefined, // 物资名称 typeId: '', // 类型规格 keyWord: '' }, @@ -698,7 +698,7 @@ export default { this.loading = false } }, - // 获取物资类型 + // 获取物资名称 async getMaTypeOpt() { try { const params = { diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue index 736a68b4..a67e0e7d 100644 --- a/src/views/business/businessHandling/index.vue +++ b/src/views/business/businessHandling/index.vue @@ -292,12 +292,12 @@ - + @@ -75,6 +79,12 @@ export default { goBack() { this.isShowComponent = "Home"; }, + reset() { + this.isShowComponent = "Home" + this.$nextTick(() => { + this.$refs.componentRef.resetQuery() + }) + } }, }; diff --git a/src/views/material/report/leaseOutReport.vue b/src/views/material/report/leaseOutReport.vue index 333c1e52..a0de3d0e 100644 --- a/src/views/material/report/leaseOutReport.vue +++ b/src/views/material/report/leaseOutReport.vue @@ -116,7 +116,7 @@ - + diff --git a/src/views/material/report/reportQuery.vue b/src/views/material/report/reportQuery.vue index e1d7fe54..4dd4d5b7 100644 --- a/src/views/material/report/reportQuery.vue +++ b/src/views/material/report/reportQuery.vue @@ -239,7 +239,7 @@ > - 机具名称 + 物资名称 规格型号 单位 数量 @@ -333,7 +333,7 @@ import QRCode from "qrcodejs2"; import axios from 'axios' import {downloadFile} from "@/utils/download"; export default { - name: "PartAccept", + name: "ReportQuery", dicts: ['part_task_status'], components: { vueEasyPrint }, data() { diff --git a/src/views/material/stquery/deviceComparisonStatistical.vue b/src/views/material/stquery/deviceComparisonStatistical.vue index ef00be4f..8a73d921 100644 --- a/src/views/material/stquery/deviceComparisonStatistical.vue +++ b/src/views/material/stquery/deviceComparisonStatistical.vue @@ -183,7 +183,7 @@ :index="indexContinuation(dialogUseQuery.pageNum, dialogUseQuery.pageSize)" > - + diff --git a/src/views/material/stquery/deviceStatusRecord.vue b/src/views/material/stquery/deviceStatusRecord.vue index 6f09ed3c..33730f04 100644 --- a/src/views/material/stquery/deviceStatusRecord.vue +++ b/src/views/material/stquery/deviceStatusRecord.vue @@ -1,7 +1,7 @@ - + @@ -213,7 +213,7 @@ type="index" :index="indexContinuation(dialogQuery.pageNum, dialogQuery.pageSize)" > - + @@ -237,7 +237,7 @@ import { getLeaseInfoDetailsApi, getLeaseInfoDetailsNoPageListApi, getSecondLeas import { formatTime } from '@/utils/bonus' export default { - name: '', + name: 'LeaseRecord', dicts: [], data() { return { diff --git a/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue b/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue index e3163111..8037212e 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/OutCodeDlg.vue @@ -27,7 +27,7 @@ > - + diff --git a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue index 33899605..fbf9433c 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/addToolsApply.vue @@ -179,7 +179,7 @@ - + diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue index 51a5d6d9..584e5e34 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue @@ -117,10 +117,10 @@ - + - + @@ -279,7 +279,7 @@ 序号 - 类型名称 + 物资名称 规格型号 计量单位 领料数量 @@ -347,7 +347,7 @@ @@ -355,7 +355,7 @@ 序号 - 类型名称 + 物资名称 规格型号 设备编码 @@ -425,7 +425,7 @@ export default { proName:'',//领料工程 subUnitName:'',//分包单位 teamName:'',//领料班组 - maTypeNames:''//领料工器具类型 + maTypeNames:''//物资名称 }, openPrint: false, open: false, @@ -535,7 +535,7 @@ export default { proName:'',//领料工程 subUnitName:'',//分包单位 teamName:'',//领料班组 - maTypeNames:''//领料工器具类型 + maTypeNames:''//物资名称 } this.$store.commit('clzOutBoubnd/clzOutBoundQueryParams', this.queryParams) this.getImpUnitOptions() diff --git a/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue b/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue index 8f464e22..7a35f823 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/queryToolsApply.vue @@ -65,7 +65,7 @@ - +