diff --git a/jshERP-web/src/components/tools/WorkflowIframe.vue b/jshERP-web/src/components/tools/WorkflowIframe.vue
index d88b8cb7..ce7707a1 100644
--- a/jshERP-web/src/components/tools/WorkflowIframe.vue
+++ b/jshERP-web/src/components/tools/WorkflowIframe.vue
@@ -59,7 +59,7 @@
this.height = height
this.sendWorkflowUrl = sendWorkflowUrl
this.visible = true
- this.modalStyle = 'top:20%; height: 50%;'
+ this.modalStyle = 'top:20%; height: 55%;'
this.model = Object.assign({}, record)
this.$nextTick(() => {
this.form.setFieldsValue(pick(this.model,'id'))
diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue
index aa1ee482..3950a32f 100644
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -120,6 +120,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index bfd8fb51..45dabad8 100644
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -120,6 +120,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index 68297e9d..ac331341 100644
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -120,6 +120,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index 1e0cadce..87138c4c 100644
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -134,6 +134,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index 47320b50..3e98b6ec 100644
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -134,6 +134,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index e91fcfea..3f53377e 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -143,6 +143,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 8c87fe95..da1b3ef7 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -162,6 +162,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index 6f99b732..b5437d2b 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -125,6 +125,7 @@
已审核
完成采购
部分采购
+ 审核中
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index 8e8fc162..5518ec4b 100644
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -143,6 +143,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index 61482dd0..9a254dd7 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -138,6 +138,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index 6748b242..0fa4f8f2 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -144,6 +144,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 3dd57945..84c065fb 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -126,6 +126,7 @@
已审核
完成销售
部分销售
+ 审核中
未采购
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index 120f1208..326e5860 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -163,6 +163,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index bd9617f1..6044d69c 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -1592,8 +1592,8 @@
handleWorkflow() {
getPlatformConfigByKey({"platformKey": "send_workflow_url"}).then((res)=> {
if (res && res.code === 200) {
- let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.number
- this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 500)
+ let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.number + '&type=1'
+ this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 320)
this.$refs.modalWorkflow.title = "发起流程"
}
})
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index 64b614a5..27032272 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -123,6 +123,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index d3bb7d9f..4103365c 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -123,6 +123,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index 1106ac64..b251a5fd 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -132,6 +132,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index 16de0a95..704fcdb2 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -132,6 +132,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index ad1a99c3..c22a9677 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -138,6 +138,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index 55e50898..37fa9481 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -138,6 +138,7 @@
未审核
已审核
+ 审核中
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index d74e7a00..dec0ad0d 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -528,8 +528,8 @@
handleWorkflow() {
getPlatformConfigByKey({"platformKey": "send_workflow_url"}).then((res)=> {
if (res && res.code === 200) {
- let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.billNo
- this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 500)
+ let sendWorkflowUrl = res.data.platformValue + '?no=' + this.model.billNo + '&type=2'
+ this.$refs.modalWorkflow.show(this.model, sendWorkflowUrl, 320)
this.$refs.modalWorkflow.title = "发起流程"
}
})