first commit

src/view/inventory/ruku.vue

@@ -46,7 +46,7 @@
 		</el-input>
 		<el-button type="primary" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
 		<el-button type="primary" @click="print_lingyong" style="width: 100px;height: 50px;">增加至入库页</el-button>
-		<!-- <el-button type="primary" @click="del_lingyong"  style="width: 100px;height: 50px;">删除面料领用</el-button> -->
+		<el-button type="primary" @click="del_lingyong"  style="width: 100px;height: 50px;">删除面料领用</el-button>
 	</div>
 	
 	<!-- 上面部分 -->
@@ -97,7 +97,7 @@
 	                  tooltip-effect="dark"  :data="FabriccollartableData" 
 	                  row-key="ID" :cell-class-name="scfjfpxsCellClass"
 	                  @selection-change="FabriccollarhandleSelectionChange">
-			  <!-- <el-table-column type="selection" width="45" /> -->
+			  <el-table-column type="selection" width="45" />
 	          <template v-for="(item, idx) in Fabriccollar_tableColumns">
 	            <el-table-column #default="{ row, column, $index }" align="left"  :label="item.label" :width="item.width">
 	              <div v-if="[''].includes(item.prop)">
@@ -123,7 +123,7 @@
   </el-dialog>
   
   <!--详情记录 -->
-  <el-dialog v-model="pickingaddvisible" :before-close="()=> pickingaddvisible = false" style="width: 70%; margin: 5% auto; height: 79%;" :title="'出库退还记录'" destroy-on-close>
+  <el-dialog v-model="pickingaddvisible" :before-close="()=> pickingaddvisible = false" style="width: 70%; margin: 5% auto; height: 79%;" :title="'出库、入库、退还记录'" destroy-on-close>
 	   <div class="dialog-footer" style="bottom: 10px; right: 10px; width: 100%;">
 		 <el-button  type="primary" @click="ckth_closeDialog" style="width: 80px;height: 40px;">关 闭</el-button>
 	   </div>
@@ -161,9 +161,9 @@
 			              style="width: 100%;height: 36vh" border
 			              :summary-method="getSummaries" tooltip-effect="dark" :data="rukutableData" row-key="ID" >
 			      <el-table-column align="left" sortable label="订单编号" prop="订单编号"  width="140"/>
-				  <el-table-column align="left" sortable label="款号" prop="款号"  width="180"/>
+				  <el-table-column align="left" sortable label="客户编号" prop="款号"  width="180"/>
 				  <el-table-column align="left" sortable label="数量" prop="数量"  width="105"/>
-			      <el-table-column align="left" sortable label="出库时间" prop="出库时间"  width="160"/>
+			      <el-table-column align="left" sortable label="入库时间" prop="入库时间"  width="160"/>
 			      <el-table-column align="left" sortable label="上报机台" prop="上报机台"  width="160"/>
 			    </el-table>
 			  </el-tab-pane>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2083,10 +2083,15 @@ const resbom_tableColumns = ref(
 	  { label: '投料单位', prop: '投料单位', width: '100' },
     ]
 )
-//修改BOM资料按钮
+//批量修改BOM资料
 const BOMclick = () => {
+	if(bomtableData.value === ''){
+		ElMessage({type: 'warning',message: 'BOM数据为空'})
+		return;
+	}
 	if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
 		ElMessage({type: 'warning',message: '请选择订单后，再操作此功能'})
+		return;
 	}else{
 		res_bomdialogFormVisible.value = true
 		ddhformData.ddh = _Gd_gdbh.value