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] =?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: {