feat: 6车间mlog撤回

src/views/wpm/mlog_dept6.vue

@@ -97,8 +97,7 @@
               </div>
             </el-header>
             <el-main>
-                <scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe
+              <scTable ref="table_handover" :apiObj="apiObjHandover" row-key="id" stripe :params="paramsHandover">
-                    :params="paramsHandover">
                 <el-table-column type="index" width="50" />
                 <el-table-column label="送料日期" prop="send_date">
                 </el-table-column>
@@ -123,8 +122,8 @@
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" align="left">
                   <template #default="scope">
-                            <el-button link type="primary" @click.stop="handover_submit(scope.row)"
+                    <el-button link type="primary" @click.stop="handover_submit(scope.row)" v-auth="'handover.submit'"
-                                v-auth="'handover.submit'" v-if="scope.row.submit_time == null">
+                      v-if="scope.row.submit_time == null">
                       确认
                     </el-button>
                   </template>
@@ -146,8 +145,7 @@
               </div>
             </el-header>
             <el-main style="padding: 0;">
-              <scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe
+              <scTable ref="table_wm" :apiObj="apiObjWm" row-key="id" :params="paramsWm" stripe hidePagination>
-                  hidePagination hideDo>
                 <el-table-column label="物料名" prop="material">
                   <template #default="scope">
                     {{ scope.row.material_.name }}

src/views/wpm/mlog_dept6_detail.vue

@@ -31,8 +31,7 @@
           </div>
         </el-header>
         <el-main style="padding: 0;">
-          <scTable ref="mtaskMlogs" :apiObj="apiObj" row-key="id" :params="params" stripe
+          <scTable ref="mtaskMlogs" :apiObj="apiObj" row-key="id" :params="params" stripe hidePagination hideDo>
-          hidePagination hideDo>
             <el-table-column label="工序" prop="mgroup_name"></el-table-column>
             <el-table-column label="产品编号">
               <template #default="scope">
@@ -54,18 +53,21 @@
               <el-table-column prop="count_n_jsqx" label="结石气绒" />
               <el-table-column prop="count_n_qt" label="其他" />
             </el-table-column>
-          <el-table-column label="操作人" prop="count_ok"></el-table-column>
+            <el-table-column label="操作人" prop="update_by_name"></el-table-column>
             <el-table-column label="操作" fixed="right" width="130">
               <template #default="scope">
-              <el-button link type="primary" @click="table_edit(scope.row)">
+                <el-button link type="primary" @click="table_edit(scope.row)" v-auth="'mlog.update'"
-                  编辑
+                  v-if="scope.row.submit_time == null">编辑
                 </el-button>
-              <el-link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
+                <el-button link type="danger" @click="table_del(scope.row)" v-auth="'mlog.delete'"
                   v-if="scope.row.submit_time == null">删除
-              </el-link>
+                </el-button>
-              <el-link type="primary" @click="mlog_submit(scope.row)"
+                <el-button link type="primary" @click="mlog_submit(scope.row)" v-auth="'mlog.submit'"
-                  v-auth="'mlog.submit'" v-if="scope.row.submit_time == null">提交
+                  v-if="scope.row.submit_time == null" :loading="mlogHandleLoading">提交
-              </el-link>
+                </el-button>
+                <el-button link type="danger" @click="mlog_revert(scope.row)" v-auth="'mlog.submit'"
+                  v-if="scope.row.submit_time != null" :loading="mlogHandleLoading">撤回
+                </el-button>
                 <el-button link type="success" @click="table_show(scope.row)">
                   日志记录
                 </el-button>
@@ -75,20 +77,9 @@
         </el-main>
       </el-container>
     </el-main>
-    <save-dialog 
+    <save-dialog v-if="dialogSave" ref="saveDialog" :mtask="mtask" :mgroup="mgroup" :handledate="handledate"
-      v-if="dialogSave" 
+      :material_out="material_out" @success="handleSaveSuccess" @closed="dialogSave = false"></save-dialog>
-      ref="saveDialog" 
+    <showDrawer ref="showDrawer" v-if="visibleDrawer" :mlogId="mlogId" @closed="visibleDrawer = false">
-      :mtask="mtask" 
-      :mgroup="mgroup"
-      :handledate="handledate"
-      :material_out="material_out"
-      @success="handleSaveSuccess" 
-      @closed="dialogSave = false"
-    ></save-dialog>
-    <showDrawer ref="showDrawer" 
-      v-if="visibleDrawer" 
-      :mlogId="mlogId"
-      @closed="visibleDrawer = false">
     </showDrawer>
   </el-container>
 </template>
@@ -101,6 +92,7 @@ export default {
   },
   data() {
     return {
+      mlogHandleLoading: false,
       dialog: {
         save: false,
       },
@@ -177,6 +169,7 @@ export default {
       }).then(() => {
         this.$API.wpm.mlog.delete.req(row.id).then((res) => {
           this.$message.success("删除成功");
+          this.$refs.mtaskMlogs.refresh();
           return res;
         }).catch((err) => {
           return err;
@@ -188,9 +181,6 @@ export default {
     handleSaveSuccess(data, mode) {
       this.$refs.mtaskMlogs.refresh();
     },
-    handleQuery() {
-      this.$refs.table.queryData(this.query)
-    },
     resetQuery() {
       this.query = {};
     },
@@ -200,6 +190,16 @@ export default {
         this.$refs.mtaskMlogs.refresh()
       }).catch(err => { })
     },
+    mlog_revert(row) {
+      this.mlogHandleLoading = true;
+      this.$API.wpm.mlog.revert.req(row.id).then(res => {
+        this.$message.success("撤回成功");
+        this.$refs.mtaskMlogs.refresh()
+        this.mlogHandleLoading = false;
+      }).catch(e => {
+        this.mlogHandleLoading = false;
+      })
+    },
   }
 }
 </script>