From baed28c7c3dd38e7e0c1c5114181446f6db327ab Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 8 Jul 2024 10:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picking/apply/component/AddPicking.vue      | 17 ++++++++---------
 .../component/addCompleteTools.vue              |  2 +-
 .../component/addCompleteTools.vue              |  2 +-
 sgzb-ui/vue.config.js                           |  4 ++--
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
index 61b92f0a..85f9c5cb 100644
--- a/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
+++ b/sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
@@ -70,7 +70,7 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="成套设备">
+                <!-- <el-form-item label="成套设备">
                     <el-select
                         @change="completeSetChange"
                         style="width: 240px"
@@ -86,7 +86,7 @@
                             :label="item.wholeTypeName"
                         />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="物品类型" prop="status">
                     <el-cascader
                         placeholder="请选择物品类型"
@@ -562,7 +562,6 @@ export default {
             const res = await getDeviceTypeTree(params)
 
             if (this.isEdit) {
-                console.log(this.queryParams.companyId, '--------------------')
                 this.deviceTypeTreeNew = res.data.filter(
                     (e) => e.companyId == this.queryParams.companyId,
                 )
@@ -901,12 +900,12 @@ export default {
                 (e) => e.companyId == val,
             )
 
-            const res = await getCompleteSetToolsApi({
-                companyId: val,
-                pageNum: 1,
-                pageSize: 9999,
-            })
-            this.completeSetList = res.rows
+            // const res = await getCompleteSetToolsApi({
+            //     companyId: val,
+            //     pageNum: 1,
+            //     pageSize: 9999,
+            // })
+            // this.completeSetList = res.rows
         },
 
         // 成套设备下拉框选择
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
index 373068fc..b9962500 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue
@@ -78,7 +78,7 @@
                     />
                 </template>
             </el-table-column>
-            <el-table-column align="center" label="数量">
+            <el-table-column align="center" label="操作">
                 <template slot-scope="{ row }">
                     <el-button
                         size="mini"
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
index 2cd49db5..a9ff5b39 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue
@@ -78,7 +78,7 @@
                     />
                 </template>
             </el-table-column>
-            <el-table-column align="center" label="数量">
+            <el-table-column align="center" label="操作">
                 <template slot-scope="{ row }">
                     <el-button
                         size="mini"
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 4cf9b9e5..eb4b088a 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -46,8 +46,8 @@ module.exports = {
         // target: `http://192.168.2.122:28080`, //超
         // target: `http://10.40.92.81:28080`, //韩/
         // target: `http://10.40.92.74:8080`,//旭/
-        // target: `http://10.40.92.140:28080`, //帅
-        target: `http://192.168.2.209:28080`, //福
+        target: `http://192.168.2.248:28080`, //帅
+        // target: `http://192.168.2.209:28080`, //福
 
         //******** 注意事项  ********* */
         //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;