整理出入库页面上的字段

src/api/storehouse/outStockPlan.js

@@ -0,0 +1,305 @@
+import request from '@/router/axios';
+//查询列表
+export const getList = (params) => {
+    return request({
+        url: '/api/blade-sales-part/tire/center/warehouse/plan/list',
+        method: 'get',
+        params: params
+    })
+}
+
+//删除
+export const remove = (data) => {
+    return request({
+        url: '/api/blade-sales-part/tire/center/warehouse/plan/removePlan',
+        method: 'post',
+        data
+    })
+}
+export const getDetails = (data) => {
+    return request({
+        url: '/api/blade-sales-part/tire/center/warehouse/plan/detail',
+        method: 'get',
+        params: data
+    })
+}
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-sales-part/tire/center/warehouse/plan/submitPlan',
+        method: 'POST',
+        data: data
+    })
+}
+
+export const itemRemove = (data) => {
+    return request({
+        url: '/api/blade-sales-part/tire/center/warehouse/plan/removePlan',
+        method: 'get',
+        params: 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) => {
+    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
+    })
+}

src/views/storehouse/inStockManage/inStockPlan/index.vue

@@ -84,7 +84,9 @@ export default {
       returnStatusList: [],
       detailsOpen: false,
       loading: false,
-      search: {},
+      search: {
+        bsType: 'RP'
+      },
       form: {},
       dataList: [],
       detailData: {},
@@ -247,7 +249,7 @@ export default {
           decimals: 2
         },],
         column: [{
-          label: '采购单号',
+          label: '业务单号',
           prop: "ordNo",
           search: true,
           overHidden: true,

src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -7,8 +7,8 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button class="el-button&#45;&#45;small-yh" style="margin-left: 6px;"
-                    type="primary" size="small" v-if="editButton" @click="confirmEditing">编 辑
+                <el-button class="el-button&#45;&#45;small-yh" style="margin-left: 6px;" type="primary" size="small"
+                    v-if="editButton" @click="confirmEditing">编 辑
                 </el-button>
                 <el-button class="el-button--small-yh" v-else style="margin-left: 6px;" type="primary" size="small"
                     :disabled="isSaveBtn" @click="editCustomer">保 存
@@ -21,16 +21,15 @@
                     <tempalte slot="customerName" slot-scope="{ row }">
                         <search-query :datalist="customerData" :selectValue="form.customerName" :clearable="true"
                             :buttonIf="false" :filterable="true" :remote="true"
-                            :disabled="findObject(optionForm.column, 'customerName').disabled || form.businessSource == '外部销售' || isDisabledTask"
-                            placeholder="请选择货主" :forParameter="{ key: 'id', label: 'cname', value: 'cname' }"
-                            @corpFocus="KHgetListfun" @remoteMethod="KHgetListfun" @corpChange="KHcorpChange"
-                            @corpClear="KHClear">
+                            :disabled="!(form.status == 0 || form.status == 3)" placeholder="请选择货主"
+                            :forParameter="{ key: 'id', label: 'cname', value: 'cname' }" @corpFocus="KHgetListfun"
+                            @remoteMethod="KHgetListfun" @corpChange="KHcorpChange" @corpClear="KHClear">
                         </search-query>
                     </tempalte>
                     <template slot-scope="{row,index}" slot="contacts">
                         <el-select v-model="form.contacts" placeholder="请选择" size="small" style="width:60%" clearable
                             filterable allow-create default-first-option @change="contactsChange($event)"
-                            :disabled=isContacts>
+                            :disabled="!(form.status == 0 || form.status == 3)">
                             <el-option v-for="item in contactsOption" :key="item.id" :label="item.contacts"
                                 :value="item.contacts" />
                         </el-select>
@@ -39,7 +38,7 @@
                         <dic-select v-model="form.salerName" placeholder="业务员" key="id" label="name"
                             url="/blade-user/salerList" :filterable="true"
                             @selectChange="dicChange('salerName', $event)"
-                            :disabled="form.generateTask == '已生成' || form.businessSource == '外部销售' || isDisabledTask">
+                            :disabled="!(form.status == 0 || form.status == 3)">
                         </dic-select>
                     </tempalte>
                 </avue-form>
@@ -48,17 +47,18 @@
                 <el-tabs v-model="activeName" type="card">
                     <el-tab-pane label="销售明细" name="sale_detail">
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
-                            :data="form.orderItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
+                            :data="form.planItemsList" :key="key" @row-save="rowSave" @row-update="rowUpdate"
                             @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
                             @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)"
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-plus" size="small"
-                                    :disabled=" form.billType == 1" @click="rowAdd(row, 1)">添加商品</el-button>
+                                    :disabled="!(form.status == 0 || form.status == 3)"
+                                    @click="rowAdd(row, 1)">添加商品</el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete"
-                                    :disabled="form.generateTask == '已生成' || form.businessSource == '外部销售' || form.billType == 1">一键删除</el-button>
+                                    :disabled="!(form.status == 0 || form.status == 3)">一键删除</el-button>
                                 <el-popover width="600" trigger="click">
                                     <avue-crud :data="inventoryData" :option="inventoryOption"></avue-crud>
                                     <el-button type="primary" plain size="small" slot="reference" @click="viewInventory"
@@ -92,7 +92,7 @@
                                 <span v-else>{{ row.dot }}</span>
                             </template>
                             <template slot="subTotalMoney" slot-scope="{ row }">{{ row.goodsNum * row.price
-                            }}</template>
+                                }}</template>
 
                             <template slot="remarks" slot-scope="{ row }">
                                 <el-input v-if="!mingxibaocun" size="small" v-model="row.remarks"
@@ -101,17 +101,17 @@
                             </template>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
                                 <el-button v-if="mingxibaocun" :size="size"
-                                    :disabled="disabled  || form.billType == 1" :type="type"
+                                    :disabled="!(form.status == 0 || form.status == 3)" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="hangeditBtn(row, index)">编辑
                                 </el-button>
-                                <el-button v-else :size="size" :disabled="disabled  || form.billType == 1"
+                                <el-button v-else :size="size" :disabled="!(form.status == 0 || form.status == 3)"
                                     :type="type" :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="hangbaocun(row, index)">保存
                                 </el-button>
                                 <el-button icon="el-icon-delete" :size="size"
-                                    :disabled="disabled || isDisabled || form.billType == 1" :type="type"
-                                    @click="rowDelBox(row, index, 'orderItemsList')">删除
+                                    :disabled="!(form.status == 0 || form.status == 3)" :type="type"
+                                    @click="rowDelBox(row, index, 'planItemsList')">删除
                                 </el-button>
                             </template>
                         </avue-crud>
@@ -214,7 +214,7 @@ import {
     submit,
     generateShipTask,
     tradingBox,
-    delOrderItem,
+    itemRemove,
     checkOrder,
     confirmRefund,
     revokeCheckOrder,
@@ -386,10 +386,10 @@ export default {
             disabled: false, // 表格按钮的禁用
             key: 0,
             form: {
-                orderItemsList: [],
-                paymentRecordsList: [],
+                planItemsList: [],
                 outboundRecordsList: [],
-                freight: 5,
+                status: 0,
+                bsType:'CP'
             },
             customerData: [], // 货主数据
             optionForm: {
@@ -928,7 +928,7 @@ export default {
             ])
         },
         synchronous(row) {
-            this.form.orderItemsList.forEach(e => {
+            this.form.planItemsList.forEach(e => {
                 if (e.goodsName == this.selectionMultilist[0].goodsName) {
                     e.inventory = row.balanceQuantity
                     e.dot = row.dot
@@ -938,7 +938,7 @@ export default {
         uploadAfter(res, done, loading, column) {
             if (Array.isArray(res)) {
                 if (res instanceof Array) {
-                    this.form.orderItemsList = this.form.orderItemsList.concat(res)
+                    this.form.planItemsList = this.form.planItemsList.concat(res)
                     res.forEach(item => {
                         dotList({
                             storageId: this.form.storageId,
@@ -1014,7 +1014,7 @@ export default {
                 id: this.detailData.id
             }).then(res => {
                 this.form = res.data.data
-                this.form.orderItemsList = res.data.data.orderItemsList
+                this.form.planItemsList = res.data.data.planItemsList
 
                 console.log(this.isEditButton, 'bianj')
                 console.log(this.isDisabledTask, 'chexiao')
@@ -1159,7 +1159,7 @@ export default {
                         }
                     }
                 }
-                this.form.orderItemsList.push(obj)
+                this.form.planItemsList.push(obj)
             }
             this.mingxibaocun = false
             this.dialogVisible = false
@@ -1283,17 +1283,17 @@ export default {
             this.$refs["form"].validate((valid, done) => {
                 done();
                 if (valid) {
-                    if (this.form.orderItemsList.length == 0) {
+                    if (this.form.planItemsList.length == 0) {
                         this.$message.warning("请添加商品");
                         return
                     }
-                    for (let i in this.form.orderItemsList) {
-                        this.form.orderItemsList[i].subTotalMoney = Number(this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price) ? Number(this.form.orderItemsList[i].goodsNum * this.form.orderItemsList[i].price).toFixed(2) : 0
-                        if (this.form.orderItemsList[i].goodsNum <= 0) {
+                    for (let i in this.form.planItemsList) {
+                        this.form.planItemsList[i].subTotalMoney = Number(this.form.planItemsList[i].goodsNum * this.form.planItemsList[i].price) ? Number(this.form.planItemsList[i].goodsNum * this.form.planItemsList[i].price).toFixed(2) : 0
+                        if (this.form.planItemsList[i].goodsNum <= 0) {
                             return this.$message.warning(`销售明细序号${Number(i) + 1}的数量不能为零`);
                         }
-                        if (!this.form.orderItemsList[i].sendNum) {
-                            this.form.orderItemsList[i].sendNum = 0
+                        if (!this.form.planItemsList[i].sendNum) {
+                            this.form.planItemsList[i].sendNum = 0
                         }
                     }
                     this.mingxibaocun = true
@@ -1376,8 +1376,8 @@ export default {
                 type: "warning"
             }).then(() => {
                 if (row.id) {
-                    delOrderItem({ ids: row.id }).then(res => {
-                        this.form.orderItemsList.splice(index, 1);
+                    itemRemove({ ids: row.id }).then(res => {
+                        this.form.planItemsList.splice(index, 1);
                         this.$message.success("操作成功!");
                     });
                 } else {
@@ -1402,7 +1402,7 @@ export default {
                 type: "warning"
             }).then(() => {
                 let multiList = this.selectionMultilist
-                let arr = this.form.orderItemsList
+                let arr = this.form.planItemsList
                 // 获取有id 的数据
                 const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
                 let arrIds = itemsWithId.map(item => item.id) // 获取id 数据
@@ -1416,7 +1416,7 @@ export default {
                 })
                 // 有id 的处理
                 if (itemsWithId.length != 0) {
-                    delOrderItem({ ids: arrIds.join(',') }).then(res => {
+                    itemRemove({ ids: arrIds.join(',') }).then(res => {
                         this.$message.success("操作成功!");
                     });
                 }

src/views/storehouse/outStockManage/outStockPlan/index.vue

@@ -64,7 +64,7 @@
 </template>
 
 <script>
-import { getList, remove, getGoodsInfo } from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { getList, remove, getGoodsInfo } from "@/api/storehouse/outStockPlan.js";
 import detailsPage from "./detailsPage"
 import { getDetails } from "@/api/tirePartsMall/salesManagement/saleOrder";
 import { getToken } from "@/util/auth";
@@ -81,7 +81,9 @@ export default {
       actualStatusList: [],
       returnStatusList: [],
       loading: false,
-      search: {},
+      search: {
+        bsType:'CP'
+      },
       form: {},
       dataList: [],
       detailData: {},
@@ -219,7 +221,7 @@ export default {
           type: 'sum',
         }],
         column: [{
-          label: '销售单号',
+          label: '业务单号',
           prop: "ordNo",
           search: true,
           overHidden: true,