From 527f44c443670000b1bcf86b2513ddaafadbef2f Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 24 Feb 2025 13:42:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=92=E6=9D=BF=E5=B7=A5=E6=AE=B5bw?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E8=A6=81=E9=BB=98=E8=AE=A4number?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm_bx/mlog_detail.vue  |  2 ++
 src/views/wpm_bx/mlogbw_check.vue | 42 ++++++++++++++-----------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/views/wpm_bx/mlog_detail.vue b/src/views/wpm_bx/mlog_detail.vue
index acc8cb74..734b656e 100644
--- a/src/views/wpm_bx/mlog_detail.vue
+++ b/src/views/wpm_bx/mlog_detail.vue
@@ -357,6 +357,7 @@
 				:mlogb="mlogb"
 				:wm = "wm"
 				:mgroup="mgroup"
+				:mgroupName= "mlogItem.mgroup_name"
 				:isSubmit="isSubmit"
 				:batchNumber="batchNumber"
 				:handle_user="handle_user"
@@ -604,6 +605,7 @@ export default {
 			that.batchNumber = row.batch;
 			that.handle_date=that.mlogItem.handle_date;
 			that.handle_user = that.mlogItem.handle_user;
+			console.log('that.mlogItem',that.mlogItem);
 			that.dialog.check_single = true;
 			if(row.qct==null){
 				that.$API.qm.qct.list.req({qctmat__material:row.material_out,page:0}).then((res)=>{
diff --git a/src/views/wpm_bx/mlogbw_check.vue b/src/views/wpm_bx/mlogbw_check.vue
index fa21bbf9..68c6114d 100644
--- a/src/views/wpm_bx/mlogbw_check.vue
+++ b/src/views/wpm_bx/mlogbw_check.vue
@@ -24,8 +24,8 @@
 				</div>
 			</el-header>
 			<el-main id="mlogbwMain">
-				<el-button type="primary" @click="check_start" style="position: absolute;top: 20px;left: 150px;">检验</el-button>
-				<el-button type="primary" v-if="setForm.equipment!=''" @click="check_set" style="position: absolute;top: 20px;left: 210px;">批量操作</el-button>
+				<el-button type="primary" v-if="!isSubmit" @click="check_start" style="position: absolute;top: 20px;left: 150px;">检验</el-button>
+				<el-button type="primary" v-if="multipleSet" @click="check_set" style="position: absolute;top: 20px;left: 210px;">批量操作</el-button>
 				<sc-form-table
 					hideDelete
 					id="mlogbwlist"
@@ -329,20 +329,9 @@
 				</el-main>
 			</el-container>
 		</el-dialog>
-		<!-- <check-drawer
-			v-if="drawerVisible"
-			ref="saveDialog"
-			:defects="qct_defects"
-			:testitems="qct_testitems"
-			:mlogbwlist="mlogbwlist"
-			@success="handleSaveSuccess"
-			@closed="saveMlogbInClose"
-		>
-		</check-drawer> -->
 	</el-drawer>
 </template>
 <script>
-import checkDrawer from "./mlogbw_check_form.vue";
 export default {
 	props: {
 		mlogb: {
@@ -369,14 +358,18 @@ export default {
 			type: String,
 			default: "",
 		},
+		mgroupName:{
+			type:String,
+			default:"",
+		},
 		isSubmit:{
 			type: Boolean,
 			default: false,
 		},
 	},
-	components: {
-	    checkDrawer
-	},
+	// components: {
+	//     checkDrawer
+	// },
 	emits: ["success", "closed"],
 	data() {
 		return {
@@ -402,6 +395,7 @@ export default {
 			hideAdd: true,
 			visible: false,
 			setVisible:false,
+			multipleSet:false,
 			checkVisible:false,
 			descriptionVisible:false,
 			options:[],
@@ -438,8 +432,12 @@ export default {
 	mounted() {
 		let that = this;
 		that.hideAdd = that.isSubmit;
-		that.addTemplate.number = that.batchNumber;
+		if(that.mgroupName!=='排板'){
+			that.addTemplate.number = that.batchNumber;
+		}
 		that.params.mlogb = that.addTemplate.mlogb = that.mlogb;
+		that.currentDate = this.$TOOL.dateFormat2(new Date());
+		console.log(that.currentDate);
 	},
 	methods: {
 		open(mode = "ins",qct = '') {
@@ -573,7 +571,7 @@ export default {
 					obj.ftest.ftestitems = [];
 					obj.ftest.ftestdefects = [];
 					obj.ftest.qct = that.qct;
-					obj.ftest.test_date = that.handle_date;
+					obj.ftest.test_date = that.handle_date!=null?that.handle_date:that.currentDate;
 					obj.ftest.test_user = that.handle_user;
 					that.qct_defects.forEach((item) => {
 						let itemObj = {};
@@ -754,13 +752,11 @@ export default {
 			this.$refs.dialogForm.validate((valid) => {
 				if (valid) {
 					Object.assign(that.setForm,that.form);
-					this.form = {};
 					that.mlogbwlist.forEach(item => {
 						if(item.ftest!==null){
 							item.ftest.ftestdefects.forEach(defect => {
 								if(that.setForm.defectids.indexOf(defect.defect) > -1){
 									defect.test_user = that.setForm.test_user;
-									// defect.test_equip = that.setForm.equipment;
 								}
 							})
 							item.ftest.ftestitems.forEach(testitem => {
@@ -774,7 +770,7 @@ export default {
 							ftest.ftestitems = [];
 							ftest.ftestdefects = [];
 							ftest.qct = that.qct;
-							ftest.test_date = that.handle_date;
+							ftest.test_date =that.handle_date!=null?that.handle_date:that.currentDate;
 							ftest.test_user = that.handle_user;
 							that.qct_defects.forEach((item0) => {
 								let itemObj = {};
@@ -782,7 +778,6 @@ export default {
 								itemObj.has = false;
 								if(that.setForm.defectids.indexOf(item0.defect) > -1){
 									itemObj.test_user = that.setForm.test_user;
-									// itemObj.test_equip = that.setForm.equipment;
 								}else{
 									itemObj.test_user = that.handle_user;
 								}
@@ -805,8 +800,9 @@ export default {
 						}
 					});
 					that.$API.wpm.mlogbw.update.req("bulk",that.mlogbwlist).then((res) => {
-						console.log('blukres',res);
+						this.form = {};
 						that.checkVisible = false;
+						this.multipleSet = true;
 						that.descriptionVisible = true;
 						that.getList();
 					}).catch((err) => {