From 00c2ab81ead3934b3e4aa7bcbccebd7e76fcff51 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sun, 13 Jul 2025 11:54:50 +0800
Subject: [PATCH] oa faqi

---
 .env.production                                | 15 +++++++++------
 src/views/outbounds/component/addoutbounds.vue |  5 ++++-
 src/views/stocks/component/addRuku.vue         |  7 +++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.env.production b/.env.production
index 9226b1e..44f4dae 100644
--- a/.env.production
+++ b/.env.production
@@ -3,16 +3,19 @@ ENV = 'production'
 
 # base api
 #http://192.168.60.99:9004/
-VUE_APP_BASE_API = 'http://192.168.60.99:8004/'
-VUE_APP_UPLOAD_API = 'http://192.168.60.99:8004/api/admin/upload-file'
+#VUE_APP_BASE_API = 'http://192.168.60.99:8004/'
+#VUE_APP_UPLOAD_API = 'http://192.168.60.99:8004/api/admin/upload-file'
+
+VUE_APP_BASE_API = ''
+VUE_APP_UPLOAD_API = '/api/admin/upload-file'
 
 # 正式oa
-#VUE_APP_OA_URL = http://192.168.60.18:2021
-#VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
+VUE_APP_OA_URL = http://192.168.60.18:2021
+VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
 
 #测试oa
-VUE_APP_OA_URL = http://192.168.60.18:8001
-VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
+#VUE_APP_OA_URL = http://192.168.60.18:8001
+#VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
 
 
 
diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue
index 37ce835..269ac76 100644
--- a/src/views/outbounds/component/addoutbounds.vue
+++ b/src/views/outbounds/component/addoutbounds.vue
@@ -549,7 +549,10 @@ export default {
         } else {
           this.form.jilurenyuan = this.authName
         }
-      } else {
+      } else {
+        if(this.$route.query.oaType==='wuzi'){
+          window.history.back()
+        }
         this.id = ''
         this.type = ''
         this.mingxiList = []
diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue
index 88f6e8a..f8311f1 100644
--- a/src/views/stocks/component/addRuku.vue
+++ b/src/views/stocks/component/addRuku.vue
@@ -102,7 +102,7 @@
     </div>
 
     <div slot="footer" class="dialog-footer">
-      <el-button v-if="activeStep < 2" @click="prevStep">上一步</el-button>
+      <el-button v-if="activeStep === 1" @click="prevStep">上一步</el-button>
       <el-button v-if="activeStep < 2" type="primary"
         @click="nextStep">{{ activeStep === 1 ? '保存' : '下一步' }}</el-button>
     </div>
@@ -597,7 +597,10 @@
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
-          }).then(() => {
+          }).then(() => {
+            if(this.$route.query.oaType==='wuzi'){
+              window.history.back()
+            }
             this.isShow = false
             this.$emit('refresh')
             this.resetForm()