浏览代码

中心仓入库撤销及库存提交问题处理

liyuan 1 周之前
父节点
当前提交
86f943f1d3

+ 3 - 260
src/api/storehouse/plan.js

@@ -53,267 +53,10 @@ export const auditPlan = (data) => {
         data: data
     })
 }
-export const goodsListXs = (customId, stock) => {
-    return request({
-        url: '/api/blade-sales-part/goodsDesc/goodsListXs',
-        method: 'get',
-        params: {
-            customId,
-            stock
-        }
-    })
-}
-// 销售订单添加轮胎列表
-export const goodsPageXs = (params) => {
-    return request({
-        url: '/api/blade-sales-part/goodsDesc/goodsPageXs',
-        method: 'get',
-        params: params
-    })
-}
-// 销售订单添加轮胎列表
-export const goodsPagePoints = (params) => {
-    return request({
-        url: '/api/blade-sales-part/goodsDesc/goodsPagePoints',
-        method: 'get',
-        params: params
-    })
-}
-//采购订单保存
-export const inboundTask = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/inboundTask',
-        method: 'POST',
-        data: data
-    })
-}
-//请核
-export const checkOrderCG = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/checkOrderCG',
-        method: 'post',
-        data: data
-    })
-}
-//采购订单撤销请核
-export const revokeCheckOrderCG = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/revokeCheckOrderCG',
-        method: 'post',
-        data: data
-    })
-}
-//采购订单撤销任务
-export const revokeInboundTask = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/revokeInboundTask',
-        method: 'post',
-        data: data
-    })
-}
-//商品类别列表查询
-export const getGoodsInfo = (query) => {
-    return request({
-        url: ' /api/blade-purchase-sales/orderitems/orderItemsList',
-        method: 'get',
-        params: query
-    })
-}
 
-//查询轮胎列表
-export const goodsListAll = () => {
-    return request({
-        url: 'api/blade-sales-part/goodsDesc/goodsListAll?enableOrNot=1',
-        method: 'get',
-    })
-}
-///
-//查询客户
-export const getKh = () => {
-    return request({
-        url: '/api/blade-sales-part/corpsDesc/listAll?corpType=KH&enableOrNot=1',
-        method: 'get',
-    })
-}
-// 收款结算里的查询客户
-export const skgetKh = () => {
-    return request({
-        url: '/api/blade-sales-part/corpsDesc/listAll?cname=&corpType=KH&enableOrNot=1',
-        method: 'get',
-    })
-}
-// 采购入库里的业务对象
-export const corpsDescListAll = (data) => {
-    return request({
-        url: '/api/blade-sales-part/corpsDesc/listAll',
-        method: 'get',
-        params: data
-    })
-}
-//收款账户下拉
-export const getSk = () => {
-    return request({
-        url: '/api/blade-sales-part/accountManagement/list?enableOrNot=1&billType=HYCK',
-        method: 'get',
-    })
-}
-//所属公司下拉
-export const topList = () => {
-    return request({
-        url: '/api/blade-system/dept/top-list',
-        method: 'get'
-    })
-}
-//制单人下拉
-export const getZd = () => {
-    return request({
-        url: '/api/blade-user/page?size=20&current=1',
-        method: 'get'
-    })
-}
-// 调拨添加轮胎列表
-export const goodsPageDB = (params) => {
-    return request({
-        url: '/api/blade-sales-part/goodsDesc/goodsPageDB',
-        method: 'get',
-        params: params
-    })
-}
-// 一件入库
-export const shortcutWarehousing = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/shortcutWarehousing',
-        method: 'post',
-        data: data
-    })
-}
-// 盘点列表
-export const inventoryList = (params) => {
-    return request({
-        url: '/api/blade-sales-part/inventory/list',
-        method: 'get',
-        params: params
-    })
-}
-// 盘点保存
-export const submitInventory = (data) => {
+export const revokePlanIn = (id) => {
     return request({
-        url: '/api/blade-sales-part/inventory/submitInventory',
-        method: 'POST',
-        data: data
-    })
-}
-// 盘点保存
-export const confirmInventory = (data) => {
-    return request({
-        url: '/api/blade-sales-part/inventory/confirmInventory',
-        method: 'POST',
-        data: data
-    })
-}
-// 生成销售退货单
-export const generateReturns = (params) => {
-    return request({
-        url: '/api/blade-sales-part/returns/generateReturns',
-        method: 'get',
-        params: params
-    })
-}
-export const confirmWarehouse = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/confirmWarehouse',
-        method: 'POST',
-        data: data
-    })
-}
-export const revokeWarehouse = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/revokeWarehouse',
-        method: 'POST',
-        data: data
-    })
-}
-export const confirmRedeem = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/confirmRedeem',
-        method: 'POST',
-        data: data
-    })
-}
-export const revokeRedeem = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/revokeRedeem',
-        method: 'POST',
-        data: data
-    })
-}
-
-// 是否存在融资
-export const whetherExistenceFinancing = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/whetherExistenceFinancing',
-        method: 'POST',
-        data: data
-    })
-}
-
-// 出库任务审批
-export const checkOrderRW = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/checkOrderRW',
-        method: 'POST',
-        data: data
-    })
-}
-// 撤销出库任务审批
-export const revokeCheckOrderRW = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/revokeCheckOrderRW',
-        method: 'POST',
-        data: data
-    })
-}
-
-export const getParamservice = (current, size, params) => {
-    return request({
-        url: '/api/blade-system/paramservice/list',
-        method: 'get',
-        params: {
-            ...params,
-            current,
-            size,
-        }
-    })
-}
-//
-export const getAdvancePaymentBalance = (params) => {
-    return request({
-        url: '/api/blade-sales-part/advancecharge/getAdvancePaymentBalance',
-        method: 'get',
-        params: params
-    })
-}
-// 确认发货
-export const confirmShipment = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/confirmShipment',
-        method: 'POST',
-        data: data
-    })
-}
-// 撤销发货
-export const cancelShipment = (data) => {
-    return request({
-        url: '/api/blade-sales-part/order/cancelShipment ',
-        method: 'POST',
-        data: data
-    })
-}
-
-export const getGoodAllList = (params) => {
-    return request({
-        url: '/api/blade-sales-part/goodsDesc/list',
-        method: 'get',
-        params: params
+        url: '/api/blade-sales-part//tire/center/warehouse/plan/revokePlanIn?id=' + id,
+        method: 'POST'
     })
 }

+ 22 - 4
src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -13,7 +13,10 @@
                 <el-button class="el-button--small-yh" v-if="!editButton" style="margin-left: 6px;" type="primary"
                     size="small" :disabled="isSaveBtn" @click="editCustomer(0)">保 存
                 </el-button>
-                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small"
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="warning" size="small"
+                           @click="revokePlan()" v-if="Number(form.status) === 1">撤 销
+                </el-button>
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="success" size="small" v-if="!editButton"
                     @click="editCustomer(1)" :disabled="form.status == 1">提 交
                 </el-button>
                 <!-- <el-dropdown v-if="form.status == 1">
@@ -270,10 +273,8 @@
 
 <script>
 import { getDetails as getCustom } from "@/api/tirePartsMall/basicData/customerInformation"
-import { getDetails as getDetailsLT } from "@/api/tirePartsMall/basicData/commodityInformation/index"
 import { dateFormat } from "@/util/date";
 import { getToken } from "@/util/auth";
-import { shortcutWarehousing } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { dotList, goodsDetail } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import reportDialog from "@/components/report-dialog/main";
 import checkSchedule from "@/components/checkL/checkSchedule";
@@ -281,7 +282,7 @@ import check from "@/components/checkL/check";
 import { getCorpType, getList } from "@/api/tirePartsMall/basicData/commodityInformation"
 import { isProcurement } from "@/api/basicData/configuration";
 import commodity from "../../configuration/commodity.json";
-import { getDetails, submit, itemRemove, auditPlan } from "@/api/storehouse/plan.js";
+import { getDetails, submit, itemRemove, auditPlan, revokePlanIn } from "@/api/storehouse/plan.js";
 import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
@@ -836,6 +837,23 @@ export default {
         moneyChange(row) {
             row.subTotalMoney = _.multiply(Number(row.price ? row.price : 0), Number(row.goodsNum ? row.goodsNum : 0)).toFixed(2)
         },
+
+        revokePlan(){
+            this.$confirm('确定要撤销该入库单吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                revokePlanIn(this.form.id).then(res => {
+                    this.$message({
+                        type: 'success',
+                        message: '撤销成功!'
+                    });
+                    this.getDetail(res.data.data, true)
+                })
+            })
+
+        },
         addRow() {
             // if (!this.form.id) {
             //     return this.$message.error('请保存数据')

+ 1 - 3
src/views/storehouse/storage-region/detailsPage.vue

@@ -22,9 +22,7 @@
             </div>
             <trade-card title="主要信息" style="margin-top: 60px">
                 <avue-form ref="form" class="trading-form" v-model="form" :option="option" :key="key">
-                    <template slot="regionCode">
-                        <el-input v-model="form.regionCode" :disabled="form.status && form.status === 1"></el-input>
-                    </template>
+
                 </avue-form>
             </trade-card>
         </div>

+ 2 - 1
src/views/storehouse/storage-region/index.vue

@@ -42,7 +42,7 @@
                         </template>
                         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
                             <el-button icon="el-icon-plus" type="primary" :size="size" @click="addStorageRegion">新增</el-button>
-                            <el-button type="warning" icon="el-icon-download" size="small" @click="">导出</el-button>
+<!--                            <el-button type="warning" icon="el-icon-download" size="small" @click="">导出</el-button>-->
                         </template>
                     </avue-crud>
                 </el-col>
@@ -151,6 +151,7 @@ export default {
         },
 
         backToList(){
+            this.query.parentId = ''
             this.detailsOpen = false;
             this.onLoad(this.page)
             this.getStorageTree()

+ 1 - 1
src/views/storehouse/storage/index.vue

@@ -37,7 +37,7 @@
                 </template>
                 <template slot-scope="{type,size,row,$index}" slot="menuLeft">
                     <el-button icon="el-icon-plus" type="primary" :size="size" @click="addStorage">新增</el-button>
-                    <el-button type="warning" icon="el-icon-download" size="small" @click="">导出</el-button>
+<!--                    <el-button type="warning" icon="el-icon-download" size="small" @click="">导出</el-button>-->
                 </template>