Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue

@@ -195,7 +195,7 @@ import bicyclerebatemanagementEdit from './bicyclerebatemanagementEdit'
 import bicyclerebatemanagementInfo from './bicyclerebatemanagementInfo'
 
 export default {
-  name: 'bicyclerebatemanagement',
+  name: 'BicycleRebateManagement',
   components: {
     Pagination,
     pageye,
@@ -264,7 +264,6 @@ export default {
       ],
       listQuery: {
         params: {
-          createOrgSid: '',
           createEndTime: '',
           createStartTime: '',
           rebateName: '',
@@ -272,7 +271,10 @@ export default {
           state: '',
           vinNo: '',
           vehModelName: '',
-          brandSid: ''
+          brandSid: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,
@@ -297,8 +299,7 @@ export default {
       })
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
-          this.listQuery.params.createOrgSid = resp.data
+          brandDown({ useOrg: resp.data }).then((res) => {
-          brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => {
             if (res.success) {
               this.brand_list = res.data
             }
@@ -352,6 +353,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
@@ -372,7 +376,6 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
-          createOrgSid: '',
           createEndTime: '',
           createStartTime: '',
           rebateName: '',
@@ -380,7 +383,10 @@ export default {
           state: '',
           vinNo: '',
           vehModelName: '',
-          brandSid: ''
+          brandSid: '',
+          orgPath: '',
+          userSid: '',
+          menuUrl: ''
         },
         current: 1,
         size: 5,
@@ -390,7 +396,7 @@ export default {
     },
     toAdd() {
       this.viewState = 2
-      this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
+      this.$refs['divAdd'].showAdd()
     },
     toEdit(row) {
       this.viewState = 3

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue

@@ -110,11 +110,11 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatemanagement'
-import { typeValues, fetchBySid } from '@/api/cheliang/dictcommons'
+import { typeValues } from '@/api/cheliang/dictcommons'
 import bicyclerebatemanagementByVehicle from './bicyclerebatemanagementByVehicle'
 
 export default {
-  name: 'bicyclerebatemanagementAdd',
+  name: 'BicycleRebateManagementAdd',
   components: {
     bicyclerebatemanagementByVehicle
   },
@@ -136,10 +136,8 @@ export default {
         calculationModeValue: '',
         calculationStandard: '',
         sid: '',
-        createOrgSid: '',
+        orgPath: '',
-        createOrgName: '',
+        createBySid: '',
-        useOrgSid: '',
-        useOrgName: '',
         scmVehRebateVehs: []
       },
       rules: {},
@@ -158,12 +156,6 @@ export default {
           this.calculationMode_list = resp.data
         }
       })
-      fetchBySid(this.formobj.createOrgSid).then((res) => {
-        if (res.success) {
-          this.formobj.createOrgName = res.data.name
-          this.formobj.useOrgName = res.data.name
-        }
-      })
     },
     UpNumber(e) {
       if (this.formobj.calculationModeValue === '') {
@@ -215,13 +207,13 @@ export default {
       } catch (e) {}
       return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
     },
-    showAdd(createOrgSid) {
+    showAdd() {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
         this.init()
       })
-      this.formobj.createOrgSid = createOrgSid
+      this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-      this.formobj.useOrgSid = createOrgSid
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.viewTitle = '【新增】单车返利'
     },
     changeRebateType(value) {
@@ -358,10 +350,8 @@ export default {
         calculationModeValue: '',
         calculationStandard: '',
         sid: '',
-        createOrgSid: '',
+        orgPath: '',
-        createOrgName: '',
+        createBySid: '',
-        useOrgSid: '',
-        useOrgName: '',
         scmVehRebateVehs: []
       }
       this.$refs['form_obj'].resetFields()

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementByVehicle.vue

@@ -112,7 +112,7 @@ import req from '@/api/bikerebate/bicyclerebatemanagement'
 import { typeValues, brandDown, getOrgSidByPath } from '@/api/cheliang/dictcommons.js'
 
 export default {
-  name: 'xuanzecheliang',
+  name: 'XuanZeCheLiang',
   components: {
     Pagination
   },

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@@ -118,7 +118,7 @@ import req from '@/api/bikerebate/bicyclerebatemanagement'
 import { typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'bicyclerebatemanagementEdit',
+  name: 'BicycleRebateManagementEdit',
   data() {
     return {
       viewTitle: '',
@@ -134,10 +134,6 @@ export default {
         calculationModeValue: '',
         calculationStandard: '',
         sid: '',
-        createOrgSid: '',
-        createOrgName: '',
-        useOrgSid: '',
-        useOrgName: '',
         vinNo: '',
         manufactorSettlementPrice: '',
         freight: '',

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue

@@ -107,7 +107,7 @@
 import req from '@/api/bikerebate/bicyclerebatemanagement'
 
 export default {
-  name: 'bicyclerebatemanagementInfo',
+  name: 'BicycleRebateManagementInfo',
   data() {
     return {
       viewTitle: '',