Ver Fonte

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

zhangdan há 3 anos atrás
pai
commit
b50706e034

+ 6 - 0
src/App.vue

@@ -33,6 +33,12 @@ export default {
     window.addEventListener('beforeunload', () => {
       sessionStorage.setItem('store', JSON.stringify(this.$store.state))
     })
+
+    this.$message.config({
+      top: `100px`,
+      duration: 2,
+      maxCount: 3
+    })
   }
 }
 </script>

+ 6 - 1
src/views/inventoryManagement/inventoryChecking/detailModal.vue

@@ -106,6 +106,7 @@
           :data="loadData"
           :defaultLoadData="false"
           :scroll="{ x: 990, y: 450 }"
+          :rowClassName="(record, index) => record.checkProfitLossQty < 0 ? 'redBg-row':''"
           bordered>
           <!-- 产品分类 -->
           <template slot="productType" slot-scope="text, record">
@@ -114,7 +115,7 @@
           </template>
           <!-- 盈亏数量 -->
           <template slot="checkProfitLossQty" slot-scope="text, record">
-            <span :style="{ color: record.checkProfitLossQty>0?'red':record.checkProfitLossQty<0?'green':'' }">{{ (record.checkProfitLossQty || record.checkProfitLossQty==0) ? record.checkProfitLossQty : '--' }}</span>
+            <span :style="{ color: record.checkProfitLossQty>0?'red':record.checkProfitLossQty<0?'green':'' }">{{ (record.checkProfitLossQty || record.checkProfitLossQty==0) ? Math.abs(record.checkProfitLossQty) : '--' }}</span>
           </template>
         </s-table>
       </a-card>
@@ -216,6 +217,7 @@ export default {
       checkWarehouseDetailCount(Object.assign(this.queryParam, { checkWarehouseSn: this.itemSn })).then(res => {
         if (res.status == 200) {
           this.productTotal = res.data
+          this.productTotal.checkLossQty = Math.abs(this.productTotal.checkLossQty || 0)
         } else {
           this.productTotal = null
         }
@@ -352,5 +354,8 @@ export default {
       text-align: right;
       padding: 5px 0 10px;
     }
+    .redBg-row{
+      background-color: #f5cdc8;
+    }
   }
 </style>

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

@@ -192,7 +192,7 @@ export default {
           this.disabled = false
           this.spinning = false
           // 总计
-          this.getTotal(Object.assign(parameter, this.queryParam))
+          this.getTotal(params)
           // 产品分类
           if (this.typeData.length == 0) {
             this.getProductType()
@@ -227,11 +227,6 @@ export default {
     },
     // 合计
     getTotal (param) {
-      if (param.zeroQtyFlag) {
-        param.zeroQtyFlag = '0'
-      } else {
-        param.zeroQtyFlag = ''
-      }
       stockCount(param).then(res => {
         if (res.status == 200 && res.data) {
           this.currentStock = res.data

+ 2 - 1
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -171,7 +171,8 @@ export default {
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '采购总数', dataIndex: 'qty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { slots: { title: 'refundableQtyTitle' }, dataIndex: 'refundableQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '库存数量', dataIndex: 'stock.currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存数量', dataIndex: 'stock.currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '') } },
+        { title: '缺货数量', dataIndex: 'cancelQty', width: 100, align: 'center' },
         { title: '退货数量', scopedSlots: { customRender: 'returnQty' }, width: 100, align: 'center' },
         { title: '采购价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },