档案

src/views/manage/index/detail.vue

@@ -189,6 +189,7 @@ const initDetail = () => {
 }
 watch(() => props.show, (n) => {
   if (n) {
+    state.loading = false
     initDictionary()
     if (props.transfer.mode === 'add') {
       state.form = {

src/views/manage/index/text-detail.vue

@@ -193,6 +193,7 @@ const onSubmit = () => {
 }
 watch(() => props.show, (n) => {
   if (n) {
+    state.loading = false
     initDictionary()
     if (props.transfer.mode === 'add') {
       state.form = {

src/views/manage/index/theme.vue

@@ -92,7 +92,7 @@ const onSubmit = () => {
       const params = {
         indexId: props.transfer.row.id,
         themeId: state.form.themeId,
-        themeField: JSON.stringify(state.textTable.data)
+        themeField: state.textTable.data.length > 0 ? JSON.stringify(state.textTable.data) : ''
       }
       sysIndexSaveThemeInfo(params).then(res => {
         if (res.code === 200) {

src/views/manage/system/dict/detail.vue

@@ -137,6 +137,7 @@ const initDetail = () => {
 }
 watch(() => props.show, (n) => {
   if (n) {
+    state.loading = false
     initDictionary()
     if (props.transfer.mode === 'parent') {
       state.form = {

src/views/manage/system/role/detail.vue

@@ -110,6 +110,7 @@ const initDetail = () => {
 }
 watch(() => props.show, (n) => {
   if (n) {
+    state.loading = false
     initDictionary()
     if (props.transfer.mode === 'add') {
       state.form = {}

src/views/manage/system/user/detail.vue

@@ -116,6 +116,7 @@ const initDetail = () => {
 }
 watch(() => props.show, (n) => {
   if (n) {
+    state.loading = false
     initDictionary()
     if (props.transfer.mode === 'add') {
       state.form = {}

src/views/manage/type/detail.vue

@@ -139,6 +139,7 @@ const initDetail = () => {
 }
 watch(() => props.show, (n) => {
   if (n) {
+    state.loading = false
     initDictionary()
     if (props.transfer.mode === 'add') {
       state.form = {

src/views/web/list/index.vue

@@ -55,7 +55,7 @@
               <transition-group name="list" tag="div">
                 <template v-if="item.__expend">
                   <template v-for="son in item.children">
-                    <div class="item-son __hover" :class="{active: son.treeId === state.resultParams.activeIndex}" @click="state.resultParams.activeIndex = son.treeId" v-if="son.__count > 0">
+                    <div class="item-son __hover" :class="{active: son.__id === state.resultParams.activeKey}" @click="state.resultParams.activeIndex = son.treeId, state.resultParams.activeKey = son.__id" v-if="son.__count > 0">
                       {{son.treeName}}<span class="total">({{son.__count}})</span>
                     </div>
                   </template>
@@ -148,7 +148,7 @@
                       <div class="__hover" @click="state.ws.detail(item.esId)">
                         <SvgIcon name="detail_1" color="var(--cus-main-color)"/>详情
                       </div>
-                      <div class="__hover" v-if="tableConfigCpt.themeMode !== 'no_support'" @click="toArchive(item)">
+                      <div class="__hover" v-if="tableConfigCpt.themeMode !== 'no_support' && tableConfigCpt.themeId" @click="toArchive(item)">
                         <SvgIcon name="archives_1" color="var(--cus-main-color)"/>档案
                       </div>
                     </div>
@@ -181,7 +181,7 @@
                           <div class="__hover" @click="state.ws.detail(item.esId)">
                             <SvgIcon name="detail_1" color="var(--cus-main-color)"/>详情
                           </div>
-                          <div class="__hover" v-if="tableConfigCpt.themeMode !== 'no_support'" @click="toArchive(item)">
+                          <div class="__hover" v-if="tableConfigCpt.themeMode !== 'no_support' && tableConfigCpt.themeId" @click="toArchive(item)">
                             <SvgIcon name="archives_1" color="var(--cus-main-color)"/>档案
                           </div>
                         </div>
@@ -256,7 +256,8 @@ const state: any = reactive({
     tree: [],
     activeTab: '',
     activeIndex: '',
-    indexConfig: {}
+    indexConfig: {},
+    activeKey: ''
   },
   ws: {
     instance: null,
@@ -326,7 +327,12 @@ const tableConfigCpt = computed(() => {
     cardImg: cardImg,
     cardConfig: cardConfig,
     detailConfig: detailConfig,
-    themeMode: state.resultParams.indexConfig.themeMode
+    themeMode: state.resultParams.indexConfig.themeMode,
+    themeId: state.resultParams.indexConfig.themeId,
+    themeField: state.resultParams.indexConfig.themeField,
+    themeType: state.resultParams.indexConfig.themeType,
+    themeUrl: state.resultParams.indexConfig.themeUrl,
+    themeParam: state.resultParams.indexConfig.themeParam,
   }
   state.tableParams.model = state.resultParams.indexConfig.defModel === 'column_model' ? 'list' : 'card'
   console.log(res)
@@ -370,6 +376,7 @@ const onSearch = () => {
 const initResultTree = () => {
   state.resultParams.activeTab = ''
   state.resultParams.activeIndex = ''
+  state.resultParams.activeKey = ''
   const arr = []
   WebStore.searchAreaTree.forEach(v => {
     const t = {
@@ -405,19 +412,27 @@ const onPage = (pageNum, pageSize) => {
   state.ws.list(false)
 }
 const toArchive = (item) => {
-  switch (tableConfigCpt.value.themeMode) {
-    case 'person': {
-      const routerUrl = router.resolve({
-        name: '2a9583dc-94ed-430e-baa7-b61af9723a0c',
-        query: {
-          esId: item.esId
+  let url = tableConfigCpt.value.themeUrl
+  switch (String(tableConfigCpt.value.themeType)) {
+    case '2': {
+      if (tableConfigCpt.value.themeField) {
+        let p = []
+        JSON.parse(tableConfigCpt.value.themeField).forEach(v => {
+          p.push(`${v.themeParam}=${item[v.fieldParam].replace(/<em>|<\/em>/g, '')}`)
+        })
+        if (p.length > 0) {
+          url += `?${p.join('&')}`
         }
-      })
-      window.open(routerUrl.href, "_blank")
+        console.log(url)
+      }
     } break
-    case 'car': {
+    case '3': {
+      if (tableConfigCpt.value.themeParam) {
+        url += tableConfigCpt.value.themeParam
+      }
     } break
   }
+  window.open(url, "_blank")
 }
 const initDictionary = () => {
   DictionaryStore.initDict('gx_method')
@@ -586,6 +601,7 @@ const initWS = () => {
                         const index = type.children[indexI]
                         if (index.__count > 0 && !state.resultParams.activeIndex) {
                           state.resultParams.activeIndex = index.treeId
+                          state.resultParams.activeKey = index.__id
                           break
                         }
                       }