From 0982fb226da4d3e8c1394e83ef99509cfc8f40f1 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 1 Aug 2024 09:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pushAndAccept/pushAndAcceptDetail.vue     | 60 ++++++++++++-------
 sgzb-ui/vue.config.js                         |  2 +-
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue b/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
index 3c279913..3fccf1b9 100644
--- a/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
+++ b/sgzb-ui/src/views/warehouseManage/pushAndAccept/pushAndAcceptDetail.vue
@@ -11,46 +11,64 @@
         >
             <el-form-item label="关键字" prop="keyWord">
                 <el-input
-                    v-model="queryForm.keyWord"
+                    v-model.trim="queryForm.keyWord"
                     clearable
                     placeholder="请输入关键字"
+                    maxlength="20"
                 />
             </el-form-item>
             <!-- 物品种类下拉 -->
-            <el-form-item label="物品种类" prop="goodsType">
-                <el-select
-                    v-model="queryForm.goodsType"
+            <el-form-item label="物品种类" prop="machineName">
+                <!-- <el-select
+                    v-model="queryForm.machineName"
                     placeholder="请选择物品种类"
                     filterable
                     clearable
                 >
                     <el-option label="物品种类1" value="1"></el-option>
                     <el-option label="物品种类2" value="2"></el-option>
-                </el-select>
+                </el-select> -->
+                <el-input
+                    v-model.trim="queryForm.machineName"
+                    clearable
+                    placeholder="请输入物品种类"
+                />
             </el-form-item>
             <!-- 设备类型下拉 -->
-            <el-form-item label="设备类型" prop="deviceType">
-                <el-select
-                    v-model="queryForm.deviceType"
+            <el-form-item label="设备类型" prop="typeName">
+                <!-- <el-select
+                    v-model="queryForm.typeName"
                     placeholder="请选择设备类型"
                     filterable
                     clearable
                 >
                     <el-option label="设备类型1" value="1"></el-option>
                     <el-option label="设备类型2" value="2"></el-option>
-                </el-select>
+                </el-select> -->
+                <el-input
+                    v-model.trim="queryForm.typeName"
+                    clearable
+                    placeholder="请输入设备类型"
+                    maxlength="20"
+                />
             </el-form-item>
             <!-- 规格型号下拉 -->
-            <el-form-item label="规格型号" prop="specificationModel">
-                <el-select
-                    v-model="queryForm.specificationModel"
+            <el-form-item label="规格型号" prop="modelName">
+                <!-- <el-select
+                    v-model="queryForm.modelName"
                     placeholder="请选择规格型号"
                     filterable
                     clearable
                 >
                     <el-option label="规格型号1" value="1"></el-option>
                     <el-option label="规格型号2" value="2"></el-option>
-                </el-select>
+                </el-select> -->
+                <el-input
+                    v-model.trim="queryForm.modelName"
+                    clearable
+                    placeholder="请输入设备类型"
+                    maxlength="20"
+                />
             </el-form-item>
             <el-form-item>
                 <el-button
@@ -332,9 +350,9 @@ export default {
             showSearch: true,
             queryForm: {
                 keyWord: '',
-                goodsType: '',
-                deviceType: '',
-                specificationModel: '',
+                machineName: '',
+                typeName: '',
+                modelName: '',
             },
             tableData: [
                 {
@@ -456,13 +474,11 @@ export default {
         },
         // 获取列表
         async getList() {
-            // const params = {
-            //     ...this.queryParams,
-            //     ...this.queryForm,
-            // }
-            const res = await receiveNotificationsDetailsApi({
+            const params = {
                 receiveId: this.$route.query.id,
-            })
+                ...this.queryForm,
+            }
+            const res = await receiveNotificationsDetailsApi(params)
             console.log(res, '接收的数据')
 
             this.tableData = res.rows
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 9c2fda17..58b54c36 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -42,7 +42,7 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://192.168.2.134:48080`, //超
+        target: `http://192.168.2.151:48080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://192.168.2.81:28080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅