From ea9395bf1424a18e2797462dab83f6df0af60f39 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 20 Jun 2025 17:25:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BE=85=E6=96=99=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=EF=BC=8C=E5=8D=8A=E6=88=90=E5=93=81=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=85=A5=E5=BA=93=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=BE=85?=
 =?UTF-8?q?=E6=96=99=E5=87=BA=E5=85=A5=E5=BA=93=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mioitem_form.vue | 24 +++++++++++++++++-------
 src/views/inm/mioitemlist.vue  |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index c38b120a..5f938f52 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -143,9 +143,9 @@
 			</el-row>
 			<el-row v-if="mTracking==20&&form.count>1&&(form.type == 'pur_in'||form.type == 'other_in')">
 				<el-col :md="12" :sm="24" v-for="i in form.count" :key="i">
-					<el-form-item :label="'编号'+i">
+					<el-form-item :label="'编号'+i" required>
 						<!-- <el-input-number v-if="i==1" v-model="mioitems[0]" @change="firstNumberChange" placeholder="请输入编号" controls-position="right" style="width:100%"/> -->
-						<el-input v-model="mioitems[i-1]"  placeholder="请输入编号" :disabled="true" />
+						<el-input v-model="mioitems[i-1]"  placeholder="请输入编号" :disabled="cate == 'mainso'" />
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -421,7 +421,7 @@ export default {
 			var that = this;
 			var type = this.form.type;
 			that.form.material = that.selectObj.id;
-			that.form.batch = that.selectObj.bin_number_main;
+			that.form.batch = that.cate=='helpso'?that.selectObj.bin_number_main:that.selectObj.batch;
 			that.mTracking = that.selectObj.tracking;
 			if (type == "do_in") {
 				if (that.selectObj.is_assemb) {
@@ -446,7 +446,7 @@ export default {
 		selectBatchChange(item) {
 			this.form.batch = item.batch;
 			this.form.mb = item.id;
-			this.form.count = 0;
+			this.form.count = Number(item.count);
 			this.form.warehouse = item.warehouse;
 			this.warehouseDisable = true;
 			this.inputBatchDisable = true;
@@ -477,7 +477,7 @@ export default {
 				for(let i=0;i<that.form.count;i++){
 					let indexs = i+1;
 					indexs = indexs<10?'0'+indexs:indexs;
-					that.mioitems[i] = that.form.batch+'-'+indexs;
+					that.mioitems[i] = that.cate == "halfgood"?'': that.form.batch+'-'+indexs;
 					let obj = {};
 					obj.number = that.mioitems[i];
 					that.mioitemw.push(obj);
@@ -521,8 +521,18 @@ export default {
 							});
 						}
 					}
-					that.form.mioitemw = that.mioitemw;
-					// console.log(that.form);
+					if(that.mTracking==20&&that.form.count>1&&(that.form.type == 'pur_in'||that.form.type == 'other_in')){
+						let mioitemw = [];
+						that.mioitems.forEach((item,index) => {
+							mioitemw[index]={ number: item };
+						})
+						if(mioitemw.length==that.mioitems.length){
+							that.form.mioitemw = mioitemw;
+						}else{
+							that.$message.error("请输入正确数量的编号")
+							return;
+						}
+					}
 					try {
 						let res;
 						if (that.mode == "add") {
diff --git a/src/views/inm/mioitemlist.vue b/src/views/inm/mioitemlist.vue
index f0d3587c..aeec6df4 100644
--- a/src/views/inm/mioitemlist.vue
+++ b/src/views/inm/mioitemlist.vue
@@ -108,7 +108,7 @@ export default {
 	data() {
 		return {
 			apiObj: null,
-			params: {with_mio:'yes'},
+			params: {with_mio:'yes',material__type:30,mio__state:20},
 			selection: [],
 			tableData:[],
 			query: {