lilei 3 years ago
parent
commit
87f3f34e1e

+ 1 - 1
public/version.json

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

+ 6 - 5
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -122,14 +122,14 @@ export default {
       queryParam: {
         shelfSn: undefined,
         settleType: undefined,
-        dealerName: undefined,
+        customerName: undefined,
         beginAmount: '',
         endAmount: ''
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '10%', align: 'center' },
         { title: '货架名称', dataIndex: 'shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '关联客户', dataIndex: 'dealerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '关联客户', dataIndex: 'customerName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '结算方式', dataIndex: 'settleTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '待结金额', dataIndex: 'waitSettleAmount', width: '15%', align: 'right', customRender: function (text) { return toThousands(text, 2) || '--' } },
         { title: '操作', width: '15%', align: 'left', scopedSlots: { customRender: 'action' } }
@@ -173,9 +173,9 @@ export default {
     custChange (obj, row) {
       if (row) {
         this.queryParam.customerSn = row && row.customerSn || undefined
-        this.queryParam.dealerName = undefined
+        this.queryParam.customerName = undefined
       } else {
-        this.queryParam.dealerName = obj || undefined
+        this.queryParam.customerName = obj || undefined
         this.queryParam.customerSn = undefined
       }
     },
@@ -216,7 +216,8 @@ export default {
       this.queryParam = {
         shelfSn: undefined,
         settleType: undefined,
-        dealerName: undefined,
+        customerName: undefined,
+        customerSn: undefined,
         beginAmount: '',
         endAmount: ''
       }

+ 5 - 7
src/views/salesManagement/productPricing/productSalesRecordModal.vue

@@ -76,9 +76,7 @@ export default {
       queryParam: {
         productSn: null,
         buyerSn: undefined,
-        salesBillEntity: {
-          buyerName: undefined
-        }
+        buyerName: undefined
       },
       // 表头
       columns: [
@@ -100,7 +98,7 @@ export default {
   methods: {
     reset () {
       this.queryParam.buyerSn = undefined
-      this.queryParam.salesBillEntity.buyerName = undefined
+      this.queryParam.buyerName = undefined
       this.$refs.custList.setData(undefined)
       this.getDetail(this.baseData)
     },
@@ -108,9 +106,9 @@ export default {
     custChange (obj, row) {
       if (row) {
         this.queryParam.buyerSn = row && row.customerSn || undefined
-        this.queryParam.salesBillEntity.buyerName = undefined
+        this.queryParam.buyerName = undefined
       } else {
-        this.queryParam.salesBillEntity.buyerName = obj || undefined
+        this.queryParam.buyerName = obj || undefined
         this.queryParam.buyerSn = undefined
       }
     },
@@ -171,7 +169,7 @@ export default {
         this.curTab = '1'
         this.list = []
         this.queryParam.buyerSn = undefined
-        this.queryParam.salesBillEntity.buyerName = undefined
+        this.queryParam.buyerName = undefined
         this.$refs.custList.setData(undefined)
       }
     }

+ 2 - 2
vue.config.js

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