From 0ee69e0c03892920c34e8941d46e5f34a27d4a32 Mon Sep 17 00:00:00 2001 From: bb_pan Date: Tue, 10 Jun 2025 17:01:40 +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/api/system/user.js | 9 + src/views/material/ma/type/index.vue | 19 +- .../material/ma/typeConfigKeeper/index.vue | 6 +- .../material/purchase/goodsAccept/index.vue | 57 ++++-- .../goodsArrived/component/addTools.vue | 10 +- .../purchase/goodsArrived/component/home.vue | 174 +++++++++++++++--- .../material/purchase/goodsEntry/index.vue | 56 +++--- src/views/system/user/index.vue | 9 +- 8 files changed, 256 insertions(+), 84 deletions(-) diff --git a/src/api/system/user.js b/src/api/system/user.js index fa78c0e3..750e3596 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -10,6 +10,15 @@ export function listUser(query) { }) } +// 查询用户列表-new +export function getUserList(query) { + return request({ + url: '/system/user/getList', + method: 'get', + params: query + }) +} + // 查询用户详细 export function getUser(userId) { return request({ diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue index eb8400ee..dd211266 100644 --- a/src/views/material/ma/type/index.vue +++ b/src/views/material/ma/type/index.vue @@ -24,7 +24,7 @@ :filter-node-method="filterNode" ref="tree" node-key="id" - :default-expand-all="false" + :default-expand-all="true" highlight-current @node-click="handleNodeClick" > @@ -518,7 +518,7 @@ @@ -953,8 +953,10 @@ export default { getList() { this.loading = true; getListByMaType(this.queryParams).then((response) => { - this.typeList = response.data.rows; - this.total = response.data.total; + if (response.code === 200 && response.data && response.data.rows) { + this.typeList = response.data.rows + this.total = response.data.total + } this.loading = false; }); }, @@ -1122,7 +1124,7 @@ export default { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); - this.getTreeData(); + // this.getTreeData(); }); }) .catch(() => {}); @@ -1131,7 +1133,7 @@ export default { this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); - this.getTreeData(); + // this.getTreeData(); }); } }else { @@ -1139,7 +1141,7 @@ export default { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); - this.getTreeData(); + // this.getTreeData(); }); } } @@ -1156,7 +1158,7 @@ export default { .then(() => { this.$modal.msgSuccess("删除成功"); this.getList(); - this.getTreeData(); + // this.getTreeData(); }) .catch(() => {}); }, @@ -1235,6 +1237,7 @@ export default { this.form.itemType = this.level1TempName; this.form.materialType = this.level2TempName; this.form.materialName = data.label; + this.form.sortNum = data.number + 1 this.open = true; this.title = "新增"; } else { diff --git a/src/views/material/ma/typeConfigKeeper/index.vue b/src/views/material/ma/typeConfigKeeper/index.vue index 29269aec..495e3c1c 100644 --- a/src/views/material/ma/typeConfigKeeper/index.vue +++ b/src/views/material/ma/typeConfigKeeper/index.vue @@ -190,15 +190,15 @@ diff --git a/src/views/material/purchase/goodsAccept/index.vue b/src/views/material/purchase/goodsAccept/index.vue index 33bea31b..c98129d7 100644 --- a/src/views/material/purchase/goodsAccept/index.vue +++ b/src/views/material/purchase/goodsAccept/index.vue @@ -128,30 +128,29 @@ /> - +
到货验收单
-
+
+ style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> 生产厂家（供应商）：{{printData.supplier}}
+ style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> 到货日期：{{printData.arrivalDate}}
-
+
单据编号：{{printData.code}}
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号物资名称规格型号单位配送信息备注
采购数量验收结论质保质量
实收份数符合要求
{{ index + 1 }}{{ row.maTypeName }}{{ row.typeName }}{{ row.unitName }}{{ row.purchaseNum }}{{ row.checkResult }}{{ row.fileReceiveNum }}{{ row.isQualified }}{{ row.remark }}
+
供应科：
@@ -207,7 +240,7 @@
- +
@@ -423,10 +456,10 @@ padding-bottom: 20px; font-size: 18px; } - ::v-deep.el-table .fixed-width .el-button--mini { + /* ::v-deep.el-table .fixed-width .el-button--mini { width: 60px !important; margin-bottom: 10px; - } + } */ //隐藏图片上传框的css ::v-deep.disabled { .el-upload--picture-card { diff --git a/src/views/material/purchase/goodsArrived/component/addTools.vue b/src/views/material/purchase/goodsArrived/component/addTools.vue index 2f30a5a3..239102be 100644 --- a/src/views/material/purchase/goodsArrived/component/addTools.vue +++ b/src/views/material/purchase/goodsArrived/component/addTools.vue @@ -52,7 +52,7 @@ 选择某天 选择月份 -
+ -
+
@@ -966,6 +966,12 @@ export default { /** 保存按钮操作 */ handleSave() { if (this.equipmentList.length > 0) { + // 每个物资至少上传一个报告 + const noReportIndex = this.equipmentList.findIndex(item => !item.bmFileInfos || item.bmFileInfos.length === 0) + if (noReportIndex > -1) { + this.$modal.msgError(`第${noReportIndex + 1}行未上传报告，请补充后再提交！`) + return + } this.$refs['maForm'].validate(valid => { if (valid) { this.maForm.taskId = this.taskId diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue index 9414f357..c88a1b25 100644 --- a/src/views/material/purchase/goodsArrived/component/home.vue +++ b/src/views/material/purchase/goodsArrived/component/home.vue @@ -115,10 +115,14 @@ v-if="scope.row.taskStatusName == '未完成'" @click="handleNotice(scope.row)" v-hasPermi="['purchase:person:notice']" >通知 - + >验收单 + 入库单 - +
- +
- 机具设备到货验收单 + 到货验收单
-
-
- 单据编号：{{printData.code}} -
+
+ style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> 生产厂家（供应商）：{{printData.supplier}}
+ style="flex-shrink: 0;margin-bottom: 5px;font-size: 14px;"> 到货日期：{{printData.arrivalDate}}
+
+ 单据编号：{{printData.code}} +
- - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号物资名称规格型号单位配送信息备注
采购数量验收结论质保质量
实收份数符合要求
{{ index + 1 }}{{ row.maTypeName }}{{ row.typeName }}{{ row.unitName }}{{ row.purchaseNum }}{{ row.checkResult }}{{ row.fileReceiveNum }}{{ row.isQualified }}{{ row.remark }}
+
供应科：
@@ -206,7 +243,7 @@
- +
@@ -215,6 +252,75 @@
+ + +
+ +
新购入库单
+
+ + +
+ 单据编号：{{ printData.code }} +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
序号物资名称规格型号单位入库数量入库时间备注
{{ index + 1 }}{{ row.maTypeName }}{{ row.typeName }}{{ row.unitName }}{{ row.inputNum }}{{ row.inputTime }}{{ row.remark }}
+ +
+
+
+ 审核：{{ printData.reviewer }} +
+
+ + + +
+
+ 库管员：{{ printData.warehouseTeam }} +
+
+
+ +
+ +
+ 打 印 + 关 闭 +
+ + @@ -366,6 +472,7 @@ export default { printTableData: [], // 供应商 supplierStr: "", + openPrint2: false, }; }, created() { @@ -400,6 +507,14 @@ export default { this.loading = false; }); }, + // 显示验收单 + showCheckForm(row) { + return [3, 4, 13, 14, 19, 21, 22].includes(Number(row.taskStatus)) + }, + // 显示入库单 + showInboundForm(row) { + return [19, 21, 22].includes(Number(row.taskStatus)) + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; @@ -615,16 +730,25 @@ export default { this.openPrint = true; this.title = "机具设备到货验收单"; }, + handlePrint2(row) { + // this.query.taskId = row.taskId + this.getPrintTable(row.taskId) + this.openPrint2 = true + this.title = "新购入库单" + }, //打印 print() { - // this.$refs.remarksPrintRef.print(); - printJS({ - printable: 'checkId', - type: 'html', - targetStyles: ['*'], - maxWidth:'1400' - // 其他配置选项 - }); + this.$refs.remarksPrintRef.print() + // printJS({ + // printable: 'checkId', + // type: 'html', + // targetStyles: ['*'], + // maxWidth:'1400' + // // 其他配置选项 + // }); + }, + print2() { + this.$refs.remarksPrintRef2.print() }, /** 删除按钮操作 */ diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue index 2c8a6ebb..2c4b43c3 100644 --- a/src/views/material/purchase/goodsEntry/index.vue +++ b/src/views/material/purchase/goodsEntry/index.vue @@ -152,43 +152,39 @@ 单据编号：{{ printData.code }}
- - + - - - - - - - - + --> + + + + + + + + + + + + + + + + + + + + + + + +
序号物资名称规格型号单位入库数量入库时间备注
{{ index + 1 }}{{ row.maTypeName }}{{ row.typeName }}{{ row.unitName }}{{ row.inputNum }}{{ row.inputTime }}{{ row.remark }}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 4a9e5aca..520ab763 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -318,7 +318,7 @@