From 69fa036d1b1de2c3c4a83fbdbb3d430e683e90f5 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 19 Jun 2023 15:47:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E5=9F=9F=E4=BB=A3=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js              | 10 +++++++++-
 src/config/http.js           |  5 +++--
 src/pages/login/Login.vue    |  6 +++---
 src/pages/proj/GroupDisk.vue | 16 +++++++++-------
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/config/index.js b/config/index.js
index be4b3fd..418d358 100644
--- a/config/index.js
+++ b/config/index.js
@@ -10,7 +10,15 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+      '/api':{
+        target:'http://999.free.idcfengye.com',
+        changeOrigin:true,
+        pathRewrite:{
+          '^/api':''
+        }
+      }
+    },
 
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
diff --git a/src/config/http.js b/src/config/http.js
index e9db7e5..39136bd 100644
--- a/src/config/http.js
+++ b/src/config/http.js
@@ -51,11 +51,12 @@ axios.interceptors.response.use(
 
 export const post = (sevmethod, params) => {
   return new Promise((resolve, reject) => {
-    axios.post(`${store.getters.baseUrl}/` + 'ZD_WMS_WebService/ZD_WMS_WebService.asmx?op=' + sevmethod, params)
+    // axios.post(`${store.getters.baseUrl}/` + 'ZD_WMS_WebService/ZD_WMS_WebService.asmx?op=' + sevmethod, params)
+    axios.post('/api/ZD_WMS_WebService/ZD_WMS_WebService.asmx?op=' + sevmethod, params)
       .then(response => {
         resolve(response.data)
       }, error => {
-        Dialog(error.message)
+        Dialog(error || error.message)
         reject(error.message)
       })
       .catch((error) => {
diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue
index 8ec2d5a..1e85910 100644
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -13,7 +13,7 @@
       <div class="fxrow check-box">
         <i class="icon-name-check" :class="{'icon-name-checked': memberName}" @click="Remember"></i>
         <span class="fxcol">记住用户名</span>
-        <router-link :to="{path: '/setup'}" class="fxcol" style="text-align:right;color:#6798ef">设置</router-link>
+        <!-- <router-link :to="{path: '/setup'}" class="fxcol" style="text-align:right;color:#6798ef">设置</router-link> -->
       </div>
       <button class="login-btn" :disabled="disabled" @click="_Login">确认登录</button>
     </section>
@@ -22,7 +22,7 @@
 
 <script>
 import {rfLogin} from '@config/getData2'
-import {encrypt} from '../../main.js'
+// import {encrypt} from '../../main.js'
 export default {
   name: 'Login',
   data () {
@@ -52,7 +52,7 @@ export default {
     },
     async rfLogin () {
       try {
-        let res = await rfLogin(this.loginname, encrypt(this.password))
+        let res = await rfLogin(this.loginname, this.password)
         if (res.ErrNO === '1') {
           let obj = {}
           if (this.memberName) {
diff --git a/src/pages/proj/GroupDisk.vue b/src/pages/proj/GroupDisk.vue
index 2949d74..0b4bb1b 100644
--- a/src/pages/proj/GroupDisk.vue
+++ b/src/pages/proj/GroupDisk.vue
@@ -57,7 +57,7 @@
       </div>
     </section>
     <section class="submit-bar">
-      <button class="btn submit-button" :class="{'btn-disabled' : !val1 || !val2}" :disabled="disabled" @click="_rfTrayPackage">组盘</button>
+      <button class="btn submit-button" :class="{'btn-disabled' : !val1 || !val2 || !active}" :disabled="disabled" @click="_rfTrayPackage">组盘</button>
       <button class="btn submit-button" @click="toCancle">取消</button>
     </section>
   </section>
@@ -66,19 +66,21 @@
 <script>
 import NavBar from '@components/NavBar.vue'
 import SearchBox from '@components/SearchBox.vue'
+import DropdownMenu from '@components/DropdownMenu.vue'
 import {rfReadTrayStatePackage, rfReadTrayStoragePackage, rfReadMatBarCodeStatePackage, rfTrayPackage} from '@config/getData2'
 export default {
   name: 'GroupDisk',
   components: {
     NavBar,
-    SearchBox
+    SearchBox,
+    DropdownMenu
   },
   data () {
     return {
       val1: '',
       val2: '',
       option: [{value: '34', label: '高尺寸托盘'}, {value: '33', label: '低尺寸托盘'}],
-      active: '1',
+      active: '',
       open: false,
       dataList: [],
       disabled: false
@@ -111,7 +113,7 @@ export default {
     /** 读取物料条码 */
     async _rfReadMatBarCodeStatePackage (val) {
       try {
-        let res = await rfReadMatBarCodeStatePackage(val)
+        let res = await rfReadMatBarCodeStatePackage(this.val1, val)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
         } else {
@@ -135,13 +137,13 @@ export default {
     /** 组盘 */
     async _rfTrayPackage () {
       this.disabled = true
-      if (!this.val1 || !this.val2) {
+      if (!this.val1 || !this.val2 || !this.active) {
         this.disabled = false
         return
       }
       try {
         let uid = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).UserPID : ''
-        let res = await rfTrayPackage(this.val1, this.val2, '', uid)
+        let res = await rfTrayPackage(this.val1, this.val2, this.option[this.active].value, uid)
         if (res.ErrNO === '1') {
           this.toast(res.ErrMsg)
         } else {
@@ -177,5 +179,5 @@ export default {
 <style lang="stylus" scoped>
 @import '~@style/mixin'
 .grid-wraper
-  height calc(100% - 2.15rem)
+  height calc(100% - 3.15rem)
 </style>