Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue

@@ -149,6 +149,7 @@ export default {
       listQuery: {
         params: {
           useOrgName: '',
+          createOrgSid: '',
           deptName: '',
           createByName: '',
           billNo: '',
@@ -281,6 +282,7 @@ export default {
       this.listQuery = {
         params: {
           useOrgName: '',
+          createOrgSid: '',
           deptName: '',
           createByName: '',
           billNo: '',

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue

@@ -181,7 +181,6 @@ export default {
         code = event.data.params.code
       }
       if (code === 1) {
-        this.init()
         this.centerDialogVisible = false
       } else if (code === 2) {
         this.dialogHeight = event.data.params.data
@@ -204,14 +203,6 @@ export default {
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
-    init() {
-      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
-        if (resp.success) {
-          this.listQuery.params.createOrgSid = resp.data
-          this.getList()
-        }
-      })
-    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@@ -491,7 +491,7 @@ export default {
     },
     handleClick() {
       this.viewState = 2
-      this.$refs['divCheck'].init()
+      this.$refs['divCheck'].getList()
     },
     toAdd() {
       this.viewState = 3

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatedistribution/specialrebatedistribution.vue

@@ -155,6 +155,7 @@ export default {
       listQuery: {
         params: {
           createOrgName: '',
+          createOrgSid: '',
           deptName: '',
           createByName: '',
           billNo: '',
@@ -283,6 +284,7 @@ export default {
       this.listQuery = {
         params: {
           createOrgName: '',
+          createOrgSid: '',
           deptName: '',
           createByName: '',
           billNo: '',
@@ -299,7 +301,7 @@ export default {
         size: 5,
         total: 0
       }
-      this.getList()
+      this.init()
     },
     handleClick() {
       this.$parent.resetState()

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholding.vue

@@ -94,7 +94,6 @@ import req from '@/api/specialrebate/specialrebatewithholding'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
-import { getOrgSidByPath } from '@/api/cheliang/dictcommons'
 import specialrebatewithholdingAdd from './specialrebatewithholdingAdd'
 import specialrebatewithholdingInfo from './specialrebatewithholdingInfo'
 import { getStorage } from '@/utils/auth'
@@ -170,7 +169,7 @@ export default {
   },
   created() {
     // 加载列表
-    this.init()
+    this.getList()
   },
   mounted() {
     // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
@@ -184,7 +183,6 @@ export default {
         code = event.data.params.code
       }
       if (code === 1) {
-        this.init()
         this.centerDialogVisible = false
       } else if (code === 2) {
         this.dialogHeight = event.data.params.data
@@ -207,14 +205,6 @@ export default {
       }
       this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
     },
-    init() {
-      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
-        if (resp.success) {
-          this.listQuery.params.createOrgSid = resp.data
-          this.getList()
-        }
-      })
-    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -301,7 +291,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/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue

@@ -81,7 +81,7 @@
 
 <script>
 import req from '@/api/specialrebate/specialrebatewithholding'
-import { fetchBySid } from '@/api/cheliang/dictcommons'
+import {fetchBySid, getOrgSidByPath} from '@/api/cheliang/dictcommons'
 import zhuanxiangfanliselect from './relation/zhuanxiangfanliselect'
 import zhuanxiangfanliAdd from './relation/zhuanxiangfanliAdd'
 
@@ -123,14 +123,6 @@ export default {
     }
   },
   methods: {
-    init() {
-      fetchBySid(this.formobj.createOrgSid).then((res) => {
-        if (res.success) {
-          this.formobj.createOrgName = res.data.name
-          this.formobj.useOrgName = res.data.name
-        }
-      })
-    },
     // 获取日期
     newDate() {
       let date = new Date()
@@ -142,17 +134,14 @@ export default {
       }
       this.formobj.withApply = year + '年' + month + '月'
     },
-    showAdd(createOrgSid) {
+    showAdd() {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
-        this.init()
         this.newDate()
       })
       this.dialogStatus = 'add'
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
       this.formobj.createByName = window.sessionStorage.getItem('name')
-      this.formobj.createOrgSid = createOrgSid
-      this.formobj.useOrgSid = createOrgSid
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
       this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
       this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
@@ -163,6 +152,18 @@ export default {
         day: nowDate.getDate()
       }
       this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success) {
+          this.formobj.createOrgSid = resp.data
+          this.formobj.useOrgSid = resp.data
+          fetchBySid(this.formobj.createOrgSid).then((res) => {
+            if (res.success) {
+              this.formobj.createOrgName = res.data.name
+              this.formobj.useOrgName = res.data.name
+            }
+          })
+        }
+      })
       this.viewTitle = '【新增】专项返利预提申请'
     },
     showEdit(row) {