Kaynağa Gözat

Merge branch 'develop_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_fencang

chenrui 2 yıl önce
ebeveyn
işleme
2473c4f7d6

+ 12 - 0
src/api/salesReturn.js

@@ -152,6 +152,18 @@ export const salesQueryByReturn = (params) => {
   })
 }
 
+// 可选产品列表
+export const queryDealerProductPage = (params) => {
+  const url = `/product/queryDealerPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
 // 退货确认  列表  分页
 export const salesReturnFinancialList = (params) => {
   const url = `/salesReturn/queryPageByFinancial/${params.pageNo}/${params.pageSize}`

+ 1 - 1
src/views/salesReturnManagement/receiveCheck/chooseProductsModal.vue

@@ -75,7 +75,7 @@ export default {
       }
       const params = {
         'price': row.productPrice,
-        'cost': row.lastStockCost,
+        // 'cost': row.lastStockCost,
         'returnReason': row.returnReason,
         'productSn': row.productSn,
         'initialQty': row.qty,

+ 6 - 6
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -94,7 +94,7 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { queryStockProductPage } from '@/api/stock'
+import { queryDealerProductPage } from '@/api/salesReturn'
 import returnReason from '@/views/common/returnReason'
 import { STable, VSelect } from '@/components'
 export default {
@@ -127,7 +127,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.queryParam.dealerSn = this.buyerSn
-        return queryStockProductPage(Object.assign(parameter, this.queryParam)).then(res => {
+        return queryDealerProductPage(Object.assign(parameter, this.queryParam)).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -167,12 +167,12 @@ export default {
     },
     pageInit (buyerSn, warehouseSn) {
       this.buyerSn = buyerSn
-      this.queryParam.warehouseSn = warehouseSn
+      // this.queryParam.warehouseSn = warehouseSn
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '单位', dataIndex: 'productUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'code', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位', dataIndex: 'unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'qty', width: '9%', align: 'center', scopedSlots: { customRender: 'qty' } },
         { title: '退货原因', dataIndex: 'returnReason', width: '10%', align: 'center', scopedSlots: { customRender: 'returnReason' } },
         { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }

+ 1 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -428,7 +428,7 @@ export default {
         'salesReturnBillSn': this.orderSn,
         'salesReturnBillNo': this.ordeDetail.salesReturnBillNo,
         'price': row.productPrice,
-        'cost': row.lastStockCost,
+        // 'cost': row.lastStockCost,
         'returnReason': row.returnReason,
         'productSn': row.productSn,
         'initialQty': row.qty

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.103/ocs-admin',
+        target: 'http://192.168.2.117/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {