fix

fanguang
Showing 2 changed files with 47 additions and 48 deletions
src/views/data_meta/standard-codetable.vue
src/views/data_meta/standard-import.vue
--- a/src/views/data_meta/standard-codetable.vue
View file @34c312e
+++ b/src/views/data_meta/standard-codetable.vue
View file @34c312e
@@ -115,7 +115,10 @@ const tableInfo: any = ref({
    { label: '标准号', field: 'standard', width: 140 },
    { label: '标准名称', field: 'standardName', width: 140 },
    // { label: '启用状态', field: 'bizState', type: 'switch', activeText: '启用', inactiveText: '停用', activeValue: 1, inactiveValue: 0, switchWidth: 56, width: 100, align: 'center' },
-    { label: '启用状态', field: 'bizState', type: 'tag', width: 100, align: 'center' },
+    { label: '启用状态', field: 'bizState', type: 'tag', width: 100, align: 'center',getName: (scope) => {
+        let status = scope.row.bizState;
+        return status == 'Y' ? '启用' : '停用';
+      } },
    { label: '创建时间', field: 'createTime', width: 140 }
  ],
  data: [],
@@ -309,7 +312,7 @@ const formItems: any = ref([
    required: true
  },
  {
-    label: '编码字段11',
+    label: '编码字段',
    type: 'select',
    placeholder: '请选择',
    field: 'codeFields',
@@ -320,6 +323,7 @@ const formItems: any = ref([
    multiple: true,
    tagsTooltip: true,
 		filterable: true,
+    visible: true
  },
  {
    label: '编码名称',
@@ -329,7 +333,8 @@ const formItems: any = ref([
    default: '',
    options: codeOptions,
    clearable: true,
-    required: true
+    required: true,
+    visible: true
  },
  {
    label: '层级结构',
@@ -338,7 +343,7 @@ const formItems: any = ref([
    field: 'hierarchy',
    default: '',
    clearable: true,
-    visible: true
+    visible: false
  }
 ])
 const formRules: any = ref({
@@ -571,36 +576,10 @@ const drawerInfo: any = ref({
 })
 const setFormItems = (row: any = null) => {
-  formItems.value = JSON.parse(JSON.stringify(orginItems))
+  // formItems.value = JSON.parse(JSON.stringify(orginItems))
  formItems.value.map(item => {
-    if (item.field == 'databaseNameZh') {
-      item.options = dataBaseList.value
      item.default = row ? row[item.field] : ''
-    } else if (item.field == 'dictionaryType') {
-      item.default = dictionaryType.value
-      // item.disabled = drawerInfo.value.type == 'add' ? false : true
-      item.disabled = true
-      item.children.map(child => {
-        child.options = orginOptions
-        if (child.field == 'codeColumn') {
-          child.default = row ? row[child.field] : 'code'
-        } else if (child.field == 'codeName') {
-          child.default = row ? row[child.field] : 'name'
-        } else {
-          child.default = row ? row[child.field] : ''
-        }
-        child.disabled = drawerInfo.value.type == 'detail' ? true : false
-        child.clearable = drawerInfo.value.type == 'detail' ? false : true
-      })
-    } else if (item.field == 'enName') {
-      item.default = row ? row[item.field] : ''
-      item.disabled = drawerInfo.value.type == 'add' ? false : true
-      item.clearable = drawerInfo.value.type == 'add' ? true : false
-    } else {
-      item.default = row ? row[item.field] : ''
-      item.disabled = drawerInfo.value.type == 'detail' ? true : false
-      item.clearable = drawerInfo.value.type == 'detail' ? false : true
-    }
  })
  formInfo.value.formInfo.readonly = drawerInfo.value.type == 'detail'
  formInfo.value.formInfo.items = formItems.value
@@ -1359,7 +1338,7 @@ const setDetailInfo = () => {
  setCodeOptions()
 }
-const saveData = async (params) => {
+const saveData = async (params, btnValue) => {
  // const passInfo = await checkParamsData()
  console.log('params', params)
  let request = drawerInfo.value.type === 'add' ? saveStandardCode : updateStandardCode
@@ -1368,11 +1347,20 @@ const saveData = async (params) => {
      ElMessage.success('操作成功')
      getTreeData()
      drawerInfo.value.visible = false
+      if (btnValue === 'saveAndAdd') {
+        // 跳转代码详情
+        toStandardCodeDetail(res.data)
+      }
+    } else {
+      ElMessage.error(res.msg)
    }
  }).finally(() => {
    drawerInfo.value.footer.btns.map((item: any) => item.disabled = false)
  })
 }
+function toStandardCodeDetail (guid) {
+}
 const scrollTable = (rowInfo) => {
  nextTick(() => {
@@ -1413,7 +1401,7 @@ const drawerBtnClick = (btn, info) => {
  }
  if (btn.value == 'submit' || btn.value == 'saveAndAdd') {
    drawerInfo.value.footer.btns.map((item: any) => item.disabled = true)
-    saveData(params)
+    saveData(params,btn.value)
  } else {
    drawerInfo.value.footer.btns.map((item: any) => delete item.disabled)
    nextTick(() => {
@@ -1423,9 +1411,19 @@ const drawerBtnClick = (btn, info) => {
 }
 const radioGroupChange = async (val, info) => {
-  dictionaryType.value = Number(val)
+  // console.log(val, info)
  await setFormItems(info)
-  setGroup()
+  // setGroup()
+  if (val == 1) {
+    // 列表结构
+    formItems.value.find(v => v.field === 'codeFields')['visible'] = true
+    formItems.value.find(v => v.field === 'codeFieldName')['visible'] = true
+    formItems.value.find(v => v.field === 'hierarchy')['visible'] = false
+  } else {
+    formItems.value.find(v => v.field === 'codeFields')['visible'] = false
+    formItems.value.find(v => v.field === 'codeFieldName')['visible'] = false
+    formItems.value.find(v => v.field === 'hierarchy')['visible'] = true
+  }
 }
 // 切换结构类型 设置选项显隐
@@ -1480,17 +1478,7 @@ onBeforeMount(() => {
 })
 onMounted(() => {
-  let dom = document.getElementById('main-app');
-  if (dom) {
-    dom.addEventListener('click', (event: any) => {
-      // 新建时不要处理。
-      if (drawerInfo.value.header.title == '数据字典详情' && !event.target?.classList?.contains('drawer-detail-cell')) {
-        if (drawerInfo.value.visible) {
-          drawerInfo.value.visible = false;
-        }
-      }
-    });
-  }
 });
 </script>
--- a/src/views/data_meta/standard-import.vue
View file @34c312e
+++ b/src/views/data_meta/standard-import.vue
View file @34c312e
@@ -29,6 +29,7 @@ import {
  getDictionaryTree
 } from '@/api/modules/dataInventory';
 import { commonPageConfig } from '@/utils/enum';
+import * as XLSX from 'xlsx';
 const { proxy } = getCurrentInstance() as any;
@@ -330,8 +331,18 @@ const open = (msg, type, isBatch = false) => {
  });
 };
+const sheetNameList = ref([])
 const onUpload = (file, fileList) => {
+  // console.log('file', file)
  uploadFiles.value = fileList
+  const reader = new FileReader()
+  reader.onload = function (e) {
+    let data = new Uint8Array(e.target.result)
+    let wb = XLSX.read(data, { type: 'array', raw: false, cellDates: true })
+    console.log('wb', wb)
+    sheetNameList.value = wb.SheetNames
+  }
+  reader.readAsArrayBuffer(file.raw)
 }
 const uploadBtnClick = (btn) => {
@@ -511,7 +522,7 @@ onActivated(() => {
                </el-form-item>
                <el-form-item v-for="item in uploadSetting" :key="item.standardGuid" :label="item.standardName" required >
                    <el-select v-model="item.value" placeholder="请选择" style="width:200px" clearable>
-                        <el-option v-for="i in uploadSetting.length" :label="`Sheet${i}`" :value="`Sheet${i}`" :key="i"></el-option>
+                        <el-option v-for="item,i in sheetNameList" :label="item" :value="item" :key="i"></el-option>
                    </el-select>
                </el-form-item>
            </el-form>