Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-op-mini-web

src/components/modal/dk-function/master-slave-checkbox.vue

@@ -52,19 +52,20 @@ export default {
     }
   },
   watch: {
-    data: {
-      handler(val) {
-        this.data = val
-        this.$emit('input', val)
-        this.$emit('on-change')
-      },
-      deep: true
-    },
+    // data: {
+    //   handler(val) {
+    //     this.data = val
+    //     this.$emit('input', val)
+    //     this.$emit('on-change')
+    //   },
+    //   deep: true
+    // },
     checked(n, o) {
       this.checkedData = n;
       if (!this.clickItemFlag) {
         // 需要把对应的子级勾上
         this.data.update(this.itemData, 'id', 'checked', 'parentId')
+        this.$emit('on-change')
         this.$forceUpdate()
       }
     },
@@ -78,6 +79,7 @@ export default {
     changeMaster(flag) {
       this.itemData.checked = flag;
       this.data.update(this.itemData, 'id', 'checked', 'parentId')
+      this.$emit('on-change')
       this.$forceUpdate()
     },
     /**
@@ -90,6 +92,12 @@ export default {
       if (flag) {
         this.clickItemFlag = true;
         this.itemData.checked = true;
+        this.$emit('on-change')
+        this.$forceUpdate()
+      }else{
+        // this.clickItemFlag = false;
+        this.itemData.checked = false;
+        this.$emit('on-change')
         this.$forceUpdate()
       }
     }

src/locale/lang/zh-CN.js

@@ -97,20 +97,20 @@ export const button = {
   receipt: '收款',
   payment: '付款',
   refund: '退款',
-  unFreeze:'解冻',
-  chooseReceivableInvoice:'选择应收款单',
-  choosePayableInvoice:'选择应付款单',
-  flgLock:'锁库',
-  addWh:'新建仓库调整',
-  addNsc:'新建批号调整',
-  intoEnter:'转入库',
-  purchaseReturn:'采购退货',
-  transferPrice:'调整单价',
-  transferAmt:'调整金额',
-  release:'发布',
-  shelves:'下架',
-  editItem:'编辑明细',
-  addItem:'新建明细',
+  unFreeze: '解冻',
+  chooseReceivableInvoice: '选择应收款单',
+  choosePayableInvoice: '选择应付款单',
+  flgLock: '锁库',
+  addWh: '新建仓库调整',
+  addNsc: '新建批号调整',
+  intoEnter: '转入库',
+  purchaseReturn: '采购退货',
+  transferPrice: '调整单价',
+  transferAmt: '调整金额',
+  release: '发布',
+  shelves: '下架',
+  editItem: '编辑明细',
+  addItem: '新建明细',
   layoutSetting: '模板设置',
 }
 
@@ -231,7 +231,7 @@ export const columns = {
   detailRemarks: '备注',
   flgShow: '是否显示',
   userType: '用户类型',
-  roleCode:'角色编码',
+  roleCode: '角色编码',
   roleName: '角色名称',
   postId: '职务名称',
   postName: '职务名称',
@@ -335,240 +335,243 @@ export const columns = {
   ingIn: '已入库',
   orderQty: '订单数量',
   canOutingQty: '可出库数量',
-  purNo:'采购订单号',
-  supplierName:'供应商',
-  supplierCode:'供应商编码',
-  brandName:'供应商品牌',
-  pickupDate:'取货日期',
-  DeliveryDate:'收货日期',
-  purDiscount:'采购折扣',
-  purStatusName:'订单状态',
-  intoStatusName:'入库状态',
-  intoingQty:'入库中数量',
-  intoingAmt:'入库中金额',
-  intoQty:'已入库数量',
-  intoAmt:'已入库金额',
-  returnIntoQty:'已入库退货数量',
-  returnIntoAmt:'已入库退货金额',
-  amtPayable:'应付金额',
-  amteMeet:'剩余应付',
-  pricePur:'采购价',
-  itemPurAmt:'采购金额',
-  nonStandardCode:'非标号',
-  returnNo:'退货单号',
-  returnQty1:'退货数量',
-  priceReturn:'退货价',
-  returnAmt1:'退货金额',
-  purchaseQuantity:'采购数量',
-  orderAll:'全部订单',
-  purchaseOrder:'采购暂存',
-  purchaseReal:'采购成交',
-  intoNo:'入库单号',
-  fromNo:'来源单号',
-  waitEntry:'待入库',
-  ingEntry:'已入库',
-  itemIntoAmt:'入库金额',
-  wareHouse:'收货仓库',
-  returnWareHouse:'退货仓库',
-  priceStandard:'标价',
-  skuSpec:'商品规格',
-  macCode:'账户编码',
-  macName:'账户名称',
-  macTypeName:'账号类别',
-  macType:'账号类别',
-  balance:'期初金额',
-  pricePurchase:'采购标价',
-  supplierType:'供应商类型',
-  receiptAmt:'收款金额',
-  addressName:'小区',
-  supName:'供应商名称',
-  supCode:'供应商编码',
-  supTypeName:'供应商类别',
-  serviceCategoriesName:'服务类别',
-  supType:'供应商类别',
-  serviceCategories:'服务类别',
-  staffPhone:'员工电话',
-  thisOutingQty:'本次出库数量',
-  invQty:'库存量',
-  usableQty:'可用量',
-  sumOutingQty:'合计出库数量',
-  sumOutingAmt:'合计出库金额',
-  outDate:'出库日期',
-  priceOut:'出库价',
-  brandCode:'品牌编码',
-  shortName:'品牌简称',
-  brandIds:'品牌',
-  checked:'授权',
-  intoDate:'入库日期',
-  intoStatus:'入库状态',
-  intoStatusList:'入库状态',
-  consignee:'收货人',
-  consigneePhone:'收货电话',
-  takeOverAddress:'收货地址',
-  seriesCode:'系列编号',
-  seriesName:'系列名称',
-  unitCode:'单位编号',
-  unitName:'单位名称',
-  catCode:'种类编码',
-  catName:'种类名称',
-  goodsAttrCode:'属性编码',
-  flgDefault:'是否默认',
-  directorMan:'责任人',
-  department:'部门',
-  autoFlag:'自动办理入库',
-  entryReason:'入库原因',
-  sumGoodsAmount:'货物总额',
-  goodsAttrName:'属性名称',
-  outboundOutQty:'已出库数量',
-  parentId:'父级',
-  freezeNo:'冻结单号',
-  autoUnfreezeDate:'解冻日期',
-  freezeDate:'冻结日期',
-  freezeStatusName:'冻结状态',
-  objId:'入库对象',
-  inboundObjectName:'入库对象',
-  intoReason:'入库原因',
-  priceInto:'入库单价',
-  objName:'对象名称',
-  objCode:'对象编码',
-  objTypeName:'对象类型',
-  receiptNo:'收款单号',
-  receiptType:'收款类型',
-  paymentType:'付款类型',
-  receiptMac:'收款账户',
-  paymentMac:'付款账户',
-  receiptTypeName:'收款类型',
-  paymentTypeName:'付款类型',
-  receiptMacName:'收款账户',
-  paymentMacName:'付款账户',
-  sumAmtRec:'收款合计金额',
-  handleAmt:'还款金额',
-  residueAmt:'剩余金额',
-  receiptDate:'收款日期',
-  accountBalance:'账户金额',
-  entryQty:'入库数量',
-  entryAmt:'入库金额',
-  handle:'办理',
-  freezeQty:'冻结数量',
-  unfreezeQty:'解冻数量',
-  surplusQty:'剩余冻结量',
-  accDate:'账务日期',
-  biznisNo:'来源单号',
-  amtRec:'收款金额',
-  ownerFlag:'主业务标识',
-  receiptResidue:'预收金额',
-  macId:'资金账户',
-  documentStatus:'单据状态',
-  recStatusName:'账务状态',
-  amtShouldReceivable:'应收金额',
-  amtShouldPayable:'应收金额',
+  purNo: '采购订单号',
+  supplierName: '供应商',
+  supplierCode: '供应商编码',
+  brandName: '供应商品牌',
+  pickupDate: '取货日期',
+  DeliveryDate: '收货日期',
+  purDiscount: '采购折扣',
+  purStatusName: '订单状态',
+  intoStatusName: '入库状态',
+  intoingQty: '入库中数量',
+  intoingAmt: '入库中金额',
+  intoQty: '已入库数量',
+  intoAmt: '已入库金额',
+  returnIntoQty: '已入库退货数量',
+  returnIntoAmt: '已入库退货金额',
+  amtPayable: '应付金额',
+  amteMeet: '剩余应付',
+  pricePur: '采购价',
+  itemPurAmt: '采购金额',
+  nonStandardCode: '非标号',
+  returnNo: '退货单号',
+  returnQty1: '退货数量',
+  priceReturn: '退货价',
+  returnAmt1: '退货金额',
+  purchaseQuantity: '采购数量',
+  orderAll: '全部订单',
+  purchaseOrder: '采购暂存',
+  purchaseReal: '采购成交',
+  intoNo: '入库单号',
+  fromNo: '来源单号',
+  waitEntry: '待入库',
+  ingEntry: '已入库',
+  itemIntoAmt: '入库金额',
+  wareHouse: '收货仓库',
+  returnWareHouse: '退货仓库',
+  priceStandard: '标价',
+  skuSpec: '商品规格',
+  macCode: '账户编码',
+  macName: '账户名称',
+  macTypeName: '账号类别',
+  macType: '账号类别',
+  balance: '期初金额',
+  pricePurchase: '采购标价',
+  supplierType: '供应商类型',
+  receiptAmt: '收款金额',
+  addressName: '小区',
+  supName: '供应商名称',
+  supCode: '供应商编码',
+  supTypeName: '供应商类别',
+  serviceCategoriesName: '服务类别',
+  supType: '供应商类别',
+  serviceCategories: '服务类别',
+  staffPhone: '员工电话',
+  thisOutingQty: '本次出库数量',
+  invQty: '库存量',
+  usableQty: '可用量',
+  sumOutingQty: '合计出库数量',
+  sumOutingAmt: '合计出库金额',
+  outDate: '出库日期',
+  priceOut: '出库价',
+  brandCode: '品牌编码',
+  shortName: '品牌简称',
+  brandIds: '品牌',
+  checked: '授权',
+  intoDate: '入库日期',
+  intoStatus: '入库状态',
+  intoStatusList: '入库状态',
+  consignee: '收货人',
+  consigneePhone: '收货电话',
+  takeOverAddress: '收货地址',
+  seriesCode: '系列编号',
+  seriesName: '系列名称',
+  unitCode: '单位编号',
+  unitName: '单位名称',
+  catCode: '种类编码',
+  catName: '种类名称',
+  goodsAttrCode: '属性编码',
+  flgDefault: '是否默认',
+  directorMan: '责任人',
+  department: '部门',
+  autoFlag: '自动办理入库',
+  entryReason: '入库原因',
+  sumGoodsAmount: '货物总额',
+  goodsAttrName: '属性名称',
+  outboundOutQty: '已出库数量',
+  parentId: '父级',
+  freezeNo: '冻结单号',
+  autoUnfreezeDate: '解冻日期',
+  freezeDate: '冻结日期',
+  freezeStatusName: '冻结状态',
+  objId: '入库对象',
+  inboundObjectName: '入库对象',
+  intoReason: '入库原因',
+  priceInto: '入库单价',
+  objName: '对象名称',
+  objCode: '对象编码',
+  objTypeName: '对象类型',
+  receiptNo: '收款单号',
+  receiptType: '收款类型',
+  paymentType: '付款类型',
+  receiptMac: '收款账户',
+  paymentMac: '付款账户',
+  receiptTypeName: '收款类型',
+  paymentTypeName: '付款类型',
+  receiptMacName: '收款账户',
+  paymentMacName: '付款账户',
+  sumAmtRec: '收款合计金额',
+  handleAmt: '还款金额',
+  residueAmt: '剩余金额',
+  receiptDate: '收款日期',
+  accountBalance: '账户金额',
+  entryQty: '入库数量',
+  entryAmt: '入库金额',
+  handle: '办理',
+  freezeQty: '冻结数量',
+  unfreezeQty: '解冻数量',
+  surplusQty: '剩余冻结量',
+  accDate: '账务日期',
+  biznisNo: '来源单号',
+  amtRec: '收款金额',
+  ownerFlag: '主业务标识',
+  receiptResidue: '预收金额',
+  macId: '资金账户',
+  documentStatus: '单据状态',
+  recStatusName: '账务状态',
+  amtShouldReceivable: '应收金额',
+  amtShouldPayable: '应收金额',
   amtHandle: '已核销金额',
   amtReceivableHandle: '本次核销金额',
   amtWaiveHandle: '本次优惠金额',
-  amtWaive:'已优惠金额',
+  amtWaive: '已优惠金额',
   amtResidue: '剩余金额',
   sumReceiptResidue: '总可用金额',
   sumReceivableResidue: '总剩余应收',
   sumAmtWaiveHandle: '优惠金额',
-  orgMac:'资金账户',
-  staffPurName:'采购人员',
-  orgPurName:'采购部门',
-  checkStaff:'盘点员工',
-  checkOrg:'盘点部门',
-  checkDate:'盘点日期',
-  checkNo:'盘点单号',
-  checkStatusName:'盘点状态',
-  oInvQty:'原存货量',
-  lossReasonName:'盘亏原因',
-  checkQty:'盘点数量',
-  balanceQty:'差异数量',
-  dictCode:'字典项目',
-  dataValue:'字典名称',
-  dutyStaff:'责任人',
-  checkPrice:'盘盈单价',
-  checkAmt:'盘盈金额',
-  transferQty:'调整数量',
-  transferDate:'调整日期',
-  transferStaff:'调整员工',
-  transferOrg:'调整部门',
-  transferNo:'调整单号',
-  transferStatusName:'调整状态',
-  amtNotHandle:'未核销金额',
-  sumUseReceiptResidue:'预收抵扣',
+  orgMac: '资金账户',
+  staffPurName: '采购人员',
+  orgPurName: '采购部门',
+  checkStaff: '盘点员工',
+  checkOrg: '盘点部门',
+  checkDate: '盘点日期',
+  checkNo: '盘点单号',
+  checkStatusName: '盘点状态',
+  oInvQty: '原存货量',
+  lossReasonName: '盘亏原因',
+  checkQty: '盘点数量',
+  balanceQty: '差异数量',
+  dictCode: '字典项目',
+  dataValue: '字典名称',
+  dutyStaff: '责任人',
+  checkPrice: '盘盈单价',
+  checkAmt: '盘盈金额',
+  transferQty: '调整数量',
+  transferDate: '调整日期',
+  transferStaff: '调整员工',
+  transferOrg: '调整部门',
+  transferNo: '调整单号',
+  transferStatusName: '调整状态',
+  amtNotHandle: '未核销金额',
+  sumUseReceiptResidue: '预收抵扣',
   sumAmtReceivableHandle: '本次核销总额',
-  sumAmtReceivableHandle2:'应收核销总额',
-  sumToReceiptResidue:'转预收金额',
-  receivableResidue:'应收金额',
-  biznisTypeName:'单据类型',
-  biznisDate:'单据日期',
-  receivableNo:'其他收入单号',
-  payableNo:'其他支出单号',
-  objectTypeName:'对象类型',
-  sumAmtReceivable:'合计收入',
-  receivableTypeName:'收入类别',
-  qtyReceivable:'收入数量',
-  shouRuAmt:'收入金额',
-  receivableType:'收入类别',
-  payableType:'支出类别',
-  qtyPayable:'支出数量',
-  zhiChuAmt:'支出金额',
-  sumAmtPayable:'合计支出',
-  payableTypeName:'支出类别',
-  fileName:'附件名称',
+  sumAmtReceivableHandle2: '应收核销总额',
+  sumToReceiptResidue: '转预收金额',
+  receivableResidue: '应收金额',
+  biznisTypeName: '单据类型',
+  biznisDate: '单据日期',
+  receivableNo: '其他收入单号',
+  payableNo: '其他支出单号',
+  objectTypeName: '对象类型',
+  sumAmtReceivable: '合计收入',
+  receivableTypeName: '收入类别',
+  qtyReceivable: '收入数量',
+  shouRuAmt: '收入金额',
+  receivableType: '收入类别',
+  payableType: '支出类别',
+  qtyPayable: '支出数量',
+  zhiChuAmt: '支出金额',
+  sumAmtPayable: '合计支出',
+  payableTypeName: '支出类别',
+  fileName: '附件名称',
   picture: '图片',
   paymentNo: '付款单号',
   paymentDate: '付款日期',
   paymentResidue: '预付金额',
   sumUsePaymentResidue: '预付抵扣',
   sumToPaymentResidue: '转预付金额',
-  sumAmtPayableHandle:'本次核销总额',
-  sumAmtPayableHandle2:'应付核销总额',
-  payableInvoice:'应付款单',
-  amtPayableHandle:'本次核销金额',
-  payableResidue:'应付金额',
-  amtPay:'付款金额',
-  sumAmtPay:'付款合计金额',
-  yuLan:'预览',
-  activityName:'活动名称',
-  activityDescribe:'活动描述',
-  activityTypeName:'活动分类',
-  activityStatusName:'活动状态',
-  beginDate:'开始日期',
-  endDate:'截止日期',
-  activityPath:'图片路径',
-  activityUrl:'跳转链接',
-  activityGradeCode:'活动版本',
-  activityFunId:'活动功能',
-  activityBanner:'活动广告',
-  funName:'功能',
-  itemDescribe:'明细描述',
-  stdPrice:'标准价',
-  salePrice:'销售价',
-  validLong:'时长',
-  extraLong:'赠送时长',
-  cpIds:'投放企业',
-  appCode:'应用类型',
-  cpCode:'企业代码',
-  cpName:'企业名称',
-  svcCode:'所在服务器',
-  openingDate:'注册日期',
-  gradeCode:'系统版本',
-  describe:'产品描述',
-  cpRevenue:'营收',
-  cpNumbers:'企业人数',
-  maxStaffNum:'人数上限',
-  curStaffNum:'当前人数',
-  cpManager:'负责人',
-  cpPhone:'联系电话',
-  cpSize:'公司规模',
-  shopSize:'门店规模',
-  feedback:'公司反馈',
-  layoutName:'模板名称',
-  docName:'业务单据',
-  appPlace:'应用端',
-  qty:'次数',
-  activityItemName:'活动明细名称',
-  activityItemDescribe:'活动明细描述',
+  sumAmtPayableHandle: '本次核销总额',
+  sumAmtPayableHandle2: '应付核销总额',
+  payableInvoice: '应付款单',
+  amtPayableHandle: '本次核销金额',
+  payableResidue: '应付金额',
+  amtPay: '付款金额',
+  sumAmtPay: '付款合计金额',
+  yuLan: '预览',
+  activityName: '活动名称',
+  activityDescribe: '活动描述',
+  activityTypeName: '活动分类',
+  activityStatusName: '活动状态',
+  beginDate: '开始日期',
+  endDate: '截止日期',
+  activityPath: '图片路径',
+  activityUrl: '跳转链接',
+  activityGradeCode: '活动版本',
+  activityFunId: '活动功能',
+  activityBanner: '活动广告',
+  funName: '功能',
+  itemDescribe: '明细描述',
+  stdPrice: '标准价',
+  salePrice: '销售价',
+  validLong: '时长',
+  extraLong: '赠送时长',
+  cpIds: '投放企业',
+  appCode: '应用类型',
+  cpCode: '企业代码',
+  cpName: '企业名称',
+  svcCode: '所在服务器',
+  openingDate: '注册日期',
+  gradeCode: '系统版本编码',
+  gradeName: '系统版本',
+  describe: '产品描述',
+  cpRevenue: '营收',
+  cpNumbers: '企业人数',
+  maxStaffNum: '人数上限',
+  curStaffNum: '当前人数',
+  cpManager: '负责人',
+  cpPhone: '联系电话',
+  cpSize: '公司规模',
+  shopSize: '门店规模',
+  feedback: '公司反馈',
+  layoutName: '模板名称',
+  docName: '业务单据',
+  appPlace: '应用端',
+  qty: '次数',
+  activityItemName: '活动明细名称',
+  activityItemDescribe: '活动明细描述',
+  appName: '应用名称',
+  menuName: '功能名称',
 }
 
 /**
@@ -857,10 +860,10 @@ export const others = {
   line: '折线图',
   pie: '饼状图',
   allocationRatio: '分配比例',
-  editPassword:'修改密码',
-  treeMenu:'树形菜单',
-  refreshBasicData:'刷新菜单',
-  changeCp:'切换公司',
+  editPassword: '修改密码',
+  treeMenu: '树形菜单',
+  refreshBasicData: '刷新菜单',
+  changeCp: '切换公司',
 }
 
 

src/mixins/index.js

@@ -374,8 +374,8 @@ export const indexMixin = {
     save(arg) {
       let modalRef = (this.modalParams && this.modalParams.modalRef) ? this.modalParams.modalRef : 'modal_editAdd';
       let button = (this.modalParams && this.modalParams.button) ? this.modalParams.button : 'add';
-      let clearFlag = (this.modalParams && this.modalParams.clearFlag) ? this.modalParams.clearFlag : true;
-      let closeFlag = (this.modalParams && this.modalParams.closeFlag) ? this.modalParams.closeFlag : false;
+      let clearFlag = (this.modalParams && this.modalParams.clearFlag != null) ? this.modalParams.clearFlag : true;
+      let closeFlag = (this.modalParams && this.modalParams.closeFlag != null) ? this.modalParams.closeFlag : false;
       // 1、校验
       this._validData(arg).then(res => {
         if (!res) {

src/view/mst/com-menu/index.vue

@@ -4,18 +4,8 @@
     <loading :loading="loading" v-if="!modalVisible"></loading>
     <BaseIndexButtonGroup ref="BaseIndexButtonGroup" id="BaseIndexButtonGroup">
       <template #left>
-        <!--    查询    -->
         <BaseIndexButton ref="search" name="search"></BaseIndexButton>
-        <!--    清空条件    -->
-        <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
-        <!--    编辑    -->
         <BaseIndexButton ref="edit" name="edit"></BaseIndexButton>
-        <!--    启用    -->
-        <BaseIndexButton ref="enable" name="enable"></BaseIndexButton>
-        <!--    停用    -->
-        <BaseIndexButton ref="disable" name="disable"></BaseIndexButton>
-        <!--   新建     -->
-        <BaseIndexButton ref="add" name="add"></BaseIndexButton>
       </template>
       <template #right>
 
@@ -26,19 +16,19 @@
     <div :style="'height: ' + (tableHeight + 30) + 'px'" class="split-div-class">
       <DkSplit v-model="split">
         <!-- 左边部分   -->
-        <DkTable slot="left" ref="leftTable" :data="leftData" :height="tableHeight + 30" :page-flag="false"
+        <DkTable slot="left" ref="left-table" :data="leftData" :height="tableHeight + 30" :page-flag="false"
                  :page-total-flag="false" :show-setting-flag="false" :freeze="false" :choose-flag="false"
-                 @current-change="currentChangeEvent($event)">
-          <DkTableColumn field="gradeCode" width="auto" :filter="false" :sortable="false"
-                         :center-flag="true">
-          </DkTableColumn>
+                 @current-change="currentChangeEvent($event)" primaryKey="gradeCode">
+          <DkTableColumn field="gradeCode" :filter="false" :sortable="false" :center-flag="true"/>
+          <DkTableColumn field="gradeName" :filter="false" :sortable="false" :center-flag="true"/>
         </DkTable>
-        <!-- 数据字典   -->
-        <DkTable slot="right" :id="'table-' + $options.name" ref="table-select"
+        <!-- 常用功能   -->
+        <DkTable slot="right" :id="'table-' + $options.name" ref="right-table"
                  :data="menuData"
                  :pageFlag="true"
                  :page-total="pageInfo.total" :current-page="pageInfo.currentPage" :choose-flag="false"
                  :height="this.tableHeight" primaryKey="menuUuid" @pageChange="pageSizeChange">
+          <DkTableColumn field="appName"></DkTableColumn>
           <DkTableColumn field="menuName"></DkTableColumn>
         </DkTable>
       </DkSplit>
@@ -53,74 +43,58 @@
       @modalOk="save"
       :saveFlag="true"
       :title="modalTitle"
-      :width="1200"
+      :width="1050"
     >
-      <DkForm ref="formInline" v-model="formData" :col-count="1">
-        <!--活动版本-->
-        <DkFormItem prop="gradeCode" :required="true">
-          <SelectPop v-model="formData.gradeCode" ref="gradeCode"
-                     :disabled="type == $config.formMode.edit"
-                     :options="gradeList"
-                     :multiple="false"
-                     labelKey="gradeName" valueKey="gradeCode"
-                     style="width: 200px;">
-          </SelectPop>
-        </DkFormItem>
-        <!--功能展示-->
-        <DkRow style="margin-left: 0px">
-          <!--功能一览-->
-          <Col>
-            <DkTabs v-model="tabValue" :options="tabList">
-              <div style="height: 600px;overflow:auto" v-for="(item, index) of appList" :key="index" :slot="item.appCode">
+      <div class="header-class" style="height: 700px;">
+        <DkSplit v-model="split2">
+          <div slot="left" class="split-pane">
+            <!--系统版本-->
+            <DkForm ref="formInline" v-model="formData" :col-count="1">
+              <DkFormItem prop="gradeName">
+                <InputPop v-model="formData.gradeName" :readonly="true"/>
+              </DkFormItem>
+            </DkForm>
+            <!--功能一览-->
+            <DkTabs v-model="tabValue" :options="tabList" @on-click="handleChangeTabs">
+              <div style="height: 640px;overflow:auto" v-for="(item, index) of appList" :key="index"
+                   :slot="item.appCode">
                 <div class="main-class">
-                  <el-collapse v-model="model" @change="handleChange(null)">
-                    <dk-el-collapse-item v-for="(it,index) in parentData.filter(f => f.appCode == item.appCode)" :key="index" :title="it[name]" :name="it.id"
-                                         :ref="'collapseItem_' + it.id" :id="it.id" :checked="it.checked" v-if="tabValue==item.appCode"
-                                         @on-change="(checked, id)=>handleChangeCheckbox(checked, id,it[name])" :disabled="disabled">
+                  <el-collapse v-model="model">
+                    <dk-el-collapse-item v-for="(it,index) in parentData.filter(f => f.appCode == item.appCode)"
+                                         :key="index" :title="it[name]" :name="it.id"
+                                         :ref="'collapseItem_' + it.id" :id="it.id" :checked="it.checked"
+                                         v-if="tabValue==item.appCode"
+                                         @on-change="(checked, id)=>handleChangeCheckbox(checked, id,it[name])"
+                                         :disabled="disabled"
+                                         style="width: 700px;">
                       <div v-for="(tIt,tIndex) in data.filter(item=>item.parentId == it.id)" :key="tIndex">
                         <!--子级-->
-                        <MasterSlaveCheckbox v-if="tIt[funcFlag]" :item="tIt" :name="name" :checked="tIt.checked" :disabled="disabled"
+                        <MasterSlaveCheckbox v-if="tIt[funcFlag]" :item="tIt" :name="name" :checked="tIt.checked"
+                                             :disabled="disabled"
                                              :child-data="data.filter(item=>item.parentId == tIt.id)"
-                                             @on-change="handleChangeCheckbox1(tIt)" ref="checkbox"></MasterSlaveCheckbox>
-                        <!--父级-->
-<!--                        <div v-else>-->
-<!--                          <el-collapse v-model="model" @change="handleChange(tIt.id)">-->
-<!--                            <dk-el-collapse-item :ref="'collapseItem_' + tIt.id" class="child-item-collapse"-->
-<!--                                                 :title="'\u3000\u3000' + tIt[name]"-->
-<!--                                                 :name="tIt.id" :id="tIt.id" :checked="tIt.checked"-->
-<!--                                                 @on-change="(checked, id)=>handleChangeCheckbox(checked, id,tIt[name])" :disabled="disabled">-->
-<!--                              <div v-for="(cIt,cIndex) in data.filter(item=>item.parentId == tIt.id)"-->
-<!--                                   :key="cIndex">-->
-<!--                                <MasterSlaveCheckbox :item="cIt" :name="name" :disabled="disabled"-->
-<!--                                                     :child-data="data.filter(item=>item.parentId == cIt.id)"></MasterSlaveCheckbox>-->
-<!--                              </div>-->
-<!--                            </dk-el-collapse-item>-->
-<!--                          </el-collapse>-->
-<!--                        </div>-->
+                                             @on-change="handleChangeCheckbox1()"
+                                             ref="checkbox"></MasterSlaveCheckbox>
                       </div>
                     </dk-el-collapse-item>
                   </el-collapse>
                 </div>
               </div>
             </DkTabs>
-          </Col>
+          </div>
           <!--常用功能-->
-          <Col>
-            <DkRow style="margin-left: 0px">
-              <DkTable :id="'table-' + $options.name" ref="table-select"
-                       :data="useMenuData"
-                       :width="500"
-                       :pageFlag="false"
-                       :choose-flag="false"
-                       primaryKey="menuUuid">
-                <DkTableColumn field="menuName"></DkTableColumn>
-              </DkTable>
-            </DkRow>
-          </Col>
-        </DkRow>
-      </DkForm>
-    </DkModal>
+          <DkTable slot="right" v-show="showTable" :id="'table-' + $options.name" ref="table-select"
+                   :data="useMenuData"
+                   :width="500"
+                   :height="670"
+                   :pageFlag="false"
+                   :choose-flag="false"
+                   primaryKey="menuUuid">
+            <DkTableColumn field="menuName"></DkTableColumn>
+          </DkTable>
 
+        </DkSplit>
+      </div>
+    </DkModal>
   </div>
 </template>
 
@@ -133,25 +107,22 @@ export default {
   name: "com-menu",
   mixins: [indexMixin],
   components: {MasterSlaveCheckbox, DkElCollapseItem},
-  data(){
+  data() {
     let self = this
     return {
+      showTable: true,
       modalTitle: '',//新建编辑弹窗名称
-      submitType: '',//新建编辑提交类型
-      formData:{
-        gradeCode:null,
+      formData: {
+        gradeCode: null,
+        gradeName: null,
       },
       split: 0.15,
+      split2: 0.7,
       minSplit: 0.15,
-      gradeList:[],
+      // gradeList: [],
       leftData: [],
-      menuData:[],
+      menuData: [],
       useMenuData: [],
-
-
-
-
-      documentKeyDownContent: Object,
       title: '',
       funcFlag: 'flgMenu',
       name: 'menuName',
@@ -162,20 +133,62 @@ export default {
       model: [],
       collapseFlag: true,
       parentData: [],
-      webData: [],
-      appData: [],
       data: [],
       collapseItems: [],
       collapseIds: [],
       disabled: false,
       tabValue: 'CP-WEB',
-      tabOptions: null,
       appList: [],
-      tabList: []
-
+      tabList: [],
+      tableRef: 'left-table',
+      appCode: 'CP-WEB'
     }
   },
-  methods:{
+  methods: {
+    /**
+     * @desc   : 加载数据
+     * @author : 常皓宁
+     * @date   : 2024/4/30 9:02
+     */
+    initData() {
+      // 获取应用
+      this.getApplication()
+    },
+    /**
+     * @desc   : 获取应用
+     * @author : 洪旭东
+     * @date   : 2023-06-30 15:02
+     */
+    getApplication() {
+      this.excute(this.$service.commonService, this.$service.commonService.getApplication, {}).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          let data = res.data.filter(it => it.appCode != 'DK-WEB')
+          this.appList = data
+          this.tabList = data.map(m => {
+            return {
+              label: m.appName,
+              name: m.appCode
+            }
+          })
+        }
+      })
+    },
+    /**
+     * @desc   : 获取数据
+     * @author : 常皓宁
+     * @date   : 2024/3/9 10:55
+     */
+    getData(params) {
+      // 查询数据
+      this.excute(this.$service.commonService, this.$service.commonService.getGrade, params).then(res => {
+        if (res.code === this.$config.SUCCESS_CODE) {
+          let gradeData = res.data.filter(it => it.gradeCode === 'STD' || it.gradeCode === 'PRO')
+          // this.gradeList = gradeData
+          this.leftData = gradeData
+        }
+      })
+      this.loading = false
+    },
     /**
      * @desc   : 左侧列表行变化事件
      * @author : 常皓宁
@@ -184,7 +197,7 @@ export default {
     currentChangeEvent({row}) {
       if (row != null) {
         let params = {
-          gradeCode:row.gradeCode
+          gradeCode: row.gradeCode
         }
         this.excute(this.$service.comMenuService, this.$service.comMenuService.selectByCond, params).then(res => {
           if (res.code === this.$config.SUCCESS_CODE) {
@@ -193,47 +206,32 @@ export default {
         })
       }
     },
-
-    /**
-     * @desc   : 获取数据
-     * @author : 常皓宁
-     * @date   : 2024/3/9 10:55
-     */
-    getData(params) {
-      if (this.kindCode) {
-        let data = {
-
-        }
-        this.currentChangeEvent({row: data})
-      }
-      this.loading = false
-    },
-
     /**
      * @desc   : 新建按钮点击事件
      * @author : 常皓宁
      * @date   : 2024/1/31 9:19
      */
-    add() {
-      this.modalTitle = this.setTitle(this.$config.formMode.add, '常用功能')
-      let row = this.$refs['leftTable'].$refs.table.getCurrentRecord()
+    edit() {
+      this.modalTitle = this.setTitle(this.$config.formMode.edit, '常用功能')
+      let row = this.$refs['left-table'].$refs.table.getCurrentRecord()
       if (row) {
-        this.formData = {}
+        this.formData.gradeCode = row.gradeCode
+        this.formData.gradeName = row.gradeName
       }
-      this.editAddModal = true
-      this.modalParams.button = 'add'
+      this.getAppMenu(this.formData.gradeCode)
+      this.modalParams.clearFlag = false
+      this.modalParams.closeFlag = true
+      this.modalParams.button = 'edit'
     },
-
     /**
-     * @desc   : 新建
+     * @desc   : 保存
      * @author : 常皓宁
      * @date   : 2024/3/9 15:51
      */
     saveData() {
-      console.log('this.useMenuData',this.useMenuData)
       let useMenuData = this.useMenuData
       let displayNo = 1
-      useMenuData.map(row =>{
+      useMenuData.map(row => {
         let item = row
         this.$set(item, 'gradeCode', this.formData.gradeCode)
         this.$set(item, 'displayNo', displayNo)
@@ -241,43 +239,18 @@ export default {
         return item
       })
       let params = useMenuData
-      console.log('sadas',params)
-      //新建
-      if (this.modalParams.button === this.$config.formMode.add) {
-        return this.excute(this.$service.comMenuService, this.$service.comMenuService.insert, params)
-      }
       //编辑
       if (this.modalParams.button === this.$config.formMode.edit) {
         return this.excute(this.$service.comMenuService, this.$service.comMenuService.update, params)
       }
     },
-
-    /**
-     * @desc   : 获取版本代码
-     * @author : 常皓宁
-     * @date   : 2024/4/15 10:47
-     */
-    getGrade(){
-      // 查询数据
-      let params = {
-      }
-      this.excute(this.$service.commonService, this.$service.commonService.getGrade, params).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          let gradeData = res.data.filter(it => it.gradeCode === 'STD' || it.gradeCode === 'PRO')
-          this.gradeList = gradeData
-          this.leftData = gradeData
-        }
-      })
-    },
-
     /**
      * @desc   : 勾选节点上的选择框
      * @author : 周兴
      * @date   : 2022/12/29 16:52
      */
-    handleChangeCheckbox(checked, id,name) {
-      console.log('1')
-      let item = {id: id, checked: checked , menuName:name};
+    handleChangeCheckbox(checked, id, name) {
+      let item = {id: id, checked: checked, menuName: name};
       let filterRows = this.data.filter(it => it.id === id);
       if (filterRows && filterRows.length > 0) {
         filterRows[0].checked = checked;
@@ -290,7 +263,6 @@ export default {
         this.useMenuData = this.useMenuData.filter(it => it.id !== item.id)
       }
     },
-
     /**
      * @desc   : 勾选节点上的选择框
      * @author : 周兴
@@ -298,11 +270,18 @@ export default {
      */
     handleChangeCheckbox1() {
       let list = []
-      for (let re of this.$refs.checkbox) {
-        list = list.concat(re.data.filter(item=>item.checked))
+      if (this.appCode == 'CP-WEB') {
+        for (let re of this.$refs.checkbox) {
+          list = list.concat(re.data.filter(item => item.checked))
+        }
+        this.useMenuData = list
+      } else {
+        let filters = this.$refs.checkbox.filter(it => it.checked)
+        filters.forEach(it => {
+          list.push(it.itemData)
+        })
+        this.useMenuData = list
       }
-      console.log('2',list)
-      this.useMenuData = list
     },
 
     /**
@@ -319,66 +298,33 @@ export default {
         })
       }
     },
-
     /**
-     * @desc   : 重新计算位置
-     * @author : 周兴
-     * @date   : 2022/12/29 16:02
+     * @desc   : 切换应用
+     * @author : 付斌
+     * @date   : 2024-06-11 11:04
      */
-    handleChange(id) {
-      this.$nextTick(() => {
-        if (this.collapseItems && this.collapseItems.length > 0) {
-          let index = 0;
-          if (id) {
-            index = this.collapseItems.findIndex(item => item == 'collapseItem_' + id)
-          }
-          for (let i = index + 1; i < this.collapseItems.length; i++) {
-            let it = this.collapseItems[i]
-            if (this.$refs[it] && this.$refs[it].length > 0) {
-              this.$refs[it][0].itemTop = null;
-              setTimeout(() => {
-                this.$refs[it][0].countCheckboxLocation();
-              }, 400)
-            }
-          }
-        }
-      })
+    handleChangeTabs(val) {
+      this.appCode = val;
+      this.getAppMenu(this.formData.gradeCode)
     },
-
     /**
-     * @desc   : 获取应用
-     * @author : 洪旭东
-     * @date   : 2023-06-30 15:02
+     * @desc   : 获取功能
+     * @author : 常皓宁
+     * @date   : 2024/5/11 13:42
      */
-    getApplication() {
-      this.excute(this.$service.commonService, this.$service.commonService.getApplication, {}).then(res => {
-        if (res.code === this.$config.SUCCESS_CODE) {
-          let data = res.data.filter(it=>it.appCode != 'DK-WEB')
-          this.appList = data
-          this.tabList = data.map(m => {return {
-            label: m.appName,
-            name: m.appCode
-          }})
-        }
-      })
-    },
-
-    /**
-    * @desc   : 获取功能
-    * @author : 常皓宁
-    * @date   : 2024/5/11 13:42
-    */
-    getAppMenu(){
+    getAppMenu(gradeCode) {
       let params = {
-
+        gradeCode: gradeCode,
+        appCode: this.appCode,
       }
-      this.excute(this.$service.commonService, this.$service.commonService.getAppMenu, params).then(res=>{
+      this.excute(this.$service.commonService, this.$service.commonService.getAppMenu, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           this.data = res.data.list
           // 先过滤顶级
           this.parentData = this.data?.filter(it => !it.parentId);
-          this.webData = this.parentData.filter(f => f.appCode == 'CP-WEB')
-          this.appData = this.parentData.filter(f => f.appCode == 'CP-WXP')
+          this.editAddModal = true
+          this.useMenuData = this.data.filter(it => it.checked);
+          // this.$refs['table-select'].reloadData(this.useMenuData);
           if (this.collapseFlag) {
             this.model = this.data.map(it => it.id)
           } else {
@@ -387,25 +333,14 @@ export default {
           this.$nextTick(() => {
             this.getCollapseItems();
           })
-          this.getApplication()
         } else {
           this.$Message.warning(res.message)
         }
       })
     },
-
-    /**
-     * @desc   : 加载数据
-     * @author : 常皓宁
-     * @date   : 2024/4/30 9:02
-     */
-    initData() {
-      this.getGrade()
-      this.getAppMenu();
-    },
   },
   created() {
-    this.primaryKey = 'menuUuId'  // 设置主键Id
+    this.primaryKey = 'gradeCode'  // 设置主键Id
     this.routeObjName = 'comMenu'  // 设置路由名称
   },
 }