diff --git a/klp-ui/src/views/wms/stockIo/panels/detail.vue b/klp-ui/src/views/wms/stockIo/panels/detail.vue
index 62911052..246f00c3 100644
--- a/klp-ui/src/views/wms/stockIo/panels/detail.vue
+++ b/klp-ui/src/views/wms/stockIo/panels/detail.vue
@@ -29,7 +29,13 @@
-
+
+
+
+
+ {{ scope.row.itemId }}
+
+
@@ -100,11 +106,11 @@
-
@@ -147,7 +153,7 @@
-
+
{{ getStatusButtonText() }}
-
+
{{ getAuditButtonText() }}
-
+
-
@@ -341,7 +347,7 @@ export default {
this.$modal.msgError('请先添加明细数据');
return;
}
-
+
// 确认审核
this.$modal.confirm('确认要审核此出入库单吗?审核后将影响库存数据。').then(() => {
this.auditLoading = true;
@@ -410,7 +416,7 @@ export default {
} else {
this.$delete(this.rules, 'fromWarehouseId');
}
-
+
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
@@ -505,7 +511,7 @@ export default {
this.$modal.msgError('请先添加明细数据');
return;
}
-
+
this.$modal.confirm('确认要提交此出入库单吗?提交后将无法修改明细。').then(() => {
this.statusLoading = true;
updateStockIoStatus(this.stockIo.stockIoId, 1).then(response => {
diff --git a/klp-ui/src/views/workflow/work/start.vue b/klp-ui/src/views/workflow/work/start.vue
index 157c9709..a8d2296d 100644
--- a/klp-ui/src/views/workflow/work/start.vue
+++ b/klp-ui/src/views/workflow/work/start.vue
@@ -6,25 +6,13 @@
-
+
-
-
- 审批人设置
-
+
-
-
- 指定用户
- 角色
- 部门
- 发起人
-
-
-
-
+
-
-
+
+
提交
@@ -45,7 +33,7 @@
-
+
@@ -116,6 +104,7 @@ export default {
procInsId: null,
formOpen: false,
formData: {},
+ parserKey: 1,
// 审批表单
approvalForm: {
approvalType: 1, // 默认指定用户
@@ -162,6 +151,9 @@ export default {
}).then(res => {
if (res.data) {
this.formData = res.data;
+ // 表单按钮隐藏
+ this.formData.formBtns = false;
+ this.parserKey++ // 只有加载新表单时才更新 key
this.formOpen = true
}
})
@@ -195,15 +187,15 @@ export default {
this.$modal.msgError("表单未加载完成");
return;
}
-
+
// 获取表单数据
parserRef.getData();
-
+
// 验证表单
parserRef.$refs[parserRef.formConfCopy.formRef].validate(valid => {
if (valid) {
const formData = parserRef[parserRef.formConfCopy.formModel];
-
+
// 添加审批人信息到表单数据
// 根据审批类型添加不同的审批人信息
if (this.approvalForm.approvalType === 1 && this.approvalUsers.length > 0) {
@@ -212,23 +204,8 @@ export default {
formData.flowable.candidateUsers = this.approvalUsers.map(user => user.userId).join(',');
formData.flowable.candidateGroups = '';
formData.flowable.text = this.approvalUsers.map(user => user.nickName).join(',');
- } else if (this.approvalForm.approvalType === 2) {
- // 角色
- formData.flowable = formData.flowable || {};
- formData.flowable.candidateUsers = '';
- formData.flowable.candidateGroups = 'ROLE_';
- } else if (this.approvalForm.approvalType === 3) {
- // 部门
- formData.flowable = formData.flowable || {};
- formData.flowable.candidateUsers = '';
- formData.flowable.candidateGroups = 'DEPT_';
- } else if (this.approvalForm.approvalType === 4) {
- // 发起人
- formData.flowable = formData.flowable || {};
- formData.flowable.candidateUsers = '';
- formData.flowable.candidateGroups = '';
}
-
+
// 启动流程并将表单数据加入流程变量
if (this.definitionId) {
startProcess(this.definitionId, JSON.stringify(formData)).then(res => {
@@ -245,7 +222,7 @@ export default {
}
});
},
-
+
// 重置表单
resetForm() {
const parserRef = this.$refs.parser;