中心仓功能优化调整

src/api/storehouse/stock.js

@@ -24,3 +24,12 @@ export const stockGoodsList = (params) => {
         params: params
     })
 }
+
+
+export const stockDataDetails = (params) => {
+    return request({
+        url: '/api/blade-sales-part/tire/center/warehouse/stockDesc/getStockItemList',
+        method: 'post',
+        data: params
+    })
+}

src/router/views/index.js

@@ -4026,7 +4026,7 @@ export default [{
     path: '/financialManagement/reconciliationC/index',
     name: '付款对账',
     meta: {
-      i18n: '/financialManagement/reconciliationC/index', 
+      i18n: '/financialManagement/reconciliationC/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/financialManagement/reconciliationC/index')
@@ -4040,7 +4040,7 @@ export default [{
     path: '/iosBasicData/inventoryAccount/index',
     name: '库存账统计(F)',
     meta: {
-      i18n: '/iosBasicData/inventoryAccount/index', 
+      i18n: '/iosBasicData/inventoryAccount/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/inventoryAccount/index')
@@ -4054,7 +4054,7 @@ export default [{
     path: '/iosBasicData/storageFeeF/index',
     name: '仓储费(F)',
     meta: {
-      i18n: '/iosBasicData/storageFeeF/index', 
+      i18n: '/iosBasicData/storageFeeF/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/storageFeeF/index')
@@ -4068,7 +4068,7 @@ export default [{
     path: '/iosBasicData/revenueInvoicing/index',
     name: '进账开票(F)',
     meta: {
-      i18n: '/iosBasicData/revenueInvoicing/index', 
+      i18n: '/iosBasicData/revenueInvoicing/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/revenueInvoicing/index')
@@ -4082,7 +4082,7 @@ export default [{
     path: '/system/businessUnlocking/index',
     name: '业务解锁(F)',
     meta: {
-      i18n: '/system/businessUnlocking/index', 
+      i18n: '/system/businessUnlocking/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/system/businessUnlocking/index')
@@ -4096,7 +4096,7 @@ export default [{
     path: '/iosBasicData/fastMail/fastMail/index',
     name: '快递业务',
     meta: {
-      i18n: '/iosBasicData/fastMail/fastMail/index', 
+      i18n: '/iosBasicData/fastMail/fastMail/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/fastMail/fastMail/index')
@@ -4110,7 +4110,7 @@ export default [{
     path: '/iosBasicData/oceanShipping/manifest/index',
     name: '海运舱单',
     meta: {
-      i18n: '/iosBasicData/oceanShipping/manifest/index', 
+      i18n: '/iosBasicData/oceanShipping/manifest/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/oceanShipping/manifest/index')
@@ -4124,7 +4124,7 @@ export default [{
     path: '/storehouse/inStockManage/inStockPlan/index',
     name: '入库单(Z)',
     meta: {
-      i18n: '/storehouse/inStockManage/inStockPlan/index', 
+      i18n: '/storehouse/inStockManage/inStockPlan/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/storehouse/inStockManage/inStockPlan/index')
@@ -4138,10 +4138,22 @@ export default [{
     path: '/storehouse/outStockManage/outStockPlan/index',
     name: '出库单(Z)',
     meta: {
-      i18n: '/storehouse/outStockManage/outStockPlan/index', 
+      i18n: '/storehouse/outStockManage/outStockPlan/index',
       keepAlive: true,
     },
     component: () => import( /* webpackChunkName: "views" */ '@/views/storehouse/outStockManage/outStockPlan/index')
   }]
-},
+}, {
+        path: '/storehouse/inventoryManage/inventory/detail',
+        component: Layout,
+        hidden: true,
+        children: [{
+            path: '/storehouse/inventoryManage/inventory/detail',
+            name: '中心仓出入明细',
+            meta: {
+                keepAlive: true,
+            },
+            component: () => import( /* webpackChunkName: "views" */ '@/views/storehouse/inventoryManage/inventory/detail')
+        }]
+    },
 ]

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

@@ -1197,7 +1197,7 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     submit(obj).then(res => {
-                        this.$message.success("操作成功");
+                        this.$message.success("提交成功");
                         this.getDetail(res.data.data)
                     }).finally(() => {
                         loading.close();

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

@@ -36,7 +36,7 @@
                 <template slot-scope="{type,size,row,index}" slot="menu">
                     <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
                     <!--  判断是否一键采购过 然后展示不同的判断按钮-->
-                    <el-button :size="size" :type="type" :disabled="row.status != 0 && row.numberRows >= 1"
+                    <el-button :size="size" :type="type" :disabled="row.status !== 1 && row.numberRows >= 1"
                         @click="$refs.crud.rowDel(row, index)">删除
                     </el-button>
                 </template>
@@ -49,7 +49,7 @@
                 <template slot-scope="{type,size,row,$index}" slot="menuLeft">
                     <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单
                     </el-button>
-                    <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
+                    <el-button type="warning" icon="el-icon-download" size="small" @click="outExport" disabled>导出</el-button>
                 </template>
                 <template slot-scope="{ row, index }" slot="ordNo">
                     <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}
@@ -471,7 +471,7 @@ export default {
             }
             console.log(config, 427)
             const routeData = this.$router.resolve({
-                path: '/api/blade-sales-part/order/listExport',      //跳转目标下载地址
+                path: '/api/blade-sales-part/tire/center/warehouse/stockDesc/stockExport',      //跳转目标下载地址
                 query: {
                     ...config.params    //括号内是要传递给新窗口的参数
                 }

src/views/storehouse/inventoryManage/inventory/config/LTdetail.json

@@ -34,7 +34,7 @@
     "column": [
         {
             "label": "业务编号",
-            "prop": "billno",
+            "prop": "ordNo",
             "search": false,
             "minWidth": 80,
             "overHidden": true,
@@ -42,19 +42,13 @@
         },
         {
             "label": "名称",
-            "prop": "corpName",
+            "prop": "customerName",
             "search": false,
             "minWidth": 80,
             "overHidden": true,
             "searchSpan": 8
         },
         {
-            "label": "状态",
-            "prop": "statusName",
-            "minWidth": 80,
-            "overHidden": true
-        },
-        {
             "label": "商品名称",
             "prop": "goodsName",
             "minWidth": 80,
@@ -62,19 +56,19 @@
         },
         {
             "label": "花纹",
-            "prop": "brandItem",
+            "prop": "pattern",
             "minWidth": 80,
             "overHidden": true
         },
         {
             "label": "规格",
-            "prop": "specificationAndModel",
+            "prop": "propertyName",
             "minWidth": 80,
             "overHidden": true
         },
         {
             "label": "类型",
-            "prop": "bizTypeName",
+            "prop": "bsType",
             "minWidth": 80,
             "overHidden": true
         },

src/views/storehouse/inventoryManage/inventory/config/detail.json

@@ -51,7 +51,7 @@
             "minWidth": 80,
             "overHidden": true
         },
-         
+
         {
             "label": "类型",
             "prop": "bizTypeName",
@@ -79,4 +79,4 @@
             "searchSpan": 8
         }
     ]
-}
+}

src/views/storehouse/inventoryManage/inventory/detail.vue

@@ -6,6 +6,10 @@
       <template slot="billno" slot-scope="{ row, index }">
         <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(row, index)">{{ row.billno }}</span>
       </template>
+        <template slot="bsType" slot-scope="{ row, index }">
+            <span v-if="row.bsType === 'RP'">入库</span>
+            <span v-else>出库</span>
+        </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -13,7 +17,8 @@
 <script>
 import option from "./config/detail.json";
 import LTdetail from './config/LTdetail.json'
-import {AppPartsStockDataDetails, stockDataDetails} from "@/api/basicData/inventoryAccount";
+import {AppPartsStockDataDetails} from "@/api/basicData/inventoryAccount";
+import { stockDataDetails } from "@/api/storehouse/stock.js";
 
 export default {
   name: "detail",
@@ -35,27 +40,18 @@ export default {
   async created() {
     // this.option = option
     console.log('打开了');
-    if (JSON.parse(localStorage.getItem('saber-tenantId')).content == 883868){
-        this.option = LTdetail;
-    }else {
-        this.option = await this.getColumnData(this.getColumnName(279), option);
-    }
+      this.option = LTdetail;
     this.$store.commit("DOMAS_IN_DETAIL");
   },
   activated() {
     this.$store.commit("DOMAS_IN_DETAIL");
-    if (this.$route.query.type == 'JL'){
-        this.params = {
-            goodsId: this.$route.query.goodsId,
-            storageId: this.$route.query.stockId
-        }
-    }else {
-        this.params = {
-            goodsId: this.$route.query.goodsId,
-            stockId: this.$route.query.stockId,
-            dot:this.$route.query.dot
-        }
-    }
+      this.params = {
+          goodsId: this.$route.query.goodsId,
+          stockId: this.$route.query.stockId,
+          dot:this.$route.query.dot,
+          regionId: this.$route.query.regionId,
+          customerId: this.$route.query.customerId
+      }
       this.onLoad(this.page)
   },
   methods: {
@@ -66,31 +62,18 @@ export default {
         this.$refs.crud.toggleRowExpansion(item, false)
       })
       this.loading = true;
-      if (this.$route.query.type == 'JL') {
-          AppPartsStockDataDetails(params).then(res=>{
-              console.log(res)
-              this.dataList = res.data.data ? res.data.data : [];
-              this.page.total = res.data.data.total;
-              if (this.page.total) {
-                  this.option.height = window.innerHeight - 260;
-              }
-          }).finally(() => {
-              this.loading = false;
-          });
-      }else {
-          stockDataDetails(params)
-              .then(res => {
-                  console.log('res', res);
-                  this.dataList = res.data.data ? res.data.data : [];
-                  this.page.total = res.data.data.total;
-                  if (this.page.total) {
-                      this.option.height = window.innerHeight - 260;
-                  }
-              })
-              .finally(() => {
-                  this.loading = false;
-              });
-      }
+        stockDataDetails(params)
+            .then(res => {
+                console.log('res', res);
+                this.dataList = res.data.data ? res.data.data : [];
+                this.page.total = res.data.data.total;
+                if (this.page.total) {
+                    this.option.height = window.innerHeight - 260;
+                }
+            })
+            .finally(() => {
+                this.loading = false;
+            });
     },
     searchChange(params, done) {
       this.onLoad(this.page, params);
@@ -122,16 +105,10 @@ export default {
       }
     },
     async resetColumn() {
-      this.option = option;
-      const inSave = await this.delColumnData(
-        this.getColumnName(279),
-        option
-      );
-      if (inSave) {
+      this.option = LTdetail;
         this.$message.success("重置成功");
         //关闭窗口
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
-      }
     },
     // 跳转
     beforeOpenPage(row, index) {

src/views/storehouse/inventoryManage/inventory/index.vue

@@ -149,6 +149,20 @@ export default {
           },
         ],
         column: [
+            {
+                label: '货主',
+                prop: "customerId",
+                search: true,
+                overHidden: true,
+                filterable: true,
+                remote: true,
+                props: {
+                    label: 'cname',
+                    value: 'cname',
+                    res: 'data'
+                },
+                dicUrl: '/api/blade-sales-part/corpsDesc/detailByIdToView?id={{key}}',
+            },
           {
             label: '商品名称',
             prop: "cname",
@@ -558,7 +572,7 @@ export default {
     //点击可用库存打开
     storeInventoryOpen(row) {
       console.log(this.$store.getters.inventoryAccount);
-      if (this.$store.getters.inventoryAccount) {
+      if (false) {
         this.$alert("明细账已存在,请保存关闭明细账再进行操作", "温馨提示", {
           confirmButtonText: "确定",
           type: "warning",
@@ -570,14 +584,16 @@ export default {
         console.log(row)
         this.params.corpId = row.corpId
         this.params.itemId = row.goodsId
-        this.params.storageId = row.storageId
-        this.$router.$avueRouter.closeTag("/tirePartsMall/inventory/detail");
+        this.params.regionId = row.regionId
+        this.params.customerId = row.customerId
+        this.$router.$avueRouter.closeTag("/storehouse/inventoryManage/inventory/detail");
         this.$router.push({
-          path: "/tirePartsMall/inventory/detail",
+          path: "/storehouse/inventoryManage/inventory/detail",
           query: {
-            stockId: row.storageId,
+            regionId: row.regionId,
             goodsId: row.goodsId,
-            dot: row.dot
+            dot: row.dot,
+              customerId: row.customerId
           },
         });
       }

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

@@ -62,7 +62,7 @@
             </trade-card>
             <trade-card title="明细信息">
                 <el-tabs v-model="activeName" type="card">
-                    <el-tab-pane label="销售明细" name="sale_detail">
+                    <el-tab-pane label="出库明细" name="sale_detail">
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
                             :data="form.planItemsList" :key="key"
                             @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
@@ -70,7 +70,7 @@
                             @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.status == 1"
-                                    @click="rowAdd(row, 1)">添加商品</el-button>
+                                    @click="rowAdd(row, 1)">选择库存</el-button>
                                 <el-button type="success" size="small" :disabled="form.status == 1"
                                     icon="el-icon-bottom" @click="excelDialogfun('code')">按Code导入
                                 </el-button>
@@ -233,7 +233,7 @@
             </p>
         </el-dialog>
 
-        <el-dialog title="选择商品" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
+        <el-dialog title="选择库存" append-to-body class="el-dialogDeep" :visible.sync="dialogVisible" width="80%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @close="closeGoods">
             <el-row :style="{ height: rowHeight }">
                 <el-col :span="5">
@@ -643,7 +643,7 @@ export default {
                 border: true,
                 align: 'center',
                 index: true,
-                addBtnText: "添加商品",
+                addBtnText: "选择库存",
                 updateBtnText: '保存',
                 refreshBtn: false,
                 dialogDrag: true,
@@ -700,7 +700,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '商品名称',
+                        label: '轮胎名称',
                         prop: 'goodsName',
                         width: 250,
                         disabled: false,
@@ -752,7 +752,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: '商品编码',
+                        label: '轮胎编码',
                         prop: 'goodsNo',
                         overHidden: true,
                         disabled: false,
@@ -779,7 +779,7 @@ export default {
                         width: 100
                     },
                     {
-                        label: '商品描述',
+                        label: '轮胎描述',
                         prop: 'goodsDescription',
                         disabled: false,
                         overHidden: true,
@@ -1158,7 +1158,7 @@ export default {
                     brandName: item.brandName,
                     brandId: item.brandId,
                     goodsNo: item.code,
-                    propertyName: item.specificationAndModel,
+                    propertyName: item.typeNo,
                     inventory: item.balanceQuantity,
                     pattern: item.brandItem,
                     goodsDescription: item.goodsDescription,
@@ -1262,7 +1262,7 @@ export default {
                     for (let row of this.form.planItemsList.filter(item => item.isDeleted != 1)) {
                         if (!row.goodsNum) {
                             this.$refs.formContacts.rowCell(row, row.$index)
-                            return this.$message.error("请完善商品明细信息");
+                            return this.$message.error("请完善库存明细信息");
                         }
                     }
                     for (let row of this.form.centerShipCostList.filter(item => item.isDeleted != 1)) {
@@ -1288,7 +1288,7 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     submitOutPlan(obj).then(res => {
-                        this.$message.success("保存成功");
+                        this.$message.success("提交成功");
                         this.getDetail(res.data.data)
                     }).finally(() => {
                         loading.close();

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

@@ -46,7 +46,7 @@
         </template>
         <template slot-scope="{type,size,row,$index}" slot="menuLeft">
           <el-button icon="el-icon-plus" type="primary" :size="size" @click="detailsOpen = true">新建订单</el-button>
-          <el-button type="warning" icon="el-icon-download" size="small" @click="outExport">导出</el-button>
+          <el-button type="warning" icon="el-icon-download" size="small" @click="outExport" disabled>导出</el-button>
         </template>
         <template slot-scope="{ row, index }" slot="ordNo">
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 2)">{{ row.ordNo }}