Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/pro/secretSend/index.vue

@@ -158,9 +158,17 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
+                v-if="!scope.row.status || scope.row.status == 3"
                 @click="handleCancel(scope.row)"
             >取消</el-button>
+            <el-button
+                size="mini"
+                type="text"
+                v-if="scope.row.status == 4"
+                @click="handleunCancel(scope.row)"
+            >撤回取消</el-button>
             </template>
+            
         </el-table-column>
         </el-table>
 
@@ -243,7 +251,7 @@ import requestIndex from "./components/requestIndex.vue";
 import { genCode } from "@/api/system/autocode/rule";
 import dayjs from 'dayjs';
 import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
-import { listSecrecyissue, putSecrecyissue } from "@/api/mes/pro/secretSend";
+import { listSecrecyissue, putSecrecyissue, cancelSecrecyissue, uncancelSecrecyissue } from "@/api/mes/pro/secretSend";
 export default {
     dicts: ['se_issue_table_status'],
     components: { requestIndex,WorkstationSelect },
@@ -415,7 +423,7 @@ export default {
         handleCancel(row) {
             const ids = row.id ? [row.id] : this.ids;
             this.$modal.confirm('是否取消发料申请？').then(function() {
-                return putSecrecyissue({
+                return cancelSecrecyissue({
                 status: 4,
                 ids: ids
             });
@@ -425,6 +433,19 @@ export default {
                 }
             })
         },
+        handleunCancel(row) {
+            const ids = row.id ? [row.id] : this.ids;
+            this.$modal.confirm('是否撤回取消发料申请？').then(function() {
+                return uncancelSecrecyissue({
+                status: 3,
+                ids: ids
+            });
+            }).then((res) => {
+                if(res.code === 200) {
+                    this.getList()
+                }
+            })
+        },
         /** 重置按钮操作 */
         resetQuery() {
             this.resetForm("queryForm");