Browse Source

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

lilei 3 years ago
parent
commit
ebe7bb5e70

+ 3 - 3
src/components/custom.less

@@ -1,9 +1,9 @@
 // 自定义样式文件   覆盖框架样式
 // 自定义样式文件   覆盖框架样式
 
 
 body{
 body{
-  font-size: 13px!important;
+  font-size: 12px!important;
   span,td,label,.ant-btn-sm{
   span,td,label,.ant-btn-sm{
-    font-size: 13px!important;
+    font-size: 12px!important;
   }
   }
   .ant-form-item-label > label{
   .ant-form-item-label > label{
     color: #333!important;
     color: #333!important;
@@ -144,7 +144,7 @@ body{
   }
   }
   .ant-table-row{
   .ant-table-row{
     .ant-table-row-cell-break-word, td{
     .ant-table-row-cell-break-word, td{
-      padding: 6px 4px!important;
+      padding: 3px 4px!important;
       color: #333!important;
       color: #333!important;
     }
     }
   }
   }

+ 11 - 9
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -11,8 +11,8 @@
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
-        可用库存总数量(个):<strong>{{ currentStock&&(currentStock.currentQty || currentStock.currentQty==0) ? currentStock.currentQty : '--' }}</strong>;
-        可用库存总成本(¥):<strong>{{ currentStock&&(currentStock.putCost || currentStock.putCost==0) ? currentStock.putCost : '--' }}</strong>。
+        可用库存总数量(个):<strong>{{ currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0) ? currentStock.currentStockQty : '--' }}</strong>;
+        可用库存总成本(¥):<strong>{{ currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0) ? currentStock.currentStockCost : '--' }}</strong>。
       </div>
       </div>
     </a-alert>
     </a-alert>
     <!-- 库存详情 -->
     <!-- 库存详情 -->
@@ -35,7 +35,7 @@
 
 
 <script>
 <script>
 import { STable } from '@/components'
 import { STable } from '@/components'
-import { stockDetailList, stockDetailCount } from '@/api/stock'
+import { stockDetailList, stockByProductSn } from '@/api/stock'
 export default {
 export default {
   name: 'InventoryQueryDetailModal',
   name: 'InventoryQueryDetailModal',
   components: { STable },
   components: { STable },
@@ -44,9 +44,11 @@ export default {
       type: Boolean,
       type: Boolean,
       default: false
       default: false
     },
     },
-    itemId: {
-      type: [Number, String],
-      default: ''
+    nowData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
     }
   },
   },
   computed: {
   computed: {
@@ -73,7 +75,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
-        return stockDetailList(Object.assign(parameter, { stockSn: this.itemId, isSellOut: '0' })).then(res => {
+        return stockDetailList(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', isSellOut: '0' })).then(res => {
           const data = res.data
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
           for (var i = 0; i < data.list.length; i++) {
@@ -81,7 +83,7 @@ export default {
           }
           }
           this.disabled = false
           this.disabled = false
           // 总计
           // 总计
-          this.getTotal(Object.assign(parameter, { stockSn: this.itemId, isSellOut: '0' }))
+          this.getTotal(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', isSellOut: '0' }))
           return data
           return data
         })
         })
       },
       },
@@ -91,7 +93,7 @@ export default {
   methods: {
   methods: {
     // 合计
     // 合计
     getTotal (param) {
     getTotal (param) {
-      stockDetailCount(param).then(res => {
+      stockByProductSn({ productSn: this.nowData && this.nowData.productSn || '' }).then(res => {
         if (res.status == 200 && res.data) {
         if (res.status == 200 && res.data) {
           this.currentStock = res.data
           this.currentStock = res.data
         } else {
         } else {

+ 4 - 4
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -116,7 +116,7 @@
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>
     <!-- 库存详情 -->
     <!-- 库存详情 -->
-    <inventory-query-detail-modal :openModal="openModal" :itemId="itemId" @close="closeModal" />
+    <inventory-query-detail-modal :openModal="openModal" :nowData="nowData" @close="closeModal" />
   </a-card>
   </a-card>
 </template>
 </template>
 
 
@@ -205,7 +205,7 @@ export default {
         })
         })
       },
       },
       openModal: false, //  查看库存详情  弹框
       openModal: false, //  查看库存详情  弹框
-      itemId: '', //  当前库存记录id
+      nowData: null,
       currentStock: null
       currentStock: null
     }
     }
   },
   },
@@ -237,12 +237,12 @@ export default {
     },
     },
     //  库存详情
     //  库存详情
     goDetail (row) {
     goDetail (row) {
-      this.itemId = row.stockSn
+      this.nowData = row
       this.openModal = true
       this.openModal = true
     },
     },
     //  关闭弹框
     //  关闭弹框
     closeModal () {
     closeModal () {
-      this.itemId = ''
+      this.nowData = null
       this.openModal = false
       this.openModal = false
     },
     },
     //  出入库明细
     //  出入库明细

+ 1 - 0
src/views/salesManagement/salesQuery/edit.vue

@@ -272,6 +272,7 @@ export default {
             }
             }
           } else {
           } else {
             this.spinning = false
             this.spinning = false
+            record.qty = record.qtyBackups
           }
           }
         })
         })
       } else {
       } else {