chenrui il y a 4 ans
Parent
commit
647899529c

+ 2 - 3
src/api/dealerProduct.js

@@ -52,10 +52,9 @@ export const dealerProductExport = params => {
 
 //  产品  详情
 export const dealerProductDetail = (params) => {
-  const url = `/dealerProduct/findById/${params.id}`
   return axios({
-    url: url,
-    data: params,
+    url: `/dealerProduct/findById/${params.id}`,
+    data: {},
     method: 'get'
   })
 }

+ 1 - 0
src/api/dealerProductType.js

@@ -23,6 +23,7 @@ export const dealerProductTypeSave = params => {
 export const dealerProductTypeDel = params => {
   return axios({
     url: `/dealerProductType/delete/${params.id}`,
+    data: {},
     method: 'get'
   })
 }

+ 13 - 0
src/api/giftsDetail.js

@@ -0,0 +1,13 @@
+import { axios } from '@/utils/request'
+
+//  赠品详情列表  分页
+export const giftsDetailList = (params) => {
+  const url = `/giftsDetail/findPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 13 - 0
src/api/oos.js

@@ -0,0 +1,13 @@
+import { axios } from '@/utils/request'
+
+//  缺货列表  分页
+export const oosList = (params) => {
+  const url = `/oos/findPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 13 - 0
src/api/oosDetail.js

@@ -0,0 +1,13 @@
+import { axios } from '@/utils/request'
+
+//  缺货详情列表  分页
+export const oosDetailList = (params) => {
+  const url = `/oosDetail/findPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 37 - 0
src/api/sales.js

@@ -0,0 +1,37 @@
+import { axios } from '@/utils/request'
+
+//  销售 列表  有分页
+export const salesList = (params) => {
+  const url = `/sales/findPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 打印
+export const salesPrint = (params) => {
+  return axios({
+    url: '/sales/print',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 打印预览
+export const salesPrintPreview = (params) => {
+  return axios({
+    url: '/sales/printPreview',
+    data: params,
+    method: 'post'
+  })
+}
+//  销售 冲减
+export const salesWriteDown = (params) => {
+  return axios({
+    url: '/sales/writeDown',
+    data: params,
+    method: 'post'
+  })
+}

+ 34 - 0
src/api/shippingAddress.js

@@ -0,0 +1,34 @@
+import { axios } from '@/utils/request'
+
+//  收货地址 列表
+export const shippingAddressQuery = (params) => {
+  return axios({
+    url: '/shippingAddress/query',
+    data: params,
+    method: 'post'
+  })
+}
+//  收货地址 保存
+export const shippingAddressSave = (params) => {
+  return axios({
+    url: '/shippingAddress/save',
+    data: params,
+    method: 'post'
+  })
+}
+//  收货地址 设置默认
+export const shippingAddressSet = (params) => {
+  return axios({
+    url: `/shippingAddress/setDefault/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}
+//  收货地址 删除
+export const shippingAddressDel = (params) => {
+  return axios({
+    url: `/shippingAddress/delete/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}

+ 11 - 0
src/api/sparePartsPur.js

@@ -11,3 +11,14 @@ export const sparePartsPurList = (params) => {
     method: 'post'
   })
 }
+//  散件采购(入库)详情列表  分页
+export const sparePartsPurDetailList = (params) => {
+  const url = `/sparePartsPur/findDetailPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 11 - 0
src/api/sparePartsRet.js

@@ -11,3 +11,14 @@ export const sparePartsRetList = (params) => {
     method: 'post'
   })
 }
+//  散件退货详情列表  分页
+export const sparePartsRetDetailList = (params) => {
+  const url = `/sparePartsRet/findDetailPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 11 - 0
src/api/stock.js

@@ -11,3 +11,14 @@ export const stockList = (params) => {
     method: 'post'
   })
 }
+//  库存详情列表  分页
+export const stockDetailList = (params) => {
+  const url = `/stock/findDetailPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 37 - 0
src/api/urgent.js

@@ -0,0 +1,37 @@
+import { axios } from '@/utils/request'
+
+//  急件列表  有分页
+export const urgentList = (params) => {
+  const url = `/urgent/findPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  急件打印
+export const urgentPrint = (params) => {
+  return axios({
+    url: '/urgent/print',
+    data: params,
+    method: 'post'
+  })
+}
+//  急件打印预览
+export const urgentPrintPreview = (params) => {
+  return axios({
+    url: '/urgent/printPreview',
+    data: params,
+    method: 'post'
+  })
+}
+//  急件冲减
+export const urgentWriteDown = (params) => {
+  return axios({
+    url: '/urgent/writeDown',
+    data: params,
+    method: 'post'
+  })
+}

+ 13 - 0
src/api/urgentDetail.js

@@ -0,0 +1,13 @@
+import { axios } from '@/utils/request'
+
+//  急件详情列表  有分页
+export const urgentDetailList = (params) => {
+  const url = `/urgentDetail/findPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 20 - 16
src/views/inventoryManagement/warehouse/list.vue

@@ -28,7 +28,6 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :showPagination="false"
       bordered>
       <!-- 仓位 -->
       <template slot="storingLocation" slot-scope="text, record">
@@ -46,7 +45,7 @@
 </template>
 
 <script>
-import { warehouseFindAll, warehouseDel } from '@/api/warehouse'
+import { warehouseList, warehouseDel } from '@/api/warehouse'
 import { STable } from '@/components'
 import warehouseEditModal from './editModal.vue'
 export default {
@@ -54,27 +53,32 @@ export default {
   data () {
     return {
       queryParam: { //  查询条件
-        name: '', //  仓库名称
+        name: '' //  仓库名称
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
         { title: '仓库名称', dataIndex: 'name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '排序', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '排序', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', scopedSlots: { customRender: 'storingLocation' }, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return warehouseFindAll( this.queryParam ).then(res => {
+        return warehouseList(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
         })
       },
-      openModal: false,  //  新增编辑  弹框
-      itemId: '',  //  当前id
-      nowData: null  //  当前记录数据
+      openModal: false, //  新增编辑  弹框
+      itemId: '', //  当前id
+      nowData: null //  当前记录数据
     }
   },
   methods: {
@@ -84,29 +88,29 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  新增/编辑
-    handleEdit(row){
+    handleEdit (row) {
       this.itemId = row ? row.id : null
-      this.nowData = row ? row : null
+      this.nowData = row || null
       this.openModal = true
     },
     //  新增/编辑  成功
-    handleOk(){
+    handleOk () {
       this.$refs.table.refresh(true)
     },
     //  关闭弹框
-    closeModal(){
+    closeModal () {
       this.itemId = ''
       this.openModal = false
     },
     //  删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
         okText: '确定',
         cancelText: '取消',
-		centered: true,
+        centered: true,
         onOk () {
           warehouseDel({
             id: row.id
@@ -120,11 +124,11 @@ export default {
       })
     },
     //  查看仓位
-    goStoringLocation(row){
+    goStoringLocation (row) {
       this.$router.push({ path: `/inventoryManagement/storingLocation/${row.id}`, query: { name: row.name } })
     }
   }
 }
 </script>
 
-<style lang="less"></style>
+<style lang="less"></style>

+ 28 - 21
src/views/inventoryManagement/warehouse/storingLocation/editModal.vue

@@ -28,11 +28,18 @@
         </a-form-model-item>
         <a-form-model-item label="所属仓库" prop="whId">
           <a-select id="storingLocationEdit-whId" disabled placeholder="请选择所属仓库" allowClear v-model="form.whId">
-          	<a-select-option v-for="item in warehouseList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+            <a-select-option v-for="item in warehouseList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
           </a-select>
         </a-form-model-item>
         <a-form-model-item label="排序" prop="sort">
-          <a-input-number v-model="form.sort" :min="0" :max="999999" :precision="0" :step="1" placeholder="请输入排序(0~999999)" style="width: 100%;" />
+          <a-input-number
+            v-model="form.sort"
+            :min="0"
+            :max="999999"
+            :precision="0"
+            :step="1"
+            placeholder="请输入排序(0~999999)"
+            style="width: 100%;" />
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">
@@ -47,7 +54,7 @@
 import { STable } from '@/components'
 import { warehouseLocSave, warehouseFindAll } from '@/api/warehouse'
 export default {
-  name: 'storingLocationEditModal',
+  name: 'StoringLocationEditModal',
   components: { STable },
   props: {
     openModal: { //  弹框显示状态
@@ -77,8 +84,8 @@ export default {
       },
       form: {
         name: '', // 仓位名称
-        whId: undefined,  //  所属仓库
-        sort: '',  //  排序
+        whId: undefined, //  所属仓库
+        sort: '' //  排序
       },
       rules: {
         name: [
@@ -86,24 +93,24 @@ export default {
         ],
         whId: [
           { required: true, message: '请选择所属仓库', trigger: 'change' }
-        ],
+        ]
       },
-      warehouseList: []  //  仓库  下拉数据
+      warehouseList: [] //  仓库  下拉数据
     }
   },
   methods: {
     //  获取仓库列表数据
-    getWarehouseList(){
+    getWarehouseList () {
       warehouseFindAll({}).then(res => {
-        if(res.status == 200){
+        if (res.status == 200) {
           this.warehouseList = res.data
-        }else{
+        } else {
           this.warehouseList = []
         }
       })
     },
     //  详情
-    getDetail(){
+    getDetail () {
       this.form = {
         name: this.nowData && this.nowData.name ? this.nowData.name : '',
         whId: this.nowData && this.nowData.whId ? this.nowData.whId : '',
@@ -111,27 +118,27 @@ export default {
       }
     },
     //  保存
-    handleSave(){
+    handleSave () {
       const _this = this
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const params = {
             id: this.itemId ? this.itemId : undefined,
-            whId: this.form.whId,  //  所属仓库
-            name: this.form.name,  //  仓库名称
-            sort: this.form.sort,  //  排序
-            isDefault: 0  //  是否为默认仓位   0为非默认,1为默认
+            whId: this.form.whId, //  所属仓库
+            name: this.form.name, //  仓库名称
+            sort: this.form.sort, //  排序
+            isDefault: 0 //  是否为默认仓位   0为非默认,1为默认
           }
           warehouseLocSave(params).then(res => {
-            if(res.status == 200){
+            if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$emit('ok')
               setTimeout(function () {
                 _this.isShow = false
                 _this.$refs.ruleForm.resetFields()
               }, 300)
-            }else{
-              
+            } else {
+
             }
           })
         } else {
@@ -139,7 +146,7 @@ export default {
           return false
         }
       })
-    },
+    }
   },
   watch: {
     //  父页面传过来的弹框状态
@@ -151,7 +158,7 @@ export default {
       if (!newValue) {
         this.$refs.ruleForm.resetFields()
         this.$emit('close')
-      }else{
+      } else {
         this.getWarehouseList()
         this.form = {
           name: '',

+ 24 - 20
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -36,7 +36,6 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :showPagination="false"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -51,7 +50,7 @@
 </template>
 
 <script>
-import { warehouseLocFindAll, warehouseFindAll, warehouseLocDel } from '@/api/warehouse'
+import { warehouseLocList, warehouseLocDel } from '@/api/warehouse'
 import { STable } from '@/components'
 import storingLocationEditModal from './editModal.vue'
 export default {
@@ -59,30 +58,35 @@ export default {
   data () {
     return {
       queryParam: { //  查询条件
-        whId: this.$route.params.id,  //  仓库id
-        name: '', //  仓位名称
+        whId: this.$route.params.id, //  仓库id
+        name: '' //  仓位名称
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
         { title: '仓位名称', dataIndex: 'name', align: 'center', ellipsis: true },
-        { title: '排序', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '排序', dataIndex: 'sort', width: 160, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return warehouseLocFindAll( this.queryParam ).then(res => {
+        return warehouseLocList(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
         })
       },
-      openModal: false,  //  新增编辑产品品牌  弹框
-      itemId: '',  //  当前品牌id
-      nowData: null  //  当前记录数据
+      openModal: false, //  新增编辑产品品牌  弹框
+      itemId: '', //  当前品牌id
+      nowData: null //  当前记录数据
     }
   },
-  mounted() {
+  mounted () {
     console.log(this.$route.query.name)
   },
   methods: {
@@ -93,35 +97,35 @@ export default {
       this.$refs.table.refresh(true)
     },
     //  新增/编辑
-    handleEdit(row){
-      if(row){
+    handleEdit (row) {
+      if (row) {
         this.itemId = row.id
         row.whId = this.$route.params.id
         this.nowData = row
-      }else{
+      } else {
         this.itemId = null
         this.nowData = { whId: this.$route.params.id }
       }
       this.openModal = true
     },
     //  新增/编辑  成功
-    handleOk(){
+    handleOk () {
       this.$refs.table.refresh(true)
     },
     //  关闭弹框
-    closeModal(){
+    closeModal () {
       this.itemId = ''
       this.openModal = false
     },
     //  删除
-    handleDel(row){
+    handleDel (row) {
       const _this = this
       this.$confirm({
         title: '提示',
         content: '删除后不可恢复,确定要进行删除吗?',
         okText: '确定',
         cancelText: '取消',
-		centered: true,
+        centered: true,
         onOk () {
           warehouseLocDel({
             id: row.id,
@@ -136,9 +140,9 @@ export default {
       })
     },
     //  返回列表
-    handleBack(){
+    handleBack () {
       this.$router.push({ path: '/inventoryManagement/warehouse/list' })
-    },
+    }
   }
 }
 </script>
@@ -149,4 +153,4 @@ export default {
       margin-bottom: 15px;
     }
   }
-</style>
+</style>