完善单车返利预提、核对；专项返利预提、核对、分配

anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@@ -280,3 +280,12 @@ export function fetchDetailsBySid(data) {
     method: 'get'
   })
 }
+
+// 获取系统管理 -- 财务参数 -- 参数值
+export function fetchByParNo(data) {
+  return request({
+    url: '/portal/v1/sysparameter/fetchByParNo',
+    method: 'post',
+    params: data
+  })
+}

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@@ -101,7 +101,7 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatecheck'
-import { fetchBySid } from '@/api/cheliang/dictcommons'
+import { fetchByParNo, fetchBySid } from '@/api/cheliang/dictcommons'
 import yiheduidanchefanli from './relation/yiheduidanchefanli'
 import bicyclerebatetobecheckedAdd from './relation/bicyclerebatetobecheckedAdd'
 
@@ -145,24 +145,6 @@ export default {
     }
   },
   methods: {
-    // 获取制单日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 本年
-      let month = date.getMonth() // 上一月
-      let day = date.getDate() // 本日
-      if (month < 1 && day < 7) {
-        month = 12
-        year = date.getFullYear() - 1
-      } else if (month < 1 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day < 7) {
-        month = date.getMonth() // 上一月
-      }
-      this.formobj.checkApply = year + '年' + month + '月'
-    },
     init() {
       fetchBySid(this.formobj.createOrgSid).then((res) => {
         if (res.success) {
@@ -175,7 +157,6 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
         this.init()
-        this.newDate()
       })
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
@@ -185,12 +166,31 @@ export default {
       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)
       var nowDate = new Date()
-      var date = {
+      var time = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,
         day: nowDate.getDate()
       }
-      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
+      fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
+        if (res.success) {
+          let date = new Date()
+          let year = date.getFullYear() // 本年
+          let month = date.getMonth() // 上一月
+          let day = date.getDate() // 本日
+          if (month < 1 && day < res.data) {
+            month = 12
+            year = date.getFullYear() - 1
+          } else if (month < 1 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day < res.data) {
+            month = date.getMonth() // 上一月
+          }
+          this.formobj.checkApply = year + '年' + month + '月'
+        }
+      })
       this.viewTitle = '【新增】单车返利核对审核申请'
     },
     showEdit(row) {

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

@@ -81,7 +81,7 @@
 
 <script>
 import req from '@/api/bikerebate/bicyclerebatewithholding'
-import { fetchBySid } from '@/api/cheliang/dictcommons'
+import { fetchBySid, fetchByParNo } from '@/api/cheliang/dictcommons'
 import danchefanliselect from './relation/danchefanliselect'
 import danchefanliAdd from './relation/danchefanliAdd'
 
@@ -131,31 +131,11 @@ export default {
         }
       })
     },
-    // 获取日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 本年
-      let month = date.getMonth() // 上一月
-      let day = date.getDate() // 本日
-      if (month < 1 && day < 7) {
-        month = 12
-        year = date.getFullYear() - 1
-      } else if (month < 1 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day < 7) {
-        month = date.getMonth() // 上一月
-      }
-      this.formobj.withApply = year + '年' + month + '月'
-    },
     showAdd(createOrgSid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
         this.init()
-        this.newDate()
       })
-
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
@@ -164,12 +144,31 @@ export default {
       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)
       var nowDate = new Date()
-      var date = {
+      var time = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,
         day: nowDate.getDate()
       }
-      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
+      fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
+        if (res.success) {
+          let date = new Date()
+          let year = date.getFullYear() // 本年
+          let month = date.getMonth() // 上一月
+          let day = date.getDate() // 本日
+          if (month < 1 && day < res.data) {
+            month = 12
+            year = date.getFullYear() - 1
+          } else if (month < 1 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day < res.data) {
+            month = date.getMonth() // 上一月
+          }
+          this.formobj.withApply = year + '年' + month + '月'
+        }
+      })
       this.viewTitle = '【新增】预提申请'
     },
     showEdit(row) {

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

@@ -101,7 +101,7 @@
 
 <script>
 import req from '@/api/specialrebate/specialrebatecheck'
-import { fetchBySid } from '@/api/cheliang/dictcommons'
+import { fetchBySid, fetchByParNo} from '@/api/cheliang/dictcommons'
 import yiheduizhuanxiangfanli from './relation/yiheduizhuanxiangfanli'
 import specialrebatetobecheckedAdd from './relation/specialrebatetobecheckedAdd'
 
@@ -144,24 +144,6 @@ export default {
     }
   },
   methods: {
-    // 获取制单日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 本年
-      let month = date.getMonth() // 上一月
-      let day = date.getDate() // 本日
-      if (month < 1 && day < 7) {
-        month = 12
-        year = date.getFullYear() - 1
-      } else if (month < 1 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day < 7) {
-        month = date.getMonth() // 上一月
-      }
-      this.formobj.checkApply = year + '年' + month + '月'
-    },
     init() {
       fetchBySid(this.formobj.createOrgSid).then((res) => {
         if (res.success) {
@@ -174,7 +156,6 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
         this.init()
-        this.newDate()
       })
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
@@ -184,12 +165,31 @@ export default {
       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)
       var nowDate = new Date()
-      var date = {
+      var time = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,
         day: nowDate.getDate()
       }
-      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
+      fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
+        if (res.success) {
+          let date = new Date()
+          let year = date.getFullYear() // 本年
+          let month = date.getMonth() // 上一月
+          let day = date.getDate() // 本日
+          if (month < 1 && day < res.data) {
+            month = 12
+            year = date.getFullYear() - 1
+          } else if (month < 1 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day < res.data) {
+            month = date.getMonth() // 上一月
+          }
+          this.formobj.checkApply = year + '年' + month + '月'
+        }
+      })
       this.viewTitle = '【新增】专项返利核对审核申请'
     },
     showEdit(row) {

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

@@ -72,7 +72,7 @@
 <script>
 import req from '@/api/specialrebate/specialrebatedistribution'
 import daifeipeizhuanxiang from './relation/daifeipeizhuanxiang'
-import { fetchBySid } from '@/api/cheliang/dictcommons'
+import { fetchByParNo, fetchBySid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'SpecialRebateDistributionAdd',
@@ -119,18 +119,10 @@ export default {
         }
       })
     },
-    // 获取制单日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 年
-      let month = date.getMonth() // 月
-      this.formobj.title = year + '年' + month + '月'
-    },
     showAdd(createOrgSid) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
         this.init()
-        this.newDate()
       })
       this.formobj.createOrgSid = createOrgSid
       this.formobj.useOrgSid = createOrgSid
@@ -140,12 +132,31 @@ export default {
       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)
       var nowDate = new Date()
-      var date = {
+      var time = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,
         day: nowDate.getDate()
       }
-      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
+      fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
+        if (res.success) {
+          let date = new Date()
+          let year = date.getFullYear() // 本年
+          let month = date.getMonth() // 上一月
+          let day = date.getDate() // 本日
+          if (month < 1 && day < res.data) {
+            month = 12
+            year = date.getFullYear() - 1
+          } else if (month < 1 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day < res.data) {
+            month = date.getMonth() // 上一月
+          }
+          this.formobj.title = year + '年' + month + '月'
+        }
+      })
       this.viewTitle = '【新增】专项返利分配申请'
     },
     showEdit(row) {

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

@@ -81,7 +81,7 @@
 
 <script>
 import req from '@/api/specialrebate/specialrebatewithholding'
-import {fetchBySid, getOrgSidByPath} from '@/api/cheliang/dictcommons'
+import { fetchBySid, getOrgSidByPath, fetchByParNo } from '@/api/cheliang/dictcommons'
 import zhuanxiangfanliselect from './relation/zhuanxiangfanliselect'
 import zhuanxiangfanliAdd from './relation/zhuanxiangfanliAdd'
 
@@ -123,28 +123,9 @@ export default {
     }
   },
   methods: {
-    // 获取日期
-    newDate() {
-      let date = new Date()
-      let year = date.getFullYear() // 本年
-      let month = date.getMonth() // 上一月
-      let day = date.getDate() // 本日
-      if (month < 1 && day < 7) {
-        month = 12
-        year = date.getFullYear() - 1
-      } else if (month < 1 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day > 6) {
-        month = date.getMonth() + 1 // 本月
-      } else if (month > 0 && day < 7) {
-        month = date.getMonth() // 上一月
-      }
-      this.formobj.withApply = year + '年' + month + '月'
-    },
     showAdd() {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
-        this.newDate()
       })
       this.dialogStatus = 'add'
       this.formobj.createBySid = window.sessionStorage.getItem('userSid')
@@ -153,12 +134,31 @@ export default {
       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)
       var nowDate = new Date()
-      var date = {
+      var time = {
         year: nowDate.getFullYear(),
         month: nowDate.getMonth() + 1,
         day: nowDate.getDate()
       }
-      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+      this.formobj.createTime = time.year + '-' + (time.month >= 10 ? time.month : '0' + time.month) + '-' + (time.day >= 10 ? time.day : '0' + time.day)
+      fetchByParNo({ parNo: 'CW_FLYJSRQ' }).then((res) => {
+        if (res.success) {
+          let date = new Date()
+          let year = date.getFullYear() // 本年
+          let month = date.getMonth() // 上一月
+          let day = date.getDate() // 本日
+          if (month < 1 && day < res.data) {
+            month = 12
+            year = date.getFullYear() - 1
+          } else if (month < 1 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day > res.data) {
+            month = date.getMonth() + 1 // 本月
+          } else if (month > 0 && day < res.data) {
+            month = date.getMonth() // 上一月
+          }
+          this.formobj.withApply = year + '年' + month + '月'
+        }
+      })
       getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.formobj.createOrgSid = resp.data