From 4fead746ce3728d4f3dce423b6fa0e195cb19ce7 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Thu, 23 Oct 2025 17:09:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/login.js | 15 ++++++++------- src/api/part/partArrived.js | 13 +++++++++++-- src/views/material/lease/outBound/index.vue | 6 +++++- vue.config.js | 5 +++-- 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/api/login.js b/src/api/login.js index 069372b6..fc3a3a28 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,14 +2,15 @@ import request from '@/utils/request' // 登录方法 - 调试使用 - 产线环境需注释 export function login(data) { + // return false return request({ - // url: '/auth/login', - // headers: { - // isToken: false, - // repeatSubmit: false - // }, - // method: 'post', - // data + url: '/auth/login', + headers: { + isToken: false, + repeatSubmit: false + }, + method: 'post', + data: data }) } diff --git a/src/api/part/partArrived.js b/src/api/part/partArrived.js index 90161031..cc8f459d 100644 --- a/src/api/part/partArrived.js +++ b/src/api/part/partArrived.js @@ -25,7 +25,7 @@ export function addPartInfo(data) { method: 'get', params: query, }) - } + } //配件新购到货-列表详情 export function getPartTypeCheckInfo(query) { @@ -79,4 +79,13 @@ export function getSelectPartListApi(query) { method: 'get', params: query }) -} \ No newline at end of file +} + +// 配件库存 +export function getPartPersonNumApi(data){ + return request({ + url: '/material/complex_query/getPartPersonNum', + method: 'get', + params: data, + }) +} diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index ac83f0fe..72d22d0c 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -834,6 +834,7 @@ export default { leaseLoading: false, taskType: '', currentRow: {}, + oldTypeId: '', allNum: null, } }, @@ -1143,7 +1144,8 @@ export default { leaseProject: this.currentRow.leaseProject, leaseProjectId: this.currentRow.leaseProjectId, taskId: this.currentRow.taskId, - code: this.currentRow.code + code: this.currentRow.code, + oldTypeId:row.oldTypeId } console.log('row', row) console.log('[obj]', [obj]) @@ -1162,6 +1164,7 @@ export default { this.outQuery.maStatus = 1 this.outQuery.code = this.currentRow.code this.outObj = row + this.oldTypeId=row.oldTypeId this.handleOutQuery() }, @@ -1216,6 +1219,7 @@ export default { this.maCodeList.forEach(item => { item.code = this.currentRow.code item.keyId = this.keyId + item.oldTypeId=this.oldTypeId }) let param = { leaseOutDetailsList: this.maCodeList } submitOut(param).then(response => { diff --git a/vue.config.js b/vue.config.js index 2e88043c..a2a68497 100644 --- a/vue.config.js +++ b/vue.config.js @@ -35,14 +35,15 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api`, // 产线 + // target: `http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api`, // 产线 // target: `http://192.168.0.96:18080`,//马 // target: `http://192.168.0.244:18580`,//测试 // target: `http://192.168.2.223:18080`,//山 // target: `http://192.168.2.23:18080`,//洪 // target: `http://192.168.0.234:18080`, //阮 // target: `http://192.168.137.1:18080`,// - // target: `http://192.168.0.15:18080`, // 韩傲宇 + // target: `http://172.20.10.9:18080`, // 韩傲宇 + target: `http://192.168.1.115:18080`, // 韩傲宇 // target: `http://192.168.0.60:18080`, // 赵福海 changeOrigin: true, pathRewrite: { From 1b3fab221ae772be9f4831e9535e0e6a9e470fff Mon Sep 17 00:00:00 2001 From: bb_pan Date: Thu, 23 Oct 2025 17:22:03 +0800 Subject: [PATCH 2/4] =?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/views/material/lease/outBound/index.vue | 24 ++- .../material/purchase/goodsAccept/detail.vue | 6 +- .../purchase/goodsAccept/editTools.vue | 5 +- .../material/purchase/goodsAccept/index.vue | 11 +- .../material/purchase/goodsArrived/index.vue | 35 +++-- .../material/purchase/goodsEntry/index.vue | 21 ++- .../repair/repairManage/component/home.vue | 147 +++++++++++++++++- 7 files changed, 214 insertions(+), 35 deletions(-) diff --git a/src/views/material/lease/outBound/index.vue b/src/views/material/lease/outBound/index.vue index 72d22d0c..858ee7c3 100644 --- a/src/views/material/lease/outBound/index.vue +++ b/src/views/material/lease/outBound/index.vue @@ -347,8 +347,8 @@
- -
+ +
施工机具设备出库检验记录表
@@ -429,14 +429,14 @@
检验单位：
-
+
- + + + +
@@ -62,6 +66,9 @@ export default { /* 新增成功 */ addToolsSuccess() { this.isShowComponent = 'Home' + this.$nextTick(() => { + this.$refs.componentRef.resetQuery() + }) }, /* 编辑工机具 */ editTools(taskId,id) { diff --git a/src/views/material/purchase/goodsEntry/index.vue b/src/views/material/purchase/goodsEntry/index.vue index d36c78d0..2a69ef46 100644 --- a/src/views/material/purchase/goodsEntry/index.vue +++ b/src/views/material/purchase/goodsEntry/index.vue @@ -289,6 +289,11 @@ export default { printTableData: [] } }, + activated() { + if (this.$route.params.isReset) { + this.resetQuery() + } + }, created() { if (this.$route.query.code) { this.queryParams.keyWord = this.$route.query.code @@ -337,8 +342,12 @@ export default { }, handleUpdate(row) { console.log(row) - let query = { Id: row.id, taskId: row.taskId, isView: 'false' } - this.$tab.closeOpenPage({ + let query = { Id: row.id, taskId: row.taskId, isView: 'false', path: 'goodsEntry' } + // this.$tab.closeOpenPage({ + // path: '/purchase/goodsEntryDetail', + // query + // }) + this.$router.push({ path: '/purchase/goodsEntryDetail', query }) @@ -346,8 +355,12 @@ export default { //查看 handleView(row) { console.log(row) - let query = { Id: row.id, taskId: row.taskId, isView: 'true' } - this.$tab.closeOpenPage({ + let query = { Id: row.id, taskId: row.taskId, isView: 'true', path: 'goodsEntry' } + // this.$tab.closeOpenPage({ + // path: '/purchase/goodsEntryDetail', + // query + // }) + this.$router.push({ path: '/purchase/goodsEntryDetail', query }) diff --git a/src/views/material/repair/repairManage/component/home.vue b/src/views/material/repair/repairManage/component/home.vue index 1317d18a..9f45f466 100644 --- a/src/views/material/repair/repairManage/component/home.vue +++ b/src/views/material/repair/repairManage/component/home.vue @@ -96,7 +96,8 @@
承修单位： - {{ repairTicketlLevelOne.backUnit }} + + 机具（物流）分公司
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
名称型号编号单位报修数量修复数量报废数量维修费小计报废图片
{{ row.typeName }}{{ row.type }} +
计数
+
+ 详见附件 +
+ 		{{ row.unitName }}{{ row.typeRepairNum }}{{ row.typeRepairedNum }}{{ row.typeScrapNum }} + ¥ {{ Number(row.typeCost) }} + +
+
+ {{ row.fileList.length }} +
+
总计{{ repairNum1 }}{{ repairNum2 }}{{ repairNum3 }}¥ {{ repairNum4 }}
+
维修内容
- + + + + + + + + + + + + + + + + + + + + + + + + + +
修理项目 + 配件名称 * 数量 / 单价 + 总价 +
+ {{ row.maTypeName }} - {{ row.typeName }} + +
+ {{ row.partName }} + × + {{ row.partNum }} + / + ¥ {{ row.partPrice }} + 无 + ¥ {{ row.partCost }} +
+
+ 合计 + + ¥ {{ acountAll }} +
+
From c2b97818e9c94a452e23ddcb81862b78712eae54 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 23 Oct 2025 17:41:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/report/goodsEntryReport.vue | 3 ++- .../material/stquery/deviceStatusRecord.vue | 20 +++++++++---------- .../material/stquery/deviceUsingRecord.vue | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/views/material/report/goodsEntryReport.vue b/src/views/material/report/goodsEntryReport.vue index 659a910f..75d206d2 100644 --- a/src/views/material/report/goodsEntryReport.vue +++ b/src/views/material/report/goodsEntryReport.vue @@ -88,7 +88,7 @@ - + @@ -501,6 +501,7 @@ this.openWaitRecord = true this.dialogWaitQuery.keyWord = "" this.dialogWaitQuery.taskId = row.taskId; + this.dialogWaitQuery.typeId = row.typeId; this.getDialogWaitDataList() }, /** 查询采购数量弹框列表 */ diff --git a/src/views/material/stquery/deviceStatusRecord.vue b/src/views/material/stquery/deviceStatusRecord.vue index ad851b13..16053dbc 100644 --- a/src/views/material/stquery/deviceStatusRecord.vue +++ b/src/views/material/stquery/deviceStatusRecord.vue @@ -61,7 +61,7 @@ {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index }} - + @@ -90,7 +90,7 @@ - + --> - + - - + –> + <!– {{ scope.row.repairInputNum }} –> - + --> @@ -222,9 +222,9 @@ - + - + Date: Thu, 23 Oct 2025 17:45:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/leasePublish/component/homeApply.vue | 4 ++-- src/views/material/back/component/dialogFormByCq.vue | 8 ++++---- .../material/lease/apply/component/homeApply.vue | 12 ++++++------ src/views/material/part/partAccept/index.vue | 4 ++-- src/views/material/part/partAcceptTwo/index.vue | 4 ++-- .../material/part/partArrived/component/home.vue | 4 ++-- .../material/part/partLease/component/homeApply.vue | 4 ++-- .../material/repair/repairManage/component/view.vue | 4 ++-- src/views/material/repair/testRecord/index.vue | 4 ++-- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/views/business/leasePublish/component/homeApply.vue b/src/views/business/leasePublish/component/homeApply.vue index f81e543b..267d3543 100644 --- a/src/views/business/leasePublish/component/homeApply.vue +++ b/src/views/business/leasePublish/component/homeApply.vue @@ -114,7 +114,7 @@ -
+