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

src/views/mtm/route_form.vue

@@ -320,6 +320,7 @@ const defaultForm = {
 };
 export default {
 	props: {
+		count: { type: Number, default : 0 },
 		routepack: { type: String, default: "" },
 	},
 	emits: ["success", "closed"],
@@ -455,8 +456,14 @@ export default {
 		},
 		//显示
 		open(mode = "add") {
-			this.mode = mode;
+			let that = this;
-			this.visible = true;
+			that.mode = mode;
+			that.visible = true;
+			that.$nextTick(() => {
+			    if(that.count){
+					that.form.sort = that.count+1;
+				}
+			})
 			return this;
 		},
 		//表单注入数据

src/views/mtm/routepack_form.vue

@@ -185,6 +185,7 @@
 		<save-dialog
 			v-if="dialog.save"
 			ref="saveDialog"
+			:count = "count"
 			:routepack="routepack"
 			@success="handleSaveSuccess"
 			@closed="dialog.save = false"
@@ -337,6 +338,9 @@ export default {
 			})
 		},
 		table_add() {
+			let that = this;
+			that.count = this.$refs.tables.total;
+			console.log("count",that.count);
 			this.dialog.save = true;
 			this.$nextTick(() => {
 				this.$refs.saveDialog.open("add");

src/views/statistics/bxerp/maopiTotal.vue

@@ -28,8 +28,12 @@
 				id="exportDiv"
 				stripe
 			>
-				<!-- <el-table-column type="index" width="50"  fixed="left"/> -->
+				<el-table-column label="单号" prop="batch" align="center" fixed="left">
-				<el-table-column label="检测日期" fixed="left" prop="batch">
+				</el-table-column>
+				<el-table-column label="检测日期" fixed="left" prop="batch" width="90">
+					<template #default="scope">
+						{{ scope.row.data.毛坯检测_日期 }}
+					</template>
 				</el-table-column>
 				<el-table-column label="版型" prop="number" fixed="left">
 					<template #default="scope">
@@ -165,8 +169,6 @@
 				</el-table-column>
 				<el-table-column label="外形偏(0.5mm)" align="center" class-name="colorheader1">
 				</el-table-column>
-				<el-table-column label="单号" prop="batch" align="center" class-name="colorheader2">
-				</el-table-column>
 				<el-table-column label="备注" align="center" class-name="colorheader3">
 					<template #default="scope">
 						<span>{{ scope.row.data.毛坯检测_缺陷_备注 }}</span>