From 49f9925597e7af01bab731c3642940ca3208de55 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Wed, 24 May 2023 11:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              | 2 +-
 .env.production                               | 9 ++++++++-
 src/views/inventory/InvPreProductsDetail.vue  | 2 +-
 src/views/inventory/inner/innerCodeDetail.vue | 9 +++++----
 vue.config.js                                 | 2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/.env.development b/.env.development
index 7d38ab8..14e382e 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 供应商自助管理平台
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://127.0.0.1:9993'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'
diff --git a/.env.production b/.env.production
index 28ea126..05db49e 100644
--- a/.env.production
+++ b/.env.production
@@ -7,7 +7,10 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5005/UDI_SPMS_SERVER/'
+
+# VUE_APP_BASE_API =  'http://127.0.0.1:9150/UDI_SPMS_SERVER/'
+
 # 吴总测试服务器
 # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
@@ -16,6 +19,10 @@ ENV = 'production'
 
 # 文明懂
 VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/'
+
+# 刘恩典
+# VUE_APP_BASE_API = 'http://192.168.0.54:9150/UDI_SPMS_SERVER/'
+
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
diff --git a/src/views/inventory/InvPreProductsDetail.vue b/src/views/inventory/InvPreProductsDetail.vue
index 5fa6132..b334905 100644
--- a/src/views/inventory/InvPreProductsDetail.vue
+++ b/src/views/inventory/InvPreProductsDetail.vue
@@ -58,7 +58,7 @@
         </el-button-group>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list" style="width: 100%"
+    <el-table v-loading="loading" :data="list" style="width: 100%" border
               :default-sort="defaultSort"  @sort-change="handleSortChange"  >
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
diff --git a/src/views/inventory/inner/innerCodeDetail.vue b/src/views/inventory/inner/innerCodeDetail.vue
index 2a30586..e562d42 100644
--- a/src/views/inventory/inner/innerCodeDetail.vue
+++ b/src/views/inventory/inner/innerCodeDetail.vue
@@ -6,7 +6,8 @@
         <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
           <el-button type="primary" @click.native="generateQRCodeText()" :loading="loading">生成内部码</el-button>
           <el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="loading">标签打印全部</el-button>
-          <el-button type="primary" @click.native="printStockOrderDetailStatementPDF()" :loading="loading">报表打印全部</el-button>
+          <el-button type="primary" @click.native="printStockOrderDetailStatementPDF()" :loading="loading">报表打印全部
+          </el-button>
         </el-button-group>
       </el-row>
 
@@ -158,7 +159,7 @@
 import {stockQRCodeText, filterPrint, generateInnerQRCodeText} from "@/api/inout/innerOrderQRCode";
 import draggable from "vuedraggable";
 import {
-  filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile,
+  filterTemp, inspectionStockQRCodeTextPDFFromTemplateFile, inspectionStockQRCodeTextPDFFromTemplateStatementFile,
   stockQRCodeTextPDFFromTemplateFile, stockQRCodeTextPDFFromTemplateFileMax
 } from "@/api/itextpdf/itextpdf";
 
@@ -267,7 +268,7 @@ export default {
 
     getOrderQRCodeTextList() {
       this.loading = true;
-      filterPrint({sOrderId :this.query.sOrderId}) //查找该单号下的所有条码
+      filterPrint({sOrderId: this.query.sOrderId}) //查找该单号下的所有条码
         .then((response) => {
           console.log(response)
           this.codeArray = response.data.list || [];
@@ -285,7 +286,7 @@ export default {
         queryId: null,
         orderId: null,
         countList: [],
-        labelId:1
+        labelId: 1
       };
       if (row == null) {
         tQuery.orderId = this.query.orderIdFk;
diff --git a/vue.config.js b/vue.config.js
index 50e9898..7d00c59 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:9993`,
+        target: process.env.VUE_APP_BASE_API,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",