From bfc277c4baa734a2137a0e76012519659d964b6f Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 19 Jun 2023 14:25:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/http.js           | 17 +----------------
 src/pages/proj/GroupDisk.vue | 26 ++++++++++++++++++++++++++
 src/vuex/modules/com.js      |  2 +-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/config/http.js b/src/config/http.js
index 40158d5..e9db7e5 100644
--- a/src/config/http.js
+++ b/src/config/http.js
@@ -51,22 +51,7 @@ axios.interceptors.response.use(
 
 export const post = (sevmethod, params) => {
   return new Promise((resolve, reject) => {
-    axios.post(`${store.getters.baseUrl}/` + sevmethod, params)
-      .then(response => {
-        resolve(response.data)
-      }, error => {
-        Dialog(error.message)
-        reject(error.message)
-      })
-      .catch((error) => {
-        reject(error)
-      })
-  })
-}
-
-export const post2 = (sevmethod, params) => {
-  return new Promise((resolve, reject) => {
-    axios.post(`${store.getters.acsip}/` + sevmethod, params)
+    axios.post(`${store.getters.baseUrl}/` + 'ZD_WMS_WebService/ZD_WMS_WebService.asmx?op=' + sevmethod, params)
       .then(response => {
         resolve(response.data)
       }, error => {
diff --git a/src/pages/proj/GroupDisk.vue b/src/pages/proj/GroupDisk.vue
index a1d1224..2949d74 100644
--- a/src/pages/proj/GroupDisk.vue
+++ b/src/pages/proj/GroupDisk.vue
@@ -14,6 +14,18 @@
         v-model="val2"
         @handleChange="handleChange2"
         ></search-box>
+        <div class="bottom-filter-tip">
+          <div class="filter-label txtjustify">托盘</div>
+          <div class="fxcol mgl20 visible" >
+            <dropdown-menu
+            :option="option"
+            :active="active"
+            :open="open"
+            @toggleItem="toggleItem"
+            @dropdownMenu="dropdownMenu">
+            </dropdown-menu>
+          </div>
+        </div>
       </div>
       <div class="grid-wraper">
         <div class="left_fixed">
@@ -65,6 +77,9 @@ export default {
     return {
       val1: '',
       val2: '',
+      option: [{value: '34', label: '高尺寸托盘'}, {value: '33', label: '低尺寸托盘'}],
+      active: '1',
+      open: false,
       dataList: [],
       disabled: false
     }
@@ -143,6 +158,17 @@ export default {
       this.val2 = ''
       this.dataList = []
       this.disabled = false
+    },
+    toggleItem () {
+      if (!this.open) {
+        this.open = true
+      } else {
+        this.open = false
+      }
+    },
+    dropdownMenu (i) {
+      this.active = i + ''
+      this.open = false
     }
   }
 }
diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js
index a48c7b5..cc45a7b 100644
--- a/src/vuex/modules/com.js
+++ b/src/vuex/modules/com.js
@@ -1,7 +1,7 @@
 import * as types from '../types'
 import { getStore, setStore } from '@config/mUtils.js'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.69:8011' : 'http://192.168.81.69:8011'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://999.free.idcfengye.com' : 'http://999.free.idcfengye.com'
 const acsip = process.env.NODE_ENV === 'development' ? 'http://192.168.81.69:8010' : 'http://192.168.81.69:8010'
 const printUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.139:8000' : 'http://192.168.81.139:8000'
 const setTime = '10'