单据撤回，单据编辑

2 years ago · bed9fd03a1
parent 8f855c3d38
commit bed9fd03a1
8 changed files with 92 additions and 71 deletions
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@ -1,15 +1,6 @@
 import axios from '@/utils/request'


-export function getDraft(query) {
-  return axios({
-    url: "/udiwms/inout/order/draft",
-    method: "get",
-    params: query
-  });
-}
-
-
 export function orderList(query) {
  return axios({
    url: "/admin/warehouse/inout/order/list",
@ -457,5 +448,20 @@ export function deleteInvByCode(query) {
  });
 }

+export function rollbackOrder(params) {
+  return axios({
+    url: "/udiwms/inout/order/received/rollback",
+    method: "get",
+    params: params
+  });
+}
+
+export function rollUnReceivebackOrder(params) {
+  return axios({
+    url: "/udiwms/inout/order/unReceive/rollback",
+    method: "get",
+    params: params
+  });
+}


--- a/src/api/inout/stockOrder.js
+++ b/src/api/inout/stockOrder.js
@ -274,13 +274,6 @@ export function supplementOrder(query) {
    });
 }

-export function updateStockOrderDetail(query) {
-    return axios({
-        url: '/udiwms/stock/order/detail/update',
-        method: 'post',
-        data: query
-    })
-}

 export function stockOrderChange(query) {

@ -301,37 +294,7 @@ export function updateStatus(query) {
    });
 }

-export function submitStockOrderToThirdSys(params) {
-    return axios({
-        url: "/udiwms/stock/order/error/submitStockOrderToThirdSys",
-        method: "get",
-        params: params
-    })
-}
-
-// export function findOrderByStockOrder(query) {
-//     return axios({
-//         url: "/udiwms/inout/order/findOrderByStockOrder",
-//         method: 'get',
-//         params: query
-//     });
-// }
-
-export function rollbackOrder(params) {
-    return axios({
-        url: "/udiwms/stock/order/received/rollback",
-        method: "get",
-        params: params
-    });
-}

-export function rollUnReceivebackOrder(params) {
-    return axios({
-        url: "/udiwms/stock/order/unReceive/rollback",
-        method: "get",
-        params: params
-    });
-}



--- a/src/views/inout/DialogSelectRl.vue
+++ b/src/views/inout/DialogSelectRl.vue
@ -20,7 +20,7 @@
        show-overflow-tooltip
      ></el-table-column>
      <el-table-column
-        label="生产企业"
+        label="生产厂家"
        prop="ylqxzcrbarmc"
        show-overflow-tooltip
      ></el-table-column>
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@ -131,6 +131,15 @@
            >打印
            </el-button
            >
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="rollback(scope.row)"
+            >撤回
+            </el-button
+            >
+
            <el-button
              type="text"
              size="small"
@ -322,7 +331,7 @@
 <script>
 import {
  deleteByOrderId, deleteInvByBillNo,
-  getOrderList
+  getOrderList, rollbackOrder, rollUnReceivebackOrder
 } from "../../api/inout/order";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@ -716,8 +725,25 @@ export default {
        this.resultTotal = 0;
      });
    },
-    editResultDialog(row) {
-
+    //单据撤回
+    rollback(row) {
+      this.$confirm('此操作将撤回单据至已校验未审核状态并删除对应库存信息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let param = {billNo: row.billNo};
+        rollbackOrder(param).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("撤回成功");
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
    },
  },
  filters: {
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@ -306,7 +306,7 @@
            show-overflow-tooltip
          ></el-table-column>
          <el-table-column
-            label="生产企业"
+            label="生产厂家"
            prop="manufacturer"
            show-overflow-tooltip
          ></el-table-column>
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@ -122,7 +122,7 @@
            </el-tag>
          </template>
        </el-table-column>
-        <el-table-column label="操作" width="150">
+        <el-table-column label="操作" width="160">
          <template slot-scope="scope">

            <el-button
@ -135,17 +135,28 @@
            <el-button
              type="text"
              size="small"
-              @click.native.stop="deleteDialog(scope.row)"
-            >删除
+              @click.native.stop="rollback(scope.row)"
+            >撤回
            </el-button
            >
+
+
            <el-button
              type="text"
              size="small"
              @click.native.stop="reviewOrder(scope.row)"
-            >验收单据
+            >审核
            </el-button
            >
+
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="deleteDialog(scope.row)"
+            >删除
+            </el-button
+            >
+
          </template>
        </el-table-column>
      </el-table>
@ -314,7 +325,7 @@
            show-overflow-tooltip
          ></el-table-column>
          <el-table-column
-            label="生产企业"
+            label="生产厂家"
            prop="manufacturer"
            show-overflow-tooltip
          ></el-table-column>
@ -433,7 +444,7 @@
 <script>
 import {
  deleteByOrderId,
-  getOrderList
+  getOrderList, rollUnReceivebackOrder
 } from "../../api/inout/order";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
@ -712,8 +723,6 @@ export default {
        .catch(() => {
        });
    },
-    checkOrder(orderId) {
-    },
    onBizReset() {
      this.bizQuery = {
        productName: null,
@ -826,11 +835,28 @@ export default {
        this.resultTotal = 0;
      });
    },
-    editResultDialog(row) {

+    //单据撤回
+    rollback(row) {
+      this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let param = {billNo: row.billNo};
+        rollUnReceivebackOrder(param).then((res) => {
+          if (res.code === 20000) {
+            this.$message.success("撤回成功");
+            this.getList();
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+      }).catch(() => {
+        // this.$message.info('回退失败');
+      });
    },

-
    //验收结束
    closeAcceptDialog() {
      this.acceptOrderVisible = false;
@ -855,13 +881,15 @@ export default {
      };
      return statusMap[status];
    },
-  },
+  }
+  ,
  mounted() {
    document.body.ondrop = function (event) {
      event.preventDefault();
      event.stopPropagation();
    };
-  },
+  }
+  ,
  created() {
    this.getInvList();
    this.getBusType();
@ -873,8 +901,10 @@ export default {
      }
    });
    this.getList();
-  },
-};
+  }
+  ,
+}
+;
 </script>

 <style type="text/scss" lang="scss">
--- a/src/views/inout/IoEditOrder.vue
+++ b/src/views/inout/IoEditOrder.vue
@ -119,10 +119,6 @@
            label="失效日期"
            prop="expireDate"
          ></el-table-column>
-          <el-table-column
-            label="实际数量"
-            prop="reCount"
-          ></el-table-column>
          <el-table-column
            label="单据数量"
            prop="count"
@ -220,7 +216,7 @@
            show-overflow-tooltip
          ></el-table-column>
          <el-table-column
-            label="生产企业"
+            label="生产厂家"
            prop="manufacturer"
            show-overflow-tooltip
          ></el-table-column>
--- a/src/views/inout/IoUnCheckedOrder.vue
+++ b/src/views/inout/IoUnCheckedOrder.vue
@ -306,7 +306,7 @@
            show-overflow-tooltip
          ></el-table-column>
          <el-table-column
-            label="生产企业"
+            label="生产厂家"
            prop="manufacturer"
            show-overflow-tooltip
          ></el-table-column>