From f024626e9d1b6bc0380655cd55892e5c102e20d9 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Sun, 13 Jul 2025 10:16:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/component/dialogFormByCq.vue | 63 +++++- .../toolsLease/apply/component/homeApply.vue | 200 +++++++++++++----- .../outBound/component/homeApply.vue | 149 ++++++++----- 3 files changed, 301 insertions(+), 111 deletions(-) diff --git a/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue b/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue index 69218a47..6d4492ed 100644 --- a/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue +++ b/src/views/materialsStation/toolsBack/back/component/dialogFormByCq.vue @@ -37,7 +37,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + +
编号物资类型物资名称规格型号计量单位退料数量编号
{{ index + 1 }}{{ row.materialType }}{{ row.materialType }}{{ row.typeName }}{{ row.unitName }}{{ row.preNum }} + 无编码 + + 查看明细 + +
+
@@ -128,13 +162,34 @@
- + + + + + + + + + + + + + + + + + + + + +
序号物资类型物资名称规格型号设备编号
{{ index + 1 }}{{ row.materialType }}{{ row.materialName }}{{ row.typeName }}{{ row.maCode }}
+
审核人：
diff --git a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue index 760991d5..93015f6f 100644 --- a/src/views/materialsStation/toolsLease/apply/component/homeApply.vue +++ b/src/views/materialsStation/toolsLease/apply/component/homeApply.vue @@ -137,7 +137,7 @@ {{ checkDataInfo.leaseUnit }}
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
机具名称规格型号单位数量设备编码额定载荷KN试验载荷KN持荷时间min试验日期下次试验日期检验结论备注
{{ row.typeName }}{{ row.typeModelName }}{{ row.unit }}{{ row.num }}{{ row.maCode }}{{ row.ratedLoad }}{{ row.testLoad }}{{ row.holdingTime }}{{ row.testTime }}{{ row.nextTestTime }}{{ row.checkResult }}{{ row.remark }}
@@ -181,30 +216,30 @@
- -
-
领料单
-
-
- 领料班组： - {{ leaseApplyData.teamName }} -
-
- 工程名称： - {{ leaseApplyData.projectName }} + +
+
领料单
+
+
+ 领料班组： + {{ leaseApplyData.teamName }} +
+
+ 工程名称： + {{ leaseApplyData.projectName }} +
+ +
+ 时间： + {{ leaseApplyData.createTime.split(' ')[0] }} +
+
+ 编号： + {{ leaseApplyData.code }} +
-
- 时间： - {{ leaseApplyData.createTime.split(' ')[0] }} -
-
- 编号： - {{ leaseApplyData.code }} -
-
- - + + + + + + + + + + + + + + + + + + + + + + + + +
序号类型名称规格型号计量单位预领数量备注出库方式
{{ index + 1 }}{{ row.maTypeName }}{{ row.typeName }}{{ row.unitName }}{{ row.preNum }}{{ row.remark }} + + 编码出库 + + 数量出库 +
-
-
-
发料：
-
-
- -
-
领料：
- +
+
+
发料：
+
+
+ +
+
领料：
+ +
-
- +
打 印 @@ -252,12 +316,30 @@
领料单编号明细
- + + + + + + + + + + + + + + + + + + +
序号类型名称规格型号设备编码
{{ index + 1 }}{{ row.materialName }}{{ row.typeName }}{{ row.maCode }}
@@ -377,6 +459,8 @@ export default { //打开领料单 async handleLld(row) { this.title = '领料单' + this.leaseApplyDetails = [] + this.leaseApplyData = {} this.open = true var ids = row.id const res = await getApplyInfo(ids) @@ -386,13 +470,13 @@ export default { //出库检验单打印 printCheck() { - printJS({ - printable: 'checkId', - type: 'html', - targetStyles: ['*'], - maxWidth: '1400' - // 其他配置选项 - }) + // printJS({ + // printable: 'checkId', + // type: 'html', + // targetStyles: ['*'], + // maxWidth: '1400' + // // 其他配置选项 + // }) }, // 关闭弹窗并刷新页面 @@ -413,14 +497,14 @@ export default { //打印 print() { - // this.$refs.remarksPrintRef.print(); - printJS({ - printable: 'checkIdTwo', - type: 'html', - targetStyles: ['*'], - maxWidth: '1400' - // 其他配置选项 - }) + this.$refs.remarksPrintRef.print() + // printJS({ + // printable: 'checkIdTwo', + // type: 'html', + // targetStyles: ['*'], + // maxWidth: '1400' + // // 其他配置选项 + // }) }, /** 删除按钮操作 */ diff --git a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue index 18f3d8ca..250db547 100644 --- a/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue +++ b/src/views/materialsStation/toolsLease/outBound/component/homeApply.vue @@ -173,29 +173,29 @@
- -
-
领料单
-
-
- 领料班组： - {{ leaseApplyData.teamName }} + +
+
领料单
+
+
+ 领料班组： + {{ leaseApplyData.teamName }} +
+
+ 工程名称： + {{ leaseApplyData.projectName }} +
+
+ 时间： + {{ leaseApplyData.createTime.split(' ')[0] }} +
+
+ 编号： + {{ leaseApplyData.code }} +
-
- 工程名称： - {{ leaseApplyData.projectName }} -
-
- 时间： - {{ leaseApplyData.createTime.split(' ')[0] }} -
-
- 编号： - {{ leaseApplyData.code }} -
-
- + + + + + + + + + + + + + + + + + + + + + + + + +
序号类型名称规格型号计量单位预领数量备注出库方式
{{ index + 1 }}{{ row.maTypeName }}{{ row.typeName }}{{ row.unitName }}{{ row.preNum }}{{ row.remark }} + + 编码出库 + + 数量出库 +
-
-
-
发料：
-
-
- -
-
领料：
- +
+
+
发料：
+
+
+ +
+
领料：
+ +
-
- +
打 印 @@ -243,12 +272,30 @@
领料单编号明细
- + + + + + + + + + + + + + + + + + + +
序号类型名称规格型号设备编码
{{ index + 1 }}{{ row.materialName }}{{ row.typeName }}{{ row.maCode }}
@@ -405,14 +452,14 @@ export default { //打印 print() { - // this.$refs.remarksPrintRef.print(); - printJS({ - printable: 'checkIdTwo', - type: 'html', - targetStyles: ['*'], - maxWidth: '1400' - // 其他配置选项 - }) + this.$refs.remarksPrintRef.print() + // printJS({ + // printable: 'checkIdTwo', + // type: 'html', + // targetStyles: ['*'], + // maxWidth: '1400' + // // 其他配置选项 + // }) }, /** 删除按钮操作 */ @@ -444,7 +491,11 @@ export default { pageNum: this.queryParams.pageNum, statusList: this.queryParams.taskStatus ? [this.queryParams.taskStatus] : [1, 2, 3, 4] } - this.download('/material/material_lease_apply_info/export', { ...params }, `领料申请_${new Date().getTime()}.xlsx`) + this.download( + '/material/material_lease_apply_info/export', + { ...params }, + `领料申请_${new Date().getTime()}.xlsx` + ) } },