lilei 3 年 前
コミット
ecd9b89eda

+ 6 - 4
src/views/bulkManagement/bulkImport/list.vue

@@ -166,7 +166,7 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.resetSearchForm()
-              _this.showSuccessModal()
+              _this.showSuccessModal(res.data)
               _this.spinning = false
             } else {
               _this.spinning = false
@@ -175,9 +175,11 @@ export default {
         }
       })
     },
-    showSuccessModal () {
-      this.openTipsModal = true
-      this.modalHtml = '<div><div>库存导入成功</div><div>入库类型:散件导入</div><div>库存批次:2021-04-22 12:25:36</div><div>总导入款数:26</div><div>总入库数量:52</div><div>总入库成本:1254</div></div>'
+    showSuccessModal (data) {
+      if (data) {
+        this.openTipsModal = true
+        this.modalHtml = `<div><div>库存导入成功</div><div>入库类型:散件导入</div><div>库存批次:${data.stockBatchNo}</div><div>总导入款数:${data.productTotalCategory}</div><div>总入库数量:${data.productTotalQty}</div><div>总入库成本:${data.productTotalCost}</div></div>`
+      }
     },
     // 取消导入
     handleCancel () {

+ 6 - 4
src/views/inventoryManagement/inventoryImport/list.vue

@@ -162,7 +162,7 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.resetSearchForm()
-              _this.showSuccessModal()
+              _this.showSuccessModal(res.data)
               _this.spinning = false
             } else {
               _this.spinning = false
@@ -171,9 +171,11 @@ export default {
         }
       })
     },
-    showSuccessModal () {
-      this.openTipsModal = true
-      this.modalHtml = '<div><div>库存导入成功</div><div>入库类型:库存导入</div><div>库存批次:2021-04-22 12:25:36</div><div>总导入款数:26</div><div>总入库数量:52</div><div>总入库成本:1254</div></div>'
+    showSuccessModal (data) {
+      if (data) {
+        this.openTipsModal = true
+        this.modalHtml = `<div><div>库存导入成功</div><div>入库类型:库存导入</div><div>库存批次:${data.stockBatchNo}</div><div>总导入款数:${data.productTotalCategory}</div><div>总入库数量:${data.productTotalQty}</div><div>总入库成本:${data.productTotalCost}</div></div>`
+      }
     },
     // 取消导入
     handleCancel () {

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -14,8 +14,8 @@
         <div class="ftext" slot="message">
           可用库存总数量(个):<strong>{{ currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0) ? currentStock.currentStockQty : '--' }}</strong>;
           可用库存总成本(¥):<strong>{{ currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0) ? currentStock.currentStockCost : '--' }}</strong>;
-          冻结库存总数量(个):<strong>{{ currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0) ? currentStock.currentStockQty : '--' }}</strong>;
-          冻结库存总成本(¥):<strong>{{ currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0) ? currentStock.currentStockCost : '--' }}</strong>。
+          冻结库存总数量(个):<strong>{{ currentStock&&(currentStock.freezeQty || currentStock.freezeQty==0) ? currentStock.freezeQty : '--' }}</strong>;
+          冻结库存总成本(¥):<strong>{{ currentStock&&(currentStock.freezeCost || currentStock.freezeCost==0) ? currentStock.freezeCost : '--' }}</strong>。
         </div>
       </a-alert>
       <!-- 库存详情 -->
@@ -77,7 +77,7 @@ export default {
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '可用库存数量', dataIndex: 'currentQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '冻结库存数量', dataIndex: 'currentQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '冻结库存数量', dataIndex: 'freezeQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '成本单价', dataIndex: 'putCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 8 - 5
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -63,7 +63,7 @@
                       v-model="queryParam.state"
                       ref="state"
                       id="warehousingAuditList-state"
-                      code="STOCK_FLOW_TYPE"
+                      code="STOCK_FLOW_STATE"
                       placeholder="请选择出入库状态"
                       allowClear></v-select>
                   </a-form-item>
@@ -85,8 +85,8 @@
           <div class="ftext" slot="message">
             当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0)) ? productTotal.currentStockQty : '--' }}</strong>;
             当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0)) ? productTotal.currentStockCost : '--' }}</strong>;
-            冻结库存总数量(个):<strong>{{ productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0) ? productTotal.currentStockQty : '--' }}</strong>;
-            冻结库存总成本(¥):<strong>{{ productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0) ? productTotal.currentStockCost : '--' }}</strong>。
+            冻结库存总数量(个):<strong>{{ productTotal&&(productTotal.freezeQty || productTotal.freezeQty==0) ? productTotal.freezeQty : '--' }}</strong>;
+            冻结库存总成本(¥):<strong>{{ productTotal&&(productTotal.freezeCost || productTotal.freezeCost==0) ? productTotal.freezeCost : '--' }}</strong>。
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -137,7 +137,8 @@ export default {
         bizNo: '',
         flowType: undefined,
         unitName: '',
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        state: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
@@ -155,7 +156,7 @@ export default {
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: '5%', align: 'center' },
         { title: '总成本', dataIndex: 'totalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '出入库状态', dataIndex: 'bizTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '出入库状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -210,9 +211,11 @@ export default {
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
       this.queryParam.bizType = undefined
+      this.queryParam.bizNo = ''
       this.queryParam.flowType = undefined
       this.queryParam.unitName = ''
       this.queryParam.warehouseSn = undefined
+      this.queryParam.state = undefined
       this.$refs.table.refresh(true)
     },
     //  返回列表