根据系统配置增加单据类型的选择来控制单据的审核按钮

jshERP-web/src/mixins/JeecgListMixin.js

@@ -274,8 +274,8 @@ export const JeecgListMixin = {
       // 新增/修改 成功时，重载列表
       this.loadData();
     },
-    handleDetail:function(record, type){
+    handleDetail:function(record, type, prefixNo){
-      this.$refs.modalDetail.show(record, type);
+      this.$refs.modalDetail.show(record, type, prefixNo);
       this.$refs.modalDetail.title=type+"-详情";
     },
     /* 导出 */

jshERP-web/src/utils/util.js

@@ -543,6 +543,21 @@ export function removeByVal(arrylist, val) {
   }
 }
 
+export function getCheckFlag(multiBillType, multiLevelApprovalFlag, prefixNo) {
+  if(multiLevelApprovalFlag==='1') {
+    //开启
+    if(multiBillType) {
+      let multiBillTypeArr = multiBillType.split(',')
+      return multiBillTypeArr.indexOf(prefixNo) <= -1
+    } else {
+      return true
+    }
+  } else {
+    //关闭
+    return true
+  }
+}
+
 /**
  * 将字符串中单个金额中的数值转为负数
  * @param str

jshERP-web/src/views/bill/AllocationOutList.vue

@@ -108,7 +108,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '调拨出库')">查看</a>
+              <a @click="myHandleDetail(record, '调拨出库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -163,6 +163,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'DBCK',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/AssembleList.vue

@@ -108,7 +108,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '组装单')">查看</a>
+              <a @click="myHandleDetail(record, '组装单', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -163,6 +163,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'ZZD',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/DisassembleList.vue

@@ -108,7 +108,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '拆卸单')">查看</a>
+              <a @click="myHandleDetail(record, '拆卸单', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -163,6 +163,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'CXD',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/OtherInList.vue

@@ -122,7 +122,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '其它入库')">查看</a>
+              <a @click="myHandleDetail(record, '其它入库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -179,6 +179,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'QTRK',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/OtherOutList.vue

@@ -122,7 +122,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '其它出库')">查看</a>
+              <a @click="myHandleDetail(record, '其它出库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -179,6 +179,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'QTCK',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/PurchaseBackList.vue

@@ -131,7 +131,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '采购退货出库')">查看</a>
+              <a @click="myHandleDetail(record, '采购退货出库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'CGTH',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -141,7 +141,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '采购入库')">查看</a>
+              <a @click="myHandleDetail(record, '采购入库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -209,6 +209,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'CGRK',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -111,7 +111,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '采购订单')">查看</a>
+              <a @click="myHandleDetail(record, '采购订单', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -169,6 +169,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'CGDD',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/RetailBackList.vue

@@ -131,7 +131,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '零售退货入库')">查看</a>
+              <a @click="myHandleDetail(record, '零售退货入库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'LSTH',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/RetailOutList.vue

@@ -126,7 +126,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '零售出库')">查看</a>
+              <a @click="myHandleDetail(record, '零售出库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -183,6 +183,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'LSCK',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/SaleBackList.vue

@@ -132,7 +132,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '销售退货入库')">查看</a>
+              <a @click="myHandleDetail(record, '销售退货入库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'XSTH',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -112,7 +112,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '销售订单')">查看</a>
+              <a @click="myHandleDetail(record, '销售订单', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -175,6 +175,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'XSDD',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/SaleOutList.vue

@@ -142,7 +142,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '销售出库')">查看</a>
+              <a @click="myHandleDetail(record, '销售出库', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -209,6 +209,7 @@
           status: "",
           remark: ""
         },
+        prefixNo: 'XSCK',
         labelCol: {
           span: 5
         },

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -1012,7 +1012,7 @@
   import pick from 'lodash.pick'
   import { getAction, postAction } from '@/api/manage'
   import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api'
-  import { getMpListShort, openDownloadDialog, sheet2blob } from "@/utils/util"
+  import { getMpListShort, getCheckFlag, openDownloadDialog, sheet2blob } from "@/utils/util"
   import BillPrintIframe from './BillPrintIframe'
   import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import FinancialDetail from '../../financial/dialog/FinancialDetail'
@@ -1040,7 +1040,7 @@
         purchaseBySaleFlag: false,
         linkNumberList: [],
         financialBillNoList: [],
-        /* 原始审核是否开启 */
+        /* 原始反审核是否开启 */
         checkFlag: true,
         tableWidth: {
           'width': '1500px'
@@ -1457,7 +1457,9 @@
         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
+            let multiBillType = res.data.multiBillType
+            let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag
+            this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
           }
         })
       },
@@ -1475,12 +1477,13 @@
           }
         })
       },
-      show(record, type) {
+      show(record, type, prefixNo) {
         //查询单条单据信息
         findBillDetailByNumber({ number: record.number }).then((res) => {
           if (res && res.code === 200) {
             let item = res.data
             this.billType = type
+            this.prefixNo = prefixNo
             //附件下载
             this.fileList = item.fileName
             this.visible = true

jshERP-web/src/views/bill/mixins/BillListMixin.js

@@ -1,13 +1,16 @@
 import Vue from 'vue'
 import {getAction } from '@/api/manage'
 import { FormTypes } from '@/utils/JEditableTableUtil'
-import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount, getCurrentSystemConfig} from '@/api/api'
+import {findBillDetailByNumber, findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getAccount,
+  getCurrentSystemConfig} from '@/api/api'
+import { getCheckFlag } from "@/utils/util"
 
 export const BillListMixin = {
   data () {
     return {
       /* 原始审核是否开启 */
       checkFlag: true,
+      prefixNo: '',
       supList: [],
       cusList: [],
       retailList: [],
@@ -79,11 +82,11 @@ export const BillListMixin = {
         this.$message.warning("抱歉，只有未审核的单据才能删除！")
       }
     },
-    myHandleDetail(record, type) {
+    myHandleDetail(record, type, prefixNo) {
       if(this.btnEnableList.indexOf(7)===-1) {
         this.$refs.modalDetail.isCanBackCheck = false
       }
-      this.handleDetail(record, type);
+      this.handleDetail(record, type, prefixNo);
     },
     handleApprove(record) {
       this.$refs.modalForm.action = "approve";
@@ -108,7 +111,9 @@ export const BillListMixin = {
     initSystemConfig() {
       getCurrentSystemConfig().then((res) => {
         if(res.code === 200 && res.data){
-          this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
+          let multiBillType = res.data.multiBillType
+          let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag
+          this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
         }
       })
     },

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -2,7 +2,7 @@ import { FormTypes, getListData } from '@/utils/JEditableTableUtil'
 import {findBySelectSup,findBySelectCus,findBySelectRetail,getMaterialByBarCode,findStockByDepotAndBarCode,getAccount,
   getPersonByNumType, getBatchNumberList, getCurrentSystemConfig} from '@/api/api'
 import { getAction,putAction } from '@/api/manage'
-import { getMpListShort, getNowFormatDateTime } from "@/utils/util"
+import { getMpListShort, getNowFormatDateTime, getCheckFlag } from "@/utils/util"
 import { USER_INFO } from "@/store/mutation-types"
 import Vue from 'vue'
 
@@ -150,7 +150,9 @@ export const BillModalMixin = {
     initSystemConfig() {
       getCurrentSystemConfig().then((res) => {
         if(res.code === 200 && res.data){
-          this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
+          let multiBillType = res.data.multiBillType
+          let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag
+          this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
         }
       })
     },

jshERP-web/src/views/financial/AdvanceInList.vue

@@ -113,7 +113,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '收预付款')">查看</a>
+              <a @click="myHandleDetail(record, '收预付款', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -172,6 +172,7 @@
           remark: "",
           roleType: Vue.ls.get('roleType')
         },
+        prefixNo: 'SYF',
         // 表头
         columns: [
           {

jshERP-web/src/views/financial/GiroList.vue

@@ -113,7 +113,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '转账')">查看</a>
+              <a @click="myHandleDetail(record, '转账', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -172,6 +172,7 @@
           remark: "",
           roleType: Vue.ls.get('roleType')
         },
+        prefixNo: 'ZZ',
         // 表头
         columns: [
           {

jshERP-web/src/views/financial/ItemInList.vue

@@ -122,7 +122,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '收入')">查看</a>
+              <a @click="myHandleDetail(record, '收入', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -182,6 +182,7 @@
           remark: "",
           roleType: Vue.ls.get('roleType')
         },
+        prefixNo: 'SR',
         // 表头
         columns: [
           {

jshERP-web/src/views/financial/ItemOutList.vue

@@ -122,7 +122,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '支出')">查看</a>
+              <a @click="myHandleDetail(record, '支出', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -182,6 +182,7 @@
           remark: "",
           roleType: Vue.ls.get('roleType')
         },
+        prefixNo: 'ZC',
         // 表头
         columns: [
           {

jshERP-web/src/views/financial/MoneyInList.vue

@@ -128,7 +128,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '收款')">查看</a>
+              <a @click="myHandleDetail(record, '收款', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
           number: "",
           roleType: Vue.ls.get('roleType')
         },
+        prefixNo: 'SK',
         // 表头
         columns: [
           {

jshERP-web/src/views/financial/MoneyOutList.vue

@@ -128,7 +128,7 @@
             :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
             @change="handleTableChange">
             <span slot="action" slot-scope="text, record">
-              <a @click="myHandleDetail(record, '付款')">查看</a>
+              <a @click="myHandleDetail(record, '付款', prefixNo)">查看</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
               <a v-if="btnEnableList.indexOf(1)>-1" @click="myHandleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -189,6 +189,7 @@
           number: "",
           roleType: Vue.ls.get('roleType')
         },
+        prefixNo: 'FK',
         // 表头
         columns: [
           {

jshERP-web/src/views/financial/dialog/FinancialDetail.vue

@@ -403,6 +403,7 @@
   import pick from 'lodash.pick'
   import { getAction, postAction } from '@/api/manage'
   import { findFinancialDetailByNumber, getCurrentSystemConfig, getPlatformConfigByKey } from '@/api/api'
+  import { getCheckFlag } from "@/utils/util"
   import WorkflowIframe from '@/components/tools/WorkflowIframe'
   import JUpload from '@/components/jeecg/JUpload'
   export default {
@@ -421,7 +422,7 @@
         isCanBackCheck: true,
         financialType: '',
         fileList: [],
-        /* 原始审核是否开启 */
+        /* 原始反审核是否开启 */
         checkFlag: true,
         labelCol: {
           xs: { span: 24 },
@@ -483,12 +484,13 @@
       this.width = realScreenWidth<1500?'1200px':'1550px'
     },
     methods: {
-      show(record, type) {
+      show(record, type, prefixNo) {
         //查询单条财务信息
         findFinancialDetailByNumber({ billNo: record.billNo }).then((res) => {
           if (res && res.code === 200) {
             let item = res.data
             this.financialType = type
+            this.prefixNo = prefixNo
             //附件下载
             this.fileList = item.fileName
             this.visible = true
@@ -520,7 +522,9 @@
       getSystemConfig() {
         getCurrentSystemConfig().then((res) => {
           if(res.code === 200 && res.data){
-            this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
+            let multiBillType = res.data.multiBillType
+            let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag
+            this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
           }
         })
       },

jshERP-web/src/views/financial/mixins/FinancialListMixin.js

@@ -1,5 +1,6 @@
 import {findFinancialDetailByNumber, findBySelectSup, findBySelectCus, findBySelectOrgan, findBySelectRetail,
   getUserList, getPersonByType, getAccount, getCurrentSystemConfig} from '@/api/api'
+import { getCheckFlag } from "@/utils/util"
 import Vue from 'vue'
 
 export const FinancialListMixin = {
@@ -7,6 +8,7 @@ export const FinancialListMixin = {
     return {
       /* 原始审核是否开启 */
       checkFlag: true,
+      prefixNo: '',
       supList: [],
       cusList: [],
       organList: [],
@@ -64,11 +66,11 @@ export const FinancialListMixin = {
         this.$message.warning("抱歉，只有未审核的单据才能删除！")
       }
     },
-    myHandleDetail(record, type) {
+    myHandleDetail(record, type, prefixNo) {
       if(this.btnEnableList.indexOf(7)===-1) {
         this.$refs.modalDetail.isCanBackCheck = false
       }
-      this.handleDetail(record, type);
+      this.handleDetail(record, type, prefixNo);
     },
     handleApprove(record) {
       this.$refs.modalForm.action = "approve";
@@ -85,7 +87,9 @@ export const FinancialListMixin = {
     initSystemConfig() {
       getCurrentSystemConfig().then((res) => {
         if(res.code === 200 && res.data){
-          this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
+          let multiBillType = res.data.multiBillType
+          let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag
+          this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
         }
       })
     },

jshERP-web/src/views/financial/mixins/FinancialModalMixin.js

@@ -2,7 +2,7 @@ import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTabl
 import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,findStockByDepotAndBarCode,getAccount,
   getPersonByType,findInOutItemByParam,getCurrentSystemConfig} from '@/api/api'
 import { getAction,putAction } from '@/api/manage'
-import { getMpListShort, getNowFormatDateTime } from "@/utils/util"
+import { getCheckFlag, getNowFormatDateTime } from "@/utils/util"
 import { USER_INFO } from "@/store/mutation-types"
 import Vue from 'vue'
 
@@ -73,7 +73,9 @@ export const FinancialModalMixin = {
     initSystemConfig() {
       getCurrentSystemConfig().then((res) => {
         if(res.code === 200 && res.data){
-          this.checkFlag = res.data.multiLevelApprovalFlag==='1'?false:true
+          let multiBillType = res.data.multiBillType
+          let multiLevelApprovalFlag = res.data.multiLevelApprovalFlag
+          this.checkFlag = getCheckFlag(multiBillType, multiLevelApprovalFlag, this.prefixNo)
         }
       })
     },

jshERP-web/src/views/system/SystemConfigList.vue

@@ -136,6 +136,7 @@
         multiLevelApprovalFlagSwitch: false, //多级审核
         originalMultiLevelApprovalFlag: '0', //原始多级审核状态
         multiBillTypeSelect: [], //单据类型
+        originalMultiBillTypeSelect: [], //原始单据类型
         isReadOnly: false,
         isShowApproval: false,
         labelCol: {
@@ -246,6 +247,7 @@
               }
               if (record.multiBillType != null && record.multiBillType != '') {
                 this.multiBillTypeSelect = record.multiBillType.split(',')
+                this.originalMultiBillTypeSelect = record.multiBillType
               }
             }
           } else {
@@ -280,7 +282,8 @@
                 this.init()
                 that.$message.info('保存成功！');
                 //如果多级审核切换状态需要刷新浏览器
-                if(this.originalMultiLevelApprovalFlag!= formData.multiLevelApprovalFlag) {
+                if(this.originalMultiLevelApprovalFlag!= formData.multiLevelApprovalFlag ||
+                  this.originalMultiBillTypeSelect!=formData.multiBillType) {
                   location.reload()
                 }
               }else{