From 5b793997ef37ba5391b01f86d79a090ae859f63d Mon Sep 17 00:00:00 2001
From: liuyunfeng <yunfeng.liu@ccwin-in.com>
Date: Wed, 12 Mar 2025 17:41:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/public/config.js                          | 11 +++
 .../basedate/m100Online/RepetitionZHB.vue     | 86 +++++++++----------
 .../pg-fis/basedate/m100Online/ScrapMB.vue    |  2 +-
 .../pg-fis/basedate/m100Online/ScrapZHB.vue   |  2 +-
 .../pg-fis/basedate/m100Online/budaMB.vue     |  2 +-
 .../pg-fis/basedate/m100Online/budaZHB.vue    |  2 +-
 .../basedate/m100Online/normalPritIndex.vue   | 77 +++++++++--------
 .../m100Online/{ => ~old}/detailMB.vue        |  0
 .../m100Online/{ => ~old}/detailZHB.vue       |  0
 .../m100Online/{ => ~old}/index-old.vue       |  0
 .../basedate/m100Online/{ => ~old}/index.vue  |  0
 .../views/pg-fis/basedate/select/index.vue    | 22 ++---
 .../basedate/select/{ => ~old}/detailMB.vue   |  0
 .../basedate/select/{ => ~old}/detailZHB.vue  |  0
 14 files changed, 113 insertions(+), 91 deletions(-)
 create mode 100644 vue/public/config.js
 rename vue/src/views/pg-fis/basedate/m100Online/{ => ~old}/detailMB.vue (100%)
 rename vue/src/views/pg-fis/basedate/m100Online/{ => ~old}/detailZHB.vue (100%)
 rename vue/src/views/pg-fis/basedate/m100Online/{ => ~old}/index-old.vue (100%)
 rename vue/src/views/pg-fis/basedate/m100Online/{ => ~old}/index.vue (100%)
 rename vue/src/views/pg-fis/basedate/select/{ => ~old}/detailMB.vue (100%)
 rename vue/src/views/pg-fis/basedate/select/{ => ~old}/detailZHB.vue (100%)

diff --git a/vue/public/config.js b/vue/public/config.js
new file mode 100644
index 00000000..02c246dd
--- /dev/null
+++ b/vue/public/config.js
@@ -0,0 +1,11 @@
+// 开发
+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_ip'] = 'http://192.168.0.68'
+// window.SITE_CONFIG['config_auth_port'] = '8066'
+// window.SITE_CONFIG['config_public_port'] = '8092'
+// window.SITE_CONFIG['config_backend_port'] = '8092'
\ No newline at end of file
diff --git a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
index a5c4d7ba..324dd671 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--重新打印柱护板模块-->
 <template>
 	<div class="cr-body-content">
 		<div ref="box">
@@ -582,48 +582,48 @@
 				}
 			},
 			//作废操作，支持批量操作-门板
-			handleDelete(row) {
-				//批量删除
-				var params = [];
-				let myalert = ""; //声明变量，其变量必须在此声明后使用
-				if (row) {
-					//单行
-					params.push(row.id);
-					myalert = row.name;
-				} else {
-					//多选
-					this.multipleSelection.forEach((element) => {
-						let id = element.id;
-						params.push(id);
-					});
-					myalert = "选中项";
-				}
-				this.$confirm("是否作废" + myalert + "?", "提示", {
-						confirmButtonText: "确定",
-						cancelButtonText: "取消",
-						type: "warning",
-					})
-					.then(() => {
-						this.$axios
-							.posts("/api/newjit/ZhuHuBanPackingList/delete", params)
-							.then((response) => {
-								const index = this.list.indexOf(row);
-								this.$notify({
-									title: "成功",
-									message: "作废成功",
-									type: "success",
-									duration: 2000,
-								});
-								this.getList();
-							});
-					})
-					.catch(() => {
-						this.$message({
-							type: "info",
-							message: "已取消操作",
-						});
-					});
-			},
+			// handleDelete(row) {
+			// 	//批量删除
+			// 	var params = [];
+			// 	let myalert = ""; //声明变量，其变量必须在此声明后使用
+			// 	if (row) {
+			// 		//单行
+			// 		params.push(row.id);
+			// 		myalert = row.name;
+			// 	} else {
+			// 		//多选
+			// 		this.multipleSelection.forEach((element) => {
+			// 			let id = element.id;
+			// 			params.push(id);
+			// 		});
+			// 		myalert = "选中项";
+			// 	}
+			// 	this.$confirm("是否作废" + myalert + "?", "提示", {
+			// 			confirmButtonText: "确定",
+			// 			cancelButtonText: "取消",
+			// 			type: "warning",
+			// 		})
+			// 		.then(() => {
+			// 			this.$axios
+			// 				.posts("/api/newjit/ZhuHuBanPackingList/delete", params)
+			// 				.then((response) => {
+			// 					const index = this.list.indexOf(row);
+			// 					this.$notify({
+			// 						title: "成功",
+			// 						message: "作废成功",
+			// 						type: "success",
+			// 						duration: 2000,
+			// 					});
+			// 					this.getList();
+			// 				});
+			// 		})
+			// 		.catch(() => {
+			// 			this.$message({
+			// 				type: "info",
+			// 				message: "已取消操作",
+			// 			});
+			// 		});
+			// },
 			fetchData(id) {
 				//循环动态
 				this.$axios
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
index 3875bc3b..aa995e27 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--报废门板-->
 <template>
 	<div class="cr-body-content">
 		<div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
index 30c0d7aa..c0540995 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--报废柱护板-->
 <template>
 	<div class="cr-body-content">
 		<div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
index ac419475..bba93ca6 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaMB.vue
@@ -1,4 +1,4 @@
-<!--总成模块信息管理页-->
+<!--补打门板模块-->
 <template>
 	<div class="cr-body-content">
 		<div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
index 823d5b30..5961a5b8 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue
@@ -1,4 +1,4 @@
-<!--补打柱护板-->
+<!--补打柱护板模块-->
 <template>
 	<div class="cr-body-content">
 		<div ref="box">
diff --git a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
index 17900d25..155769bc 100644
--- a/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
+++ b/vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue
@@ -34,22 +34,19 @@
 						<el-button ref="btn1" type="primary" size="mini" style="margin-left: 15px" @click="print()">打印门板发货排序单
 						</el-button>
 
-						<el-button v-show="false" @click="drawerMBPrint = true" size="mini" type="warning" plain>
+						<el-button v-show="this.listQuery.productType !== 2" @click="drawerMBReprint = true" size="mini" type="warning" plain>
 							<strong>重新打印门板</strong></el-button>
-						<el-button v-show="false" @click="drawerbudaMBPrint = true" size="mini" type="warning" plain>
+						<el-button v-show="this.listQuery.productType !== 2" @click="drawerbudaMBPrint = true" size="mini" type="warning" plain>
 							<strong>门板补打</strong></el-button>
-						<el-button v-show="false" @click="drawerMBDelete = true" size="mini" type="danger" plain><strong>门板作废</strong></el-button>
+						<el-button v-show="this.listQuery.productType !== 2" @click="drawerMBDelete = true" size="mini" type="danger" plain>
+							<strong>门板作废</strong></el-button>
 
-						<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBPrint = true" size="mini" type="warning"
+						<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBReprint = true" size="mini" type="warning"
 						 plain>
 							<strong>重新打印柱护板</strong></el-button>
-
-
 						<el-button v-show="this.listQuery.productType === 2" @click="drawerbudaZHBPrint = true" size="mini" type="warning"
 						 plain>
 							<strong>柱护板补打</strong></el-button>
-
-
 						<el-button v-show="this.listQuery.productType === 2" @click="drawerZHBDelete = true" size="mini" type="danger"
 						 plain><strong>柱护板作废</strong></el-button>
 						<!-- <el-button icon="el-icon-refresh" size="mini" @click="open()"
@@ -81,31 +78,28 @@
 			</flexbox>
 		</div>
 		<!--门板重打-->
-		<el-drawer title="门板重新打印" :visible.sync="drawerMBPrint" direction="rtl" size="65%">
+		<el-drawer title="门板重新打印" :visible.sync="drawerMBReprint" direction="rtl" size="65%">
 			<RepetitionMB v-bind:customerInfosMB="customerInfosMB"></RepetitionMB>
 		</el-drawer>
+		<!--柱护板重打-->
+		<el-drawer title="柱护板重新打印" :visible.sync="drawerZHBReprint" direction="rtl" size="65%">
+			<RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
+		</el-drawer>
+		
 		<!--门板补打-->
 		<el-drawer title="门板补打" :visible.sync="drawerbudaMBPrint" direction="rtl" size="65%">
 			<budaMB v-bind:customerInfosMB="customerInfosMB"></budaMB>
 		</el-drawer>
-		<!--门板作废-->
-		<el-drawer title="门板作废" :visible.sync="drawerMBDelete" direction="rtl" @open="opens()" size="65%">
-			<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
-		</el-drawer>
-		<!--柱护板重打-->
-		<el-drawer title="柱护板重新打印" :visible.sync="drawerZHBPrint" direction="rtl" size="65%">
-			<RepetitionZHB v-bind:customerInfosZHB="customerInfosZHB"></RepetitionZHB>
-		</el-drawer>
-
-
 		<!--柱护板补打-->
 		<el-drawer title="柱护板补打" :visible.sync="drawerbudaZHBPrint" direction="rtl" size="65%">
 			<budaZHB v-bind:customerInfosZHB="customerInfosZHB"></budaZHB>
 		</el-drawer>
-
-
-
-		<!--柱护板重打和作废-->
+		
+		<!--门板作废-->
+		<el-drawer title="门板作废" :visible.sync="drawerMBDelete" direction="rtl" @open="opens()" size="65%">
+			<ScrapMB v-bind:customerInfosMB="customerInfosMB"></ScrapMB>
+		</el-drawer>
+		<!--柱护板作废-->
 		<el-drawer title="柱护板作废" :visible.sync="drawerZHBDelete" direction="rtl" size="65%">
 			<ScrapZHB v-bind:customerInfosZHB="customerInfosZHB"></ScrapZHB>
 		</el-drawer>
@@ -213,16 +207,18 @@
 	} from "vuex";
 	import moment from "moment";
 	import Detail from "./detail.vue";
-	import MBDetail from "./detailMB.vue";
-	import ZHBDetail from "./detailZHB.vue";
+	// import MBDetail from "./detailMB.vue";
+	// import ZHBDetail from "./detailZHB.vue";
 	import {
 		downloadFile
 	} from "@/utils/crmindex.js";
 	import qs from "qs";
 	import RepetitionMB from "./RepetitionMB.vue";
+	import RepetitionZHB from "./RepetitionZHB.vue";
+	
 	import budaMB from "./budaMB.vue";
 	import budaZHB from "./budaZHB.vue";
-	import RepetitionZHB from "./RepetitionZHB.vue";
+
 	import ScrapMB from "./ScrapMB.vue";
 	import ScrapZHB from "./ScrapZHB.vue";
 	import {
@@ -236,8 +232,8 @@
 			CRMTableHead,
 			importExcel,
 			Detail,
-			MBDetail,
-			ZHBDetail,
+			// MBDetail,
+			// ZHBDetail,
 			RepetitionMB,
 			RepetitionZHB,
 			ScrapMB,
@@ -279,11 +275,13 @@
 				crmType: "M100Online",
 				//productLineList:null,
 				isDisable: false,
-				drawerMBPrint: false,
+				drawerMBReprint: false, //显示门板重新打印
+				drawerZHBReprint: false,
+				
 				drawerbudaMBPrint: false,
 				drawerbudaZHBPrint: false, //显示补打柱护板
-				drawerMBDelete: false,
-				drawerZHBPrint: false,
+				
+				drawerMBDelete: false, //显示门板报废
 				drawerZHBDelete: false,
 				activeNames: ["1"],
 				printNum: "12",
@@ -446,9 +444,10 @@
 		},
 		mounted() {
 			this.setTableHeight()
+			let _this = this;
 
 			let timer = setInterval(() => {
-				this.open();
+				this.open(_this);
 			}, 5000);
 		},
 		created() {
@@ -552,7 +551,7 @@
 
 				this.getList();
 			},
-			open() {
+			open(self) {
 				// let productLineList = [];
 				// //console.log("门版-主界面传过来的值：11111111111111111111111111111111111111111" );
 				// productLineList.forEach(element => {
@@ -599,7 +598,11 @@
 							if (response.item !== null) {
 								response.item.forEach((JKITEM) => {
 									if (JKITEM.productLine == "01") {
-										this.$refs.sp01.Visible = true;
+
+										if (self.$refs && self.$refs.sp01) {
+											self.$refs.sp01.Visible = true;
+										}
+										
 										this.content01 =
 											"大众一厂已经" +
 											JKITEM.timeoutMinutes +
@@ -957,6 +960,8 @@
 			roleFilter(type) {
 				return projectTypeKeyValue[type];
 			},
+			
+			/*取M100列表*/
 			getList(data) {
 
 				this.listLoading = true;
@@ -979,6 +984,9 @@
 				this.listQueryList.ProductLine = this.listQuery.productLine; //产线
 				this.listQueryList.CanNotPrint = false; //不可打印
 				this.listQueryList.fwStation = this.listQuery.fwStation; //BA2 BA5
+				
+				this.listQueryList.productType = this.listQuery.productType;
+				
 				console.log(
 					"日常打印M100查询条件：" + JSON.stringify(this.listQueryList)
 				);
@@ -1710,6 +1718,7 @@
 				this.$forceUpdate();
 				//console.log(this.listQuery.productType);
 				this.listQuery.productLine = "";
+				debugger
 				this.PLChildList = this.PLList.filter(
 					(u) => u.productType === parseInt(this.listQuery.productType)
 				).sort((a, b) => {
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailMB.vue b/vue/src/views/pg-fis/basedate/m100Online/~old/detailMB.vue
similarity index 100%
rename from vue/src/views/pg-fis/basedate/m100Online/detailMB.vue
rename to vue/src/views/pg-fis/basedate/m100Online/~old/detailMB.vue
diff --git a/vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue b/vue/src/views/pg-fis/basedate/m100Online/~old/detailZHB.vue
similarity index 100%
rename from vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue
rename to vue/src/views/pg-fis/basedate/m100Online/~old/detailZHB.vue
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index-old.vue b/vue/src/views/pg-fis/basedate/m100Online/~old/index-old.vue
similarity index 100%
rename from vue/src/views/pg-fis/basedate/m100Online/index-old.vue
rename to vue/src/views/pg-fis/basedate/m100Online/~old/index-old.vue
diff --git a/vue/src/views/pg-fis/basedate/m100Online/index.vue b/vue/src/views/pg-fis/basedate/m100Online/~old/index.vue
similarity index 100%
rename from vue/src/views/pg-fis/basedate/m100Online/index.vue
rename to vue/src/views/pg-fis/basedate/m100Online/~old/index.vue
diff --git a/vue/src/views/pg-fis/basedate/select/index.vue b/vue/src/views/pg-fis/basedate/select/index.vue
index a0619936..18d6b1ab 100644
--- a/vue/src/views/pg-fis/basedate/select/index.vue
+++ b/vue/src/views/pg-fis/basedate/select/index.vue
@@ -211,23 +211,23 @@
       </flexbox>
     </div>
     <!--门板重打和作废-->
-    <el-drawer
+<!--    <el-drawer
       title="门板作废和重打"
       :visible.sync="drawerMB"
       direction="rtl"
       size="65%"
     >
       <MBDetail v-bind:customerInfosMB="customerInfosMB"></MBDetail>
-    </el-drawer>
+    </el-drawer> -->
     <!--柱护板重打和作废-->
-    <el-drawer
+<!--    <el-drawer
       title="柱护板作废和重打"
       :visible.sync="drawerZHB"
       direction="rtl"
       size="65%"
     >
       <ZHBDetail v-bind:customerInfosZHB="customerInfosZHB"></ZHBDetail>
-    </el-drawer>
+    </el-drawer> -->
 
     <div class="l-table" style="margin-top: -30px">
       <!--表格渲染-->
@@ -392,8 +392,8 @@ import CRMTableHead from "../../components/CRMTableHead";
 import importExcel from "@/components/ImportExcel-vw";
 import Lockr from "lockr";
 import Detail from "./detail.vue";
-import MBDetail from "./detailMB.vue";
-import ZHBDetail from "./detailZHB.vue";
+//import MBDetail from "./detailMB.vue";
+//import ZHBDetail from "./detailZHB.vue";
 import { mapGetters } from "vuex";
 import moment from "moment";
 
@@ -419,8 +419,8 @@ export default {
     CRMTableHead,
     importExcel,
     Detail,
-    MBDetail,
-    ZHBDetail,
+    //MBDetail,
+    //ZHBDetail,
   },
   directives: { permission },
   filters: {
@@ -445,8 +445,8 @@ export default {
     return {
       chkindex: 0, //复选按钮选择索引
       crmType: "select",
-      drawerZHB: false,
-      drawerMB: false,
+      //drawerZHB: false,
+      //drawerMB: false,
       activeNames: ["1"],
       rules: {
         erpAssemblyName: [
@@ -826,6 +826,8 @@ export default {
     roleFilter(type) {
       return projectTypeKeyValue[type];
     },
+		
+		
     getList(data) {
       this.listLoading = true;
       if (data != undefined) {
diff --git a/vue/src/views/pg-fis/basedate/select/detailMB.vue b/vue/src/views/pg-fis/basedate/select/~old/detailMB.vue
similarity index 100%
rename from vue/src/views/pg-fis/basedate/select/detailMB.vue
rename to vue/src/views/pg-fis/basedate/select/~old/detailMB.vue
diff --git a/vue/src/views/pg-fis/basedate/select/detailZHB.vue b/vue/src/views/pg-fis/basedate/select/~old/detailZHB.vue
similarity index 100%
rename from vue/src/views/pg-fis/basedate/select/detailZHB.vue
rename to vue/src/views/pg-fis/basedate/select/~old/detailZHB.vue