Browse Source

bug修复

chenrui 4 năm trước cách đây
mục cha
commit
75c8f00093

+ 13 - 0
src/api/stockFlow.js

@@ -0,0 +1,13 @@
+import { axios } from '@/utils/request'
+
+//  库存流水(出入库明细) 列表  有分页
+export const stockFlowList = (params) => {
+  const url = `/stockFlow/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 0 - 21
src/api/stockPut.js

@@ -1,21 +0,0 @@
-import { axios } from '@/utils/request'
-
-//  入库 列表  有分页
-export const stockPutList = (params) => {
-  const url = `/stockPut/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-//  入库 根据业务信息查询入库单
-export const stockPutBizInfo = (params) => {
-  return axios({
-    url: '/stockPut/findByBizInfo',
-    data: params,
-    method: 'post'
-  })
-}

+ 1 - 1
src/config/router.config.js

@@ -729,7 +729,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'warehouseDetail/:id',
+                path: 'warehouseDetail/:sn',
                 name: 'inventoryQueryWarehouseDetail',
                 component: () => import(/* webpackChunkName: "shop" */ '@/views/inventoryManagement/inventoryQuery/warehouseDetail.vue'),
                 meta: {

+ 1 - 1
src/views/allocationManagement/chainTransferOut/edit.vue

@@ -321,7 +321,7 @@ export default {
     //  添加/编辑
     handleAdd (row, isEdit) {
       if (!isEdit && !row.outQty) {
-        this.$message.warning('请输入调出数量')
+        this.$message.warning('请输入调出数量后再添加!')
         return
       }
       const params = {

+ 4 - 4
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -268,10 +268,10 @@ export default {
         { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center', ellipsis: true },
         { title: '调出仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: 140, align: 'center' },
+        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
         { title: '可用库存数', dataIndex: 'currentQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '冻结库存数', dataIndex: 'freezeQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       loadData: [],
@@ -294,8 +294,8 @@ export default {
         { title: '分类', scopedSlots: { customRender: 'productType' }, width: 200, align: 'center', ellipsis: true },
         { title: '调出仓位', dataIndex: 'outWarehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调入仓位', scopedSlots: { customRender: 'putWarehouseLocationSn' }, width: 140, align: 'center' },
-        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
+        { title: '单位', dataIndex: 'productUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       chooseLoadData: [],
@@ -357,11 +357,11 @@ export default {
     //  添加/编辑
     handleAdd (row, isEdit) {
       if (!isEdit && !row.putWarehouseLocationSn) {
-        this.$message.warning('请选择调入仓位')
+        this.$message.warning('请选择调入仓位后再添加!')
         return
       }
       if (!isEdit && !row.outQty) {
-        this.$message.warning('请输入调出数量')
+        this.$message.warning('请输入调出数量后再添加!')
         return
       }
       const params = {

+ 4 - 4
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -363,19 +363,19 @@ export default {
     //  添加/编辑
     handleAdd (row, isEdit) {
       if (!isEdit && !row.putCost) {
-        this.$message.warning('请输入成本价')
+        this.$message.warning('请输入成本价后再添加!')
         return
       }
       if (!isEdit && !row.putQty) {
-        this.$message.warning('请输入数量')
+        this.$message.warning('请输入数量后再添加!')
         return
       }
       if (!isEdit && !row.warehouseSn) {
-        this.$message.warning('请选择仓库')
+        this.$message.warning('请选择仓库后再添加!')
         return
       }
       if (!isEdit && !row.warehouseLocationSn) {
-        this.$message.warning('请选择仓位')
+        this.$message.warning('请选择仓位后再添加!')
         return
       }
       const params = {

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

@@ -225,7 +225,7 @@ export default {
     },
     //  出入库明细
     goWarehouseDetail (row) {
-      this.$router.push({ path: `/inventoryManagement/inventoryQuery/warehouseDetail/${row.id}` })
+      this.$router.push({ path: `/inventoryManagement/inventoryQuery/warehouseDetail/${row.productSn}` })
     },
     //  导出
     handleExport () {

+ 7 - 26
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -87,7 +87,7 @@
 </template>
 
 <script>
-// import { customerBundleDelayList, customerBundleExportDelay } from '@/api/FinancialManagement'
+import { stockFlowList } from '@/api/stockFlow'
 import { STable } from '@/components'
 export default {
   components: { STable },
@@ -96,9 +96,6 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       queryParam: { //  查询条件
         orderBundleNo: '', //  订单编号
-        orderBundle: {
-          custMobile: '' //  客户手机
-        },
         bundleName: '', //  套餐名称
         itemName: '', //  服务名称
         brand: undefined, //  产品品牌
@@ -118,8 +115,8 @@ export default {
         { title: '单据类型', dataIndex: 'productBdrand', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'prodfuctBrand', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', dataIndex: 'produhctBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓库', dataIndex: 'productBrangd', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'productBjrand', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '数量', scopedSlots: { customRender: 'number' }, width: 100, align: 'center' },
         { title: '总成本', dataIndex: 'inventoryMoney', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'inventoryMoneys', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
@@ -127,30 +124,14 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => {
-        //   const data = res.data
-        //   const no = (data.pageNo - 1) * data.pageSize
-        //   for (var i = 0; i < data.list.length; i++) {
-        //     data.list[i].no = no + i + 1
-        //   }
-        //   this.disabled = false
-        //   return data
-        // })
-        const _this = this
-        return new Promise(function (resolve, reject) {
-          const data = {
-            pageNo: 1,
-            pageSize: 10,
-            list: [
-              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
-            ]
-          }
+        return stockFlowList(Object.assign(parameter, this.queryParam)).then(res => {
+          const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
           }
-          _this.disabled = false
-          resolve(data)
+          this.disabled = false
+          return data
         })
       }
     }

+ 9 - 4
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -262,10 +262,10 @@ export default {
     handleSave (row, isBatch) {
       const params = []
       if (isBatch) { //  批量更新
-        let dataInd = -1
+        const dataInd = []
         this.selectedRows.map((item, index) => {
           if ((!item.inTransit && item.inTransit != 0) || (!item.upperLimit && item.upperLimit != 0) || (!item.lowerLimit && item.lowerLimit != 0)) {
-            dataInd = item.no
+            dataInd.push(item.no)
           }
           params.push({
             id: item.id,
@@ -274,8 +274,13 @@ export default {
             lowerLimit: item.lowerLimit
           })
         })
-        if (dataInd != -1) {
-          this.$message.warning('请完善第' + dataInd + '行数据后再提交')
+        if (dataInd.length > 0) {
+          let str = ''
+          dataInd.map(item => {
+            str += item + '、'
+          })
+          str = str.substr(0, str.length - 1)
+          this.$message.warning('请完善第' + str + '行数据后再提交')
           return
         }
       } else { //  单个保存