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

src/views/inm/good_mio.vue

@@ -115,6 +115,15 @@
 						>
 							提交
 						</el-button>
+						<el-button
+							link
+							type="warning"
+							@click="revert(scope.row)"
+							v-auth="'mio.submit'"
+							v-if="scope.row.state == 20"
+						>
+							撤销
+						</el-button>
 						<el-button
 							link
 							type="danger"
@@ -234,6 +243,24 @@ export default {
 				})
 				.catch(() => {});
 		},
+		revert(row) {
+			this.$confirm(`确定撤销该操作吗？`, "提示", {
+				type: "warning",
+			})
+				.then(() => {
+					this.$API.inm.mio.revert
+						.req(row.id)
+						.then((res) => {
+							this.$message.success("撤销成功");
+							this.$refs.table.refresh();
+							return res;
+						})
+						.catch((err) => {
+							return err;
+						});
+				})
+				.catch(() => {});
+		},
 		table_submit(row) {
 			this.$API.inm.mio.submit.req(row.id).then((res) => {
 				this.$message.success("提交成功");

src/views/inm/mio.vue

@@ -118,6 +118,17 @@
 						>
 							提交
 						</el-button>
+						<el-button
+							link
+							type="warning"
+							@click="revert(scope.row)"
+							v-auth="'mio.submit'"
+							v-if="scope.row.state == 20&&
+								(scope.row.type == 'other_in' ||
+									scope.row.type == 'other_out')"
+						>
+							撤销
+						</el-button>
 						<el-button
 							link
 							type="danger"
@@ -253,6 +264,24 @@ export default {
 				this.$refs.table.refresh();
 			});
 		},
+		revert(row) {
+			this.$confirm(`确定撤销该操作吗？`, "提示", {
+				type: "warning",
+			})
+				.then(() => {
+					this.$API.inm.mio.revert
+						.req(row.id)
+						.then((res) => {
+							this.$message.success("撤销成功");
+							this.$refs.table.refresh();
+							return res;
+						})
+						.catch((err) => {
+							return err;
+						});
+				})
+				.catch(() => {});
+		},
 		handleQuery() {
 			this.$refs.table.queryData(this.query);
 		},

src/views/wpm_gx/fmlog_detail.vue

@@ -115,6 +115,7 @@
 					<el-table-column label="加工前不良" prop="count_pn_jgqbl"></el-table-column>
 					<el-table-column label="合格数" prop="count_ok"></el-table-column>
 					<el-table-column label="不合格数" prop="count_notok"></el-table-column>
+					<el-table-column label="操作日期" prop="handle_date"></el-table-column>
 					<!-- <el-table-column label="开始时间" prop="work_start_time"></el-table-column>
 					<el-table-column label="结束时间" prop="work_end_time"></el-table-column> -->
 					<el-table-column label="班次" prop="shift_name"></el-table-column>