lilei 1 سال پیش
والد
کامیت
418ae997da

+ 0 - 51
src/api/sales.js

@@ -240,57 +240,6 @@ export const updateWarehouse = (params) => {
   })
 }
 
-//  按仓库查询销售单 列表  有分页
-export const queryPageForWarehouse = (params) => {
-  const url = `/salesn/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 获取按仓库查询销售单数量
-export const queryCountForWarehouse = (params) => {
-  return axios({
-    url: '/salesn/queryCountForWarehouse',
-    method: 'post',
-    data: params
-  })
-}
-// 按仓库查询销售明细 列表
-export const queryPageForWarehouseDetail = (params) => {
-  const url = `/salesn/detail/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-
-// 获取按仓库查询销售单明细数量
-export const queryCountForWarehouseDetail = (params) => {
-  return axios({
-    url: '/sales/detail/queryCountForWarehouse',
-    method: 'post',
-    data: params
-  })
-}
-// 按仓库导出销售单
-
-export const exportForWarehouse = params => {
-  const url = `/sales/exportForWarehouse`
-  return axios.request({
-    url: url,
-    data: params,
-    method: 'post',
-    responseType: 'blob'
-  })
-}
-
 // 销售一览表 列表
 export const salesOverviewQueryPage = (params) => {
   const url = `/salesOverview/queryPage/${params.pageNo}/${params.pageSize}`

+ 52 - 0
src/api/salesNew.js

@@ -240,3 +240,55 @@ export const salesDetailTypeExcel = params => {
     responseType: 'blob'
   })
 }
+
+
+// 仓库销售单
+//  按仓库查询销售单 列表  有分页
+export const queryPageForWarehouse = (params) => {
+  const url = `/salesn/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 获取按仓库查询销售单数量
+export const queryCountForWarehouse = (params) => {
+  return axios({
+    url: '/salesn/queryCountForWarehouse',
+    method: 'post',
+    data: params
+  })
+}
+// 按仓库查询销售明细 列表
+export const queryPageForWarehouseDetail = (params) => {
+  const url = `/salesn/detail/queryPageForWarehouse/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 获取按仓库查询销售单明细数量
+export const queryCountForWarehouseDetail = (params) => {
+  return axios({
+    url: '/salesn/detail/queryCountForWarehouse',
+    method: 'post',
+    data: params
+  })
+}
+// 按仓库导出销售单
+export const exportForWarehouse = params => {
+  const url = `/salesn/exportForWarehouse`
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 4 - 5
src/views/salesManagement/salesOrderWarehouse/detail.vue

@@ -58,10 +58,9 @@
           bordered>
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">
-            <a-badge count="促" v-if="record.promotionFlag == 1">
-              <div style="padding-right: 15px;">{{ text }}</div>
-            </a-badge>
-            <span v-else>{{ text }}</span>
+            <span>{{ text }}</span>
+            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
           </template>
         </s-table>
       </a-card>
@@ -76,7 +75,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import moment from 'moment'
 import { exportExcel } from '@/libs/JGPrint.js'
-import { queryPageForWarehouseDetail, queryCountForWarehouseDetail, salesDetailBySn, salesDetailExcel } from '@/api/sales'
+import { queryPageForWarehouseDetail, queryCountForWarehouseDetail, salesDetailBySn, salesDetailExcel } from '@/api/salesNew'
 import printModal from './printModal.vue'
 export default {
   name: 'SalesOrderWarehouseDetail',

+ 1 - 2
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -88,7 +88,6 @@
         <template slot="stockOutNo" slot-scope="text, record" v-if="$hasPermissions('B_salesOrderWarehouseDetail')">
           <span class="link-bule" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
           <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
-          <!-- <a-badge count="正" v-if="record.promotionFlag=='REGULAR'" :number-style="{ backgroundColor: '#108ee9', zoom:'80%' }"></a-badge> -->
           <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
         </template>
       </s-table>
@@ -107,7 +106,7 @@ import Area from '@/views/common/area.js'
 import reportModal from '@/views/common/reportModal.vue'
 import { STable, VSelect } from '@/components'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
-import { queryPageForWarehouse, queryCountForWarehouse, exportForWarehouse } from '@/api/sales'
+import { queryPageForWarehouse, queryCountForWarehouse, exportForWarehouse } from '@/api/salesNew'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
 export default {

+ 0 - 1
src/views/salesManagement/salesOrderWarehouse/printModal.vue

@@ -42,7 +42,6 @@
 </template>
 
 <script>
-import { salesDetailProductType } from '@/api/sales'
 export default {
   props: {
     openModal: { //  弹框显示状态