feat:光芯成品出库添加几个字段

src/views/inm/mioitem.vue

@@ -11,25 +11,15 @@
 				<el-card style="width: 100%" header="基本信息" shadow="hover">
 					<el-button type="primary" @click="handlePrint" style="position: absolute;right: 40px;">打印</el-button>
 					<el-descriptions>
-						<el-descriptions-item label="编号">{{
+						<el-descriptions-item label="编号">{{mioObj.number}}</el-descriptions-item>
-							mioObj.number
+						<el-descriptions-item label="出入库类型">{{typeDict[mioObj.type]}}</el-descriptions-item>
-						}}</el-descriptions-item>
+						<el-descriptions-item label="状态">{{stateDict[mioObj.state]}}</el-descriptions-item>
-						<el-descriptions-item label="出入库类型">{{
+						<el-descriptions-item label="部门/车间">{{mioObj.belong_dept_name}}-{{ mioObj.mgroup_name }}</el-descriptions-item>
-							typeDict[mioObj.type]
-						}}</el-descriptions-item>
-						<el-descriptions-item label="状态">{{
-							stateDict[mioObj.state]
-						}}</el-descriptions-item>
-						<el-descriptions-item label="部门/车间">{{
-							mioObj.belong_dept_name
-						}}-{{ mioObj.mgroup_name }}</el-descriptions-item>
 						<el-descriptions-item label="执行人">
 							<span v-if="mioObj.do_user_name!==null">{{mioObj.do_user_name}}</span>
 							<span v-if="mioObj.mio_user_name!==null">{{mioObj.mio_user_name}}</span>
 						</el-descriptions-item>
-						<el-descriptions-item label="创建时间">{{
+						<el-descriptions-item label="创建时间">{{mioObj.create_time}}</el-descriptions-item>
-							mioObj.create_time
-						}}</el-descriptions-item>
 						<el-descriptions-item
 							label="采购订单"
 							v-if="mioObj.type == 'pur_in'"
@@ -97,14 +87,8 @@
 					>
 						<el-table-column type="selection" width="50" />
 						<el-table-column type="index" width="50" />
-						<el-table-column
+						<el-table-column label="物料" prop="material" show-overflow-tooltip>
-							label="物料"
+							<template #default="scope">{{ scope.row.material_name }}</template>
-							prop="material"
-							show-overflow-tooltip
-						>
-							<template #default="scope"
-								>{{ scope.row.material_name }}
-							</template>
 						</el-table-column>
 						<el-table-column label="批次号" prop="batch">
 						</el-table-column>
@@ -118,52 +102,35 @@
 								<el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
 							</template>
 						</el-table-column>
+						<el-table-column label="发出数量" prop="count_send" v-if="mioObj.type == 'sale_out'&&project_code=='gx'">
+						</el-table-column>
+						<el-table-column label="样品数量" prop="count" v-if="mioObj.type == 'sale_out'&&project_code=='gx'">
+							<template #default="scope">
+								{{ Number(scope.row.count) - Number(scope.row.count_send) }}
+							</template>
+						</el-table-column>
 						<el-table-column label="检验" prop="count_tested" v-if="cate=='mainso'">
 						</el-table-column>
-						<el-table-column
+						<el-table-column label="组合件信息" v-if="cate == 'good'&&project_code=='gzerp'" width="300">
-							label="组合件信息"
-							v-if="cate == 'good'&&project_code=='gzerp'"
-							width="300"
-						>
 							<template #default="scope">
 								<div v-if="scope.row.assemb.length > 0">
-									<div
+									<div v-for="item in scope.row.assemb" :key="item.id">
-										v-for="item in scope.row.assemb"
-										:key="item.id"
-									>
 										<div>
 											{{ item.material_name }}
-											<span
+											<span style="color: gray;font-size: 12px;">批:</span>
-												style="
+											{{ item.batch }}
-													color: gray;
+											<span style="color: gray;font-size: 12px;">比:</span>
-													font-size: 12px;
+											{{ item.rate }}
-												"
-												>批:</span
-											>{{ item.batch }}
-											<span
-												style="
-													color: gray;
-													font-size: 12px;
-												"
-												>比:</span
-											>{{ item.rate }}
 										</div>
 									</div>
 								</div>
 							</template>
 						</el-table-column>
-						<!-- <el-table-column label="合格数量" prop="count_ok">
-						</el-table-column> -->
 						<el-table-column label="不合格数量" prop="count_notok">
 						</el-table-column>
-						<el-table-column
+						<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip>
-							label="创建时间"
-							prop="create_time"
-							show-overflow-tooltip
-						>
 						</el-table-column>
-						<el-table-column
+						<el-table-column label="操作"
-							label="操作"
 							fixed="right"
 							align="center"
 							width="150px"

src/views/inm/mioitem_form.vue

@@ -155,9 +155,11 @@
 					<el-form-item label="数量">
 						<el-input-number
 							v-model="form.count"
-							:min="1"
+							:min="0"
+							:max="batchcount"
 							:disabled="form.type == 'do_out'&&project_code=='bxerp'"
 							style="width: 100%"
+							@change="countChangegx('1')"
 						/>
 					</el-form-item>
 				</el-col>
@@ -176,6 +178,16 @@
 						<el-input v-model="prefix" placeholder="编号前缀"/>
 					</el-form-item>
 				</el-col>
+				<el-col :md="12" :sm="24" v-if="form.type == 'sale_out'&&project_code=='gx'">
+					<el-form-item label="发出数量">
+						<el-input-number v-model="form.count_send" :max="batchcount" placeholder="发出数量" @change="countChangegx('2')"/>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24" v-if="form.type == 'sale_out'&&project_code=='gx'">
+					<el-form-item label="样品数量">
+						<el-input-number v-model="count_send_yp" :max="batchcount" placeholder="样品数量" @change="countChangegx('3')"/>
+					</el-form-item>
+				</el-col>
 				<el-button v-if="form.type == 'sale_out'&&project_code=='bxerp'" type="primary" @click="getNumber">获取编号</el-button>
 				<el-col :md="12" :sm="24" v-if="digitNum!==null">
 					<el-form-item label="流水位数">
@@ -200,12 +212,9 @@
 					style="margin-bottom: 8px"
 				>
 					<el-col :span="12" style="padding-left: 120px">
-						{{ item.name
+						{{ item.name}}
-						}}<span v-if="item.model !== null"
+						<span v-if="item.model !== null">|{{ item.model }}</span>
-							>|{{ item.model }}</span
+						<span v-if="item.specification !== null">|{{ item.specification }}</span>
-						><span v-if="item.specification !== null"
-							>|{{ item.specification }}</span
-						>
 					</el-col>
 					<el-col :span="12">
 						<el-select
@@ -220,17 +229,13 @@
 								:label="itemx.batch"
 								:value="itemx.batch"
 							>
-								<span style="float: left">{{
+								<span style="float: left">{{itemx.batch}}</span>
-									itemx.batch
-								}}</span>
 								<span
 									style="
 										float: right;
 										color: var(--el-text-color-secondary);
 										font-size: 13px;
-									"
+									">{{ itemx.count }}</span>
-									>{{ itemx.count }}</span
-								>
 							</el-option>
 						</el-select>
 					</el-col>
@@ -312,6 +317,7 @@ export default {
 			mioitemw:[],
 			wprList:[],
 			prefix:'',
+			count_send_yp:0,
 			project_code:'',
 			digitNum:null,
 			mtype:null,
@@ -664,6 +670,14 @@ export default {
 				}
 			}
 		},
+		countChangegx(tip){
+			let that = this;
+			if(tip=='1'){
+				that.count_send_yp = Number(that.form.count) - Number(that.form.count_send);
+			}else{
+				that.form.count = Number(that.form.count_send) + Number(that.count_send_yp);
+			}
+		},
 		firstNumberChange(){
 			let that = this;
 			that.mioitemw = [];