xxxxx

src/packages/pc/views/member/institution/broker/components/details/index.vue

@@ -2,17 +2,11 @@
 <template>
     <app-drawer :title="t('member.institution.broker.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
         <app-table-details :title="t('member.institution.broker.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
-        <span>
-            <span>{{ t('member.institution.broker.details.market') }}</span>
-            <span>{{ t('member.institution.broker.details.markets') }}</span>
-            <span v-for="item in goodslimit" v-bind:key="item.id">
-                <span>{{ item.title }}: </span>
-            </span> 
-        </span>
-        <span>
-            <span>{{ t('member.institution.broker.details.market') }}</span>
-            <span>{{ t('member.institution.broker.details.transurl') }} {{ data?.transurl }}</span>
-        </span>
+        <app-table-details :title="t('member.institution.broker.details.market')" :data="data?.organ" :label-width="160" :cell-props="detailProps2">
+            <template #market>
+                {{ goodslimit.join(',') }}
+            </template>
+        </app-table-details>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
         </template>
@@ -53,6 +47,12 @@ const { data } = useRequest(queryRoleDetail, {
     }
 })
 
+const goodslimit = computed(() => data.value?.markets.map(e => `${e.marketname+': '+goodsinfo(e.marketid)}`) ?? [])
+
+const goodsinfo = (marketid: number) => { 
+    return ((data.value?.operategoodsinfo ?? []).filter(e => e.marketid === marketid).map(e => e.goodsname) ?? []).join(',') ?? ''
+}
+
 const detailProps1: CellProp[] = [
     { prop: 'accountname', label: 'member.institution.broker.details.accountname' },
     { prop: 'userName', label: 'member.institution.broker.details.userName', formatValue: () => {
@@ -61,15 +61,10 @@ const detailProps1: CellProp[] = [
     { prop: 'reckonaccountid', label: 'member.institution.broker.details.reckonaccountid' }
 ]
 
-const goodslimit = computed(() => {
-    return data.value?.markets.map(e => {
-        return {
-            id: e.marketid,
-            title: e.marketname,
-            value: data.value?.operategoodsinfo?.filter(g => g.marketid === e.marketid).map(e => e.goodsname).join(','),
-        }
-    }) ?? []
-})
+const detailProps2: CellProp[] = [
+    { prop: 'market', label: 'member.institution.broker.details.markets' },
+    { prop: 'transurl', label: 'member.institution.broker.details.transurl' }
+]
 
 const onCancel = (isRefresh = false) => {
     show.value = false

src/packages/pc/views/member/institution/marketer/components/details/index.vue

@@ -4,9 +4,6 @@
         <app-table-details :title="t('member.institution.marketer.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
         <app-table-details :title="t('member.institution.marketer.details.subtitle3')" :data="data?.roleNight[0]" :label-width="160" :cell-props="detailProps2" :column="1" />
         <app-table-details v-if="marker" :title="t('member.institution.marketer.details.subtitle4')" :data="marker" :label-width="160" :cell-props="detailProps3" :column="2" />
-        <fieldset class="g-fieldset el-form--horizontal">
-            <legend class="g-fieldset__legend">{{ t('member.institution.marketer.details.subtitle4') }}</legend>
-        </fieldset>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
         </template>

src/packages/pc/views/member/institution/operation/components/details/index.vue

@@ -2,13 +2,11 @@
 <template>
     <app-drawer :title="t('member.institution.operation.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
         <app-table-details :title="t('member.institution.operation.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
-        <span>
-            <span>{{ t('member.institution.operation.details.subtitle2') }}</span>
-            <span v-for="item in goodslimit" v-bind:key="item.id">
-                <span>{{ item.title }}: </span>
-                <span>{{ item.value }}</span>
-            </span> 
-        </span>
+        <app-table-details :title="t('member.institution.operation.details.subtitle2')" :data="data?.organ" :label-width="160" :cell-props="detailProps2">
+            <template #goodslimit>
+                {{ goodslimit.join(',') }}
+            </template>
+        </app-table-details>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
         </template>
@@ -56,15 +54,15 @@ const detailProps1: CellProp[] = [
     { prop: 'reckonaccountid', label: 'member.institution.operation.details.reckonaccountid' }
 ]
 
-const goodslimit = computed(() => {
-    return data.value?.operatemarkets.map(e => {
-        return {
-            id: e.marketid,
-            title: e.marketname,
-            value: data.value?.operategoodsinfo?.filter(g => g.marketid === e.marketid).map(e => e.goodsname).join(','),
-        }
-    }) ?? []
-})
+const goodslimit = computed(() => data.value?.operatemarkets.map(e => `${e.marketname+': '+goodsinfo(e.marketid)}`) ?? [])
+
+const goodsinfo = (marketid: number) => { 
+    return ((data.value?.operategoodsinfo ?? []).filter(e => e.marketid === marketid).map(e => e.goodsname) ?? []).join(',') ?? ''
+}
+
+const detailProps2: CellProp[] = [
+    { prop: 'goodslimit', label: 'member.institution.industry.details.subtitle2' }
+]
 
 const onCancel = (isRefresh = false) => {
     show.value = false

src/packages/pc/views/member/institution/self/components/details/index.vue

@@ -2,12 +2,11 @@
 <template>
     <app-drawer :title="t('member.institution.self.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
         <app-table-details :title="t('member.institution.self.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
-        <span>
-            <span>{{ t('member.institution.self.details.market') }}</span>
-            <span v-for="item in goodslimit" v-bind:key="item.id">
-                <span>{{ item.title }}: </span>
-            </span> 
-        </span>
+        <app-table-details :title="t('member.institution.self.details.market')" :data="data?.organ" :label-width="80" :cell-props="detailProps2">
+            <template #market>
+                {{ goodslimit.join(', ') }}
+            </template>
+        </app-table-details>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
         </template>
@@ -56,14 +55,11 @@ const detailProps1: CellProp[] = [
     { prop: 'reckonaccountid', label: 'member.institution.self.details.reckonaccountid' }
 ]
 
-const goodslimit = computed(() => {
-    return data.value?.markets.map(e => {
-        return {
-            id: e.marketid,
-            title: e.marketname
-        }
-    }) ?? []
-})
+const detailProps2: CellProp[] = [
+    { prop: 'market', label: 'member.institution.self.details.market' }
+]
+
+const goodslimit = computed(() => data.value?.markets.map((e) => e.marketname) ?? [])
 
 const onCancel = (isRefresh = false) => {
     show.value = false

src/packages/pc/views/member/institution/warehouse/components/details/index.vue

@@ -2,13 +2,11 @@
 <template>
     <app-drawer :title="t('member.institution.warehouse.details.title')" width="900" v-model:show="show" :loading="loading" :refresh="refresh">
         <app-table-details :title="t('member.institution.warehouse.details.subtitle')" :data="data?.organ" :label-width="160" :cell-props="detailProps1" :column="2" />
-        <span>
-            <span>{{ t('member.institution.warehouse.details.subtitle2') }}</span>
-            <span v-for="item in warehouse" v-bind:key="item.id">
-                <span>{{ item.label }}: </span>
-                <span>{{ item.title }}</span>
-            </span> 
-        </span>
+        <app-table-details :title="t('member.institution.warehouse.details.subtitle2')" :data="data?.organ" :label-width="160" :cell-props="detailProps2">
+            <template #warehouse>
+                {{ warehouse.join(',') }}
+            </template>
+        </app-table-details>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
         </template>
@@ -57,15 +55,11 @@ const detailProps1: CellProp[] = [
     { prop: 'reckonaccountid', label: 'member.institution.warehouse.details.reckonaccountid' }
 ]
 
-const warehouse = computed(() => {
-    return data.value?.warehouse.map(e => {
-        return {
-            id: e.warehousecode,
-            title: e.warehousename,
-            label: t('member.institution.warehouse.details.subtitle2')
-        }
-    }) ?? []
-})
+const warehouse = computed(() => data.value?.warehouse.map((e) => e.warehousename ) ?? [])
+
+const detailProps2: CellProp[] = [
+    { prop: 'warehouse', label: 'member.institution.warehouse.details.subtitle2' }
+]
 
 const onCancel = (isRefresh = false) => {
     show.value = false