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

src/api/model/inm.js

@@ -103,6 +103,14 @@ export default {
 					);
 			}
 		},
+		revert: {
+			name: "撤销",
+			req: async function(id){
+				return await http.post(
+					`${config.API_URL}/inm/mio/${id}/revert/`,
+				);
+			}
+		}
 	},
 	// 出入库明细
 	mioitem: {

src/views/inm/good.vue

@@ -44,6 +44,8 @@
                         </el-table-column>
                         <el-table-column label="有效期" prop="expiration_date">
                         </el-table-column>
+                        <el-table-column label="更新时间" prop="update_time">
+                        </el-table-column>
                     </scTable>
                 </el-main>
             </el-container>

src/views/inm/halfgood.vue

@@ -44,6 +44,8 @@
                         </el-table-column>
                         <el-table-column label="有效期" prop="expiration_date">
                         </el-table-column>
+                        <el-table-column label="更新时间" prop="update_time">
+                        </el-table-column>
                     </scTable>
                 </el-main>
             </el-container>

src/views/inm/halfgood_mio.vue

@@ -53,6 +53,9 @@
               v-if="scope.row.state == 10">
               删除
             </el-button>
+            <el-button link type="warning" @click="revert(scope.row)" v-auth="'mio.submit'" v-if="scope.row.state == 20">
+              撤销
+            </el-button>
           </template>
         </el-table-column>
       </scTable>
@@ -141,6 +144,19 @@ 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/helpso.vue

@@ -30,6 +30,8 @@
                 </el-table-column>
                 <el-table-column label="有效期" prop="expiration_date">
                 </el-table-column>
+                <el-table-column label="更新时间" prop="update_time">
+                </el-table-column>
             </scTable>
         </el-main>
     </el-container>

src/views/inm/mainso.vue

@@ -30,6 +30,8 @@
                 </el-table-column>
                 <el-table-column label="有效期" prop="expiration_date">
                 </el-table-column>
+                <el-table-column label="更新时间" prop="update_time">
+                </el-table-column>
             </scTable>
         </el-main>
     </el-container>