优化

src/view/performance/caiqiebaogong.vue

@@ -108,27 +108,27 @@
 							          @selection-change="handleSelectionChange">
 									  <!-- <el-table-column type="selection" width="55" /> -->
 									  <!-- <el-table-column  sortable  align="center" label="订单编号" prop="订单编号" width="120"/> -->
-									  <el-table-column  sortable align="left" label="订单子编号" prop="子订单编号"  width="130"/>
+									  <el-table-column   align="left" label="订单子编号" prop="子订单编号"  width="130"/>
 									  <!-- <el-table-column  sortable  align="left" label="客户编号" prop="客户编号" width="120"/> -->
-									  <el-table-column  sortable  align="left" label="款号" prop="款号" width="120" />
+									  <el-table-column    align="left" label="款号" prop="款号" width="140" />
 									  <!-- <el-table-column  sortable  align="left" label="款式" prop="款式" width="100" /> -->
-									  <el-table-column  sortable  align="left" label="色系名称" prop="颜色" width="108" />
+									  <el-table-column    align="left" label="色系名称" prop="颜色" width="100" />
 									  <!-- <el-table-column  sortable  align="left" label="组别" prop="组别" width="100" /> -->
 									  
-									  <el-table-column v-for="item in sizeDatas" :key="item" align="center" :label="item"
-										:prop="item" width="70" :cell-style="cellStyle">
+									  <el-table-column v-for="item in sizeDatas" :key="item" align="left" :label="item"
+										:prop="item" width="60" :cell-style="cellStyle">
 										<template v-slot="scope">
 											<div 
-												style="margin-left: -5px;width: 80px;"
+												style="width: 80px;"
 												@click="handleSizeClick(scope.$index, item, scope.row)">
 												{{ scope.row[item] }}
 											</div>
 										</template>
 										</el-table-column>
 										
-									  <el-table-column  sortable  align="left" label="制单总数" prop="制单数" width="108" />
-									  <el-table-column  sortable  align="left" label="裁剪总数" prop="裁剪数" width="110" />
-									  <el-table-column  sortable  align="left" label="上报时间" prop="上报时间" width="160" />
+									  <!-- <el-table-column  sortable  align="left" label="制单总数" prop="制单数" width="108" /> -->
+									  <el-table-column    align="left" label="裁剪数" prop="裁剪数" width="90" />
+									  <el-table-column    align="left" label="上报时间" prop="上报时间" width="160" />
 							</el-table>
 						</el-tab-pane>
 						
@@ -510,7 +510,7 @@ const add_onSubmit = async ()=>{
                 // 如果需要，可以在这里添加单位  
                 // sums[index] += ' 件';  
             } else {  
-                 sums[index] = 'N/A';  
+                 sums[index] = '';  
             }  
         }  
     });  
@@ -586,7 +586,7 @@ const tableRowClick = async (row)=>{
   add_searchInfo.value = row.子订单编号
 	// console.log(row)
 	_order.value = row.子订单编号
-  add_onSubmit();
+  // add_onSubmit();
 }
 
 

src/view/performance/chafengbaogong.vue

@@ -117,16 +117,16 @@
 					
 					<el-row :gutter="0">
 						<el-col :span="2.5"><el-text style="font-size: 30px;">上报数量</el-text></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl1" id="sl1"  :readonly="!zdslformdata.cmsl1" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl2" id="sl2"  :readonly="!zdslformdata.cmsl2" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl3" id="sl3"  :readonly="!zdslformdata.cmsl3" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl4" id="sl4"  :readonly="!zdslformdata.cmsl4" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl5" id="sl5"  :readonly="!zdslformdata.cmsl5" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl6" id="sl6"  :readonly="!zdslformdata.cmsl6" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl7" id="sl7"  :readonly="!zdslformdata.cmsl7" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl8" id="sl8"  :readonly="!zdslformdata.cmsl8" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl9" id="sl9"  :readonly="!zdslformdata.cmsl9" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
-						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl10" id="sl10"  :readonly="!zdslformdata.cmsl10" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl1" id="sl1"  :readonly="!scslformdata.scsl1" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl2" id="sl2"  :readonly="!scslformdata.scsl2" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl3" id="sl3"  :readonly="!scslformdata.scsl3" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl4" id="sl4"  :readonly="!scslformdata.scsl4" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl5" id="sl5"  :readonly="!scslformdata.scsl5" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl6" id="sl6"  :readonly="!scslformdata.scsl6" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl7" id="sl7"  :readonly="!scslformdata.scsl7" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl8" id="sl8"  :readonly="!scslformdata.scsl8" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl9" id="sl9"  :readonly="!scslformdata.scsl9" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
+						<el-col :span="1" style="padding-right: 5px;margin-right: 11px;"><el-input v-model="slformdata.sl10" id="sl10"  :readonly="!scslformdata.scsl10" @input="updateTotal" style="width: 65px;height: 40px;" /></el-col>
 						<el-col :span="2"><el-input v-model="slformdata.sctotal" id="cm11" readonly style="width: 65px;height: 40px;" /></el-col>
 						<el-button type="primary" @click="add_Dialog"
 							style="width: 100px;height: 60px;font-size: 20px;margin: 0px 0 0 0px">报工</el-button>
@@ -527,17 +527,20 @@ const currentDates = `${year}-${month}-${day}`;
 			})
 		} else {
 			
-			//领料
-			let llparams = {};
-			llparams.子订单编号 = add_searchInfo.value
-			llparams.班组 = add_formData['机台号']
-			llparams.订单编号 = add_searchInfo.value.split('-')[0]
-			llparams.Sys_id = _username.value
-			const processAdd_post = await processAdd(llparams);
+			// //领料
+			// let llparams = {};
+			// llparams.子订单编号 = add_searchInfo.value
+			// llparams.班组 = add_formData['机台号']
+			// llparams.订单编号 = add_searchInfo.value.split('-')[0]
+			// llparams.Sys_id = _username.value
+			// const processAdd_post = await processAdd(llparams);
 			
 			//获取报工历史记录
 			const getSpotLists = await getSpotList({order: add_searchInfo.value,code: _code,sys_sbID: add_formData['机台号']});
 			console.log(getSpotLists)
+			sizeDatas.splice(0, getSpotLists.data.headers.length, ...getSpotLists.data.headers); //型号数据
+			add_tableData.splice(0, add_tableData.length, ...getSpotLists.data.records); //表格数据
+			
 			
 			_list.value = getSpotLists.data.list
 			if (!add_searchInfo.value.includes('-') && getSpotLists.data.records.length === 0) {
@@ -570,18 +573,18 @@ const currentDates = `${year}-${month}-${day}`;
 			//如果搜索是子订单编号
 			if (add_searchInfo.value.includes('-')) {
 				for (let key of keys1) {
-					if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
-						cmformdata[key] = getSpotLists.data.list[0][key];
+					if (getSpotLists.data.list.hasOwnProperty(key)) { // 确保键存在于对象中  
+						cmformdata[key] = getSpotLists.data.list[key];
 					}
 				}
 				for (let key of keys2) {
-					if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
-						zdslformdata[key] = getSpotLists.data.list[0][key];
+					if (getSpotLists.data.list.hasOwnProperty(key)) { // 确保键存在于对象中  
+						zdslformdata[key] = getSpotLists.data.list[key];
 					}
 				}
 				for (let key of keys3) {
-					if (getSpotLists.data.list[0].hasOwnProperty(key)) { // 确保键存在于对象中  
-						scslformdata[key] = getSpotLists.data.list[0][key];
+					if (getSpotLists.data.list.hasOwnProperty(key)) { // 确保键存在于对象中  
+						scslformdata[key] = getSpotLists.data.list[key];
 					}
 				}
 				setTimeout(() => {
@@ -598,11 +601,10 @@ const currentDates = `${year}-${month}-${day}`;
 					zdslformdata[key] = '';
 				}
 			}
-			//历史记录
-			if (getSpotLists.data.headers) {
-				sizeDatas.splice(0, getSpotLists.data.headers.length, ...getSpotLists.data.headers); //型号数据
-				add_tableData.splice(0, add_tableData.length, ...getSpotLists.data.records); //表格数据
-			}
+			// //历史记录
+			// if (getSpotLists.data.headers) {
+				
+			// }
 		}
 	}