From 24a1753366c1da983f93f68404cc4bc04069f77f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 10 Jan 2024 15:37:40 +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=91=E6=97=A5=E5=B8=B8=E6=89=93=E5=8D=B0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                                 |  6 ++++++
 .../basedate/m100Online/normalPritIndex.vue       | 15 +++++++++------
 vue/static/config.js                              |  5 ++++-
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 package-lock.json

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..d138b35
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "FIS1.5",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 2f628a9..d28abde 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -372,7 +372,7 @@
                   @change="beginHostSNChange"
 									:disabled="true"
                 />
-                <label class="label1">-</label>
+                <!-- <label class="label1">-</label>
                 <el-input
                   v-model="form.endHostSN"
                   placeholder=""
@@ -380,7 +380,7 @@
                   :disabled="true"
                   size="small"
                   style="width: 240px"
-                />
+                /> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -529,7 +529,7 @@ export default {
       drawerZHBPrint: false,
       drawerZHBDelete: false,
       activeNames: ["1"],
-      printNum: "12",
+      printNum: "10",
       printNumZHB: "24",
       rules: {
         erpAssemblyName: [
@@ -1335,7 +1335,7 @@ export default {
         });
         return;
       }
-      (this.printNum = "12"),
+      (this.printNum = "10"),
         (this.printNumZHB = "24"),
         (this.hostSNQuery.productLine = this.listQuery.productLine);
       this.hostPrintQuery.productLine = this.listQuery.productLine;
@@ -1699,8 +1699,11 @@ export default {
 	/**
 	 * 保存、加载、打印门板
 	 */
-	private_printMenBan()
-	{
+	private_printMenBan(){
+    // 2024-01-10 新增字段PrintCount
+    if(this.listQuery.productType == 1){
+      this.hostPrintQuery.printCount = this.printNum
+    }
 		this.$axios
 		  .posts(
 			//"/api/newjit/bill-m100/save-menban-report",
diff --git a/vue/static/config.js b/vue/static/config.js
index ebf7976..380ece6 100644
--- a/vue/static/config.js
+++ b/vue/static/config.js
@@ -2,11 +2,14 @@ let configJSON;
 if (process.env.NODE_ENV === "development") {
   configJSON = {
     base: {
-
       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",
     },
     basic: {},
     upload: {