Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change
This commit is contained in:
@@ -551,7 +551,7 @@
|
|||||||
_formData.append('id', this.bpnId || '')
|
_formData.append('id', this.bpnId || '')
|
||||||
_formData.append("createUser", this.$store.getters.userInfo.userId);
|
_formData.append("createUser", this.$store.getters.userInfo.userId);
|
||||||
_formData.append("createUserName", this.$store.getters.userInfo.userName);
|
_formData.append("createUserName", this.$store.getters.userInfo.userName);
|
||||||
_formData.append("prcType", "30");
|
_formData.append("prcType", "34");
|
||||||
_formData.append("json", JSON.stringify({
|
_formData.append("json", JSON.stringify({
|
||||||
form: json,
|
form: json,
|
||||||
roleForm: this.$refs.personnelInformationRef.roleForm,
|
roleForm: this.$refs.personnelInformationRef.roleForm,
|
||||||
@@ -753,7 +753,7 @@
|
|||||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||||
createUser: this.$store.getters.userInfo.userId,
|
createUser: this.$store.getters.userInfo.userId,
|
||||||
createUserName: this.$store.getters.userInfo.userName,
|
createUserName: this.$store.getters.userInfo.userName,
|
||||||
type: '30',
|
type: '34',
|
||||||
json: JSON.stringify(query)
|
json: JSON.stringify(query)
|
||||||
}, {_this: this}, res => {
|
}, {_this: this}, res => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
|
|||||||
@@ -591,7 +591,7 @@
|
|||||||
_formData.append('id', this.bpnId || '')
|
_formData.append('id', this.bpnId || '')
|
||||||
_formData.append("createUser", this.$store.getters.userInfo.userId);
|
_formData.append("createUser", this.$store.getters.userInfo.userId);
|
||||||
_formData.append("createUserName", this.$store.getters.userInfo.userName);
|
_formData.append("createUserName", this.$store.getters.userInfo.userName);
|
||||||
_formData.append("prcType", "29");
|
_formData.append("prcType", "33");
|
||||||
_formData.append("json", JSON.stringify({
|
_formData.append("json", JSON.stringify({
|
||||||
form: json,
|
form: json,
|
||||||
roleForm: this.$refs.personnelInformationRef.roleForm,
|
roleForm: this.$refs.personnelInformationRef.roleForm,
|
||||||
@@ -738,7 +738,7 @@
|
|||||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||||
createUser: this.$store.getters.userInfo.userId,
|
createUser: this.$store.getters.userInfo.userId,
|
||||||
createUserName: this.$store.getters.userInfo.userName,
|
createUserName: this.$store.getters.userInfo.userName,
|
||||||
type: '29',
|
type: '33',
|
||||||
json: JSON.stringify(query)
|
json: JSON.stringify(query)
|
||||||
}, {_this: this}, res => {
|
}, {_this: this}, res => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
|
|||||||
Reference in New Issue
Block a user