zhouhao пре 2 година
родитељ
комит
d605e14a14

+ 4 - 1
src/components/SalesHeader/SalesHeader.vue

@@ -140,7 +140,8 @@ export default {
       provinceList: [],
       cityList: [],
       areaList: [],
-      streetList: []
+      streetList: [],
+      areaValue:''
     }
   },
   created() {
@@ -192,6 +193,7 @@ export default {
 
     // 切换区
     changeArea(value) {
+      this.areaValue = value
       this.screenForm.streetId = ''
       this.streetList = []
       this.getRegion(3, value)
@@ -201,6 +203,7 @@ export default {
 
     // 切换街道
     changeStreet(value) {
+      this.getRegion(3, this.areaValue)
       this.handleArea(value,'street')
     },
 

+ 11 - 3
src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -46,7 +46,7 @@ import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import SalesHeader from '@/components/SalesHeader/SalesHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
 import { addFrontOrder, getFrontOrderDetail, sbumitFrontOrder, updateFrontOrder } from '@/api/sales'
-import { getcustomerFrontList } from '@/api/stock'
+import { getcustomerFrontList, getFrontListCustomer } from '@/api/stock'
 
 export default {
   name: 'WarehouseForm',
@@ -110,7 +110,8 @@ export default {
           type: 'text'
 
         }
-      ]
+      ],
+      isFront:JSON.parse(localStorage.getItem('supply_user')).isFront
     }
   },
   created() {
@@ -133,7 +134,14 @@ export default {
   methods: {
 
     getDialogList(p) {
-      return getcustomerFrontList(...p)
+      let func = getcustomerFrontList
+      if (this.isFront===true){
+        func = getcustomerFrontList
+      }
+      if (this.isFront===false){
+        func = getFrontListCustomer
+      }
+      return func(...p)
     },
     confirm(selected) {
       console.log(selected)

+ 10 - 1
src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -52,6 +52,7 @@ import {
   sendRefund,
   updateRefund
 } from '@/api/sales'
+import { getcustomerFrontList, getFrontListCustomer } from '@/api/stock'
 
 export default {
   name: 'WarehouseForm',
@@ -119,7 +120,8 @@ export default {
           isInput: true,
           type:'text'
         }
-      ]
+      ],
+      isFront:JSON.parse(localStorage.getItem('supply_user')).isFront
     }
   },
   created() {
@@ -137,6 +139,13 @@ export default {
 
   methods: {
     getDialogList(p) {
+      let func = getcustomerFrontList
+      if (this.isFront===true){
+        func = getcustomerFrontList
+      }
+      if (this.isFront===false){
+        func = getFrontListCustomer
+      }
       return getFrontOrderList(...p)
     },
     confirm(selected) {

+ 2 - 2
src/views/sales_control/sales_management/customer_sales_list.vue

@@ -21,8 +21,8 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { delFrontOrder, exportCustomerFrontOrder, getFrontOrderList } from '@/api/sales'
-import customer_sales_form from '@/views/sales_order_management/sales_management/components/customer_sales_form'
-import customer_sales_details from '@/views/sales_order_management/sales_management/components/customer_sales_details'
+import customer_sales_form from '@/views/sales_control/sales_management/components/customer_sales_form'
+import customer_sales_details from '@/views/sales_control/sales_management/components/customer_sales_details'
 
 export default {
   components: { TemplatePage, customer_sales_form, customer_sales_details },

+ 2 - 2
src/views/sales_control/sales_management/return_sales_list.vue

@@ -21,8 +21,8 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import { delDeleteRefund, exportRefund, getFrontOrderListRefund } from '@/api/sales'
-import return_sales_form from '@/views/sales_order_management/sales_management/components/return_sales_form'
-import return_sales_details from '@/views/sales_order_management/sales_management/components/return_sales_details'
+import return_sales_form from '@/views/sales_control/sales_management/components/return_sales_form'
+import return_sales_details from '@/views/sales_control/sales_management/components/return_sales_details'
 export default {
   components: { TemplatePage,return_sales_form,return_sales_details },
   mixins: [import_mixin],

+ 3 - 3
src/views/stock_control/adjust_warehouse.vue

@@ -23,9 +23,9 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 
 import { getFrontListCustomerAcc, exportCustomerStockOrderBean, deleteCustomerStockOrder } from '@/api/stock'
-import WarehouseForm from '@/views/basic_data/stock/components/WarehouseForm'
-import WarehouseExamine from '@/views/basic_data/stock/components/WarehouseExamine'
-import WarehouseDetails from '@/views/basic_data/stock/components/WarehouseDetails'
+import WarehouseForm from '@/views/stock_control/components/WarehouseForm'
+import WarehouseExamine from '@/views/stock_control/components/WarehouseExamine'
+import WarehouseDetails from '@/views/stock_control/components/WarehouseDetails'
 
 export default {
   components: { TemplatePage, WarehouseForm, WarehouseExamine, WarehouseDetails },