Revert "放开抄送"

This reverts commit bea6e51eea.

src/App.vue

@@ -63,7 +63,7 @@ watch(
 </script>
 <template>
   <ConfigGlobal :size="currentSize">
-    <div class="h-100% w-100%" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
+    <div class="h-100% w-100%" style="overflow-y: auto;" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
       <RouterView />
     </div>
     <routerSearch />

src/api/design/table/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import { encryptAES } from '@/components/LowDesign/src/utils/aes'
+import download from '@/utils/download'
 
 //获取表单开发列表
 export const getDbList = (data) => {
@@ -158,6 +159,11 @@ export const exportExcelData = (tableId, data) => {
   return request.download({ url: `/jeelowcode/excel/exportExcel/${tableId}`, method: 'POST', data })
 }
 
+//导出Excel表数据
+export const exportExcelDataCustom = (explain,tableId, data) => {
+  return request.download({ url: `/jeelowcode/excel/exportExcelCustom/${tableId}`, method: 'POST', data }).then((data) => download.excel(data, explain, 'xlsx'))
+}
+
 //下载导入模板
 export const downloadImportTemplate = (tableId) => {
   return request.download({ url: `/jeelowcode/excel/exportExcelTemplate/${tableId}` })

src/components/LowDesign/src/LowTable/index.vue

@@ -18,6 +18,18 @@
           v-bind="userVBind"
           class="w-100%"
         ></userSelect>
+   </span>
+      <span prop="delegateDictId" style="display:none">
+    
+    <DicTableSelect
+    id="costomDictSelect"
+      :column="distSelectColumn"
+      size="default"
+      type="add"
+      prop="fields_7897245"
+      :scope="dictSelectScope"
+      @set-form-data="handleSetFormData"
+    ></DicTableSelect>
    </span>
     <!-- 顶部统计 -->
     <div
@@ -383,12 +395,108 @@ interface Props {
   dicRowKey?: string //dicTable模式 行数据的 Key
 }
 
+const dictSelectScope = {
+        "key": 0,
+        "value": "",
+        "column": {
+            "type": "dicTableSelect",
+            "controlType": "select",
+            "label": "表格选择框",
+            "fixedSearch":{
+              "approveStatusName":"已审批"
+            },
+            "separator": " | ",
+            "multiple": true,
+            "display": true,
+            "span": 12,
+            "disabled": false,
+            "required": false,
+            "hideLabel": false,
+            "i18nCode": "fields_7897245",
+            "dictTable": "1959187451673116674",
+            "dictCode": "id",
+            "dictText": "personName",
+            "dictTableColumn": [
+              "personName",
+              "personAge",
+              "personSex",
+              "mobile",
+              "approveStatusName"
+            ],
+            "prop": "fields_7897245",
+            "dataType": "string",
+            "className": "control-dicTableSelect control-fields_7897245 ",
+            "props": {
+                "lable": "personName",
+                "value": "id"
+            },
+            "rules": [
+
+            ]
+        },
+        "size": "default",
+        "disabled": false
+    }
+
+const distSelectColumn = {
+        "type": "dicTableSelect",
+        "controlType": "select",
+        "multiple": true,
+        "label": "表格选择框",
+        "separator": " | ",
+        "display": true,
+        "span": 12,
+        "disabled": false,
+        "fixedSearch":{
+              "approveStatusName":"已审批"
+            },
+        "required": false,
+        "hideLabel": false,
+        "i18nCode": "fields_7897245",
+        "dictTable": "1959187451673116674",
+        "dictCode": "id",
+        "dictText": "personName",
+        "dictTableColumn": [
+          "personName",
+          "personAge",
+          "personSex",
+          "mobile",
+          "approveStatusName"
+          ]
+        ,
+        "prop": "fields_7897245",
+        "dataType": "string",
+        "className": "control-dicTableSelect control-fields_7897245 ",
+        "props": {
+            "lable": "personName",
+            "value": "id"
+        },
+        "rules": [
+
+        ]
+    }
+
 const props = withDefaults(defineProps<Props>(), {
   model: 'default',
   fixedSearch: () => {
     return {}
   }
 })
+const handleSetFormData = (key, val) => {
+  console.log(key);
+  console.log(val);
+  // 在这里添加其他处理逻辑
+  useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + val, {
+  }).then(res => {
+    if (res.length > 0) {
+        message.success('下发成功')
+        useFun.refreshChange()
+    } else {
+      message.error(res.message)
+    }
+  })
+};
+
 const userVBind = {
   prop: 'delegateUserId',
   type: 'edit',

src/components/LowDesign/src/shareControl/DicTableSelect.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="dic-table-select-box w-100%">
+    {{ JSON.stringify(props) }}
     <div
       class="table-input pos-relative"
       :class="[{ disabled }, type, size]"
@@ -273,9 +274,9 @@ const getCurrTableSelect = (type?) => {
   const dicObj = {}
   const textList: string[] = []
   const ids = tableRef.value.tableSelect.map((item) => {
-    if (item[props.column.dictText]) {
-      dicObj[item[dicCode.value]] = item[props.column.dictText]
-      textList.push(item[props.column.dictText])
+    if (item[props.column.dictCode]) {
+      dicObj[item[dicCode.value]] = item[props.column.dictCode]
+      textList.push(item[props.column.dictCode])
     }
     return item[dicCode.value]
   })

src/components/LowDesign/src/utils/defaultUseUtil.ts

@@ -7,6 +7,7 @@ import { encryptAES, decryptAES } from '@/components/LowDesign/src/utils/aes'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useI18n } from '@/hooks/web/useI18n';
 import router from '@/router/index'
+import {exportExcelDataCustom} from '@/api/design/table'
 
 const message = useMessage() // 消息弹窗
 
@@ -18,6 +19,7 @@ export default {
    * @param options 请求配置 如：{ params:{ text:'测试' } }
   */
   requestApi: (Method, url, options) => callApiFun(Method, url, options),
+  exportExcelCustom: (tableId, data) => exportExcelDataCustom(tableId, data),
   cloneDeep, //深拷贝
   listToTree,//列表转树结构
   formatDate,//时间格式化

src/views/bpm/processInstance/detail/index.vue

@@ -173,6 +173,8 @@ const handleAudit = async (task, pass) => {
   getDetail()
 }
 
+
+
 const printPage = async () => {
  
  const { href } = router.resolve({ name: 'BpmProcessInstanceInfo', 

src/views/document/TabsCardDocument.vue

@@ -61,6 +61,13 @@ const tabsPaneList = ref([
     calcHeight: 200,
     fixedSearch: {file_main_type: 4}
   },
+  {
+    label: '工作档案',
+    name: 'workArchive',
+    formId: '1966386366515343361',
+    calcHeight: 200,
+    fixedSearch: {file_main_type: 5}
+  },
 ])
 
 // 定义点击tab的事件动作