Merge branch 'develop'

king

2022-09-13 10c86c1fab41f01c7bf7fcb9d2f8b624142f6a54

 src/utils/utils.js

@@ -1966,11 +1966,14 @@
      if (!_arr.includes('submitdate')) {
        _form.push('submitdate=getdate()')
      }
      if (!_arr.includes('submituserid')) {
        _form.push('submituserid=@userid@')
      }
      if (!_arr.includes('submituser')) {
        _form.push('submituser=@username')
      }
      if (!_arr.includes('submitstaff')) {
        _form.push('submitstaff=@fullname')
      }
      if (!_arr.includes('submituserid')) {
        _form.push('submituserid=@userid@')
      }
    } else {
      if (!_arr.includes('modifydate')) {
@@ -1979,6 +1982,9 @@
      if (!_arr.includes('modifyuser')) {
        _form.push('modifyuser=@username')
      }
      if (!_arr.includes('modifystaff')) {
        _form.push('modifystaff=@fullname')
      }
      if (!_arr.includes('modifyuserid')) {
        _form.push('modifyuserid=@userid@')
      }