Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/mtm/route_show.vue

@@ -37,7 +37,7 @@
 						</el-table-column>
 						<el-table-column label="工时" prop="hour_work">
 						</el-table-column>
-						<el-table-column label="批次绑定" prop="batch_bind">
+						<el-table-column label="批次校验" prop="batch_bind">
 						</el-table-column>
 					</scTable>
 				</el-card>

src/views/mtm/routepack_form.vue

@@ -109,7 +109,7 @@
 					</el-table-column>
 					<el-table-column label="工时" prop="hour_work">
 					</el-table-column>
-					<el-table-column label="批次绑定" prop="batch_bind">
+					<el-table-column label="批次校验" prop="batch_bind">
 					</el-table-column>
 					<el-table-column
 						label="操作"

src/views/wpm_gx/handover.vue

@@ -216,6 +216,10 @@ export default {
 		that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
+				if(res.length != 1){
+					that.$message.error("获取工段错误");
+					return;
+				}
 				that.mgroupId = res[0].id;
 				that.processId = res[0].process;
 				that.processCate = res[0].process_cate;

src/views/wpm_gx/inm.vue

@@ -152,6 +152,10 @@ export default {
 		that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
+				if(res.length != 1){
+					that.$message.error("获取工段错误");
+					return;
+				}
 				that.mgroupId = res[0].id;
 				that.params.mgroupx = res[0].id;
 				that.apiObj = that.$API.wpm.wmaterial.list;

src/views/wpm_gx/mlog_form.vue

@@ -315,7 +315,7 @@ export default {
 		getRoute(id) {
 			let that = this;
 			that.$API.mtm.route.list
-				.req({ process: that.process, page: 0 })
+				.req({ process: that.process, page: 0, routepack__state: 30 })
 				.then((res) => {
 					that.routeOptions = res;
 				});

src/views/wpm_gx/mlogb_form.vue

@@ -146,7 +146,7 @@ export default {
 		getMtask() {
 			let that = this;
 			this.$API.pm.mtask.list
-				.req({ page: 0, mgroup: that.mgroup })
+				.req({ page: 0, mgroup: that.mgroup, state: 20 })
 				.then((res) => {
 					that.options = res;
 				});

src/views/wpm_gx/mlogs.vue

@@ -178,6 +178,10 @@ export default {
 		that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
+				if(res.length != 1){
+					that.$message.error("获取工段错误");
+					return;
+				}
 				that.mgroupId = res[0].id;
 				that.deptId = res[0].belong_dept;
 				that.processId = res[0].process;

src/views/wpm_gx/mtask.vue

@@ -111,6 +111,10 @@ export default {
 		that.$API.mtm.mgroup.list
 			.req({ page: 0, search: that.mgroupName })
 			.then((res) => {
+				if(res.length != 1){
+					that.$message.error("获取工段错误");
+					return;
+				}
 				that.mgroupId = res[0].id;
 				that.processId = res[0].process;
 				that.processCate = res[0].process_cate;