2023-04-04

king

2023-04-04 bda849855c1036b352b4ea29bf1c1d7460d340be

2023-04-04

 public/options.json

@@ -1,12 +1,12 @@
{
  "appId": "202108312122504607B107A83F55B40C98CCF",
  "appkey": "20210831212235413F287EC3BF489424496C8",
  "appId": "201912040924165801464FF1788654BC5AC73",
  "appkey": "20191106103859640976D6E924E464D029CF0",
  "mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
  "systemType": "",
  "externalDatabase": "",
  "lineColor": "",
  "filter": "false",
  "defaultApp": "mkindustry",
  "defaultApp": "mk",
  "defaultLang": "zh-CN",
  "WXAppID": "",
  "WXminiAppID": "",
@@ -17,6 +17,6 @@
  "transfer": "false",
  "keepPassword": "true",
  "platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
  "host": "http://demo.mk9h.cn",
  "service": "erp_new/"
  "host": "http://qingqiumarket.cn",
  "service": "MKWMS/"
}

 src/menu/components/share/actioncomponent/index.jsx

@@ -266,6 +266,12 @@
      if ((btn.OpenType === 'excelIn' || btn.OpenType === 'excelOut') && (!btn.verify || !btn.verify.columns) && (config.subtype === 'basetable' || config.subtype === 'normaltable')) {
        let columns = []
        let maps = []
        let labels = {}
        if (config.subtype === 'normaltable') {
          config.columns.forEach(col => {
            labels[col.field] = col.label
          })
        }

        if (btn.OpenType === 'excelOut') {
          let pushcol = (item) => {
@@ -289,16 +295,27 @@
          }

          config.cols.forEach(item => {
            if (item.type === 'colspan' && config.subtype === 'normaltable') {
              item.subcols.forEach(cell => {
                if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
                maps.push(cell.field)
            if (item.Hide === 'true') return

                pushcol(cell)
              })
            if (config.subtype === 'normaltable') {
              if (item.type === 'colspan') {
                item.subcols.forEach(cell => {
                  if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
                  maps.push(cell.field)
  
                  pushcol(cell)
                })
              } else if (item.type === 'custom') {
                item.elements.forEach(cell => {
                  if (!cell.field || maps.includes(cell.field)) return
                  maps.push(cell.field)
  
                  pushcol({...cell, label: labels[cell.field]})
                })
              }
            }

            if (!item.field || item.Hide === 'true' || maps.includes(item.field)) return
            if (!item.field || maps.includes(item.field)) return
            maps.push(item.field)
  
            pushcol(item)
@@ -337,16 +354,27 @@
          }

          config.cols.forEach(item => {
            if (item.type === 'colspan' && config.subtype === 'normaltable') {
              item.subcols.forEach(cell => {
                if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
                maps.push(cell.field)
            if (item.Hide === 'true') return

                pushcol(cell)
              })
            if (config.subtype === 'normaltable') {
              if (item.type === 'colspan') {
                item.subcols.forEach(cell => {
                  if (!cell.field || cell.Hide === 'true' || maps.includes(cell.field)) return
                  maps.push(cell.field)
  
                  pushcol(cell)
                })
              } else if (item.type === 'custom') {
                item.elements.forEach(cell => {
                  if (!cell.field || maps.includes(cell.field)) return
                  maps.push(cell.field)
  
                  pushcol({...cell, label: labels[cell.field]})
                })
              }
            }

            if (!item.field || item.Hide === 'true' || maps.includes(item.field)) return
            if (!item.field || maps.includes(item.field)) return
            maps.push(item.field)
  
            pushcol(item)