lilei 3 år sedan
förälder
incheckning
3e4a69fd8c
3 ändrade filer med 9 tillägg och 3 borttagningar
  1. 1 1
      public/version.json
  2. 1 0
      src/libs/JGPrint.js
  3. 7 2
      src/views/inventoryManagement/inventoryQuery/list.vue

+ 1 - 1
public/version.json

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

+ 1 - 0
src/libs/JGPrint.js

@@ -145,6 +145,7 @@ export const getPrintList = function(){
       printList.push({name:pname,value:i})
     }
   }
+  console.log(printList)
   return printList
 }
 // 获取打印机状态

+ 7 - 2
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -178,6 +178,7 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
+        console.log(parameter)
         // 查询条件有直销天数先校验滞销天数
         if (this.checkValueRange()) {
           this.disabled = true
@@ -191,6 +192,10 @@ export default {
             parameter.sortField = 'currentStockCost'
             parameter.sortAlias = 'stock'
           }
+          if (parameter.sortField == 'unsalableDays') {
+            parameter.sortField = 'unsalableDays'
+            parameter.sortAlias = ''
+          }
           const params = Object.assign(parameter, this.queryParam)
           params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
           params.enableFlag = params.enableFlag ? '' : '1'
@@ -214,7 +219,7 @@ export default {
           this.disabled = true
           this.spinning = true
           return new Promise(function (resolve, reject) {
-            const data = []
+            const data = { list: [], count: 0, pageNo: 1, pageSize: 10 }
             _this.disabled = false
             _this.spinning = false
             resolve(data)
@@ -237,7 +242,7 @@ export default {
         { 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: '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', scopedSlots: { customRender: 'unsalableDays' }, sorter: true },
+        { 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: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {