lilei 1 week ago
parent
commit
8f194a6008

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1752649528494
+  "version": 1752650548255
 }

+ 8 - 6
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -109,7 +109,8 @@
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
         <div class="ftext" slot="message">
-          可用库存总数量:<strong>{{ currentStock&&(currentStock.totalCurrentStockQty || currentStock.totalCurrentStockQty==0) ? currentStock.totalCurrentStockQty : '--' }}个</strong>;
+          冻结总库存:<strong>{{ currentStock&&(currentStock.totalFreezeQty || currentStock.totalFreezeQty==0) ? currentStock.totalFreezeQty : '--' }}个</strong>;
+          可用总库存:<strong>{{ currentStock&&(currentStock.totalCurrentStockQty || currentStock.totalCurrentStockQty==0) ? currentStock.totalCurrentStockQty : '--' }}个</strong>;
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
             可用库存总成本:<strong>{{ currentStock&&(currentStock.totalCurrentStockCost || currentStock.totalCurrentStockCost==0) ? toThousands(currentStock.totalCurrentStockCost) : '--' }}</strong>。
           </div>
@@ -281,19 +282,20 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '16%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品品牌', dataIndex: 'brandName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productTypeName' }, width: '13%', align: 'center' },
-        { title: '可用库存数量(个)', dataIndex: 'currentStockQty', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '冻结库存(个)', dataIndex: 'freezeQty', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '可用库存(个)', dataIndex: 'currentStockQty', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '可用库存成本(¥)', dataIndex: 'currentStockCost', width: '8%', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: <div><a-tooltip placement='top' title='1:产品距离最近一次销售的时间,30天算一个月 2:采购退货,调拨等不算销售,不用来计算滞销天数'><a-icon type="question-circle" /></a-tooltip>&nbsp;滞销天数</div>, width: '10%', align: 'center', dataIndex: 'unsalableDays', scopedSlots: { customRender: 'unsalableDays' }, sorter: true },
         { title: <div><a-tooltip placement='top' title='注意:购物车仅限添加箭冠已上线产品。'><a-icon type="question-circle" /></a-tooltip>&nbsp;操作</div>, scopedSlots: { customRender: 'action' }, width: '16%', align: 'center' }
       ]
       // 成本权限
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(7, 0, { title: '可用库存成本(¥)', dataIndex: 'currentStockCost', width: '8%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '可用库存成本(¥)', dataIndex: 'currentStockCost', width: '10%', align: 'right', sorter: true, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

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

@@ -88,11 +88,13 @@
         <!-- 合计 -->
         <a-alert type="info" style="margin-bottom:10px">
           <div class="ftext" slot="message">
-            当前库存总数量:<strong>{{ (productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0)) ? productTotal.currentStockQty : '--' }}个</strong>;
+            总入数量:<strong>{{ (productTotal&&(productTotal.putQty || productTotal.putQty==0)) ? productTotal.putQty : '--' }}个</strong>;
+            总出数量:<strong>{{ (productTotal&&(productTotal.outQty || productTotal.outQty==0)) ? productTotal.outQty : '--' }}个</strong>;
+            可用总库存:<strong>{{ (productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0)) ? productTotal.currentStockQty : '--' }}个</strong>;
             <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-              当前库存总成本:<strong>{{ (productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0)) ? toThousands(productTotal.currentStockCost) : '--' }}</strong>;
+              可用库存总成本:<strong>{{ (productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0)) ? toThousands(productTotal.currentStockCost) : '--' }}</strong>;
             </div>
-            冻结库存总数量:<strong>{{ productTotal&&(productTotal.freezeQty || productTotal.freezeQty==0) ? productTotal.freezeQty : '--' }}个</strong>;
+            冻结库存:<strong>{{ productTotal&&(productTotal.freezeQty || productTotal.freezeQty==0) ? productTotal.freezeQty : '--' }}个</strong>;
             <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
               冻结库存总成本:<strong>{{ productTotal&&(productTotal.freezeCost || productTotal.freezeCost==0) ? toThousands(productTotal.freezeCost) : '--' }}</strong>。
             </div>

+ 2 - 0
src/views/salesManagement/salesReturn/list.vue

@@ -182,6 +182,8 @@ export default {
         { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户关系', dataIndex: 'buyerRelationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '退款总金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折扣金额', dataIndex: 'discountAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折后金额', dataIndex: 'discountedAmount', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总款数', dataIndex: 'totalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '是否抓单', dataIndex: 'grabFlag', width: '6%', align: 'center', customRender: function (text) { return ['否', '是'][text] } },