huangxw 7 maanden geleden
bovenliggende
commit
4e7d10c7dd

+ 8 - 0
src/api/authority/index.ts

@@ -60,6 +60,14 @@ export const expertPersonCount = (query?: any): AxiosPromise => {
         params: query
     });
 };
+// 专家抽取统计
+export const queryChooseCount = (query?: any): AxiosPromise => {
+    return request({
+        url: '/dgtmedicine/expertChoose/queryChooseCount',
+        method: 'get',
+        params: query
+    });
+};
 // 查询专家抽取事项信息列表
 export const expertItemList = (query?: any): AxiosPromise => {
     return request({

+ 23 - 22
src/components/DictTag/index.vue

@@ -1,28 +1,29 @@
 <template>
-    <div>
+    <div class="d-flex flex-wrap">
         <template v-for="(item, index) in options">
             <template v-if="values.includes(item.value)">
-                <span v-if="(item.elTagType === 'default' || item.elTagType === '') && (item.elTagClass === '' || item.elTagClass == null)" :key="item.value" :index="index" :class="item.elTagClass">
-                    {{ item.label + ' ' }}
-                </span>
-                <el-tag
-                    v-else
-                    :key="item.value + ''"
-                    :disable-transitions="true"
-                    :index="index"
-                    :type="
-            item.elTagType === 'primary' ||
-            item.elTagType === 'success' ||
-            item.elTagType === 'info' ||
-            item.elTagType === 'warning' ||
-            item.elTagType === 'danger'
-              ? item.elTagType
-              : 'primary'
-          "
-                    :class="item.elTagClass"
-                >
-                    {{ item.label + ' ' }}
-                </el-tag>
+                <div class="pd-4">
+                    <span v-if="(item.elTagType === 'default' || item.elTagType === '') && (item.elTagClass === '' || item.elTagClass == null)" :key="item.value" :index="index" :class="item.elTagClass">
+                        {{ item.label + ' ' }}
+                    </span>
+                    <el-tag
+                        v-else
+                        :key="item.value + ''"
+                        :disable-transitions="true"
+                        :index="index"
+                        :type="item.elTagType === 'primary' ||
+                        item.elTagType === 'success' ||
+                        item.elTagType === 'info' ||
+                        item.elTagType === 'warning' ||
+                        item.elTagType === 'danger'
+                        ? item.elTagType
+                        : 'primary'
+                    "
+                        :class="item.elTagClass"
+                    >
+                        {{ item.label + ' ' }}
+                    </el-tag>
+                </div>
             </template>
         </template>
         <template v-if="unmatch && showValue">

+ 15 - 13
src/views/authority/choose-detail/index.vue

@@ -38,19 +38,21 @@
                         <el-tag v-for="(item, index) in form?.personInfo" :key="index" class="mr-10">{{ selectDictLabel(dm_person_type, item?.personType) }}({{ item?.personCount }})</el-tag>
                     </div>
                     <el-divider />
-                    <div class="info-title f-w-5 mb-10">审核记录</div>
-                    <!-- // 表格 -->
-                    <vxe-table :data="form?.approvalLogVos" border min-height="0" style="width: 100%">
-                        <vxe-column title="审核结果">
-                            <template #default="{ row }">
-                                <div v-if="+row?.res === 1" class="c-primary">通过</div>
-                                <div v-if="+row?.res === 2" class="c-danger">不通过</div>
-                                <div v-if="+row?.res === 2" class="f-s-12 c-danger">原因:{{ row?.msg }}</div>
-                            </template>
-                        </vxe-column>
-                        <vxe-column field="createTime" title="审核时间" />
-                        <vxe-column field="auditorName" title="审核人" />
-                    </vxe-table>
+                    <template v-if="form?.approvalLogVos.length">
+                        <div class="info-title f-w-5 mb-10">审核记录</div>
+                        <!-- // 表格 -->
+                        <vxe-table :data="form?.approvalLogVos" border min-height="0" style="width: 100%">
+                            <vxe-column title="审核结果">
+                                <template #default="{ row }">
+                                    <div v-if="+row?.res === 1" class="c-primary">通过</div>
+                                    <div v-if="+row?.res === 2" class="c-danger">不通过</div>
+                                    <div v-if="+row?.res === 2" class="f-s-12 c-danger">原因:{{ row?.msg }}</div>
+                                </template>
+                            </vxe-column>
+                            <vxe-column field="createTime" title="审核时间" />
+                            <vxe-column field="auditorName" title="审核人" />
+                        </vxe-table>
+                    </template>
                     <template v-if="form?.res === '1'">
                         <el-divider />
                         <div class="info-title f-w-5 mb-10">

+ 11 - 7
src/views/authority/choose-list/index.vue

@@ -39,7 +39,7 @@
             <div class="d-flex flex1 ov-hd flex-cln pd-16">
                 <div class="d-flex j-sb mb-16">
                     <div>
-                        <searchTabs v-model="queryParams.status" @change="handleQuery" :list="tabs" key-label="name" key-count="num" key-value="type"></searchTabs>
+                        <searchTabs v-model="queryParams.res" @change="handleQuery" :list="tabs" key-label="name" key-count="num" key-value="type"></searchTabs>
                     </div>
                 </div>
                 <div class="flex1 ov-hd">
@@ -61,7 +61,11 @@
                         <vxe-column title="联系电话" width="110" field="tel" :formatter="colNoData" />
                         <vxe-column title="抽取专家要求">
                             <template #default="{ row }">
-                                <el-tag v-for="(item, index) in row?.personInfo" :key="index">{{ selectDictLabel(dm_person_type, item?.personType) }}({{ item?.personCount }})</el-tag>
+                                <div class="d-flex flex-wrap">
+                                    <div v-for="(item, index) in row?.personInfo" :key="index" class="pd-4">
+                                        <el-tag>{{ selectDictLabel(dm_person_type, item?.personType) }}({{ item?.personCount }})</el-tag>
+                                    </div>
+                                </div>
                             </template>
                         </vxe-column>
                         <vxe-column title="事项状态" width="100">
@@ -83,11 +87,11 @@
     </div>
 </template>
 
-<script setup name="authority-choose-list" lang="ts">
+<script setup name="choose-check" lang="ts">
 import { colNoData } from '@/utils/noData';
 import { DateRange } from '@/views/models/index';
 import { searchTabs } from '@/views/models';
-import { expertItemList, expertList, expertPersonCount, expertPersonDelete, expertPersonOff, expertPersonOn } from '@/api/authority';
+import { expertItemList, expertList, expertPersonCount, expertPersonDelete, expertPersonOff, expertPersonOn, queryChooseCount } from '@/api/authority';
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { dm_join_type, dm_person_type, dm_expert_item_list } = toRefs<any>(proxy?.useDict('dm_join_type', 'dm_person_type', 'dm_expert_item_list'));
@@ -102,10 +106,10 @@ const data = reactive<any>({
     queryParams: {
         pageNum: 1,
         pageSize: 10,
-        status: '',
+        res: '0',
         startDate: '',
         endDate: '',
-        dateRange: [],
+        dateRange: []
     },
     rules: {}
 });
@@ -142,7 +146,7 @@ const editRow = (row) => {
 // 获取专家统计数量
 const tabs = ref([]);
 const getExpertPersonCount = async () => {
-    const res = await expertPersonCount();
+    const res = await queryChooseCount();
     if (res?.code === 200) {
         tabs.value = res.data;
     }

+ 3 - 3
src/views/authority/info/index.vue

@@ -12,15 +12,15 @@
                             <el-form-item label="单位" prop="workUnit">
                                 <el-input v-model="queryParams.workUnit" placeholder="搜单位关键字" clearable style="width: 160px" @keyup.enter="handleQuery" />
                             </el-form-item>
-                            <el-form-item label="拟加入专家组" prop="queryPersonType">
-                                <el-select style="width: 140px" v-model="queryParams.queryPersonType" clearable placeholder="请选择拟加入专家组">
+                            <el-form-item label="专家组" prop="queryPersonType">
+                                <el-select style="width: 160px" v-model="queryParams.queryPersonType" clearable placeholder="请选择专家组">
                                     <el-option v-for="item in dm_person_type" :key="item.value" :label="item.label" :value="item.value" @change="handleQuery" />
                                 </el-select>
                             </el-form-item>
                             <el-form-item label="专业品种" prop="variety">
                                 <el-input v-model="queryParams.variety" placeholder="搜专业品种" clearable style="width: 160px" @keyup.enter="handleQuery" />
                             </el-form-item>
-                            <el-form-item label="前端显示状态" prop="putawayFlag">
+                            <el-form-item label="前端显示" prop="putawayFlag">
                                 <el-select style="width: 140px" v-model="queryParams.putawayFlag" clearable placeholder="请选择状态">
                                     <el-option label="显示" value="1" />
                                     <el-option label="不显示" value="0" />