From cb6b565fb76052671853e7e415e4b3f6f2ce62a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Fri, 19 Jan 2024 13:55:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=95=BF=E6=98=A5=E6=B4=BE=E6=A0=BC1.?=
 =?UTF-8?q?5=E3=80=910119=E9=9C=80=E6=B1=82=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pg-fis/basedate/alreadyPrint/detail.vue   | 14 ++++++++++--
 .../pg-fis/basedate/alreadyPrint/index.vue    |  2 +-
 vue/static/config.js                          | 22 ++++++++++++++-----
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/vue/src/views/pg-fis/basedate/alreadyPrint/detail.vue b/vue/src/views/pg-fis/basedate/alreadyPrint/detail.vue
index 8f84588..59d357f 100644
--- a/vue/src/views/pg-fis/basedate/alreadyPrint/detail.vue
+++ b/vue/src/views/pg-fis/basedate/alreadyPrint/detail.vue
@@ -42,7 +42,7 @@
             class="two-list"
       </el-table-column> -->
 
-      <el-table-column type="expand" prop="details">
+      <!-- <el-table-column type="expand" prop="details">
         <template slot-scope="scope">
           <el-table :data="scope.row.details">
             <el-table-column
@@ -66,7 +66,7 @@
             </el-table-column>
           </el-table>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         v-for="(item, index) in getDefaultField"
         :key="index"
@@ -219,6 +219,16 @@ export default {
     /** 列表字段 */
     getDefaultField() {
       var tempsTabs = [];
+      tempsTabs.push({
+        label: "规格说明",
+        prop: "specExplain",
+        width: 160,
+      });
+      tempsTabs.push({
+        label: "颜色说明",
+        prop: "colorExplain",
+        width: 160,
+      });
       tempsTabs.push({
         label: "总成编号",
         prop: "erpAssemblyCode",
diff --git a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
index 138a923..5e65c50 100644
--- a/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
+++ b/vue/src/views/pg-fis/basedate/alreadyPrint/index.vue
@@ -449,7 +449,7 @@ export default {
   },
   created() {
     this.billState.forEach((element, index) => {
-      if (index === 0) {
+      if (index === 1) {
         this.listQuery.state.push(element.id);
       }
     });
diff --git a/vue/static/config.js b/vue/static/config.js
index 380ece6..6883e8a 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -2,14 +2,19 @@ let configJSON;
 if (process.env.NODE_ENV === "development") {
   configJSON = {
     base: {
-      ip: "http://localhost",
-      auth_port: "44344",
-      public_port: "44344",
-      backend_port: "44344",
+      // ip: "http://localhost",
+      // auth_port: "44344",
+      // public_port: "44344",
+      // backend_port: "44344",
       // ip: "http://222.169.228.163",
       // auth_port: "7696",
       // public_port: "7692",
       // backend_port: "7692",
+
+      ip: "http://192.168.0.228",
+      auth_port: "7696",
+      public_port: "7692",
+      backend_port: "7692",
     },
     basic: {},
     upload: {
@@ -42,10 +47,15 @@ if (process.env.NODE_ENV === "development") {
       // auth_port: "8066",
       // public_port: "8092",
       // backend_port: "8092",
-      ip: "http://222.169.228.163",
+      // ip: "http://222.169.228.163",
+      // auth_port: "7696",
+      // public_port: "7692",
+      // backend_port: "7692",	
+      
+      ip: "http://192.168.0.228",
       auth_port: "7696",
       public_port: "7692",
-      backend_port: "7692",			
+      backend_port: "7692",		
     },
     basic: {},
     upload: {