浏览代码

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

chenrui 5 月之前
父节点
当前提交
3b79bbd694

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1735798874366
+  "version": 1735978177382
 }
 }

+ 3 - 2
src/views/numsGoodsShelves/onlinePayInvoice/detail.vue

@@ -157,7 +157,8 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
-        this.queryParam.buyerSn = this.$route.params.sn
+        this.queryParam.buyerSnSource = this.$route.params.sn
+        this.queryParam.shelfSn = this.$route.params.shelfSn
         const params = Object.assign(parameter, this.queryParam)
         const params = Object.assign(parameter, this.queryParam)
         return queryByBizTradeList(params).then(res => {
         return queryByBizTradeList(params).then(res => {
           let data
           let data
@@ -211,7 +212,7 @@ export default {
     },
     },
     //  详情
     //  详情
     getDetail () {
     getDetail () {
-      queryShelfSettleRuleCount({ shelfSn: this.$route.params.shelfSn, buyerSn: this.$route.params.sn }).then(res => {
+      queryShelfSettleRuleCount({ shelfSn: this.$route.params.shelfSn, buyerSnSource: this.$route.params.sn }).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           this.detailData = res.data
           this.detailData = res.data
         } else {
         } else {

+ 1 - 0
src/views/numsGoodsShelves/onlinePayInvoice/list.vue

@@ -119,6 +119,7 @@ export default {
   methods: {
   methods: {
     // 选择客户
     // 选择客户
     custChange (obj, row) {
     custChange (obj, row) {
+      console.log(obj, row)
       if (row) {
       if (row) {
         this.queryParam.customerSn = row && row.customerSn || undefined
         this.queryParam.customerSn = row && row.customerSn || undefined
         this.queryParam.customerName = undefined
         this.queryParam.customerName = undefined

+ 1 - 1
src/views/salesManagement/onlinePayOrder/detail.vue

@@ -181,7 +181,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
-        return salesDetailList(Object.assign(parameter, { orderBy: 'sales_bill_detail.CREATE_DATE desc', salesBillSn: this.outBizSn || this.$route.params.sn })).then(res => {
+        return salesDetailList(Object.assign(parameter, { salesBillSn: this.outBizSn || this.$route.params.sn })).then(res => {
           let data
           let data
           if (res.status == 200) {
           if (res.status == 200) {
             data = res.data
             data = res.data

+ 2 - 3
vue.config.js

@@ -209,9 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.2.113:8550/qpls-md',
-        // target: 'https://p.iscm.360arrow.com/qpls-md',
-        // target: 'https://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.113:8550/qpls-md',
+        target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,
         changeOrigin: true,
         changeOrigin: true,