优化

src/view/inventory/fabricsummary.vue

@@ -7,10 +7,11 @@
 				@keyup.enter="add_onSubmit" id="searchInput"  style="width: 340px;height: 50px;margin-left: 10px;">
 			  </el-input> -->
         
-        <el-date-picker
+        <!-- <el-date-picker
               v-model="mlscgdformData['日期']" id="日期"  @input="handleInput"
               style="height: 50px;margin-left: 20px;"
-              type="date"/>
+              type="mouth"/> -->
+              <el-date-picker v-model="mlscgdformData['日期']" @input="handleInput" type="month" placeholder="选择月份"style="height: 50px;margin-left: 20px;"></el-date-picker>
 			  <el-button type="primary" @click="add_onSubmit" style="height: 50px;font-size: 20px;">查询</el-button>
 			  <!-- <el-button type="primary" icon="reading" @click="details_onSubmit" style="height: 50px;font-size: 20px;">出库退还记录</el-button> -->
 		</el-row>
@@ -32,7 +33,7 @@
               <el-table-column  align="left" label="生产款号" prop="生产款号" width="170"/>
               <el-table-column  align="left" label="款式" 	 prop="款式" 	width="170"/>
 			  <el-table-column  align="left" label="物料名称" prop="物料名称" width="160"/>
-              <el-table-column  align="left" label="库存总量" prop="库存总量" width="100"/>
+              <el-table-column  align="left" label="库存总量" prop="入库总量" width="100"/>
 			  <el-table-column  align="left" label="面料结余" prop="面料结余" width="100"/>
 			  <el-table-column  align="left" label="投料单位" prop="投料单位" width="100"/>
             </el-table>
@@ -131,7 +132,7 @@ const add_onSubmit = async ()=>{
   let lhrq_formattedDeliveryDate = '';  
   if (mlscgdformData['日期']) {  
     const date = new Date(mlscgdformData['日期']);  
-    lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}-${('0' + date.getDate()).slice(-2)}`;  
+    lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}`;  
   }  
 
 	//订单信息数据查询【接口】

src/view/inventory/pickinglist.vue

@@ -34,17 +34,18 @@
 						  @selection-change="handleSelectionChange">
 						<!-- <el-table-column type="selection" width="80" /> -->
 				  <el-table-column  align="left" label="订单编号" prop="订单编号" width="160" />
-				  <el-table-column  align="left" label="出库单" 	 prop="出库单" 	width="160"/>
-				  <el-table-column  align="left" label="款号" prop="款号" width="100"/>
+				  <el-table-column  align="left" label="单号" 	 prop="出库单" 	width="160"/>
 				  <el-table-column  align="left" label="物料名称" prop="物料名称" width="160"/>
+				  <el-table-column  align="left" label="款号" prop="款号" width="100"/>
+          <el-table-column  align="left" label="单号类型" 	 prop="单号类型" 	width="160"/>
 				  <el-table-column  align="left" label="领料人员" prop="领料人员" width="160"/>
-				  <el-table-column  align="left" label="操作机台" 	 prop="操作机台" 	width="160"/>
+				  <el-table-column  align="left" label="操作人员" 	 prop="操作机台" 	width="160"/>
 				  <el-table-column  align="left" label="日期" prop="日期" width="160"/> 
 				</el-table>
 			  </div>
 		  
 		  <el-tabs v-model="activeName" @tab-click="handleClick">
-			<el-tab-pane label="出库单详情"  @click="showTable('出库单详情')"  name="first">
+			<el-tab-pane label="单号详情"  @click="showTable('出库单详情')"  name="first">
 			  <el-table ref="multipleTable"
 						:row-style="{ height: '20px' }"
 						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -58,12 +59,12 @@
 						:summary-method="getSummaries" tooltip-effect="dark" :data="listtableData" row-key="ID" >
 					<!-- <el-table-column type="selection" width="30" /> -->
 					<el-table-column  align="left" label="订单编号" prop="订单编号" width="160" />
+					<el-table-column  align="left" label="单号" 	 prop="出库单据编号" 	width="160"/>
+					<el-table-column  align="left" label="物料名称" prop="物料名称" width="220"/>
 					<el-table-column  align="left" label="款号" prop="款号" width="100"/>
-					<el-table-column  align="left" label="出库单" 	 prop="出库单据编号" 	width="160"/>
-					<el-table-column  align="left" label="物料名称" prop="物料名称" width="160"/>
 					<el-table-column  align="left" label="数量" prop="数量" width="160"/>
 					<el-table-column  align="left" label="领料人员" prop="领料人员" width="160"/>
-					<el-table-column  align="left" label="操作机台" 	 prop="操作机台" 	width="160"/>
+					<el-table-column  align="left" label="操作人员" 	 prop="操作机台" 	width="160"/>
 					<el-table-column  align="left" label="日期" prop="日期" width="160"/>
 			  </el-table>
 			</el-tab-pane>

src/view/inventory/ruku.vue

@@ -195,7 +195,7 @@
 	destroy-on-close>
 	   <div class="dialog-footer" style="bottom: 10px; right: 10px; width: 100%;">
 		 <el-button  type="primary" @click="details_ckth_closeDialog" style="width: 80px;height: 40px;">关 闭</el-button>
-		 <el-button type="primary"  @click="deldetail_delclick" style="width: 80px;height: 40px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button>
+		 <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 40px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button>
 	   </div>
 	   <br>
 		<div>

src/view/performance/chukubaogong.vue

@@ -194,7 +194,7 @@
 	destroy-on-close>
 	   <div class="dialog-footer" style="bottom: 10px; right: 10px; width: 100%;">
 		 <el-button  type="primary" @click="details_ckth_closeDialog" style="width: 80px;height: 40px;">关 闭</el-button>
-		 <el-button type="primary"  @click="deldetail_delclick" style="width: 80px;height: 40px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button>
+		 <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 40px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button>
 	   </div>
 	   <br>
 		<div>

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -197,11 +197,6 @@
                   <el-table-column align="left" label="计划用料" prop="计划用料"  width="100" />
                   <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
 				  <el-table-column align="left" label="门封" prop="门封"  width="80"/>
-                  <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="120"/>
-                  <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="120"/>
-				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/>
-				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="90"/>
-				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="90"/>
 				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
 				  <el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
@@ -222,14 +217,21 @@
 						  :summary-method="mlgetSummaries" 
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="mltableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
-                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="110"/>
-                  <el-table-column align="left" label="生产款号" prop="生产款号"  width="130"/>
-                  <el-table-column align="left" label="客户编号" prop="客户编号"  width="100"/>
-                  <el-table-column align="left" label="款式" prop="款式"  width="150"/>
-                  <el-table-column align="left" label="物料名称" prop="物料名称"  width="170" />
-                  <el-table-column align="left" label="库存总量" prop="入库总量"  width="120"/>
-                  <el-table-column align="left" label="面料结余" prop="面料结余"  width="160"/>
-                  <el-table-column align="left" label="投料单位" prop="投料单位"  width="100"/>
+				  <el-table-column type="selection" width="30" />
+                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
+                  <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
+                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="100" />
+                  <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
+				  <el-table-column align="left" label="门封" prop="门封"  width="80"/>
+                  <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="120"/>
+                  <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="120"/>
+				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/>
+				  <el-table-column align="left" label="入库总量" prop="入库总量"  width="90"/>
+				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="90"/>
+				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
+				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
+				  <el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
+				  <el-table-column align="left" label="更新日期" prop="日期"  width="160"/>
                 </el-table>
               </el-tab-pane>
             </el-tabs>
@@ -1550,10 +1552,10 @@ const ys_edit_closeDialog = async (row) => {
 };
 const mlinventoryVisible = ref(false)
 const historytableData = ref([])
-//双击面料库存
-const mlupdateCompanyFunc = async (row) => {
-  mlinventoryVisible.value = true;
-}
+// //双击面料库存
+// const mlupdateCompanyFunc = async (row) => {
+//   mlinventoryVisible.value = true;
+// }
 
 //库存测试
 const CSclick = async (row) => {
@@ -2111,7 +2113,7 @@ const BOMclick = () => {
 }
 
 const handleInput = (value, row, prop) => {
-	if(prop != "物料名称"){
+	if(prop != "物料名称" && prop != "备注" ){
 		// 使用正则表达式过滤非数字和小数点的字符
 		let filteredValue = value.replace(/[^\d.]/g, '');