From ac57394f602a141ce3e78b2f66e3d8ec26a85b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 23 Feb 2023 01:21:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=BC=80=E5=85=B3=E5=85=BC?=
=?UTF-8?q?=E5=AE=B9=E5=A4=9A=E7=BA=A7=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/tools/WorkflowIframe.vue | 83 +++++++++++++++++++
jshERP-web/src/mixins/JeecgListMixin.js | 2 +-
.../src/views/bill/AllocationOutList.vue | 5 +-
jshERP-web/src/views/bill/AssembleList.vue | 5 +-
jshERP-web/src/views/bill/DisassembleList.vue | 5 +-
jshERP-web/src/views/bill/OtherInList.vue | 5 +-
jshERP-web/src/views/bill/OtherOutList.vue | 5 +-
.../src/views/bill/PurchaseBackList.vue | 5 +-
jshERP-web/src/views/bill/PurchaseInList.vue | 5 +-
.../src/views/bill/PurchaseOrderList.vue | 5 +-
jshERP-web/src/views/bill/RetailBackList.vue | 5 +-
jshERP-web/src/views/bill/RetailOutList.vue | 5 +-
jshERP-web/src/views/bill/SaleBackList.vue | 5 +-
jshERP-web/src/views/bill/SaleOrderList.vue | 5 +-
jshERP-web/src/views/bill/SaleOutList.vue | 5 +-
.../src/views/bill/dialog/BillDetail.vue | 24 +++++-
.../src/views/bill/mixins/BillListMixin.js | 11 ++-
.../src/views/bill/mixins/BillModalMixin.js | 11 ++-
.../views/bill/modules/AllocationOutModal.vue | 3 +-
.../src/views/bill/modules/AssembleModal.vue | 3 +-
.../views/bill/modules/DisassembleModal.vue | 3 +-
.../src/views/bill/modules/OtherInModal.vue | 3 +-
.../src/views/bill/modules/OtherOutModal.vue | 3 +-
.../views/bill/modules/PurchaseBackModal.vue | 3 +-
.../views/bill/modules/PurchaseInModal.vue | 3 +-
.../views/bill/modules/PurchaseOrderModal.vue | 3 +-
.../views/bill/modules/RetailBackModal.vue | 3 +-
.../src/views/bill/modules/RetailOutModal.vue | 3 +-
.../src/views/bill/modules/SaleBackModal.vue | 3 +-
.../src/views/bill/modules/SaleOrderModal.vue | 3 +-
.../src/views/bill/modules/SaleOutModal.vue | 3 +-
.../src/views/financial/AdvanceInList.vue | 5 +-
jshERP-web/src/views/financial/GiroList.vue | 5 +-
jshERP-web/src/views/financial/ItemInList.vue | 5 +-
.../src/views/financial/ItemOutList.vue | 5 +-
.../src/views/financial/MoneyInList.vue | 5 +-
.../src/views/financial/MoneyOutList.vue | 5 +-
.../financial/dialog/FinancialDetail.vue | 29 ++++++-
.../financial/mixins/FinancialListMixin.js | 11 ++-
.../financial/mixins/FinancialModalMixin.js | 12 ++-
.../financial/modules/AdvanceInModal.vue | 3 +-
.../src/views/financial/modules/GiroModal.vue | 3 +-
.../views/financial/modules/ItemInModal.vue | 3 +-
.../views/financial/modules/ItemOutModal.vue | 3 +-
.../views/financial/modules/MoneyInModal.vue | 3 +-
.../views/financial/modules/MoneyOutModal.vue | 3 +-
.../src/views/system/SystemConfigList.vue | 8 +-
47 files changed, 275 insertions(+), 68 deletions(-)
create mode 100644 jshERP-web/src/components/tools/WorkflowIframe.vue
diff --git a/jshERP-web/src/components/tools/WorkflowIframe.vue b/jshERP-web/src/components/tools/WorkflowIframe.vue
new file mode 100644
index 00000000..d88b8cb7
--- /dev/null
+++ b/jshERP-web/src/components/tools/WorkflowIframe.vue
@@ -0,0 +1,83 @@
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index c08b6bba..2acb8f1b 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -59,7 +59,7 @@ export const JeecgListMixin = {
/** 是否加载时就执行 */
disableMixinCreated: false,
/* 按钮权限 */
- btnEnableList: ''
+ btnEnableList: '',
}
},
created() {
diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue
index 8901a8a5..aa1ee482 100644
--- a/jshERP-web/src/views/bill/AllocationOutList.vue
+++ b/jshERP-web/src/views/bill/AllocationOutList.vue
@@ -81,8 +81,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -203,6 +203,7 @@
computed: {
},
created() {
+ this.initSystemConfig()
this.getDepotData()
this.initUser()
},
diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue
index dd864613..bfd8fb51 100644
--- a/jshERP-web/src/views/bill/AssembleList.vue
+++ b/jshERP-web/src/views/bill/AssembleList.vue
@@ -81,8 +81,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -203,6 +203,7 @@
computed: {
},
created() {
+ this.initSystemConfig()
this.getDepotData()
this.initUser()
},
diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue
index c37d70d9..68297e9d 100644
--- a/jshERP-web/src/views/bill/DisassembleList.vue
+++ b/jshERP-web/src/views/bill/DisassembleList.vue
@@ -81,8 +81,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -203,6 +203,7 @@
computed: {
},
created() {
+ this.initSystemConfig()
this.getDepotData()
this.initUser()
},
diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue
index 7f027f3e..1e0cadce 100644
--- a/jshERP-web/src/views/bill/OtherInList.vue
+++ b/jshERP-web/src/views/bill/OtherInList.vue
@@ -95,8 +95,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -220,6 +220,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initSupplier()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue
index 5181a742..47320b50 100644
--- a/jshERP-web/src/views/bill/OtherOutList.vue
+++ b/jshERP-web/src/views/bill/OtherOutList.vue
@@ -95,8 +95,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -220,6 +220,7 @@
computed: {
},
created() {
+ this.initSystemConfig()
this.initCustomer()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue
index 3459a696..e91fcfea 100644
--- a/jshERP-web/src/views/bill/PurchaseBackList.vue
+++ b/jshERP-web/src/views/bill/PurchaseBackList.vue
@@ -104,8 +104,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -248,6 +248,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initSupplier()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue
index 85b5c82c..8c87fe95 100644
--- a/jshERP-web/src/views/bill/PurchaseInList.vue
+++ b/jshERP-web/src/views/bill/PurchaseInList.vue
@@ -112,8 +112,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -271,6 +271,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initSupplier()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue
index b6f6a349..6f99b732 100644
--- a/jshERP-web/src/views/bill/PurchaseOrderList.vue
+++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue
@@ -83,8 +83,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -223,6 +223,7 @@
}
},
created() {
+ this.initSystemConfig()
this.initSupplier()
this.initUser()
},
diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue
index 80c9af3f..8e8fc162 100644
--- a/jshERP-web/src/views/bill/RetailBackList.vue
+++ b/jshERP-web/src/views/bill/RetailBackList.vue
@@ -104,8 +104,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -245,6 +245,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initRetail()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue
index eb8ab1a3..61482dd0 100644
--- a/jshERP-web/src/views/bill/RetailOutList.vue
+++ b/jshERP-web/src/views/bill/RetailOutList.vue
@@ -99,8 +99,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -239,6 +239,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initRetail()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue
index 3f557cf7..6748b242 100644
--- a/jshERP-web/src/views/bill/SaleBackList.vue
+++ b/jshERP-web/src/views/bill/SaleBackList.vue
@@ -105,8 +105,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -248,6 +248,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initCustomer()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue
index 00665e56..3dd57945 100644
--- a/jshERP-web/src/views/bill/SaleOrderList.vue
+++ b/jshERP-web/src/views/bill/SaleOrderList.vue
@@ -84,8 +84,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -227,6 +227,7 @@
}
},
created() {
+ this.initSystemConfig()
this.initCustomer()
this.initUser()
this.getSystemConfig()
diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue
index 214d4d47..120f1208 100644
--- a/jshERP-web/src/views/bill/SaleOutList.vue
+++ b/jshERP-web/src/views/bill/SaleOutList.vue
@@ -113,8 +113,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -271,6 +271,7 @@
computed: {
},
created() {
+ this.initSystemConfig()
this.initCustomer()
this.getDepotData()
this.initUser()
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 8be31792..bd9617f1 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -36,8 +36,10 @@
导出
导出
- 反审核
+ 反审核
取消
+
+ 提交流程
@@ -1001,6 +1003,7 @@
+
@@ -1011,6 +1014,7 @@
import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api'
import { getMpListShort, openDownloadDialog, sheet2blob } from "@/utils/util"
import BillPrintIframe from './BillPrintIframe'
+ import WorkflowIframe from '@/components/tools/WorkflowIframe'
import FinancialDetail from '../../financial/dialog/FinancialDetail'
import JUpload from '@/components/jeecg/JUpload'
import Vue from 'vue'
@@ -1018,6 +1022,7 @@
name: 'BillDetail',
components: {
BillPrintIframe,
+ WorkflowIframe,
FinancialDetail,
JUpload
},
@@ -1035,6 +1040,8 @@
purchaseBySaleFlag: false,
linkNumberList: [],
financialBillNoList: [],
+ /* 原始审核是否开启 */
+ checkFlag: true,
tableWidth: {
'width': '1500px'
},
@@ -1450,6 +1457,7 @@
getCurrentSystemConfig().then((res) => {
if(res.code === 200 && res.data){
this.purchaseBySaleFlag = res.data.purchaseBySaleFlag==='1'?true:false
+ this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
}
})
},
@@ -1575,8 +1583,18 @@
if (res && res.code === 200) {
let billPrintUrl = res.data.platformValue + '?no=' + this.model.number
let billPrintHeight = this.dataSource.length*50 + 600
- this.$refs.modalDetail.show(this.model, billPrintUrl, billPrintHeight);
- this.$refs.modalDetail.title = this.billType + "-三联打印预览";
+ this.$refs.modalDetail.show(this.model, billPrintUrl, billPrintHeight)
+ this.$refs.modalDetail.title = this.billType + "-三联打印预览"
+ }
+ })
+ },
+ //发起流程
+ 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)
+ this.$refs.modalWorkflow.title = "发起流程"
}
})
},
diff --git a/jshERP-web/src/views/bill/mixins/BillListMixin.js b/jshERP-web/src/views/bill/mixins/BillListMixin.js
index e9f17662..606f2b43 100644
--- a/jshERP-web/src/views/bill/mixins/BillListMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillListMixin.js
@@ -1,11 +1,13 @@
import Vue from 'vue'
import {getAction } from '@/api/manage'
import { FormTypes } from '@/utils/JEditableTableUtil'
-import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount} from '@/api/api'
+import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount, getCurrentSystemConfig} from '@/api/api'
export const BillListMixin = {
data () {
return {
+ /* 原始审核是否开启 */
+ checkFlag: true,
supList: [],
cusList: [],
retailList: [],
@@ -103,6 +105,13 @@ export const BillListMixin = {
onDateOk(value) {
console.log(value);
},
+ initSystemConfig() {
+ getCurrentSystemConfig().then((res) => {
+ if(res.code === 200 && res.data){
+ this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
+ }
+ })
+ },
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{
diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
index 020fff1c..75165f33 100644
--- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js
+++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js
@@ -1,6 +1,6 @@
import { FormTypes, getListData } from '@/utils/JEditableTableUtil'
import {findBySelectSup,findBySelectCus,findBySelectRetail,getMaterialByBarCode,findStockByDepotAndBarCode,getAccount,
- getPersonByNumType, getBatchNumberList} from '@/api/api'
+ getPersonByNumType, getBatchNumberList, getCurrentSystemConfig} from '@/api/api'
import { getAction,putAction } from '@/api/manage'
import { getMpListShort, getNowFormatDateTime } from "@/utils/util"
import { USER_INFO } from "@/store/mutation-types"
@@ -29,6 +29,8 @@ export const BillModalMixin = {
minWidth: 1100,
isCanCheck: true,
isTenant: false,
+ /* 原始审核是否开启 */
+ checkFlag: true,
validatorRules:{
price:{
rules: [
@@ -145,6 +147,13 @@ export const BillModalMixin = {
}
}
},
+ initSystemConfig() {
+ getCurrentSystemConfig().then((res) => {
+ if(res.code === 200 && res.data){
+ this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
+ }
+ })
+ },
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{
diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
index 406807c8..770602ee 100644
--- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -213,6 +213,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initDepot()
},
//提交单据时整理成formData
diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue
index aea7052f..2fdf45fe 100644
--- a/jshERP-web/src/views/bill/modules/AssembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -211,6 +211,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initDepot()
},
//提交单据时整理成formData
diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
index e0e65d72..420bf00e 100644
--- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue
+++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -210,6 +210,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initDepot()
},
//提交单据时整理成formData
diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue
index 79aefc8d..6b237f7f 100644
--- a/jshERP-web/src/views/bill/modules/OtherInModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -237,6 +237,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initSupplier()
this.initDepot()
},
diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
index 29b325bc..5ce51f49 100644
--- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -237,6 +237,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initCustomer()
this.initDepot()
},
diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
index 870a44a4..a32ed6f5 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -340,6 +340,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initSupplier()
this.initDepot()
this.initAccount()
diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 80007ff6..0e4107d0 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -378,6 +378,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initSupplier()
this.initDepot()
this.initAccount()
diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
index 4326db14..ccf37e2e 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
@@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -324,6 +324,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initSupplier()
this.initAccount()
},
diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
index c1227035..aa83017f 100644
--- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -317,6 +317,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initRetail()
this.initDepot()
this.initAccount()
diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
index 7f8f308b..870f8b0f 100644
--- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue
@@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -327,6 +327,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initRetail()
this.initDepot()
this.initAccount()
diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
index 74ec23c0..fd61c147 100644
--- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue
@@ -11,7 +11,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -347,6 +347,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initCustomer()
this.initSalesman()
this.initDepot()
diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
index dc2dd617..67be8dc5 100644
--- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue
@@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -307,6 +307,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initCustomer()
this.initSalesman()
this.initAccount()
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index 685dc9d7..b7006408 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -14,7 +14,7 @@
style="top:20px;height: 95%;">
取消
- 保存并审核
+ 保存并审核
保存
@@ -396,6 +396,7 @@
this.model.tenantId = ''
this.copyAddInit(this.prefixNo)
}
+ this.initSystemConfig()
this.initCustomer()
this.initSalesman()
this.initDepot()
diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue
index 0d0660a8..64b614a5 100644
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -86,8 +86,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -202,6 +202,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initRetail()
this.initUser()
this.initPerson()
diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue
index e7a62a01..d3bb7d9f 100644
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -86,8 +86,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -200,6 +200,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initUser()
this.initPerson()
this.initAccount()
diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue
index aa093e7e..1106ac64 100644
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -95,8 +95,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -211,6 +211,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initOrgan()
this.initUser()
this.initPerson()
diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue
index e022d348..16de0a95 100644
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -95,8 +95,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -211,6 +211,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initOrgan()
this.initUser()
this.initPerson()
diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue
index 0f389518..ad1a99c3 100644
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -100,8 +100,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -220,6 +220,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initCustomer()
this.initUser()
this.initPerson()
diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue
index 81f1341f..55e50898 100644
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -100,8 +100,8 @@
删除
- 审核
- 反审核
+ 审核
+ 反审核
批量操作
@@ -220,6 +220,7 @@
computed: {
},
created () {
+ this.initSystemConfig()
this.initSupplier()
this.initUser()
this.initPerson()
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 4f4ddbaf..d74e7a00 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -18,8 +18,10 @@
打印
打印
- 反审核
+ 反审核
取消
+
+ 提交流程
@@ -394,16 +396,19 @@
+