lilei 2 лет назад
Родитель
Сommit
8313e9a820

+ 3 - 2
src/views/allocationManagement/transferReturn/edit.vue

@@ -20,14 +20,15 @@
               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调入仓库">
-                <warehouse
+                <!-- <warehouse
                 style="width:200px;"
                 :allowClear="false"
                   v-model="basicInfoData.warehouseSn"
                   @change="updateWarehouse"
                   id="basicInfo-warehouseSn"
                   placeholder="请选择调入仓库"
-                />
+                /> -->
+                {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
               </a-descriptions-item>
               <a-descriptions-item label="费用/调拨退货类型">
                 <AllocateType

+ 3 - 2
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -20,14 +20,15 @@
               <a-descriptions-item label="调拨退货对象">{{ (basicInfoData&&basicInfoData.targetTypeDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调拨退货对象名称">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="调入仓库">
-                <warehouse
+                <!-- <warehouse
                 style="width:200px;"
                 :allowClear="false"
                   v-model="basicInfoData.warehouseSn"
                   @change="updateWarehouse"
                   id="basicInfo-warehouseSn"
                   placeholder="请选择调入仓库"
-                />
+                /> -->
+                {{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}
               </a-descriptions-item>
               <a-descriptions-item label="费用/调拨退货类型">
                 <AllocateType

+ 1 - 1
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -48,7 +48,7 @@ export default {
       this.data = []
       this.fetching = true
       const params = {'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
-      if(this.itemSn){
+      if(this.itemSn && !dealerName){
         params.dealerSn = this.itemSn
       }else{
         params.dealerName = dealerName

+ 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.117/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: {