|
@@ -141,7 +141,12 @@
|
|
|
</el-form>
|
|
</el-form>
|
|
|
|
|
|
|
|
<div slot="footer">
|
|
<div slot="footer">
|
|
|
- <el-button v-click-once type="primary" size="small" @click="submit" :loading="loading"
|
|
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-click-once
|
|
|
|
|
+ type="primary"
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ @click="submit"
|
|
|
|
|
+ :loading="loading"
|
|
|
>提交</el-button
|
|
>提交</el-button
|
|
|
>
|
|
>
|
|
|
<el-button
|
|
<el-button
|
|
@@ -152,7 +157,12 @@
|
|
|
v-click-once
|
|
v-click-once
|
|
|
>提交并发布</el-button
|
|
>提交并发布</el-button
|
|
|
>
|
|
>
|
|
|
- <el-button v-click-once size="small" @click="isCloseRefresh ? cancel() : cancel1()">关闭</el-button>
|
|
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-click-once
|
|
|
|
|
+ size="small"
|
|
|
|
|
+ @click="isCloseRefresh ? cancel() : cancel1()"
|
|
|
|
|
+ >关闭</el-button
|
|
|
|
|
+ >
|
|
|
</div>
|
|
</div>
|
|
|
</ele-modal>
|
|
</ele-modal>
|
|
|
</template>
|
|
</template>
|
|
@@ -215,7 +225,7 @@
|
|
|
isCloseRefresh: {
|
|
isCloseRefresh: {
|
|
|
type: Boolean,
|
|
type: Boolean,
|
|
|
default: true
|
|
default: true
|
|
|
- },
|
|
|
|
|
|
|
+ }
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
@@ -300,7 +310,7 @@
|
|
|
methods: {
|
|
methods: {
|
|
|
init(row = {}) {
|
|
init(row = {}) {
|
|
|
this.form = { ...this.form, ...row };
|
|
this.form = { ...this.form, ...row };
|
|
|
- console.log(row)
|
|
|
|
|
|
|
+ console.log(row);
|
|
|
// this.form.businessId = row.id;
|
|
// this.form.businessId = row.id;
|
|
|
// this.form.businessKey = row.businessKey;
|
|
// this.form.businessKey = row.businessKey;
|
|
|
// this.form.formCreateUserId = row.createUserId;
|
|
// this.form.formCreateUserId = row.createUserId;
|
|
@@ -399,11 +409,9 @@
|
|
|
} else if (row.type === 70) {
|
|
} else if (row.type === 70) {
|
|
|
let data = JSON.parse(row.variableName);
|
|
let data = JSON.parse(row.variableName);
|
|
|
if (data.direction == 1) {
|
|
if (data.direction == 1) {
|
|
|
- return topLevel2.find((item) => item.value == data.topLevel)
|
|
|
|
|
- ?.label;
|
|
|
|
|
|
|
+ return topLevel2.find((item) => item.value == data.topLevel)?.label;
|
|
|
} else {
|
|
} else {
|
|
|
- return topLevel1.find((item) => item.value == data.topLevel)
|
|
|
|
|
- ?.label;
|
|
|
|
|
|
|
+ return topLevel1.find((item) => item.value == data.topLevel)?.label;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return '未知(' + option + ')';
|
|
return '未知(' + option + ')';
|
|
@@ -467,18 +475,18 @@
|
|
|
}
|
|
}
|
|
|
this.loading = true;
|
|
this.loading = true;
|
|
|
try {
|
|
try {
|
|
|
- console.log(this.form)
|
|
|
|
|
-
|
|
|
|
|
|
|
+ console.log(this.form);
|
|
|
|
|
+
|
|
|
let params = {
|
|
let params = {
|
|
|
- ...this.form,
|
|
|
|
|
|
|
+ ...this.form,
|
|
|
variables: {
|
|
variables: {
|
|
|
// businessName: data.supplierName,
|
|
// businessName: data.supplierName,
|
|
|
...this.form.variables
|
|
...this.form.variables
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
- if(this.isSpecialeSubmit) {
|
|
|
|
|
- console.log('特殊提交', params)
|
|
|
|
|
-
|
|
|
|
|
|
|
+ if (this.isSpecialeSubmit) {
|
|
|
|
|
+ console.log('特殊提交', params);
|
|
|
|
|
+
|
|
|
this.$emit('specialesubmit', params);
|
|
this.$emit('specialesubmit', params);
|
|
|
} else {
|
|
} else {
|
|
|
await processInstanceCreateAPI(params);
|
|
await processInstanceCreateAPI(params);
|
|
@@ -487,7 +495,6 @@
|
|
|
// this.$emit('reload');
|
|
// this.$emit('reload');
|
|
|
this.cancel();
|
|
this.cancel();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
console.error('提交审批失败', error);
|
|
console.error('提交审批失败', error);
|
|
|
}
|
|
}
|
|
@@ -511,7 +518,7 @@
|
|
|
},
|
|
},
|
|
|
cancel1() {
|
|
cancel1() {
|
|
|
this.$emit('update:processSubmitDialogFlag', false);
|
|
this.$emit('update:processSubmitDialogFlag', false);
|
|
|
- },
|
|
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
</script>
|
|
</script>
|