Browse Source

修改出入库 库存bug

Qukatie 5 days ago
parent
commit
a22af434cd

+ 18 - 0
src/enums/column-name.js

@@ -2069,6 +2069,24 @@ const columnName = [{
 },{
   code: 472,
   name: '货代-报关-空运进口关贸云列表页'
+},{
+  code: 473,
+  name: '中心仓库-出库管理-出库列表页'
+},{
+  code: 474,
+  name: '中心仓库-出库管理-出库明细'
+},{
+  code: 475,
+  name: '中心仓库-出库管理-费用明细'
+},{
+  code: 476,
+  name: '中心仓库-入库管理-入库列表页'
+},{
+  code: 477,
+  name: '中心仓库-入库管理-入库明细'
+},{
+  code: 478,
+  name: '中心仓库-入库管理-费用明细'
 }
 ]
 export const getColumnName = (key) => {

+ 3 - 0
src/page/index/tags.vue

@@ -312,6 +312,9 @@ export default {
         if (tag.label == "库存账明细") {
           this.$store.commit("DOMAS_OUT_DETAIL");
         }
+          if (tag.label == "中心仓出入明细") {
+          this.$store.commit("DOMAS_OUT_DETAIL");
+        }
         if (tag.label == "出库工单(L)") {
           this.$store.commit("DOMIO_OUT_DETAIL");
         }

+ 3 - 3
src/store/modules/ifdetail.js

@@ -681,6 +681,9 @@ const ifdetail = {
       if (tag.label == '库存账明细') {
         state.inventoryAccount = true
       }
+       if (tag.label == '中心仓出入明细') {
+        state.inventoryAccount = true
+      }
       if (tag.label == '出库工单(L)') {
         state.inboundAndOutbound = true
       }
@@ -690,9 +693,6 @@ const ifdetail = {
       if (tag.label == '采购订单(N)') {
         state.domPurStatus = true
       }
-      if (tag.label == '锁定订单明细') {
-        state.domStockDetail = true
-      }
       if (tag.label == '销项发票') {
         state.outputStatus = true
       }

+ 6 - 6
src/views/storehouse/inStockManage/inStockPlan/detailsPage.vue

@@ -67,8 +67,8 @@
                             :data="form.planItemsList" :key="key"
                             @row-update="rowUpdate" @row-close="rowClose" :before-close="beforeClose"
                             @selection-change="selectionContacts"
-                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)"
-                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
+                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 477)"
+                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 477)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
                                 <el-button type="primary" icon="el-icon-plus" size="small"
                                     :disabled="editButton || form.status == 1" @click="rowAdd(row)">添加商品
@@ -132,8 +132,8 @@
                     <el-tab-pane label="费用明细" name="outbound_records">
                         <avue-crud :option="optionOutboundRecords" ref="outbound_records"
                             :data="form.centerShipCostList" @row-update="rowUpdate"
-                            @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)"
-                            @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)">
+                            @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 478)"
+                            @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 478)">
                             <template slot="indexHeader" slot-scope="{row,index}">
                                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editButton" circle
                                     @click="addRow()">
@@ -797,8 +797,8 @@ export default {
         detailData: Object
     },
     async created() {
-        this.optionContacts = await this.getColumnData(this.getColumnName(269.1), this.optionContactsBack);
-        this.optionOutboundRecords = await this.getColumnData(this.getColumnName(269.3), this.optionOutboundRecordsBack);
+        this.optionContacts = await this.getColumnData(this.getColumnName(477), this.optionContactsBack);
+        this.optionOutboundRecords = await this.getColumnData(this.getColumnName(478), this.optionOutboundRecordsBack);
         this.key++
         if (this.onLoad.id && this.detailData.id) {
             this.$set(this.optionForm, 'disabled', true)

+ 3 - 3
src/views/storehouse/inStockManage/inStockPlan/index.vue

@@ -4,8 +4,8 @@
             <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
                 ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
                 @expand-change="expandChange" @refresh-change="refreshChange"
-                @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 274.4)"
-                @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 274.4)" :page.sync="page">
+                @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 476)"
+                @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 476)" :page.sync="page">
                 <template slot-scope="{ row }" slot="expand">
                     <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading"
                         :cell-style="cellStyle" class="itemTable"></avue-crud>
@@ -434,7 +434,7 @@ export default {
         }, 100);
     },
     async created() {
-        this.option = await this.getColumnData(this.getColumnName(274.4), this.optionList);
+        this.option = await this.getColumnData(this.getColumnName(476), this.optionList);
         this.key++
         let i = 0;
         this.option.column.forEach(item => {

+ 3 - 3
src/views/storehouse/inventoryManage/inventory/index.vue

@@ -571,9 +571,9 @@ export default {
     },
     //点击可用库存打开
     storeInventoryOpen(row) {
-      console.log(this.$store.getters.inventoryAccount);
-      if (false) {
-        this.$alert("明细已存在,请保存关闭明细再进行操作", "温馨提示", {
+      console.log();
+      if (this.$store.getters.inventoryAccount) {
+        this.$alert("中心仓出入明细已存在,请保存关闭中心仓出入明细再进行操作", "温馨提示", {
           confirmButtonText: "确定",
           type: "warning",
           callback: action => {

+ 8 - 8
src/views/storehouse/outStockManage/outStockPlan/detailsPage.vue

@@ -66,8 +66,8 @@
                         <avue-crud :option="optionContacts" v-model="formContacts" ref="formContacts"
                             :data="form.planItemsList" :key="key"
                             @row-close="rowClose" :before-close="beforeClose" @selection-change="selectionContacts"
-                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)"
-                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.6)">
+                            @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 474)"
+                            @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 474)">
                             <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>
@@ -124,8 +124,8 @@
                     <el-tab-pane label="收费明细" name="outbound_records">
                         <avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records"
                             :data="form.centerShipCostList"
-                            @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)"
-                            @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)">
+                            @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 475)"
+                            @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 475)">
                             <template slot="indexHeader" slot-scope="{row,index}">
                                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editButton" circle
                                     @click="addRowD()">
@@ -170,8 +170,8 @@
                     <el-tab-pane label="付费明细" name="outbound_records2">
                         <avue-crud :option="optionOutboundRecords" v-model="formContacts" ref="outbound_records2"
                             :data="form.centerShipPaymentCostList"
-                            @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)"
-                            @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 269.3)">
+                            @resetColumn="resetColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 475)"
+                            @saveColumn="saveColumnTwo('outbound_records', 'optionOutboundRecords', 'optionOutboundRecordsBack', 475)">
                             <template slot="indexHeader" slot-scope="{row,index}">
                                 <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editButton" circle
                                     @click="addRowC()">
@@ -908,8 +908,8 @@ export default {
         detailData: Object
     },
     async created() {
-        this.optionContacts = await this.getColumnData(this.getColumnName(269.6), this.optionContactsBack);
-        this.optionOutboundRecords = await this.getColumnData(this.getColumnName(269.3), this.optionOutboundRecordsBack);
+        this.optionContacts = await this.getColumnData(this.getColumnName(474), this.optionContactsBack);
+        this.optionOutboundRecords = await this.getColumnData(this.getColumnName(475), this.optionOutboundRecordsBack);
         this.key++
         if (this.onLoad.id && this.detailData.id) {
             this.$set(this.optionForm, 'disabled', true)

+ 3 - 3
src/views/storehouse/outStockManage/outStockPlan/index.vue

@@ -4,8 +4,8 @@
       <avue-crud :option="option" :search.sync="search" v-model="form" :table-loading="loading" :data="dataList"
         ref="crud" :key="key" @on-load="onLoad" @search-change="searchChange" @row-del="rowDel"
         @expand-change="expandChange" @refresh-change="refreshChange"
-        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 269)"
-        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 269)" :page.sync="page">
+        @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 473)"
+        @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 473)" :page.sync="page">
         <template slot-scope="{ row }" slot="status">
           <span v-for="(item, index) in orderStatusList" :key="index">
             <span v-if="item.dictKey == row.status" :style="{ background: item.colour }" class="bottomBox">
@@ -406,7 +406,7 @@ export default {
     }, 100);
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(269), this.optionList);
+    this.option = await this.getColumnData(this.getColumnName(473), this.optionList);
     this.key++
     let i = 0;
     this.option.column.forEach(item => {