Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/inm/mioitem.vue

@@ -84,6 +84,8 @@
 						hideDo
 						@row-click="rowClick"
 						@selection-change="selectionChange"
+						:summary-method="getSummaries" 
+						show-summary
 					>
 						<el-table-column type="selection" width="50" />
 						<el-table-column type="index" width="50" />
@@ -104,7 +106,7 @@
 						</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'">
+						<el-table-column label="样品数量" v-if="mioObj.type == 'sale_out'&&project_code=='gx'">
 							<template #default="scope">
 								{{ Number(scope.row.count) - Number(scope.row.count_send) }}
 							</template>
@@ -642,6 +644,48 @@ export default {
 				loading.close();
 			});
 		},
+		getSummaries({ columns, data }) {
+			const sums = [];
+			columns.forEach((column, index) => {
+				if (index === 0) {
+					sums[index] = "合计";
+					return;
+				}
+				let propert = '';
+				//尺寸检验
+				if(index == 6){
+					propert = 'count';
+				}else if(index == 7){
+					propert = 'count_send';
+				}
+				if (propert!=='') {
+					const values = data.map((item) =>
+						Number(item[propert])
+					);
+					if (!values.every((value) => Number.isNaN(value))) {
+						sums[index] = values.reduce((prev, curr) => {
+							const value = Number(curr);
+							let sum = Number(Number(prev) + Number(curr));
+							if (!isNaN(value)) {
+								return sum;
+							} else {
+								return prev;
+							}
+						}, 0);
+					} 
+				}
+				if(index==8){
+					if(sums[6]){
+						if(sums[7]){
+							sums[index] = sums[6]-sums[7];
+						}else{
+							sums[index] = sums[6];
+						}
+					}
+				}
+			});
+			return sums;
+		},
 	},
 };
 </script>

src/views/ofm/vehicle_form.vue

@@ -72,7 +72,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="使用日期" prop="vdate">
-              <el-date-picker v-model="form.vdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择会议日期" :readonly="localMode === 'show'" @change="mdateChange"></el-date-picker>
+              <el-date-picker v-model="form.vdate" type="date" value-format="YYYY-MM-DD" style="width: 100%;" placeholder="请选择使用日期" :readonly="localMode === 'show'" @change="mdateChange"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>