瀏覽代碼

接口联调

1004749546@qq.com 4 年之前
父節點
當前提交
49baf1984b

+ 26 - 0
src/api/atorg.js

@@ -0,0 +1,26 @@
+import { axios } from '@/utils/request'
+
+// 组织机构列表
+export const findOrgTree = params => {
+  return axios({
+    url: '/atorg/findOrgTree',
+    data: {},
+    method: 'get'
+  })
+}
+// 保存
+export const saveAtorg = params => {
+  return axios({
+    url: '/atorg/save',
+    data: params,
+    method: 'post'
+  })
+}
+// 删除
+export const delAtorg = params => {
+  return axios({
+    url: `/atorg/delete/${params.id}`,
+    data: {},
+    method: 'get'
+  })
+}

+ 60 - 0
src/api/storeManagement.js

@@ -0,0 +1,60 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 卫星仓绑定相关接口
+ */
+// 供应商门店绑定分页查询
+export const supplierStoreList = params => {
+  const url = `/supplierStore/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 供应商与门店新增绑定
+export const supplierStoreBind = params => {
+  return axios.request({
+    url: '/supplierStore/bind',
+    data: params,
+    method: 'post'
+  })
+}
+/**
+ * 门店信息相关接口
+ */
+// 门店分页查询
+export const storeListQuery = params => {
+  const url = `/store/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 查询所有门店
+export const storeFindAll = params => {
+  return axios.request({
+    url: '/store/findAll',
+    data: params,
+    method: 'post'
+  })
+}
+/**
+ * 配件信息
+ */
+// 配件分页查询
+export const partListQuery = params => {
+  const url = `/part/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 29 - 0
src/api/supplierManagement.js

@@ -0,0 +1,29 @@
+import { axios } from '@/utils/request'
+
+// 供应商分页查询
+export const supplierListQuery = params => {
+  const url = `/supplier/queryLike/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 查询所有供应商
+export const supplierFindAll = params => {
+  return axios.request({
+    url: '/supplier/findAll',
+    data: params,
+    method: 'post'
+  })
+}
+// 供应商编辑
+export const supplierEdit = params => {
+  return axios.request({
+    url: '/supplier/edit',
+    data: params,
+    method: 'post'
+  })
+}

+ 13 - 32
src/views/storehouseManagement/customerInfo/CustomerList.vue

@@ -5,8 +5,8 @@
       <a-form-model ref="queryForm" :model="queryParam" layout="inline" @keyup.enter.native="refresh">
         <a-row :gutter="48">
           <a-col :lg="8" :sm="12">
-            <a-form-model-item prop="storeName" label="客户名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-input class="full-width" v-model="queryParam.storeName" placeholder="请输入客户名称" allowClear id="customerList-name"/>
+            <a-form-model-item prop="name" label="客户名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-input class="full-width" v-model="queryParam.name" placeholder="请输入客户名称" allowClear id="customerList-name"/>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
@@ -36,31 +36,18 @@ import {
   STable,
   VSelect
 } from '@/components'
-import {
-  settlementRecordsList,
-  settlementRecordsListTotal
-} from '@/api/FinancialManagement'
+import { storeListQuery } from '@/api/storeManagement.js'
 export default {
-  name: 'StockSearch',
+  name: 'CustomerList',
   components: {
     VSelect,
     STable
   },
   data () {
     return {
-      storeList: [
-        { id: 11, name: '常青二路店' },
-        { id: 112, name: '西部大道店99999999999999999' },
-        { id: 114, name: '渭滨路店' },
-        { id: 115, name: '未央店' },
-        { id: 116, name: '凤城八路店' }
-      ],
       // 搜索条件
       queryParam: {
-        storeName: '', // 客户名称
-        // partName: '', // 配件名称
-        // status: '', // 分账状态
-        settleNo: ''
+        name: '' // 客户名称
       },
       columns: [{
         title: '序号',
@@ -70,40 +57,34 @@ export default {
       },
       {
         title: '客户名称',
-        dataIndex: 'settleDate',
+        dataIndex: 'name',
         width: 200,
         align: 'center'
       },
       {
         title: '负责人',
-        dataIndex: 'settleNo',
+        dataIndex: 'manager',
         width: 150,
         align: 'center'
       },
       {
         title: '手机号码',
-        dataIndex: 'orderNum',
+        dataIndex: 'managerMobile',
         width: 150,
         align: 'center'
       },
       {
         title: '地址',
-        dataIndex: 'realAmount',
         align: 'center',
-        width: 150
+        width: 150,
+        customRender: (text, record, index) => {
+          return record.addrProvinceName + record.addrCityName + record.addrDistrictName + record.addrDetail
+        }
       }
       ],
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
-        console.log(this.queryOrderDate, 'this.queryOrderDate')
-        if (this.queryOrderDate && this.queryOrderDate.length) {
-          searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-          searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-        } else {
-          searchData.beginDate = ''
-          searchData.endDate = ''
-        }
-        return settlementRecordsList(searchData).then(res => {
+        return storeListQuery(searchData).then(res => {
           const no = (res.data.pageNo - 1) * res.data.pageSize
           for (let i = 0; i < res.data.list.length; i++) {
             const _item = res.data.list[i]

+ 20 - 53
src/views/storehouseManagement/productInfo/ProductList.vue

@@ -5,29 +5,18 @@
       <a-form-model ref="queryForm" :model="queryParam" layout="inline" @keyup.enter.native="handleSearch">
         <a-row :gutter="48">
           <a-col :lg="6" :sm="12">
-            <a-form-model-item prop="partName" label="配件名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-input class="full-width" v-model="queryParam.partName" placeholder="请输入配件名称" allowClear id="productList-partName"/>
+            <a-form-model-item prop="name" label="配件名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-input class="full-width" v-model="queryParam.name" placeholder="请输入配件名称" allowClear id="productList-name"/>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
-            <a-form-model-item prop="storeName" label="配件品牌" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-select
-                show-search
-                allowClear
-                id="productList-brand"
-                placeholder="请选择配件品牌"
-                option-filter-prop="children"
-                v-model="queryParam.storeName"
-              >
-                <a-select-option v-for="item in storeList" :key="item.id" :value="item.id">
-                  {{ item.name }}
-                </a-select-option>
-              </a-select>
+            <a-form-model-item prop="brandName" label="配件品牌" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-input class="full-width" v-model="queryParam.brandName" placeholder="请输入配件名称" allowClear id="productList-brandName"/>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
-            <a-form-model-item prop="settleNo" label="配件编码/OE码" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
-              <a-input class="full-width" v-model="queryParam.settleNo" placeholder="配件编码/OE码" allowClear id="productList-code"/>
+            <a-form-model-item prop="queryWord" label="配件编码/OE码" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+              <a-input class="full-width" v-model="queryParam.queryWord" placeholder="配件编码/OE码" allowClear id="productList-code"/>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
@@ -52,35 +41,24 @@
 </template>
 
 <script>
-import moment from 'moment'
 import {
   STable,
   VSelect
 } from '@/components'
-import {
-  settlementRecordsList,
-  settlementRecordsListTotal
-} from '@/api/FinancialManagement'
+import { partListQuery, partBrandQuery } from '@/api/storeManagement.js'
 export default {
-  name: 'StockSearch',
+  name: 'ProductList',
   components: {
     VSelect,
     STable
   },
   data () {
     return {
-      storeList: [
-        { id: 11, name: '常青二路店' },
-        { id: 112, name: '西部大道店99999999999999999' },
-        { id: 114, name: '渭滨路店' },
-        { id: 115, name: '未央店' },
-        { id: 116, name: '凤城八路店' }
-      ],
       // 搜索条件
       queryParam: {
-        storeName: undefined, // 配件品牌
-        partName: '', // 配件名称
-        settleNo: '' // 配件编码/OE码
+        brandName: undefined, // 配件品牌
+        name: '', // 配件名称
+        queryWord: '' // 配件编码/OE码
       },
       columns: [{
         title: '序号',
@@ -90,58 +68,47 @@ export default {
       },
       {
         title: '配件名称',
-        dataIndex: 'settleNo',
+        dataIndex: 'name',
         width: 150,
         align: 'center'
       },
       {
         title: '配件品牌',
-        dataIndex: 'orderNum',
+        dataIndex: 'brandName',
         width: 150,
-        align: 'center',
-        scopedSlots: {
-          customRender: 'userInfo'
-        }
+        align: 'center'
       },
       {
         title: '配件编码',
-        dataIndex: 'realAmount',
+        dataIndex: 'code',
         align: 'center',
         width: 150
       },
       {
         title: 'OE码',
-        dataIndex: 'code',
+        dataIndex: 'oe',
         align: 'center',
         width: 150
       },
       {
         title: '单位',
-        dataIndex: 'status',
+        dataIndex: 'unit',
         align: 'center',
         width: 150
       },
       {
         title: '终端采购价(¥)',
-        dataIndex: 'remarks',
+        dataIndex: 'purchasePrice',
         width: 100,
         align: 'center',
         customRender: (text) => {
-          return text || '--'
+          return text || '0'
         }
       }
       ],
       loadData: parameter => {
         const searchData = Object.assign(parameter, this.queryParam)
-        console.log(this.queryOrderDate, 'this.queryOrderDate')
-        if (this.queryOrderDate && this.queryOrderDate.length) {
-          searchData.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-          searchData.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-        } else {
-          searchData.beginDate = ''
-          searchData.endDate = ''
-        }
-        return settlementRecordsList(searchData).then(res => {
+        return partListQuery(searchData).then(res => {
           const no = (res.data.pageNo - 1) * res.data.pageSize
           for (let i = 0; i < res.data.list.length; i++) {
             const _item = res.data.list[i]

+ 35 - 55
src/views/storehouseManagement/storeBind/StoreBindList.vue

@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <!-- 搜索条件 -->
     <div class="table-page-search-wrapper">
-      <a-form-model layout="inline" @keyup.enter.native="refresh">
+      <a-form-model ref="queryForm" :model="queryParam" layout="inline" @keyup.enter.native="refresh">
         <a-row :gutter="48">
           <a-col :lg="8" :sm="12">
             <a-form-model-item label="绑定时间" :label-col="{ span:4 }" :wrapper-col="{ span:16}">
@@ -11,29 +11,28 @@
                 :disabledDate="disabledDate"
                 style="width: 100%;"
                 v-model="queryOrderDate"
-                :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                format="YYYY-MM-DD"
                 :placeholder="['开始时间', '结束时间']" />
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
-            <a-form-model-item prop="channeName" label="供应商名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+            <a-form-model-item prop="supplierName" label="供应商名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
               <a-select
-                id="storeBindList-channeName"
+                id="storeBindList-supplierName"
                 show-search
                 allowClear
                 placeholder="请输入供应商名称"
                 option-filter-prop="children"
-                v-model="queryParam.channeName"
+                v-model="queryParam.supplierName"
               >
-                <a-select-option v-for="item in storeList" :key="item.id" :value="item.id">
+                <a-select-option v-for="item in supplierList" :key="item.id" :value="item.id">
                   {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :lg="6" :sm="12">
-            <a-form-model-item prop="channeName" label="门店名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
+            <a-form-model-item prop="storeName" label="门店名称" :label-col="{ span:4 }" :wrapper-col="{ span:12}">
               <a-select
                 id="storeBindList-storeName"
                 show-search
@@ -70,8 +69,8 @@
         :data="loadData">
       </s-table>
     </div>
-    <!-- 申请提现弹窗 -->
-    <store-bind-modal :openStoreBindModal="openStoreBindModal" @close="openStoreBindModal=false" @refresh="refresh"></store-bind-modal>
+    <!-- 绑定弹窗 -->
+    <store-bind-modal :openStoreBindModal="openStoreBindModal" :supplierList="supplierList" :storeList="storeList" @close="openStoreBindModal=false" @refresh="refresh"></store-bind-modal>
   </a-card>
 </template>
 
@@ -82,12 +81,10 @@ import {
   VSelect
 } from '@/components'
 import storeBindModal from './StoreBindModal.vue'
-import {
-  settlementRecordsList,
-  settlementRecordsListTotal
-} from '@/api/FinancialManagement'
+import { supplierStoreList, storeFindAll } from '@/api/storeManagement.js'
+import { supplierFindAll } from '@/api/supplierManagement.js'
 export default {
-  name: 'CashOutManagement',
+  name: 'StoreBindList',
   components: {
     VSelect,
     STable,
@@ -95,18 +92,13 @@ export default {
   },
   data () {
     return {
-      openStoreBindModal: false, // 是否打开申请提现弹窗
+      openStoreBindModal: false, // 是否打开绑定弹窗
       queryOrderDate: undefined,
-      storeList: [
-        { id: 11, name: '常青二路店' },
-        { id: 112, name: '西部大道店' },
-        { id: 114, name: '渭滨路店' },
-        { id: 115, name: '未央店' },
-        { id: 116, name: '凤城八路店' }
-      ],
+      supplierList: [], // 供应商列表
+      storeList: [], // 门店列表
       queryParam: {
-        storeName: undefined, // 客户名称
-        channeName: undefined, // 供应商名称
+        storeName: undefined, // 门店名称
+        supplierName: undefined, // 供应商名称
         beginDate: '',
         endDate: ''
       },
@@ -170,7 +162,7 @@ export default {
           searchData.beginDate = ''
           searchData.endDate = ''
         }
-        return settlementRecordsList(searchData).then(res => {
+        return supplierStoreList(searchData).then(res => {
           const no = (res.data.pageNo - 1) * res.data.pageSize
           for (let i = 0; i < res.data.list.length; i++) {
             const _item = res.data.list[i]
@@ -186,44 +178,29 @@ export default {
     disabledDate (current) {
       return current && current > moment().endOf('day')
     },
+    // 获取供应商列表
+    getSupplierList () {
+      supplierFindAll({}).then(res => {
+        this.supplierList = res.data || []
+      })
+    },
+    // 获取门店列表
+    getStoreList () {
+      storeFindAll({}).then(res => {
+        this.storeList = res.data || []
+      })
+    },
     // 查询
     refresh () {
       this.$refs.table.refresh(true)
-      this.getListTotal()
     },
     // 重置
     resetSearchForm () {
+      this.$refs.queryForm.resetFields()
       this.queryOrderDate = null
       this.$refs.table.refresh(true)
-      this.getListTotal()
-    },
-    // 合计
-    getListTotal () {
-      const params = {
-        settleNo: this.queryParam.settleNo,
-        beginDate: this.queryParam.beginDate,
-        endDate: this.queryParam.endDate
-      }
-      if (this.queryOrderDate && this.queryOrderDate.length) {
-        params.beginDate = moment(this.queryOrderDate[0]).format('YYYY-MM-DD')
-        params.endDate = moment(this.queryOrderDate[1]).format('YYYY-MM-DD')
-      } else {
-        params.beginDate = ''
-        params.endDate = ''
-      }
-      settlementRecordsListTotal(params).then(res => {
-        if (res.status == 200) {
-          if (res.data) {
-            this.orderTotal = res.data.orderNum || 0
-            this.amountTotal = res.data.amount || 0
-          } else {
-            this.orderTotal = 0
-            this.amountTotal = 0
-          }
-        }
-      })
     },
-    // 打开提现弹窗
+    // 打开绑定弹窗
     openModal () {
       this.openStoreBindModal = true
     }
@@ -233,6 +210,9 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.queryOrderDate = null
+      vm.$refs.queryForm.resetFields()
+      vm.getSupplierList()
+      vm.getStoreList()
     })
   }
 }

+ 22 - 18
src/views/storehouseManagement/storeBind/StoreBindModal.vue

@@ -9,16 +9,16 @@
       :width="600"
       :centered="true">
       <a-form-model ref="ruleForm" :model="form" :rules="rules" :labelCol="{span:5}" :wrapperCol="{span:15}">
-        <a-form-model-item required label="选择供应商" prop="channeName">
+        <a-form-model-item required label="选择供应商" prop="supplierName">
           <a-select
-            id="storeBindModal-channeName"
+            id="storeBindModal-supplierName"
             show-search
             allowClear
             placeholder="请选择供应商"
             option-filter-prop="children"
-            v-model="form.channeName"
+            v-model="form.supplierName"
           >
-            <a-select-option v-for="item in storeList" :key="item.id" :value="item.id">
+            <a-select-option v-for="item in supplierList" :key="item.id" :value="item.id">
               {{ item.name }}
             </a-select-option>
           </a-select>
@@ -63,28 +63,31 @@ export default {
       type: Boolean,
       default: false
     },
-    settleId: {
-      type: String,
-      default: ''
+    // 供应商列表
+    supplierList: {
+      type: Array,
+      default: function () {
+        return []
+      }
+    },
+    // 门店列表
+    storeList: {
+      type: Array,
+      default: function () {
+        return []
+      }
     }
   },
   data () {
     return {
       isshow: this.openStoreBindModal,
-      storeList: [
-        { id: 11, name: '常青二路店' },
-        { id: 112, name: '西部大道店' },
-        { id: 114, name: '渭滨路店' },
-        { id: 115, name: '未央店' },
-        { id: 116, name: '凤城八路店' }
-      ],
       form: {
-        channeName: undefined, // 供应商名称
+        supplierName: undefined, // 供应商名称
         storeName: undefined, // 门店名称
         storeAddress: '' // 门店地址
       },
       rules: {
-        channeName: [{ required: true, message: '请选择供应商', trigger: ['change', 'blur'] }],
+        supplierName: [{ required: true, message: '请选择供应商', trigger: ['change', 'blur'] }],
         storeName: [{ required: true, message: '请选择关联客户', trigger: ['change', 'blur'] }]
       }
     }
@@ -115,9 +118,10 @@ export default {
 	  },
 	  isshow (val) {
 	    if (!val) {
-        this.$refs['ruleForm'].resetFields()
 	      this.$emit('close')
-	    }
+	    } else {
+        this.$refs['ruleForm'].resetFields()
+      }
 	  },
 	  settleId (newValue, oldValue) {
 	    if (newValue && this.isshow) {

+ 35 - 37
src/views/supplierManagement/SupplierList.vue

@@ -71,60 +71,58 @@
 <script>
 import { STable, VSelect } from '@/components'
 import SupplierModal from './SupplierModal.vue'
-// import { findStoreList } from '@/api/store.js'
-// import { findOrgTree } from '@/api/atorg.js'
+import { findOrgTree } from '@/api/atorg.js'
+import { supplierListQuery } from '@/api/supplierManagement.js'
 export default {
   name: 'StoreManagement',
   components: { STable, VSelect, SupplierModal },
   data () {
     return {
       queryParam: {
-        name: '', //  门店名称
-        managerMobile: '', //  负责人手机
-        orgCode: null, //  组织机构
-        enableFlag: '' //  启用状态
+        name: '', //  供应商名称
+        orgCode: null //  组织机构
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '组织机构', scopedSlots: { customRender: 'orgCode' }, width: 150, align: 'center' },
         { title: '供应商名称', dataIndex: 'name', width: 120, align: 'center' },
-        { title: '联系人', scopedSlots: { customRender: 'managerName' }, width: 100, align: 'center' },
+        { title: '联系人', dataIndex: 'manager', width: 100, align: 'center', customRender: (text, record, index) => { return text || '--' } },
         { title: '手机号码', dataIndex: 'managerMobile', width: 100, align: 'center' },
-        { title: '座机号码', dataIndex: 'phone', customRender: (text, record, index) => { return text || '--' }, width: 80, align: 'center' },
+        { title: '座机号码', dataIndex: 'tel', customRender: (text, record, index) => { return text || '--' }, width: 80, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 120, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        // return findStoreList(Object.assign(parameter, this.queryParam)).then(res => {
-        //   if (res.status == 200) {
-        //     const no = (res.data.pageNo - 1) * res.data.pageSize
-        //     for (let i = 0; i < res.data.list.length; i++) {
-        //       const _item = res.data.list[i]
-        //       _item.no = no + i + 1
-        //       // 重组组织机构
-        //       let codeNameArr = []
-        //       if (_item.orgPCodeName) { //  父级组织机构名称
-        //         const orgPCodeNameArr = _item.orgPCodeName.split(',')
-        //         codeNameArr = orgPCodeNameArr.splice(0, orgPCodeNameArr.length - 1)
-        //       }
-        //       if (_item.orgCodeName) { //  当前组织机构名称
-        //         codeNameArr.push(_item.orgCodeName)
-        //       }
-        //       _item.codeNameArr = codeNameArr
-        //     }
-        //     return res.data
-        //   }
-        // })
-        return Promise.resolve().then(data => {
-          return {
-            list: [
-              { no: '1', id: '1', codeNameArr: ['陕西省公司', '西安分公司'], name: '箭冠汽配南京分公司', managerName: '张三', managerMobile: '18792701236' }
-            ],
-            pageNo: 1,
-            pageSize: 10,
-            count: 1
+        return supplierListQuery(Object.assign(parameter, this.queryParam)).then(res => {
+          if (res.status == 200) {
+            const no = (res.data.pageNo - 1) * res.data.pageSize
+            for (let i = 0; i < res.data.list.length; i++) {
+              const _item = res.data.list[i]
+              _item.no = no + i + 1
+              // 重组组织机构
+              let codeNameArr = []
+              if (_item.orgPCodeName) { //  父级组织机构名称
+                const orgPCodeNameArr = _item.orgPCodeName.split(',')
+                codeNameArr = orgPCodeNameArr.splice(0, orgPCodeNameArr.length - 1)
+              }
+              if (_item.orgCodeName) { //  当前组织机构名称
+                codeNameArr.push(_item.orgCodeName)
+              }
+              _item.codeNameArr = codeNameArr
+            }
+            return res.data
           }
         })
+        // return Promise.resolve().then(data => {
+        //   return {
+        //     list: [
+        //       { no: '1', id: '1', codeNameArr: ['陕西省公司', '西安分公司'], name: '箭冠汽配南京分公司', managerName: '张三', managerMobile: '18792701236' }
+        //     ],
+        //     pageNo: 1,
+        //     pageSize: 10,
+        //     count: 1
+        //   }
+        // })
       },
       openModal: false, //  编辑 门店所属组织  弹框展示状态
       supplierId: '', // 供应商id
@@ -164,7 +162,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       vm.$refs.queryForm.resetFields()
-      // vm.getOrgList()
+      vm.getOrgList()
     })
   }
 }

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'https://channel.test.zyucgj.com/zyyc-channel/',
-        // target: 'http://192.168.16.102:8081/zyyc-channel/',
+        // target: 'https://channel.test.zyucgj.com/zyyc-channel/',
+        target: 'http://192.168.16.134:4301/zycar-supplier/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {