From 9c9d3801af0932679f05c58c036ec62203231166 Mon Sep 17 00:00:00 2001
From: liuyunfeng <yunfeng.liu@ccwin-in.com>
Date: Thu, 13 Mar 2025 15:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/public/config.js                          |  8 +++++-
 vue/src/router/index.js                       |  8 +++---
 .../basedate/m100Online/normalPritIndex.vue   | 28 +++++++++++++++----
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/vue/public/config.js b/vue/public/config.js
index 02c246dd..3c1af53d 100644
--- a/vue/public/config.js
+++ b/vue/public/config.js
@@ -2,7 +2,13 @@
 window.SITE_CONFIG['config_ip'] = 'http://192.168.1.228'
 window.SITE_CONFIG['config_auth_port'] = '8066'
 window.SITE_CONFIG['config_public_port'] = '8092'
-window.SITE_CONFIG['config_backend_port'] = '8092'
+window.SITE_CONFIG['config_backend_port'] = '8092'
+
+
+// window.SITE_CONFIG['config_ip'] = 'http://127.0.0.1'
+// window.SITE_CONFIG['config_auth_port'] = '44344'
+// window.SITE_CONFIG['config_public_port'] = '44344'
+// window.SITE_CONFIG['config_backend_port'] = '44344'
 
 // 发布
 // window.SITE_CONFIG['config_ip'] = 'http://192.168.0.68'
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 237ef916..7490456a 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -66,10 +66,10 @@ export const constantRoutes = [
     path: '/login',
   component: () => import('@/views/login/index'),
 	//component: () => import('@/views/pg-fis/basedate/customerPartCfg'),
-	//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
-	//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
-	//component: () => import('@/views/pg-fis/basedate/unknownAssembly'), //?? one
-	// component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'),
+	//component: () => import('@/views/pg-fis/basedate/partSwitch'),
+	//component: () => import('@/views/pg-fis/basedate/assemblyCfg'),
+	//component: () => import('@/views/pg-fis/basedate/unknownAssembly'),
+	//component: () => import('@/views/pg-fis/basedate/m100Online/normalPritIndex.vue'), //?? one
 	//component: () => import('@/views/pg-fis/basedate/select'), //M100查询
 	//component: () => import('@/views/pg-fis/basedate/m100BIll'), //M100单据信息维护
 	//component: () => import('@/views/pg-fis/basedate/r100Online'), //R100上线信息
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 155769bc..75b2c28b 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -160,7 +160,7 @@
 								<el-input v-model.number="form.beginHostSN" placeholder="" clearable type="number" size="small" style="width: 240px"
 								 @change="beginHostSNChange" />
 								<label class="label1">-</label>
-								<el-input v-model="form.endHostSN" placeholder="" clearable :disabled="true" size="small" style="width: 240px;" />
+								<el-input v-show="this.listQuery.productType === 2" v-model="form.endHostSN" placeholder="" clearable :disabled="true" size="small" style="width: 240px;" />
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -1172,7 +1172,7 @@
 				this.hostPrintQuery.fwStation = this.listQuery.fwStation;
 
 				//后端服务更改了 前端跟着更改成以下方式
-				if (this.listQuery.productType === 1) {
+				if (this.listQuery.productType === 1) { //打印门板分支
 					//门板
 					this.hostSNQuery.isZhuHuBan = "0";
 					console.log("门板hostsn2参数" + JSON.stringify(this.hostSNQuery));
@@ -1186,9 +1186,20 @@
 							console.log(response.item);
 							if (response.item !== null) {
 								this.form.beginHostSN = parseInt(response.item.beginHostSN);
-								this.printNum = parseInt(response.item.count);
+								this.printNum = parseInt(response.item.count); //从数据库中取未打印订单数
+								if (this.listQuery.productLine == "01") {
+									if (this.printNum > 26) {
+										this.printNum = 26;
+									}
+								}
+								else if (this.listQuery.productLine == "02") {
+									if (this.printNum > 24) {
+										this.printNum = 24;
+									}
+								}
+								
 								if (this.listQuery.productType === 1) {
-									this.form.endHostSN = parseInt(response.item.beginHostSN) + parseInt(response.item.count) - 1;
+									this.form.endHostSN = parseInt(response.item.beginHostSN) + this.printNum - 1;
 								} else if (this.listQuery.productType === 2) {
 									//柱护板
 									this.form.endHostSN = parseInt(response.item) + 23;
@@ -1201,7 +1212,7 @@
 								return;
 							}
 						});
-				} else if (this.listQuery.productType === 2) {
+				} else if (this.listQuery.productType === 2) { //打印柱护板分支
 					//柱护板
 					this.hostSNQuery.isZhuHuBan = "1";
 					console.log("柱护板hostsn2参数" + JSON.stringify(this.hostSNQuery));
@@ -1264,8 +1275,13 @@
 						case "00":
 							this.productName = "全部门板";
 							break;
+						case "01":
+							this.productName = "大众一厂";
+							break;
+						case "02":
+							this.productName = "大众二厂";
+							break;
 					}
-
 					this.formTitle = "打印-门板发货排序单";
 				} else {
 					this.productName = "";